From 326cf18915b9e09636ceaf1e669464f4c81bd567 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 14 Jan 2005 13:19:21 +0100
Subject: [PATCH] Completed the Finnish OSD texts and fixed
 internationalization of the text for "Setup/DVB/Audio language(s)"

---
 CONTRIBUTORS |  6 +++++-
 HISTORY      |  2 ++
 i18n.c       | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 menu.c       |  4 ++--
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index acdf227c..b8b55b45 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -835,9 +835,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
diff --git a/HISTORY b/HISTORY
index 47fcc381..44e59c18 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3294,3 +3294,5 @@ Video Disk Recorder Revision History
   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).
diff --git a/i18n.c b/i18n.c
index 911dd233..39a634e4 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.170 2005/01/14 13:16:03 kls Exp $
  *
  * Translations provided by:
  *
@@ -2302,7 +2302,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Äänen kieli ei ole valittavissa!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -3102,7 +3102,7 @@ const tI18nPhrase Phrases[] = {
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Käytä Dolby Digital -ääntä",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -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,7 +4681,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Ääni",
     "",// TODO
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index 6f8ef283..49f56105 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.335 2005/01/14 13:13:58 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();