diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-09-13 11:18:53 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-09-13 11:18:53 +0200 |
| commit | cc16e9fdc73bcba6cc5fb677111cf76fcbc6a2c7 (patch) | |
| tree | 69b2692a52acf158ab60161e6aa7a6076d28d44e | |
| parent | e775f25add85c3c36df7e8601fbd472c8fbd2b09 (diff) | |
| download | vdr-cc16e9fdc73bcba6cc5fb677111cf76fcbc6a2c7.tar.gz vdr-cc16e9fdc73bcba6cc5fb677111cf76fcbc6a2c7.tar.bz2 | |
If regenerating an index file fails and no data is written to the file, VDR now reports this error and removes the empty index file
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | config.h | 10 | ||||
| -rw-r--r-- | po/ar.po | 5 | ||||
| -rw-r--r-- | po/ca_ES.po | 5 | ||||
| -rw-r--r-- | po/cs_CZ.po | 5 | ||||
| -rw-r--r-- | po/da_DK.po | 5 | ||||
| -rw-r--r-- | po/de_DE.po | 5 | ||||
| -rw-r--r-- | po/el_GR.po | 5 | ||||
| -rw-r--r-- | po/es_ES.po | 5 | ||||
| -rw-r--r-- | po/et_EE.po | 5 | ||||
| -rw-r--r-- | po/fi_FI.po | 5 | ||||
| -rw-r--r-- | po/fr_FR.po | 5 | ||||
| -rw-r--r-- | po/hr_HR.po | 5 | ||||
| -rw-r--r-- | po/hu_HU.po | 5 | ||||
| -rw-r--r-- | po/it_IT.po | 5 | ||||
| -rw-r--r-- | po/lt_LT.po | 5 | ||||
| -rw-r--r-- | po/mk_MK.po | 5 | ||||
| -rw-r--r-- | po/nl_NL.po | 5 | ||||
| -rw-r--r-- | po/nn_NO.po | 5 | ||||
| -rw-r--r-- | po/pl_PL.po | 5 | ||||
| -rw-r--r-- | po/pt_PT.po | 5 | ||||
| -rw-r--r-- | po/ro_RO.po | 5 | ||||
| -rw-r--r-- | po/ru_RU.po | 5 | ||||
| -rw-r--r-- | po/sk_SK.po | 5 | ||||
| -rw-r--r-- | po/sl_SI.po | 5 | ||||
| -rw-r--r-- | po/sr_SR.po | 5 | ||||
| -rw-r--r-- | po/sv_SE.po | 5 | ||||
| -rw-r--r-- | po/tr_TR.po | 5 | ||||
| -rw-r--r-- | po/uk_UA.po | 5 | ||||
| -rw-r--r-- | po/zh_CN.po | 5 | ||||
| -rw-r--r-- | recording.c | 17 |
31 files changed, 134 insertions, 38 deletions
@@ -7234,3 +7234,8 @@ Video Disk Recorder Revision History Authors of plugins that implement skins may want to adapt their SetButtons() function in order to make use of this new feature. See, for instance, the function cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details. + +2012-09-13: Version 1.7.31 + +- If regenerating an index file fails and no data is written to the file, VDR now + reports this error and removes the empty index file. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.51 2012/09/09 12:57:33 kls Exp $ + * $Id: config.h 2.52 2012/09/13 11:12:07 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.30" -#define VDRVERSNUM 10730 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.31" +#define VDRVERSNUM 10731 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.30" -#define APIVERSNUM 10730 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.31" +#define APIVERSNUM 10731 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to @@ -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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1280,6 +1280,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "لا يمكن Ù‚Ù�Ù„ Ø§Ù„ØØ§Ø³ÙˆØ¨ الرمز s لم ÙŠØØ¯Ø¯" diff --git a/po/ca_ES.po b/po/ca_ES.po index ce863deb..a66c9a71 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1255,6 +1255,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "No puc apagar, falta la opció -s !" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 96f6b146..baadee4e 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1254,6 +1254,9 @@ msgstr "Generovánà index souboru" msgid "Index file regeneration complete" msgstr "Generovánà index souboru dokonÄ�eno" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Vypnutà nenà možné - chybà volba '-s'!" diff --git a/po/da_DK.po b/po/da_DK.po index 3615bc74..3283eba2 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Kan ikke slukke - parameter '-s' ikke angivet!" diff --git a/po/de_DE.po b/po/de_DE.po index aaa92ea2..f58128f6 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "Index-Datei wird regeneriert" msgid "Index file regeneration complete" msgstr "Regenerierung der Index-Datei abgeschlossen" +msgid "Index file regeneration failed!" +msgstr "Regenerierung der Index-Datei fehlgeschlagen!" + msgid "Can't shutdown - option '-s' not given!" msgstr "Ausschalten unmöglich - Option '-s' fehlt!" diff --git a/po/el_GR.po b/po/el_GR.po index 42bd8be2..27959caa 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Áäýíáôïí íá ãßíåé ôåñìáôéóìüò. Áíýðáñêôç ç ðáñÜìåôñïò '-s'!" diff --git a/po/es_ES.po b/po/es_ES.po index 2bda405b..98ab6346 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "¡No se puede apagar - falta el parámetro '-s'!" diff --git a/po/et_EE.po b/po/et_EE.po index ddf9a80f..73feafd1 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "Indeksfaili regenereerimine" msgid "Index file regeneration complete" msgstr "Indeksfaili regenereerimine lõpetatud" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Väljalülitamine nurjus - '-s' parameeter puudub!" diff --git a/po/fi_FI.po b/po/fi_FI.po index 11a74ada..f6f85643 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1255,6 +1255,9 @@ msgstr "Luodaan indeksitiedosto uudelleen" msgid "Index file regeneration complete" msgstr "Indeksitiedosto valmistui" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Sammutus ei onnistu - '-s' parametri puuttuu!" diff --git a/po/fr_FR.po b/po/fr_FR.po index 5d65eaa1..abdf1a7f 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1258,6 +1258,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Arrêt impossible - option '-s' absente !" diff --git a/po/hr_HR.po b/po/hr_HR.po index b7b8983a..d81d2421 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1254,6 +1254,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Ga¹enje nemoguæe - nedostaje opcija '-s'!" diff --git a/po/hu_HU.po b/po/hu_HU.po index 58cf9ce2..c4e6db03 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+0200\n" "PO-Revision-Date: 2012-01-02 11:54+0200\n" "Last-Translator: István Füley <ifuley@tigercomp.ro>\n" "Language-Team: Hungarian <vdr@linuxtv.org>\n" @@ -1256,6 +1256,9 @@ msgstr "Az index file újragenerálása" msgid "Index file regeneration complete" msgstr "Index file újragenerálása kész." +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "A leállítás nem lehetséges - Opció '-s' hiányzik!" diff --git a/po/it_IT.po b/po/it_IT.po index 59b763f6..46f1f500 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1259,6 +1259,9 @@ msgstr "Rigenerazione file indice" msgid "Index file regeneration complete" msgstr "Rigenerazione file indice completata" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Impossibile spegnere - parametro '-s' non assegnato!" diff --git a/po/lt_LT.po b/po/lt_LT.po index d9bf213f..264eb6d6 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "Pergeneruojamas index failas" msgid "Index file regeneration complete" msgstr "Index failo pergeneravimas baigtas" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Sistemos negalima iÅ¡jungti, nes starto metu nebuvo komandinÄ—j eilutÄ—j paduota savybÄ— '-s'!" diff --git a/po/mk_MK.po b/po/mk_MK.po index 46d9419c..7f54c87b 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "Регенерирање на индекÑ� датотека" msgid "Index file regeneration complete" msgstr "Регенерирањето на индекÑ�от заврши" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Ð�евозможно гаÑ�нење - недоÑ�таÑ�ува опцијата '-s'!" diff --git a/po/nl_NL.po b/po/nl_NL.po index df75d23d..26d569a3 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1256,6 +1256,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Shutdown onmogelijk - Optie '-s' ontbreekt!" diff --git a/po/nn_NO.po b/po/nn_NO.po index f221214d..a4413868 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Kan ikke slå av - startet uten parameteret '-s'!" diff --git a/po/pl_PL.po b/po/pl_PL.po index 19133898..3b17abe8 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Nie mo¿na wy³±czyæ - nie podano opcji '-s'!" diff --git a/po/pt_PT.po b/po/pt_PT.po index 11fdb4c0..2026fb84 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "A regenerar índice do ficheiro" msgid "Index file regeneration complete" msgstr "Regeneração do índice do ficheiro completa" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Impossível desligar - falta o parâmetro '-s'!" diff --git a/po/ro_RO.po b/po/ro_RO.po index 40571e55..048c1146 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1255,6 +1255,9 @@ msgstr "Generez index" msgid "Index file regeneration complete" msgstr "Generarea indexului s-a incheiat" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Nu pot închide - vezi opþiunea '-s'" diff --git a/po/ru_RU.po b/po/ru_RU.po index f159d1ef..7a71e604 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "²ëÚÛîçÕÝØÕ ÝÕÒÞ×ÜÞÖÝÞ - ÝÕ ×ÐÔÐÝ ßÐàÐÜÕâà '-s'!" diff --git a/po/sk_SK.po b/po/sk_SK.po index fc75998f..3a479cf6 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "Regeneraèný indexový súbor" msgid "Index file regeneration complete" msgstr "Regenerácia indexového súboru hotová" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Vypnutie nie je mo¾né - chýba voµba '-s'!" diff --git a/po/sl_SI.po b/po/sl_SI.po index 95a45dfe..5c888f6d 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1253,6 +1253,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Zaustavitev ni izvedljiva - opcija '-s' ni podana!" diff --git a/po/sr_SR.po b/po/sr_SR.po index 0e6f9cd6..7b4e8180 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1278,6 +1278,9 @@ msgstr "Obnavljanje index datoteke" msgid "Index file regeneration complete" msgstr "Obnavljanje index datoteke zavr¹eno" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Ga¹enje nemoguæe - nedostaje opcija '-s'!" diff --git a/po/sv_SE.po b/po/sv_SE.po index aa66721c..e54b0375 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1255,6 +1255,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Kan inte avsluta, måste använda parameter '-s'" diff --git a/po/tr_TR.po b/po/tr_TR.po index e4acde3f..23598e7a 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+0200\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Language-Team: Turkish <vdr@linuxtv.org>\n" @@ -1252,6 +1252,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Kapatýlamýyor - '-s' seçeneði verilmemiþ!" diff --git a/po/uk_UA.po b/po/uk_UA.po index 62b5fc64..33db2a0e 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1252,6 +1252,9 @@ msgstr "РегенераціÑ� файлу індекÑ�ів" msgid "Index file regeneration complete" msgstr "Регенерацію файлу індекÑ�у завершено" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "ВиключенннÑ� неможливе - не задано параметр '-s'!" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2277a940..d4d97195 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-09-09 15:20+0200\n" +"POT-Creation-Date: 2012-09-13 13:15+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" @@ -1255,6 +1255,9 @@ msgstr "" msgid "Index file regeneration complete" msgstr "" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "ä¸�能关机 - æ“�作 '-s' ä¸�å…�许!" diff --git a/recording.c b/recording.c index 9c80505e..49c5276e 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 2.60 2012/09/06 09:57:31 kls Exp $ + * $Id: recording.c 2.61 2012/09/13 11:02:17 kls Exp $ */ #include "recording.h" @@ -1483,6 +1483,7 @@ cIndexFileGenerator::~cIndexFileGenerator() void cIndexFileGenerator::Action(void) { bool IndexFileComplete = false; + bool IndexFileWritten = false; bool Rewind = false; cFileName FileName(recordingName, false); cUnbufferedFile *ReplayFile = FileName.Open(); @@ -1514,6 +1515,7 @@ void cIndexFileGenerator::Action(void) if (FrameDetector.NewFrame()) { IndexFile.Write(FrameDetector.IndependentFrame(), FileName.Number(), FrameOffset >= 0 ? FrameOffset : FileSize); FrameOffset = -1; + IndexFileWritten = true; } FileSize += Processed; Buffer.Del(Processed); @@ -1568,11 +1570,16 @@ void cIndexFileGenerator::Action(void) break; } } + if (IndexFileComplete) { + if (IndexFileWritten) { + Skins.QueueMessage(mtInfo, tr("Index file regeneration complete")); + return; + } + else + Skins.QueueMessage(mtError, tr("Index file regeneration failed!")); + } // Delete the index file if the recording has not been processed entirely: - if (IndexFileComplete) - Skins.QueueMessage(mtInfo, tr("Index file regeneration complete")); - else - IndexFile.Delete(); + IndexFile.Delete(); } // --- cIndexFile ------------------------------------------------------------ |
