diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2021-07-01 15:40:46 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2021-07-01 15:40:46 +0200 |
| commit | 7301f2de0879fe10bf22c16191fcfd7bf836e148 (patch) | |
| tree | 9a13976bb78f498f3b8e9cc2a82b59091e823372 | |
| parent | 8c7d387e8650d82883685602708fe05c6b655a8b (diff) | |
| download | vdr-7301f2de0879fe10bf22c16191fcfd7bf836e148.tar.gz vdr-7301f2de0879fe10bf22c16191fcfd7bf836e148.tar.bz2 | |
The Recordings menu now marks recordings with errors, and the number of errors (if any) is displayed in the recording's Info menu
43 files changed, 208 insertions, 49 deletions
@@ -9720,7 +9720,7 @@ Video Disk Recorder Revision History - Removed unused declaration of cDvbTuner::SetFrontendType() (thanks to Helmut Binder). - Fixed handling incomplete multi-packet CAT (thanks to Helmut Binder). -2021-06-21: +2021-07-01: - Fixed restarting PMT pids after starting a recording on the currently viewed channel (with help from Helmut Binder). @@ -9734,3 +9734,5 @@ Video Disk Recorder Revision History - Improved responsiveness in cSectionHandler::Action() (thanks to Helmut Binder). - Fixed deleting the edited recording in case of an error (reported by Christoph Haubrich). - Fixed triggering the PAT filter. +- The Recordings menu now marks recordings with errors with an exclamation mark ('!'), + and the number of errors (if any) is displayed in the recording's Info menu. diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index cda9fa36..051addab 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -152,3 +152,8 @@ VDR Plugin 'skincurses' Revision History - Reacting to changes in screen size. - Simplified color handling. - Using 'stdscr' directly instead of an additional window. + +2021-07-01: Version 2.4.3 + +- The number of errors (if any) of a recording is now displayed in the recording's + Info menu. diff --git a/PLUGINS/src/skincurses/po/de_DE.po b/PLUGINS/src/skincurses/po/de_DE.po index 94291d70..20102c57 100644 --- a/PLUGINS/src/skincurses/po/de_DE.po +++ b/PLUGINS/src/skincurses/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-15 16:07+0200\n" "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n" "Language-Team: German <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Eine reine Text-Oberflche" +msgid "errors" +msgstr "Fehler" + msgid "Key$Mute" msgstr "Stumm" diff --git a/PLUGINS/src/skincurses/po/et_EE.po b/PLUGINS/src/skincurses/po/et_EE.po index f2f63c9a..9e19b545 100644 --- a/PLUGINS/src/skincurses/po/et_EE.po +++ b/PLUGINS/src/skincurses/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-14 20:48+0300\n" "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n" "Language-Team: Estonian <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstipõhine kest" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Hääletu" diff --git a/PLUGINS/src/skincurses/po/fi_FI.po b/PLUGINS/src/skincurses/po/fi_FI.po index 2e9316e0..16bdc040 100644 --- a/PLUGINS/src/skincurses/po/fi_FI.po +++ b/PLUGINS/src/skincurses/po/fi_FI.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2007-08-14 20:48+0300\n" "Last-Translator: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstipohjainen ulkoasu" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Mykistys" diff --git a/PLUGINS/src/skincurses/po/it_IT.po b/PLUGINS/src/skincurses/po/it_IT.po index 3727b8de..77a5b62b 100644 --- a/PLUGINS/src/skincurses/po/it_IT.po +++ b/PLUGINS/src/skincurses/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2008-01-27 20:35+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Una interfaccia solo testo" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Muto" diff --git a/PLUGINS/src/skincurses/po/lt_LT.po b/PLUGINS/src/skincurses/po/lt_LT.po index 405ec2be..74fc54ab 100644 --- a/PLUGINS/src/skincurses/po/lt_LT.po +++ b/PLUGINS/src/skincurses/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2010-02-22 18:18+0200\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Tekstinis apvalkalas" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Išjungti garsą" diff --git a/PLUGINS/src/skincurses/po/pl_PL.po b/PLUGINS/src/skincurses/po/pl_PL.po index d2f1dc0e..7e8123ed 100644 --- a/PLUGINS/src/skincurses/po/pl_PL.po +++ b/PLUGINS/src/skincurses/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2018-02-19 00:48+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2018-02-19 01:02+0100\n" "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n" "Language-Team: Polish <vdr@linuxtv.org>\n" @@ -21,6 +21,9 @@ msgstr "" msgid "A text only skin" msgstr "Skóra tekstowa" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Wycisz" diff --git a/PLUGINS/src/skincurses/po/ru_RU.po b/PLUGINS/src/skincurses/po/ru_RU.po index 7e060392..228d3347 100644 --- a/PLUGINS/src/skincurses/po/ru_RU.po +++ b/PLUGINS/src/skincurses/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2008-03-14 00:21+0100\n" "Last-Translator: Alexander Gross <Bikalexander@gmail.com>\n" "Language-Team: Russian <vdr@linuxtv.org>\n" @@ -20,6 +20,9 @@ msgstr "" msgid "A text only skin" msgstr " " +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr ". " diff --git a/PLUGINS/src/skincurses/po/sk_SK.po b/PLUGINS/src/skincurses/po/sk_SK.po index 4ddf1800..a9ebca7c 100644 --- a/PLUGINS/src/skincurses/po/sk_SK.po +++ b/PLUGINS/src/skincurses/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skincurses 2.4.0\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2015-02-08 11:16+0100\n" +"POT-Creation-Date: 2021-07-01 17:28+0200\n" "PO-Revision-Date: 2009-09-30 12:52+0100\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n" @@ -19,6 +19,9 @@ msgstr "" msgid "A text only skin" msgstr "Iba text vzhadu" +msgid "errors" +msgstr "" + msgid "Key$Mute" msgstr "Stlmi zvuk" diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 9e8b59e8..2b671457 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 4.6 2020/05/11 10:23:15 kls Exp $ + * $Id: skincurses.c 5.1 2021/07/01 15:40:46 kls Exp $ */ #include <ncurses.h> @@ -12,7 +12,7 @@ #include <vdr/skins.h> #include <vdr/videodir.h> -static const char *VERSION = "2.4.2"; +static const char *VERSION = "2.4.3"; static const char *DESCRIPTION = trNOOP("A text only skin"); static const char *MAINMENUENTRY = NULL; @@ -447,9 +447,18 @@ void cSkinCursesDisplayMenu::SetRecording(const cRecording *Recording) cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, 0, y, ScOsdWidth, ScOsdHeight - y - 2, t, &Font, clrYellow, clrBackground); y += ts.Height(); + int xt = ScOsdWidth; if (Info->GetEvent()->ParentalRating()) { cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString()); - osd->DrawText(ScOsdWidth - Utf8StrLen(buffer), y, buffer, clrBlack, clrYellow, &Font); + int w = Utf8StrLen(buffer); + osd->DrawText(xt - w, y, buffer, clrBlack, clrYellow, &Font); + xt -= w + 1; + } + if (Info->Errors() > 0) { + cString buffer = cString::sprintf(" %d %s ", Info->Errors(), tr("errors")); + int w = Utf8StrLen(buffer); + osd->DrawText(xt - w, y, buffer, clrBlack, clrYellow, &Font); + xt -= w + 1; } y += 1; const char *Title = Info->Title(); @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1566,6 +1566,9 @@ msgstr "Recording - restart anyway?" msgid "restart anyway?" msgstr "restart anyway?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "الصوت " diff --git a/po/ca_ES.po b/po/ca_ES.po index 5f93593f..000c47ed 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1565,6 +1565,9 @@ msgstr "Gravant - Reiniciar de totes maneres?" msgid "restart anyway?" msgstr "Reiniciar de totes maneres?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volum " diff --git a/po/cs_CZ.po b/po/cs_CZ.po index bbc98251..d35f2e2d 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2010-05-06 11:00+0200\n" "Last-Translator: Aleš Juřík <ajurik@quick.cz>\n" "Language-Team: Czech <vdr@linuxtv.org>\n" @@ -1565,6 +1565,9 @@ msgstr "Nahrávání - přesto restartovat?" msgid "restart anyway?" msgstr "přesto restartovat?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Hlasitost " diff --git a/po/da_DK.po b/po/da_DK.po index 03eb1ac2..30130738 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1562,6 +1562,9 @@ msgstr "Optagelse igang - genstart alligevel?" msgid "restart anyway?" msgstr "genstart alligevel?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Lydstyrke " diff --git a/po/de_DE.po b/po/de_DE.po index 26fce0e5..07d2b012 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-10 13:45+0100\n" "Last-Translator: Klaus Schmidinger <vdr@tvdr.de>\n" "Language-Team: German <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Aufnahme luft - trotzdem neu starten?" msgid "restart anyway?" msgstr "trotzdem neu starten?" +msgid "errors" +msgstr "Fehler" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Lautstrke " diff --git a/po/el_GR.po b/po/el_GR.po index 6c285310..09b84994 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1562,6 +1562,9 @@ msgstr " - ?" msgid "restart anyway?" msgstr " ?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr " " diff --git a/po/es_ES.po b/po/es_ES.po index dbb63f48..406470d9 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-19 23:00+0100\n" "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n" "Language-Team: Spanish <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Grabacin en curso - reiniciar igualmente?" msgid "restart anyway?" msgstr "reiniciar igualmente?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volumen " diff --git a/po/et_EE.po b/po/et_EE.po index cc95d818..1229bddf 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1562,6 +1562,9 @@ msgstr "Salvestamine aktiivne - taaskäivitada ikkagi?" msgid "restart anyway?" msgstr "taaskäivitada ikkagi?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Helitugevus " diff --git a/po/fi_FI.po b/po/fi_FI.po index caf56864..9a4a8682 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Matti Lehtimäki <matti.lehtimaki@gmail.com>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -1566,6 +1566,9 @@ msgstr "Tallennus kesken - käynnistetäänkö uudelleen?" msgid "restart anyway?" msgstr "käynnistetäänkö uudelleen?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Äänenvoimakkuus " diff --git a/po/fr_FR.po b/po/fr_FR.po index f3ae021a..e44a7c2f 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-04-14 10:16+0100\n" "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n" "Language-Team: French <vdr@linuxtv.org>\n" @@ -1573,6 +1573,9 @@ msgstr "Enregistrement en cours - confirmer redémarrage ?" msgid "restart anyway?" msgstr "confirmer redémarrage ?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volume " diff --git a/po/hr_HR.po b/po/hr_HR.po index 873af786..75369403 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1564,6 +1564,9 @@ msgstr "Snimanje je u tijeku - ponovno pokreni unato?" msgid "restart anyway?" msgstr "ponovno pokreni unato?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Glasnoa " diff --git a/po/hu_HU.po b/po/hu_HU.po index 3b937a02..bf550c3f 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-04-09 21:42+0300\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n" @@ -1567,6 +1567,9 @@ msgstr "Felvétel folyamatban - mégis újraindítani?" msgid "restart anyway?" msgstr "mégis újraindítani?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Hangerő " diff --git a/po/it_IT.po b/po/it_IT.po index 2eb313a9..1a7de4d9 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-04-06 19:13+0100\n" "Last-Translator: Gringo <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr@linuxtv.org>\n" @@ -1568,6 +1568,9 @@ msgstr "Registrazione in corso - riavviare comunque?" msgid "restart anyway?" msgstr "riavviare comunque?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volume " diff --git a/po/lt_LT.po b/po/lt_LT.po index 527274f0..9bd6ea94 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-11 14:02+0200\n" "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n" "Language-Team: Lithuanian <vdr@linuxtv.org>\n" @@ -1562,6 +1562,9 @@ msgstr "Įrašinėjama - perkrauti vistiek?" msgid "restart anyway?" msgstr "perkrati bet kokiu atveju?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Garsas " diff --git a/po/mk_MK.po b/po/mk_MK.po index a49a4ab0..547bdb03 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-03-31 21:47+0100\n" "Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n" "Language-Team: Macedonian <kde-i18n-doc@kde.org>\n" @@ -1564,6 +1564,9 @@ msgstr "Снимање во тек - рестартирај?" msgid "restart anyway?" msgstr "сеедно рестартирај?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Глас " diff --git a/po/nl_NL.po b/po/nl_NL.po index 5e0d7827..23131b79 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-10 19:43+0100\n" "Last-Translator: Erik Oomen <oomen.e@gmail.com>\n" "Language-Team: Dutch <vdr@linuxtv.org>\n" @@ -1568,6 +1568,9 @@ msgstr "Opname loopt - toch opnieuw starten?" msgid "restart anyway?" msgstr "toch opnieuw starten?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volume " diff --git a/po/nn_NO.po b/po/nn_NO.po index 18594aab..8a61bad2 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1563,6 +1563,9 @@ msgstr "Gjr opptak - starte p nytt likevel?" msgid "restart anyway?" msgstr "starte p nytt likevel?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volum " diff --git a/po/pl_PL.po b/po/pl_PL.po index ecee3d25..ebc4492a 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-02-19 00:42+0100\n" "Last-Translator: Tomasz Maciej Nowak <tmn505@gmail.com>\n" "Language-Team: Polish <vdr@linuxtv.org>\n" @@ -1567,6 +1567,9 @@ msgstr "Trwa nagrywanie - zrestartować mimo to?" msgid "restart anyway?" msgstr "zrestartować mimo to?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Głośność " diff --git a/po/pt_PT.po b/po/pt_PT.po index 2ef67313..1cd4c1f9 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1563,6 +1563,9 @@ msgstr "Gravao em curso - reiniciar mesmo assim?" msgid "restart anyway?" msgstr "reiniciar mesmo assim?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volume " diff --git a/po/ro_RO.po b/po/ro_RO.po index 06c61214..3f6ca64d 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-11 22:26+0100\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: Romanian <vdr@linuxtv.org>\n" @@ -1564,6 +1564,9 @@ msgstr "Tocmai se înregistrează - repornesc, totuşi?" msgid "restart anyway?" msgstr "repornesc, totuşi?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volum " diff --git a/po/ru_RU.po b/po/ru_RU.po index 4added7c..d33fd131 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2016-12-27 17:13+0100\n" "Last-Translator: Pridvorov Andrey <ua0lnj@bk.ru>\n" "Language-Team: Russian <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Идёт запись - действительно перезапуст msgid "restart anyway?" msgstr "действительно перезапустить?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Громкость " diff --git a/po/sk_SK.po b/po/sk_SK.po index 0a663e5d..217fe9dc 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-17 18:59+0100\n" "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n" "Language-Team: Slovak <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Nahrva - aj tak retartova?" msgid "restart anyway?" msgstr "Urite retartova?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Hlasitos " diff --git a/po/sl_SI.po b/po/sl_SI.po index 4c4e34db..b75735d1 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2013-03-04 12:46+0100\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: Slovenian <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Snemanje - zares ponoven zagon?" msgid "restart anyway?" msgstr "zares ponoven zagon?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Glasnost " diff --git a/po/sr_RS.po b/po/sr_RS.po index e1833182..b6c3ef85 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2013-03-16 15:05+0100\n" "Last-Translator: Zoran Turalija <zoran.turalija@gmail.com>\n" "Language-Team: Serbian <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Snimanje u toku - svejedno ponovno pokreni!!!?" msgid "restart anyway?" msgstr "svejedno ponovo pokreni?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Jaina " diff --git a/po/sv_SE.po b/po/sv_SE.po index eb5b2129..260d6fab 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2015-02-12 21:58+0100\n" "Last-Translator: Magnus Sirvi <sirwio@hotmail.com>\n" "Language-Team: Swedish <vdr@linuxtv.org>\n" @@ -1567,6 +1567,9 @@ msgstr "Inspelning pgr, vill du starta om nd?" msgid "restart anyway?" msgstr "vill du starta om nd?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volym " diff --git a/po/tr_TR.po b/po/tr_TR.po index 01dc881c..03c6dc96 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+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" @@ -1562,6 +1562,9 @@ msgstr "Kayt ediliyor - buna ramen yeniden balat?" msgid "restart anyway?" msgstr "buna ramen yeniden balat?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Volm " diff --git a/po/uk_UA.po b/po/uk_UA.po index ad159a62..1b7cac84 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2018-03-18 20:00+0100\n" "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n" "Language-Team: Ukrainian <vdr@linuxtv.org>\n" @@ -1563,6 +1563,9 @@ msgstr "Йде запис - дійсно перезапустити?" msgid "restart anyway?" msgstr "дійсно перезапустити?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "Гучність " diff --git a/po/zh_CN.po b/po/zh_CN.po index 9385f6ae..9485f4b1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 2.4.0\n" "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n" -"POT-Creation-Date: 2021-05-21 12:36+0200\n" +"POT-Creation-Date: 2021-07-01 17:10+0200\n" "PO-Revision-Date: 2013-03-04 14:52+0800\n" "Last-Translator: NFVDR <nfvdr@live.com>\n" "Language-Team: Chinese (simplified) <nfvdr@live.com>\n" @@ -1564,6 +1564,9 @@ msgstr "录像中,是否现在重启?" msgid "restart anyway?" msgstr "现在重启?" +msgid "errors" +msgstr "" + #. TRANSLATORS: note the trailing blank! msgid "Volume " msgstr "音量调整 " diff --git a/recording.c b/recording.c index f9ff14b1..47587de7 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 5.12 2021/06/21 15:30:16 kls Exp $ + * $Id: recording.c 5.13 2021/07/01 15:40:46 kls Exp $ */ #include "recording.h" @@ -1083,7 +1083,8 @@ const char *cRecording::FileName(void) const const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) const { - char New = NewIndicator && IsNew() ? '*' : ' '; + const char *New = NewIndicator && IsNew() ? "*" : ""; + const char *Err = NewIndicator && (info->Errors() > 0) ? "!" : ""; free(titleBuffer); titleBuffer = NULL; if (Level < 0 || Level == HierarchyLevels()) { @@ -1103,7 +1104,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons Minutes % 60 ); } - titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%c%c%s", + titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%s%s%s%c%s", t->tm_mday, t->tm_mon + 1, t->tm_year % 100, @@ -1112,6 +1113,7 @@ const char *cRecording::Title(char Delimiter, bool NewIndicator, int Level) cons t->tm_min, *Length, New, + Err, Delimiter, s)); // let's not display a trailing FOLDERDELIMCHAR: diff --git a/skinclassic.c b/skinclassic.c index 26408993..3b01cb96 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinclassic.c 4.1 2016/12/22 14:07:04 kls Exp $ + * $Id: skinclassic.c 5.1 2021/07/01 15:40:46 kls Exp $ */ #include "skinclassic.h" @@ -393,11 +393,20 @@ void cSkinClassicDisplayMenu::SetRecording(const cRecording *Recording) cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, x1, y, x2 - x1, y3 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); y += ts.Height(); + int xt = x3; if (Info->GetEvent()->ParentalRating()) { cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString()); const cFont *font = cFont::GetFont(fontSml); int w = font->Width(buffer); - osd->DrawText(x3 - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w); + xt -= w + 5; + } + if (Info->Errors() > 0) { + cString buffer = cString::sprintf(" %d %s ", Info->Errors(), tr("errors")); + const cFont *font = cFont::GetFont(fontSml); + int w = font->Width(buffer); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuEventVpsFg), Theme.Color(clrMenuEventVpsBg), font, w); + xt -= w + 5; } y += font->Height(); const char *Title = Info->Title(); diff --git a/skinlcars.c b/skinlcars.c index 190839fc..50198a2d 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 5.2 2021/04/18 14:56:40 kls Exp $ + * $Id: skinlcars.c 5.3 2021/07/01 15:40:46 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -1693,11 +1693,23 @@ void cSkinLCARSDisplayMenu::SetRecording(const cRecording *Recording) cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, xl, y, xi01 - xl, yi01 - y, t, font, Theme.Color(clrEventTime), Theme.Color(clrBackground)); y += ts.Height(); + int xt = xi01; if (Info->GetEvent()->ParentalRating()) { cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString()); const cFont *font = cFont::GetFont(fontSml); int w = font->Width(buffer); - osd->DrawText(xi01 - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w); + xt -= w + xi02 - xi01; + } + if (Info->Errors() > 0) { + cString buffer = cString::sprintf(" %d %s ", Info->Errors(), tr("errors")); + const cFont *font = cFont::GetFont(fontSml); + int w = font->Width(buffer); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuFrameFg), frameColor, font, w); + xt -= w + xi02 - xi01; + } + if (xt != xi01) { + const cFont *font = cFont::GetFont(fontSml); int yb = y + font->Height(); osd->DrawRectangle(xi02, y, xi02 + lineHeight / 2 - 1, yb - 1, frameColor); osd->DrawEllipse (xi02 + lineHeight / 2, y, xi03 - 1, yb - 1, frameColor, 5); diff --git a/skinsttng.c b/skinsttng.c index 792652ee..3603f8d3 100644 --- a/skinsttng.c +++ b/skinsttng.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinsttng.c 4.1 2016/12/22 14:07:22 kls Exp $ + * $Id: skinsttng.c 5.1 2021/07/01 15:40:46 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures @@ -709,11 +709,23 @@ void cSkinSTTNGDisplayMenu::SetRecording(const cRecording *Recording) cString t = cString::sprintf("%s %s %s", *DateString(Recording->Start()), *TimeString(Recording->Start()), Info->ChannelName() ? Info->ChannelName() : ""); ts.Set(osd, xl, y, x4 - xl, y4 - y, t, font, Theme.Color(clrMenuEventTime), Theme.Color(clrBackground)); y += ts.Height(); + int xt = x4; if (Info->GetEvent()->ParentalRating()) { cString buffer = cString::sprintf(" %s ", *Info->GetEvent()->GetParentalRatingString()); const cFont *font = cFont::GetFont(fontSml); int w = font->Width(buffer); - osd->DrawText(x4 - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w); + xt -= w + x5 - x4; + } + if (Info->Errors() > 0) { + cString buffer = cString::sprintf(" %d %s ", Info->Errors(), tr("errors")); + const cFont *font = cFont::GetFont(fontSml); + int w = font->Width(buffer); + osd->DrawText(xt - w, y, buffer, Theme.Color(clrMenuEventVps), frameColor, font, w); + xt -= w + x5 - x4; + } + if (xt != x4) { + const cFont *font = cFont::GetFont(fontSml); int yb = y + font->Height(); osd->DrawRectangle(x5, y, x6 - 1, yb - 1, frameColor); osd->DrawEllipse (x6, y, x7 - 1, yb - 1, frameColor, 5); |