Version 1.0.0pre4vdr-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.

1 files changed, 359 insertions, 199 deletions

diff --git a/i18n.c b/i18n.c
index 2b52c68..a7d6305 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)