Corrected text in setup menu (timer-conflicts are now checked with epgsearch)

2 files changed, 2 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index aad47bd..cb924dc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -66,6 +66,7 @@ ____-__-__: Version 1.3
   - new: Option "bgColor" used for items "Text", "Marquee", and "Blink".
   - remember period to next timeout when doing a non-timeout refresh
     prevent occasional start/stop of marquee-text
+- Corrected text in setup menu (timer-conflicts are now checked with epgsearch)
 
 2009-06-01: Version 1.2
 
diff --git a/menu.c b/menu.c
index 200278a..d8bf5cd 100644
--- a/menu.c
+++ b/menu.c
@@ -25,7 +25,7 @@ void cText2SkinSetupPage::Setup(void) {
 		Add(new cMenuEditBoolItem(tr("   Extract known tags"), &mData.StripAux, tr("no"), tr("yes")));
 #endif
 #if VDRVERSNUM >= 10330
-	Add(new cMenuEditBoolItem(tr("Use 'timeline' to check timer-conflicts"), &mData.CheckTimerConflict, tr("no"), tr("yes")));
+	Add(new cMenuEditBoolItem(tr("Use 'epgsearch' to check timer-conflicts"), &mData.CheckTimerConflict, tr("no"), tr("yes")));
 #endif
 	Add(new cOsdItem(tr("Flush image cache"), osUser1));
 	Add(new cMenuEditIntItem(tr("Max. image cache size"), &mData.MaxCacheFill));