From 3ad941de73f411f42be4439aaf9e73837915376f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 17 Jun 2007 12:33:53 +0200
Subject: [PATCH] Changed the parameter "OSD font" to "Default font" in
 "Setup/OSD"

---
 CONTRIBUTORS |  1 +
 HISTORY      |  2 ++
 MANUAL       |  8 ++++----
 i18n.c       | 10 +++++-----
 menu.c       |  8 ++++----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 51041238..77ddbaf8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1013,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
diff --git a/HISTORY b/HISTORY
index 2818df27..14db3b7a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5249,3 +5249,5 @@ Video Disk Recorder Revision History
 - 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).
diff --git a/MANUAL b/MANUAL
index e244e46f..86379acf 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/i18n.c b/i18n.c
index b99b8ba4..fdeafc5b 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.296 2007/06/17 12:28:20 kls Exp $
+ * $Id: i18n.c 1.297 2007/06/17 12:31:02 kls Exp $
  *
  * Translations provided by:
  *
@@ -3578,8 +3578,8 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$OSD font name",
-    "OSD Schriftart",
+  { "Setup.OSD$Default font",
+    "Standard-Schriftart",
     "",// 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
@@ -3624,7 +3624,7 @@ const tI18nPhrase Phrases[] = {
     "",// TODO
     "",// TODO
   },
-  { "Setup.OSD$Fixed font name",
+  { "Setup.OSD$Fixed font",
     "Festbreiten-Schriftart",
     "",// TODO
     "",// TODO
diff --git a/menu.c b/menu.c
index 084d75ef..13e224d9 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.454 2007/06/17 11:54:35 kls Exp $
+ * $Id: menu.c 1.455 2007/06/17 12:33:01 kls Exp $
  */
 
 #include "menu.h"
@@ -2214,9 +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));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$OSD font name"),          &fontOsdIndex, fontOsdNames.Size(), &fontOsdNames[0]));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Small font name"),        &fontSmlIndex, fontSmlNames.Size(), &fontSmlNames[0]));
-  Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font name"),        &fontFixIndex, fontFixNames.Size(), &fontFixNames[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));