summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pages/menu.ecpp2
-rw-r--r--pages/multischedule.ecpp2
-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.po23
-rw-r--r--po/fr_FR.po5
-rw-r--r--po/hr_HR.po5
-rw-r--r--po/hu_HU.po5
-rwxr-xr-xpo/it_IT.po5
-rw-r--r--po/lt_LT.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/sl_SI.po5
-rw-r--r--po/sv_SE.po5
-rw-r--r--po/tr_TR.po5
-rw-r--r--recman.cpp4
-rw-r--r--timers.cpp4
26 files changed, 102 insertions, 38 deletions
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index 5721e42..74ff1b9 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -36,7 +36,7 @@ if (!component.empty()) {
<div class="menu">
<a href="whats_on.html?type=now" <& menu.setactive current=("whats_on") &>><$ tr("What's on?") $></a>
| <a href="schedule.html" <& menu.setactive current=("schedule") &>><$ trVDR("Schedule") $></a>
- | <a href="multischedule.html" <& menu.setactive current=("multischedule") &>><$ trVDR("MultiSchedule") $></a>
+ | <a href="multischedule.html" <& menu.setactive current=("multischedule") &>><$ tr("MultiSchedule") $></a>
| <a href="timers.html" <& menu.setactive current=("timers") &>><$ trVDR("Timers") $></a>
<%cpp>
if ( LiveFeatures< features::epgsearch >().Recent() ) {
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index 9005932..180b371 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -207,7 +207,7 @@ pageTitle = trVDR("Schedule");
esyslog("Live: Error parsing time '%s'", part->c_str() );
};
};
- // add the time of the farourites to the time list
+ // add the time of the favourites to the time list
for (int i=0; i< MAX_DAYS ; i++ )
{
vector< time_t >::const_iterator offset = offsets.begin();
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 31fd120..65f4040 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -472,6 +472,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index c632d4b..69793ce 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index cdebfca..bdee90c 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 1ed99b8..17cd77f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Dieter Hametner <dh+vdr@gekrumbel.de>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr "EPG-Anzeige bis Kanal"
@@ -472,6 +472,9 @@ msgstr "Benutzer"
msgid "What's on?"
msgstr "Was läuft?"
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr "Suchen"
diff --git a/po/el_GR.po b/po/el_GR.po
index f6d08e9..a65dca0 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-7\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index a52d39c..0088337 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 6fa0ebb..6701e57 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-13\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 60bbcf3..4dd01e9 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
msgid "Last channel to display"
msgstr "Näytä viimeisenä kanava"
@@ -371,12 +371,11 @@ msgstr "Luo uusi ajastin"
msgid "Weekday"
msgstr "Viikonpäivä"
-#, fuzzy
msgid "Couldn't find user. Maybe you mistyped your request?"
-msgstr "Ajastinta ei löydy. Kirjoititko varmasti oikein?"
+msgstr "Käyttäjää ei löydy. Kirjoititko varmasti oikein?"
msgid "This user name is already in use!"
-msgstr ""
+msgstr "Käyttäjänimi on jo käytössä!"
msgid "Edit user"
msgstr "Muokkaa käyttäjää"
@@ -471,6 +470,9 @@ msgstr "Käyttäjä"
msgid "What's on?"
msgstr "Menossa?"
+msgid "MultiSchedule"
+msgstr "Ohjelmistot"
+
msgid "Search"
msgstr "Etsi"
@@ -502,7 +504,7 @@ msgid "%A, %b %d %Y"
msgstr "%A, %d.%m.%Y"
msgid "Time"
-msgstr ""
+msgstr "Ajankohta"
msgid "Switch to this channel."
msgstr "Vaihda kanavalle"
@@ -678,7 +680,7 @@ msgstr "Toista tallenne"
#. TRANSLATORS: strftime format string for recording start info: day, date, hour.
#, no-c-format
msgid "%a %x %X"
-msgstr ""
+msgstr "%a %x %X"
msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?"
msgstr "Kanavaa ei löydy. Kirjoititko varmasti oikein?"
@@ -767,15 +769,14 @@ msgstr "Lisäajankohdat 'Menossa?'-sivulle"
msgid "Format is HH:MM. Separate multiple times with a semicolon"
msgstr "Käytä HH:MM formaattia ja erota ajankohdat puolipisteellä"
-#, fuzzy
msgid "Channel groups for MultiSchedule"
-msgstr "Kanavalla ei ole ohjelmatietoja"
+msgstr "Kanavaryhmät 'Ohjelmistot'-sivulle"
msgid "Separate channels with a comma ',', separate groups with a semi-colon ';'"
-msgstr ""
+msgstr "Käytä pilkkua erottimena kanaville ja puolipistettä kanavaryhmille"
msgid "Duration of MultiSchedule in hours"
-msgstr ""
+msgstr "'Ohjelmistot'-sivun kesto tunteina"
msgid "Show channels without EPG"
msgstr "Näytä ohjelmaoppaattomat kanavat"
@@ -848,7 +849,7 @@ msgid "%a, %x"
msgstr "%a, %x"
msgid "What's running on"
-msgstr "Menossa kello"
+msgstr "Menossa"
msgid "at"
msgstr "kello"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 693ff68..37cab8f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,10 +13,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr "Dernière chaîne affichée"
@@ -489,6 +489,9 @@ msgstr "Utilisateur"
msgid "What's on?"
msgstr "Actuellement?"
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr "Recherche"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 8509d46..69892e3 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index bd5e32a..d8e27f1 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 5c81b08..15d9063 100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -13,10 +13,10 @@ msgstr ""
"PO-Revision-Date: 2010-02-22 00:19+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -476,6 +476,9 @@ msgstr "Utente"
msgid "What's on?"
msgstr "In programmazione"
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr "Ricerca"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index bb7e82f..7039c8a 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr "Paskutinis rodytas kanalas"
@@ -470,6 +470,9 @@ msgstr "Vartotojo vardas"
msgid "What's on?"
msgstr "Kas rodoma Å¡iuo metu?"
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr "Paieška"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c832bbd..a3c9d38 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -12,10 +12,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -486,6 +486,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 8842b3f..e0472d9 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 50dcac1..c627b68 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ffc3486..e23d819 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index c25ea12..492fbe6 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index a331b43..585a8e7 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -470,6 +470,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 21d715b..779530b 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 759253f..fd99577 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: see developers in README\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index e769a2b..65af1e5 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -11,10 +11,10 @@ msgstr ""
"PO-Revision-Date: 2007-08-19 20:15+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-9\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
msgid "Last channel to display"
msgstr ""
@@ -471,6 +471,9 @@ msgstr ""
msgid "What's on?"
msgstr ""
+msgid "MultiSchedule"
+msgstr ""
+
msgid "Search"
msgstr ""
diff --git a/recman.cpp b/recman.cpp
index 8bfccab..3e9b00d 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -83,7 +83,7 @@ namespace vdrlive {
cRecording const * RecordingsManager::GetByMd5Hash(string const & hash) const
{
if (!hash.empty()) {
- for (cRecording* rec = Recordings.First(); rec != 0; rec = Recordings.Next(rec)) {
+ for (cRecording* rec = Recordings.First(); rec; rec = Recordings.Next(rec)) {
if (hash == Md5Hash(rec))
return rec;
}
@@ -277,7 +277,7 @@ namespace vdrlive {
m_root(new RecordingsItemDir("", 0, RecordingsItemPtr()))
{
// esyslog("DH: ****** RecordingsTree::RecordingsTree() ********");
- for (cRecording* recording = Recordings.First(); recording != 0; recording = Recordings.Next(recording)) {
+ for (cRecording* recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
if (m_maxLevel < recording->HierarchyLevels()) {
m_maxLevel = recording->HierarchyLevels();
}
diff --git a/timers.cpp b/timers.cpp
index 9c741ad..de303d4 100644
--- a/timers.cpp
+++ b/timers.cpp
@@ -88,7 +88,7 @@ namespace vdrlive {
// dsyslog("live reloading timers");
clear();
- for ( cTimer* timer = Timers.First(); timer != 0; timer = Timers.Next( timer ) ) {
+ for ( cTimer* timer = Timers.First(); timer; timer = Timers.Next( timer ) ) {
push_back( *timer );
}
sort();
@@ -236,7 +236,7 @@ namespace vdrlive {
}
cTimer* checkTimer = Timers.GetTimer( newTimer.get() );
- if ( checkTimer != 0 ) {
+ if ( checkTimer ) {
StoreError( timerData, tr("Timer already defined") );
return;
}