summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--command/logos/ProSieben-A16_9-P0.pgmbin10019 -> 6817 bytes
-rw-r--r--command/logos/kabel_eins-A16_9-P0.pgmbin10019 -> 8818 bytes
-rw-r--r--command/logos/kabel_eins-A16_9-P1.pgmbin2517 -> 0 bytes
-rw-r--r--command/logos/kabel_eins-A16_9-P2.pgmbin2517 -> 0 bytes
-rw-r--r--command/markad-standalone.cpp25
-rw-r--r--command/po/cs_CZ.po4
-rw-r--r--command/po/de_DE.po4
-rw-r--r--command/po/fi_FI.po4
-rw-r--r--command/po/it_IT.po4
-rw-r--r--command/po/sk_SK.po4
-rw-r--r--plugin/po/de_DE.po4
-rw-r--r--plugin/po/es_ES.po4
-rw-r--r--plugin/po/fi_FI.po4
-rw-r--r--plugin/po/it_IT.po4
-rw-r--r--plugin/po/sk_SK.po7
15 files changed, 45 insertions, 23 deletions
diff --git a/command/logos/ProSieben-A16_9-P0.pgm b/command/logos/ProSieben-A16_9-P0.pgm
index bcee4bb..c9fe337 100644
--- a/command/logos/ProSieben-A16_9-P0.pgm
+++ b/command/logos/ProSieben-A16_9-P0.pgm
Binary files differ
diff --git a/command/logos/kabel_eins-A16_9-P0.pgm b/command/logos/kabel_eins-A16_9-P0.pgm
index 271cb83..d9fdad6 100644
--- a/command/logos/kabel_eins-A16_9-P0.pgm
+++ b/command/logos/kabel_eins-A16_9-P0.pgm
Binary files differ
diff --git a/command/logos/kabel_eins-A16_9-P1.pgm b/command/logos/kabel_eins-A16_9-P1.pgm
deleted file mode 100644
index 6c7580e..0000000
--- a/command/logos/kabel_eins-A16_9-P1.pgm
+++ /dev/null
Binary files differ
diff --git a/command/logos/kabel_eins-A16_9-P2.pgm b/command/logos/kabel_eins-A16_9-P2.pgm
deleted file mode 100644
index e95f62e..0000000
--- a/command/logos/kabel_eins-A16_9-P2.pgm
+++ /dev/null
Binary files differ
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index 47d9eaa..10ed7a2 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -1123,7 +1123,7 @@ void cMarkAdStandalone::ProcessFile()
AddMark(&tempmark);
}
}
- skipped=demux->Skipped();
+ if (demux) skipped=demux->Skipped();
}
void cMarkAdStandalone::Process()
@@ -1934,6 +1934,11 @@ bool cMarkAdStandalone::CreatePidfile()
}
fclose(oldpid);
}
+ else
+ {
+ // fopen above sets the error to 2, reset it here!
+ errno=0;
+ }
if (duplicate)
{
free(buf);
@@ -2036,7 +2041,17 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
}
}
- isyslog("starting v%s",VERSION);
+ long lb;
+ errno=0;
+ lb=sysconf(_SC_LONG_BIT);
+ if (errno==0)
+ {
+ isyslog("starting v%s (%libit)",VERSION,lb);
+ }
+ else
+ {
+ isyslog("starting v%s",VERSION);
+ }
isyslog("on %s",Directory);
if (!bDecodeAudio)
@@ -2065,7 +2080,11 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
bIgnoreTimerInfo=true;
}
- if (!CheckTS()) return;
+ if (!CheckTS()) {
+ esyslog("no files found");
+ abort=true;
+ return;
+ }
if (isTS)
{
diff --git a/command/po/cs_CZ.po b/command/po/cs_CZ.po
index be08408..7decee6 100644
--- a/command/po/cs_CZ.po
+++ b/command/po/cs_CZ.po
@@ -4,10 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-05-27 15:32+0200\n"
+"POT-Creation-Date: 2011-07-28 15:52+0200\n"
"PO-Revision-Date: 2011-03-01 20:30+0100\n"
"Last-Translator: jiri dobry <jdobry@centrum.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,4 +21,3 @@ msgstr "vyhledávání reklamy zrušeno pro"
msgid "markad finished for"
msgstr "vyhledávání reklamy skončilo pro"
-
diff --git a/command/po/de_DE.po b/command/po/de_DE.po
index 721fbbf..fb34b96 100644
--- a/command/po/de_DE.po
+++ b/command/po/de_DE.po
@@ -4,14 +4,14 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:31+0100\n"
+"POT-Creation-Date: 2011-07-28 15:52+0200\n"
"PO-Revision-Date: 2010-03-31 03:07+0200\n"
"Last-Translator: Jochen Dolze <vdr@dolze.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
msgid "starting markad for"
msgstr "Starte markad für"
diff --git a/command/po/fi_FI.po b/command/po/fi_FI.po
index 06709cb..034cfbf 100644
--- a/command/po/fi_FI.po
+++ b/command/po/fi_FI.po
@@ -5,14 +5,14 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:31+0100\n"
+"POT-Creation-Date: 2011-07-28 15:52+0200\n"
"PO-Revision-Date: 2011-02-27 02:27+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
msgid "starting markad for"
msgstr "markad käynnistetty:"
diff --git a/command/po/it_IT.po b/command/po/it_IT.po
index 4c0e06d..824493a 100644
--- a/command/po/it_IT.po
+++ b/command/po/it_IT.po
@@ -4,10 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-05-27 15:32+0200\n"
+"POT-Creation-Date: 2011-07-28 15:52+0200\n"
"PO-Revision-Date: 2011-03-05 15:55+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,4 +24,3 @@ msgstr "markad annullato per"
msgid "markad finished for"
msgstr "markad completato per"
-
diff --git a/command/po/sk_SK.po b/command/po/sk_SK.po
index 41f782b..41d434d 100644
--- a/command/po/sk_SK.po
+++ b/command/po/sk_SK.po
@@ -4,10 +4,11 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-05-27 15:32+0200\n"
+"POT-Creation-Date: 2011-07-28 15:52+0200\n"
"PO-Revision-Date: 2011-03-01 20:30+0100\n"
"Last-Translator: milan hrala <hrala.milan@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,4 +21,3 @@ msgstr "Vyhladávanie reklamy zrušené v"
msgid "markad finished for"
msgstr "Vyhladávanie reklamy skončilo v"
-
diff --git a/plugin/po/de_DE.po b/plugin/po/de_DE.po
index a2bc9eb..6af1866 100644
--- a/plugin/po/de_DE.po
+++ b/plugin/po/de_DE.po
@@ -4,14 +4,14 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:32+0100\n"
+"POT-Creation-Date: 2011-07-28 16:06+0200\n"
"PO-Revision-Date: 2009-08-27 14:18+0200\n"
"Last-Translator: Jochen Dolze <vdr@dolze.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
msgid "markad still running"
msgstr "markad läuft noch"
diff --git a/plugin/po/es_ES.po b/plugin/po/es_ES.po
index f0c540e..650f99b 100644
--- a/plugin/po/es_ES.po
+++ b/plugin/po/es_ES.po
@@ -4,14 +4,14 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:32+0100\n"
+"POT-Creation-Date: 2011-07-28 16:06+0200\n"
"PO-Revision-Date: 2011-02-12 11:30+0100\n"
"Last-Translator: Javier Bradineras <jbradi@hotmail.com>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-Country: SPAIN\n"
"X-Poedit-SourceCharset: utf-8\n"
diff --git a/plugin/po/fi_FI.po b/plugin/po/fi_FI.po
index f9e1eb9..12fad2c 100644
--- a/plugin/po/fi_FI.po
+++ b/plugin/po/fi_FI.po
@@ -5,14 +5,14 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:32+0100\n"
+"POT-Creation-Date: 2011-07-28 16:06+0200\n"
"PO-Revision-Date: 2011-02-27 02:27+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
msgid "markad still running"
msgstr "Mainosten merkintä yhä aktiivinen"
diff --git a/plugin/po/it_IT.po b/plugin/po/it_IT.po
index ab43e69..dda37c6 100644
--- a/plugin/po/it_IT.po
+++ b/plugin/po/it_IT.po
@@ -4,14 +4,14 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-03-21 22:32+0100\n"
+"POT-Creation-Date: 2011-07-28 16:06+0200\n"
"PO-Revision-Date: 2011-03-05 16:11+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n"
diff --git a/plugin/po/sk_SK.po b/plugin/po/sk_SK.po
index 6c7de3e..cbd4eb9 100644
--- a/plugin/po/sk_SK.po
+++ b/plugin/po/sk_SK.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: markad\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-02-23 22:24+0100\n"
+"POT-Creation-Date: 2011-07-28 16:06+0200\n"
"PO-Revision-Date: 2011-03-01 20:26+0100\n"
"Last-Translator: milan hrala <hrala.milan@gmail.com>\n"
"Language-Team: milan hrala <grala.milan@gmail.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -107,10 +108,12 @@ msgstr "Značkovač reklamy"
#~ msgid "high"
#~ msgstr "vysoký"
+
#~ msgid "normal"
#~ msgstr "normálny"
+
#~ msgid "low"
#~ msgstr "nízky"
+
#~ msgid "backup marks"
#~ msgstr "zálohovanie značiek"
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 02:48:49 +0000