summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dummer <martin.dummer@gmx.net>2012-06-19 10:56:20 +0200
committerMartin Dummer <martin.dummer@gmx.net>2012-06-19 10:56:20 +0200
commit237b14cd40b06b2dbcd9230b7e5b2fc5223d1062 (patch)
treecaa6574e3c44392da0c2b9a229680d14e1d5ee6a
parent3f2ce05498fcd485ae013df0c07c6f305f66415f (diff)
downloadvdr-plugin-undelete-237b14cd40b06b2dbcd9230b7e5b2fc5223d1062.tar.gz
vdr-plugin-undelete-237b14cd40b06b2dbcd9230b7e5b2fc5223d1062.tar.bz2
merge patch with cosmetic changes: change text summary to info for VDR >= 1.3.25 from Matthias Schwarzott <zzam@gentoo.org>
-rw-r--r--HISTORY2
-rw-r--r--menuundelete.c2
-rw-r--r--undelete.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 8f3de74..70a6df4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -46,5 +46,7 @@ VDR Plugin 'undelete' Revision History
- merge patch for gcc-4.4 from Holger Schvestka <hotzenplotz5@gmx.de>
- merge patch with changes for VDR >= 1.5.7 from Stone <syphyr@gmail.com>
- merge patch with changes for VDR >= 1.7.3 from Thomas Günther <tom@toms-cafe.de>
+- merge patch with cosmetic changes: change text summary to info for VDR >= 1.3.25
+ from Matthias Schwarzott <zzam@gentoo.org>
diff --git a/menuundelete.c b/menuundelete.c
index 0402c71..0c24bc7 100644
--- a/menuundelete.c
+++ b/menuundelete.c
@@ -422,7 +422,7 @@ eOSState cMenuRecordingSelect::FunctionCall(int FunctionNumber)
case 7: recording = GetRecording(item);
#if VDRVERSNUM >= 10325
if (recording && recording->Info() && recording->Info()->Description() && *recording->Info()->Description())
- state = AddSubMenu(new cMenuText(tr("Summary"), recording->Info()->Description()));
+ state = AddSubMenu(new cMenuText(tr("Info"), recording->Info()->Description()));
#else
if (recording && recording->Summary() && *recording->Summary())
state = AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
diff --git a/undelete.c b/undelete.c
index 226737b..a3f99b8 100644
--- a/undelete.c
+++ b/undelete.c
@@ -286,7 +286,11 @@ void cPluginUndelete::TestAndSetOSDLanguage(void)
FunctionHotKey[4] = tr("Display$purge all");
FunctionHotKey[5] = tr("Display$salvage all");
FunctionHotKey[6] = tr("Open");
+#if VDRVERSNUM >= 10325
+ FunctionHotKey[7] = tr("Info");
+#else
FunctionHotKey[7] = tr("Summary");
+#endif
FunctionHotKey[8] = tr("Display$<--1");
FunctionHotKey[9] = tr("Display$2-->");
FunctionHotKey[10] = tr("Display$disp. keys");