summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY4
-rw-r--r--MANUAL5
-rw-r--r--channels.c36
-rw-r--r--channels.h8
-rw-r--r--config.c5
-rw-r--r--config.h3
-rw-r--r--menu.c3
-rw-r--r--po/ar.po5
-rw-r--r--po/ca_ES.po5
-rw-r--r--po/cs_CZ.po5
-rw-r--r--po/da_DK.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/el_GR.po5
-rw-r--r--po/es_ES.po5
-rw-r--r--po/et_EE.po5
-rw-r--r--po/fi_FI.po5
-rw-r--r--po/fr_FR.po5
-rw-r--r--po/hr_HR.po5
-rw-r--r--po/hu_HU.po5
-rw-r--r--po/it_IT.po5
-rw-r--r--po/lt_LT.po5
-rw-r--r--po/mk_MK.po5
-rw-r--r--po/nl_NL.po5
-rw-r--r--po/nn_NO.po5
-rw-r--r--po/pl_PL.po5
-rw-r--r--po/pt_PT.po5
-rw-r--r--po/ro_RO.po5
-rw-r--r--po/ru_RU.po5
-rw-r--r--po/sk_SK.po5
-rw-r--r--po/sl_SI.po5
-rw-r--r--po/sr_SR.po5
-rw-r--r--po/sv_SE.po5
-rw-r--r--po/tr_TR.po5
-rw-r--r--po/uk_UA.po5
-rw-r--r--po/zh_CN.po5
-rw-r--r--sources.h3
36 files changed, 168 insertions, 39 deletions
diff --git a/HISTORY b/HISTORY
index 4b044889..a65aac58 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7148,7 +7148,7 @@ Video Disk Recorder Revision History
caching the information whether a recording is stored on the video directory file
system within the cRecording data (based on a patch from Torsten Lang).
-2012-06-13: Version 1.7.29
+2012-06-17: Version 1.7.29
- Added a missing template specification to the c'tor of cSortedTimers (thanks to Udo
Richter).
@@ -7187,3 +7187,5 @@ Video Disk Recorder Revision History
is currently open.
- Changed some of the colors in the LCARS skin (you may need to delete the file
lcars-default.theme from your themes directory to see these changes).
+- The new setup option "Miscellaneous/Show channel names with source" can be used to
+ turn on adding the source character to channel names whenever they are displayed.
diff --git a/MANUAL b/MANUAL
index fdb7ab23..5d3c9a53 100644
--- a/MANUAL
+++ b/MANUAL
@@ -913,6 +913,11 @@ Version 1.6
wrap around the beginning or end of the channel list if
this parameter is set to 'yes'.
+ Show channel names with source = no
+ If this option is turned on, channel names will be displayed
+ with the source appended to them, as in "ZDF (S)", where
+ 'S' stands for "Satellite".
+
Emergency exit = yes If, for some reason, a recording fails because the video
data stream is broken, or the CAM doesn't decrypt etc.,
VDR automatically exits in order to allow the surrounding
diff --git a/channels.c b/channels.c
index 65e51348..1136cc52 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.22 2012/04/01 09:27:08 kls Exp $
+ * $Id: channels.c 2.23 2012/06/17 11:53:10 kls Exp $
*/
#include "channels.h"
@@ -112,10 +112,34 @@ cChannel& cChannel::operator= (const cChannel &Channel)
provider = strcpyrealloc(provider, Channel.provider);
portalName = strcpyrealloc(portalName, Channel.portalName);
memcpy(&__BeginData__, &Channel.__BeginData__, (char *)&Channel.__EndData__ - (char *)&Channel.__BeginData__);
+ nameSource = NULL; // these will be recalculated automatically
+ shortNameSource = NULL;
parameters = Channel.parameters;
return *this;
}
+const char *cChannel::Name(void) const
+{
+ if (Setup.ShowChannelNamesWithSource) {
+ if (isempty(nameSource))
+ nameSource = cString::sprintf("%s (%c)", name, cSource::ToChar(source));
+ return nameSource;
+ }
+ return name;
+}
+
+const char *cChannel::ShortName(bool OrName) const
+{
+ if (OrName && isempty(shortName))
+ return Name();
+ if (Setup.ShowChannelNamesWithSource) {
+ if (isempty(shortNameSource))
+ shortNameSource = cString::sprintf("%s (%c)", shortName, cSource::ToChar(source));
+ return shortNameSource;
+ }
+ return shortName;
+}
+
int cChannel::Transponder(int Frequency, char Polarization)
{
// some satellites have transponders at the same frequency, just with different polarization:
@@ -233,10 +257,14 @@ void cChannel::SetName(const char *Name, const char *ShortName, const char *Prov
modification |= CHANNELMOD_NAME;
Channels.SetModified();
}
- if (nn)
+ if (nn) {
name = strcpyrealloc(name, Name);
- if (ns)
+ nameSource = NULL;
+ }
+ if (ns) {
shortName = strcpyrealloc(shortName, ShortName);
+ shortNameSource = NULL;
+ }
if (np)
provider = strcpyrealloc(provider, Provider);
}
@@ -721,6 +749,8 @@ bool cChannel::Parse(const char *s)
free(tpidbuf);
free(caidbuf);
free(namebuf);
+ nameSource = NULL;
+ shortNameSource = NULL;
if (!GetChannelID().Valid()) {
esyslog("ERROR: channel data results in invalid ID!");
return false;
diff --git a/channels.h b/channels.h
index 203a4c94..815cb479 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.h 2.15 2012/03/11 11:46:39 kls Exp $
+ * $Id: channels.h 2.16 2012/06/17 11:21:33 kls Exp $
*/
#ifndef __CHANNELS_H
@@ -123,6 +123,8 @@ private:
int number; // Sequence number assigned on load
bool groupSep;
int __EndData__;
+ mutable cString nameSource;
+ mutable cString shortNameSource;
cString parameters;
int modification;
mutable const cSchedule *schedule;
@@ -137,8 +139,8 @@ public:
cString ToText(void) const;
bool Parse(const char *s);
bool Save(FILE *f);
- const char *Name(void) const { return name; }
- const char *ShortName(bool OrName = false) const { return (OrName && isempty(shortName)) ? name : shortName; }
+ const char *Name(void) const;
+ const char *ShortName(bool OrName = false) const;
const char *Provider(void) const { return provider; }
const char *PortalName(void) const { return portalName; }
int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
diff --git a/config.c b/config.c
index 5927c753..56454dfa 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 2.25 2012/06/13 09:12:53 kls Exp $
+ * $Id: config.c 2.26 2012/06/17 12:27:07 kls Exp $
*/
#include "config.h"
@@ -462,6 +462,7 @@ cSetup::cSetup(void)
DeviceBondings = "";
InitialVolume = -1;
ChannelsWrap = 0;
+ ShowChannelNamesWithSource = 0;
EmergencyExit = 1;
}
@@ -657,6 +658,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "InitialVolume")) InitialVolume = atoi(Value);
else if (!strcasecmp(Name, "DeviceBondings")) DeviceBondings = Value;
else if (!strcasecmp(Name, "ChannelsWrap")) ChannelsWrap = atoi(Value);
+ else if (!strcasecmp(Name, "ShowChannelNamesWithSource")) ShowChannelNamesWithSource = atoi(Value);
else if (!strcasecmp(Name, "EmergencyExit")) EmergencyExit = atoi(Value);
else
return false;
@@ -755,6 +757,7 @@ bool cSetup::Save(void)
Store("InitialVolume", InitialVolume);
Store("DeviceBondings", DeviceBondings);
Store("ChannelsWrap", ChannelsWrap);
+ Store("ShowChannelNamesWithSource", ShowChannelNamesWithSource);
Store("EmergencyExit", EmergencyExit);
Sort();
diff --git a/config.h b/config.h
index 4c837054..acdf77a7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.48 2012/06/03 13:04:49 kls Exp $
+ * $Id: config.h 2.49 2012/06/17 11:14:50 kls Exp $
*/
#ifndef __CONFIG_H
@@ -323,6 +323,7 @@ public:
int CurrentDolby;
int InitialVolume;
int ChannelsWrap;
+ int ShowChannelNamesWithSource;
int EmergencyExit;
int __EndData__;
cString InitialChannel;
diff --git a/menu.c b/menu.c
index 18274d34..9f4c54e5 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 2.57 2012/06/13 13:03:26 kls Exp $
+ * $Id: menu.c 2.58 2012/06/17 11:12:25 kls Exp $
*/
#include "menu.h"
@@ -3158,6 +3158,7 @@ cMenuSetupMisc::cMenuSetupMisc(void)
Add(new cMenuEditChanItem(tr("Setup.Miscellaneous$Initial channel"), &data.InitialChannel, tr("Setup.Miscellaneous$as before")));
Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Initial volume"), &data.InitialVolume, -1, 255, tr("Setup.Miscellaneous$as before")));
Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Channels wrap"), &data.ChannelsWrap));
+ Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Show channel names with source"), &data.ShowChannelNamesWithSource));
Add(new cMenuEditBoolItem(tr("Setup.Miscellaneous$Emergency exit"), &data.EmergencyExit));
}
diff --git a/po/ar.po b/po/ar.po
index 414e6b67..ddfc50a6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -1146,6 +1146,9 @@ msgstr "فعل الصوت"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "كسابق"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "خروج طارىء"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index cd017b22..ce13921c 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Volum inicial"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Sortida d'emergncia"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 2feacbed..96193613 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1121,6 +1121,9 @@ msgstr "Hlasitost po spuštění"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Nouzové ukončení"
diff --git a/po/da_DK.po b/po/da_DK.po
index b5681b04..5a463b9e 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Lydstyrke ved opstart"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Ndudgang"
diff --git a/po/de_DE.po b/po/de_DE.po
index 088dbaf6..20a54765 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Lautstrke beim Einschalten"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Rundum zappen"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr "Kanalnamen mit Quelle anzeigen"
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Notausstieg"
diff --git a/po/el_GR.po b/po/el_GR.po
index bb53086f..d27af7e5 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 93ca6693..f38ce2f1 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Volumen inicial"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Salida de emergencia"
diff --git a/po/et_EE.po b/po/et_EE.po
index cfd61f0d..b136d37e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Helitugevus käivitamisel"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Kanalite ringkerimine"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Hädaväljumine"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 80088653..aa76eef3 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Äänenvoimakkuus käynnistettäessä"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Kanavien rullaus"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Käytä hätäsammutusta"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 44b2fa30..451cf565 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-02-27 18:14+0100\n"
"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
"Language-Team: French <vdr@linuxtv.org>\n"
@@ -1125,6 +1125,9 @@ msgstr "Volume initial"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Arrt d'urgence"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 541c64e7..6fddf87a 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1121,6 +1121,9 @@ msgstr "Poetna jaina zvuka"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Izlaz u sluaju nude"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c7814ee0..71047a3b 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2012-01-02 11:54+0200\n"
"Last-Translator: Istvn Fley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1123,6 +1123,9 @@ msgstr "Hanger indulsnl"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Csatornalista grgetse"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Vszlellts"
diff --git a/po/it_IT.po b/po/it_IT.po
index 0cbf66f2..03cfbe13 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2012-06-06 22:50+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1126,6 +1126,9 @@ msgstr "Volume iniziale"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Riavvolgimento canali"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Uscita di emergenza"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 03d3508f..98b8a687 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-10-30 11:55+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Garsas įjungimo metu"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Kanalų pridengimas"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Avarinis išėjimas"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index e62fac88..a767aca3 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR-1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-03-11 00:54+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Почетна јачина на звук"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Премотување канали"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Итен излез"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9d1fcde8..a312fdc0 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1123,6 +1123,9 @@ msgstr "Opstartvolume"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Nooduitgang"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 44940e07..2612be24 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr ""
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 90a1762e..166b35b2 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Pocztkowa gono"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Wyjcie awaryjne"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index c2017619..da11c078 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.15\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Volume inicial"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Retroceder canais"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Sada de emergncia"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 64aadc8e..3f6d1e15 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.12\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2011-03-10 23:52+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Volumul la pornire"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Lista de canale n bucl"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Oprire de urgen"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index f3cd5c33..4ed78010 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-12-15 14:37+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr " "
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr " "
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 985435d2..069fd55c 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2011-02-15 16:29+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Hlasitos po spusten"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Prepna z prvho na posledn a opane"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Ndzov ukonenie"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 8b25fc30..5bb6b9b1 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-02-28 19:44+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1120,6 +1120,9 @@ msgstr "Privzeta glasnost"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Izhod v sili"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 39bc9d24..4be71c53 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.1\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2011-01-09 15:57+0100\n"
"Last-Translator: Milan Cvijanovi <elcom_cvijo@hotmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1143,6 +1143,9 @@ msgstr "Poetna jaina tona"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Kanal spakovan"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Izlaz u sluaju nude"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 7987755a..4e998933 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-03-12 18:25+0100\n"
"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "Ljudstyrka vid uppstart"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Ofrutsedd avslutning"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 163b8231..d38761a4 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Aldaki ses"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Acil ck"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 588cf7a1..5ec4a0b5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2010-04-25 16:35+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1119,6 +1119,9 @@ msgstr "Гучність при включенні"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr "Кінець каналів"
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "Аварійний вихід"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d0879467..0c1e18b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-06-02 15:10+0200\n"
+"POT-Creation-Date: 2012-06-17 13:59+0200\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1122,6 +1122,9 @@ msgstr "初始化声音"
msgid "Setup.Miscellaneous$Channels wrap"
msgstr ""
+msgid "Setup.Miscellaneous$Show channel names with source"
+msgstr ""
+
msgid "Setup.Miscellaneous$Emergency exit"
msgstr "突发事件退出"
diff --git a/sources.h b/sources.h
index 6b362e38..516a3edc 100644
--- a/sources.h
+++ b/sources.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: sources.h 2.3 2010/03/07 13:53:11 kls Exp $
+ * $Id: sources.h 2.4 2012/06/17 11:19:23 kls Exp $
*/
#ifndef __SOURCES_H
@@ -33,6 +33,7 @@ public:
int Code(void) const { return code; }
const char *Description(void) const { return description; }
bool Parse(const char *s);
+ static char ToChar(int Code) { return (Code & st_Mask) >> 24; }
static cString ToString(int Code);
static int FromString(const char *s);
static int FromData(eSourceType SourceType, int Position = 0, bool East = false);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 00:13:59 +0000