From 9d3589d325ae9499fea823ad29dce79480a667c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 15 Oct 2011 12:56:45 +0300 Subject: Include streamdev version in about view, fine tune epgsearch display in it. --- po/cs.po | 17 +++++++++++------ po/de.po | 16 +++++++++++----- po/es.po | 16 +++++++++++----- po/fi.po | 16 +++++++++++----- po/fr.po | 16 +++++++++++----- po/it.po | 16 +++++++++++----- po/nl.po | 16 +++++++++++----- po/ru.po | 16 +++++++++++----- po/vdradmin.pot | 12 +++++++++--- template/default/about.html | 8 ++------ vdradmind.pl | 3 ++- 11 files changed, 101 insertions(+), 51 deletions(-) diff --git a/po/cs.po b/po/cs.po index 5b84398..c6f750e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2006-09-23 13:14+0200\n" "Last-Translator: Karel Borkovec \n" "Language-Team: Czech \n" @@ -81,12 +81,17 @@ msgstr "Verze VDR:" msgid "Supported features in VDR:" msgstr "Podporované vlastnosti ve VDR:" -#, fuzzy -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "TV streamování (Streamdev Plugin)" +msgid "EPGSearch" +msgstr "" + +msgid "EPGSearch Plugin" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "TV streamování" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "TV streamování (Streamdev Plugin)" +msgid "Streamdev Plugin" +msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Přejmenování nahrávek (Liemikuutio Patch)" diff --git a/po/de.po b/po/de.po index 64a169c..e571f49 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.5+cvs\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2009-12-30 19:31+0200\n" "Last-Translator: Andreas Mair \n" "Language-Team: German \n" @@ -76,11 +76,17 @@ msgstr "VDR Version:" msgid "Supported features in VDR:" msgstr "Unterstützte Funktionen im VDR:" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "EPGSearch (EPGSearch Plugin)" +msgid "EPGSearch" +msgstr "" + +msgid "EPGSearch Plugin" +msgstr "EPGSearch Plugin" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "LiveTV Streaming (Streamdev Plugin)" +msgid "LiveTV Streaming" +msgstr "" + +msgid "Streamdev Plugin" +msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Aufnahmen umbenennen (Liemikuutio Patch)" diff --git a/po/es.po b/po/es.po index e8b25b2..6f516ef 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2010-02-11 22:46+0100\n" "Last-Translator: Manuel Gomez \n" "Language-Team: Spanish \n" @@ -80,11 +80,17 @@ msgstr "Versión de VDR:" msgid "Supported features in VDR:" msgstr "Características respaldadas en VDR:" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "Búsqueda EPG (EPGSearch Plugin) (en alemán de momento)" +msgid "EPGSearch" +msgstr "Búsqueda EPG" + +msgid "EPGSearch Plugin" +msgstr "" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "Flujo de LiveTV (Streamdev Plugin) (en alemán de momento)" +msgid "LiveTV Streaming" +msgstr "Flujo de LiveTV" + +msgid "Streamdev Plugin" +msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Renombrar grabaciones (Liemikuutio Patch)" diff --git a/po/fi.po b/po/fi.po index 0d95ac5..53db417 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2011-07-30 23:22+0200\n" "Last-Translator: Ville Skyttä \n" "Language-Team: Finnish \n" @@ -77,11 +77,17 @@ msgstr "VDR:n versio:" msgid "Supported features in VDR:" msgstr "VDR:n tuetut ominaisuudet:" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "Hakuajastimet (EPGSearch-laajennos)" +msgid "EPGSearch" +msgstr "Hakuajastimet" + +msgid "EPGSearch Plugin" +msgstr "EPGSearch-laajennos" + +msgid "LiveTV Streaming" +msgstr "Live-kuvan suoratoisto" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "Live-kuvan suoratoisto (Streamdev-laajennos)" +msgid "Streamdev Plugin" +msgstr "Streamdev-laajennos" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Tallenteiden uudelleennimeäminen (Liemikuutio-kokoelma)" diff --git a/po/fr.po b/po/fr.po index 96b5325..6f1b444 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.0\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2007-08-23 10:45+0100\n" "Last-Translator: Trois Six \n" "Language-Team: French \n" @@ -78,11 +78,17 @@ msgstr "Version de VDR :" msgid "Supported features in VDR:" msgstr "Options supportées par VDR :" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "Plugin de Recherche dans les données EPG (EPGSearch)" +msgid "EPGSearch" +msgstr "Plugin de Recherche dans les données EPG" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "Plugin de Streaming Live (Streamdev)" +msgid "EPGSearch Plugin" +msgstr "EPGSearch" + +msgid "LiveTV Streaming" +msgstr "Plugin de Streaming Live" + +msgid "Streamdev Plugin" +msgstr "Streamdev" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Renommer les Enregistrements (Patch Liemikuutio)" diff --git a/po/it.po b/po/it.po index 94f25e8..490e945 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2010-03-29 01:02+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" @@ -79,11 +79,17 @@ msgstr "Versione VDR:" msgid "Supported features in VDR:" msgstr "Funzioni supportate da VDR:" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "Ricerca EPG (Plugin EPGSearch)" +msgid "EPGSearch" +msgstr "Ricerca EPG" + +msgid "EPGSearch Plugin" +msgstr "Plugin EPGSearch" + +msgid "LiveTV Streaming" +msgstr "Trasmissione TV dal vivo" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "Trasmissione TV dal vivo (Plugin Streamdev)" +msgid "Streamdev Plugin" +msgstr "Plugin Streamdev" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Rinomina registrazioni (Patch di Liemikuutio)" diff --git a/po/nl.po b/po/nl.po index 277be23..821c4a3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.7\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2010-08-13 13:36+0200\n" "Last-Translator: Roel Koelewijn \n" "Language-Team: Dutch \n" @@ -80,11 +80,17 @@ msgstr "VDR versie:" msgid "Supported features in VDR:" msgstr "Ondersteunde elementen in VDR" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "Autotimer(Vanaf versie 3.5 is de autotimer vervallen en
word nu gebruik gemaakt van de plugin \"EPG zoeken\" EPGSearch Plugin)" +msgid "EPGSearch" +msgstr "EPG zoeken" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "LiveTV Streaming (Streamdev Plugin)" +msgid "EPGSearch Plugin" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "Streamdev Plugin" +msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Hernoem opnames (Liemikuutio Patch)" diff --git a/po/ru.po b/po/ru.po index ec5c1e0..0c6a274 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: 2006-10-27 15:42+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian \n" @@ -78,11 +78,17 @@ msgstr "Версия VDR:" msgid "Supported features in VDR:" msgstr "Поддерживаемые улучшения в VDR:" -msgid "EPGSearch (EPGSearch Plugin)" -msgstr "EPG Поиск (EPGSearch Plugin)" +msgid "EPGSearch" +msgstr "EPG Поиск" -msgid "LiveTV Streaming (Streamdev Plugin)" -msgstr "LiveTV Streaming (Streamdev Plugin" +msgid "EPGSearch Plugin" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "Streamdev Plugin" +msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" msgstr "Переименование записей (Liemikuutio Patch)" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index f33d275..ab51dbe 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM 3.6.8\n" "Report-Msgid-Bugs-To: Andreas Mair \n" -"POT-Creation-Date: 2011-06-03 06:37+0200\n" +"POT-Creation-Date: 2011-10-15 12:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,10 +90,16 @@ msgstr "" msgid "Supported features in VDR:" msgstr "" -msgid "EPGSearch (EPGSearch Plugin)" +msgid "EPGSearch" msgstr "" -msgid "LiveTV Streaming (Streamdev Plugin)" +msgid "EPGSearch Plugin" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "Streamdev Plugin" msgstr "" msgid "Rename Recordings (Liemikuutio Patch)" diff --git a/template/default/about.html b/template/default/about.html index 148aa6e..2346ffc 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -122,17 +122,13 @@ -  EPGSearch Plugin)') %?> - -  v - -
+   (EPGSearch Plugin') %?> v)
-  Streamdev Plugin)') %?>
+   (Streamdev Plugin') %?> v)
diff --git a/vdradmind.pl b/vdradmind.pl index 0340b1a..76ae450 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -6996,8 +6996,9 @@ sub getSupportedFeatures { $FEATURES{EPGSEARCH_VERSION} = ($1 * 10000 + $2 * 100 + $3); $FEATURES{EPGSEARCH_VERSION_HR} = "$1.$2.$3$4"; } - if ($_ =~ /^streamdev-server/) { + if ($_ =~ /^streamdev-server(?:\s+v(\S+))?/) { $FEATURES{STREAMDEV} = 1; + $FEATURES{STREAMDEV_VERSION_HR} = $1; } } } -- cgit v1.2.3