From cc16e9fdc73bcba6cc5fb677111cf76fcbc6a2c7 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 13 Sep 2012 11:18:53 +0200 Subject: [PATCH] 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 --- HISTORY | 5 +++++ config.h | 10 +++++----- po/ar.po | 5 ++++- po/ca_ES.po | 5 ++++- po/cs_CZ.po | 5 ++++- po/da_DK.po | 5 ++++- po/de_DE.po | 5 ++++- po/el_GR.po | 5 ++++- po/es_ES.po | 5 ++++- po/et_EE.po | 5 ++++- po/fi_FI.po | 5 ++++- po/fr_FR.po | 5 ++++- po/hr_HR.po | 5 ++++- po/hu_HU.po | 5 ++++- po/it_IT.po | 5 ++++- po/lt_LT.po | 5 ++++- po/mk_MK.po | 5 ++++- po/nl_NL.po | 5 ++++- po/nn_NO.po | 5 ++++- po/pl_PL.po | 5 ++++- po/pt_PT.po | 5 ++++- po/ro_RO.po | 5 ++++- po/ru_RU.po | 5 ++++- po/sk_SK.po | 5 ++++- po/sl_SI.po | 5 ++++- po/sr_SR.po | 5 ++++- po/sv_SE.po | 5 ++++- po/tr_TR.po | 5 ++++- po/uk_UA.po | 5 ++++- po/zh_CN.po | 5 ++++- recording.c | 17 ++++++++++++----- 31 files changed, 134 insertions(+), 38 deletions(-) diff --git a/HISTORY b/HISTORY index 8084dcf6..b0e96dd0 100644 --- a/HISTORY +++ b/HISTORY @@ -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. diff --git a/config.h b/config.h index a58b75c7..c0b69830 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.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 diff --git a/po/ar.po b/po/ar.po index 8347285e..7282e0a5 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: \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 \n" "Language-Team: Arabic \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: \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 \n" "Language-Team: Catalan \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: \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ý \n" "Language-Team: Czech \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: \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 \n" "Language-Team: Danish \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: \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 \n" "Language-Team: German \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 unmglich - 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: \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 \n" "Language-Team: Greek \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: \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 \n" "Language-Team: Spanish \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 parmetro '-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: \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 \n" "Language-Team: Estonian \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: \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 \n" "Language-Team: Finnish \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: \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 \n" "Language-Team: French \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 "Arrt 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: \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 \n" "Language-Team: Croatian \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 "Gaenje nemogue - 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: \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: Istvn Fley \n" "Language-Team: Hungarian \n" @@ -1256,6 +1256,9 @@ msgstr "Az index file msgid "Index file regeneration complete" msgstr "Index file jragenerlsa ksz." +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "A lellts nem lehetsges - Opci '-s' hinyzik!" 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: \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 \n" "Language-Team: Italian \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: \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 \n" "Language-Team: Lithuanian \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: \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 \n" "Language-Team: Macedonian \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: \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 \n" "Language-Team: Dutch \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: \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 \n" "Language-Team: Norwegian Nynorsk \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: \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 \n" "Language-Team: Polish \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 mona wyczy - 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: \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 \n" "Language-Team: Portuguese \n" @@ -1253,6 +1253,9 @@ msgstr "A regenerar msgid "Index file regeneration complete" msgstr "Regenerao do ndice do ficheiro completa" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Impossvel desligar - falta o parmetro '-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: \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 \n" "Language-Team: Romanian \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 opiunea '-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: \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 \n" "Language-Team: Russian \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: \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 \n" "Language-Team: Slovak \n" @@ -1252,6 +1252,9 @@ msgstr "Regenera msgid "Index file regeneration complete" msgstr "Regenercia indexovho sboru hotov" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Vypnutie nie je mon - chba voba '-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: \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 \n" "Language-Team: Slovenian \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: \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 \n" "Language-Team: Serbian \n" @@ -1278,6 +1278,9 @@ msgstr "Obnavljanje index datoteke" msgid "Index file regeneration complete" msgstr "Obnavljanje index datoteke zavreno" +msgid "Index file regeneration failed!" +msgstr "" + msgid "Can't shutdown - option '-s' not given!" msgstr "Gaenje nemogue - 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: \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 \n" "Language-Team: Swedish \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, mste anvnda 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: \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 Yolgeen \n" "Language-Team: Turkish \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 "Kapatlamyor - '-s' seenei 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: \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 \n" "Language-Team: Ukrainian \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: \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 \n" "Language-Team: Chinese (simplified) \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 ------------------------------------------------------------