diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2011-10-15 12:56:45 +0300 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2011-10-15 12:56:45 +0300 |
| commit | 9d3589d325ae9499fea823ad29dce79480a667c9 (patch) | |
| tree | 1a0aa444b831e171c985be2788b86f355f9951ca | |
| parent | 3b4eb77b4db81920a5fdac8e55ff3fccd7aee1cf (diff) | |
| download | vdradmin-am-9d3589d325ae9499fea823ad29dce79480a667c9.tar.gz vdradmin-am-9d3589d325ae9499fea823ad29dce79480a667c9.tar.bz2 | |
Include streamdev version in about view, fine tune epgsearch display in it.
| -rw-r--r-- | po/cs.po | 17 | ||||
| -rw-r--r-- | po/de.po | 16 | ||||
| -rw-r--r-- | po/es.po | 16 | ||||
| -rw-r--r-- | po/fi.po | 16 | ||||
| -rw-r--r-- | po/fr.po | 16 | ||||
| -rw-r--r-- | po/it.po | 16 | ||||
| -rw-r--r-- | po/nl.po | 16 | ||||
| -rw-r--r-- | po/ru.po | 16 | ||||
| -rw-r--r-- | po/vdradmin.pot | 12 | ||||
| -rw-r--r-- | template/default/about.html | 8 | ||||
| -rwxr-xr-x | vdradmind.pl | 3 |
11 files changed, 101 insertions, 51 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <her-ur@her-ur.org>\n" "Language-Team: Czech <cs@li.org>\n" @@ -81,12 +81,17 @@ msgstr "Verze VDR:" msgid "Supported features in VDR:" msgstr "Podporované vlastnosti ve VDR:" -#, fuzzy -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "TV streamování (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" +msgid "EPGSearch" +msgstr "" + +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "TV streamování" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "TV streamování (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Přejmenování nahrávek (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.5+cvs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <mail@andreas.vdr-developer.org>\n" "Language-Team: German <mail@andreas.vdr-developer.org>\n" @@ -76,11 +76,17 @@ msgstr "VDR Version:" msgid "Supported features in VDR:" msgstr "Unterstützte Funktionen im VDR:" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/\" target=\"_blank\">EPGSearch Plugin</a>)" +msgid "EPGSearch" +msgstr "" + +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "<a href=\"http://winni.vdr-developer.org/epgsearch/\" target=\"_blank\">EPGSearch Plugin</a>" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" +msgid "LiveTV Streaming" +msgstr "" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Aufnahmen umbenennen (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <mgrojo@gmail.com>\n" "Language-Team: Spanish <r_jung@web.de>\n" @@ -80,11 +80,17 @@ msgstr "Versión de VDR:" msgid "Supported features in VDR:" msgstr "Características respaldadas en VDR:" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "Búsqueda EPG (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>) (en alemán de momento)" +msgid "EPGSearch" +msgstr "Búsqueda EPG" + +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "Flujo de LiveTV (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>) (en alemán de momento)" +msgid "LiveTV Streaming" +msgstr "Flujo de LiveTV" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Renombrar grabaciones (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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ä <ville.skytta@iki.fi>\n" "Language-Team: Finnish <vdr@linuxtv.org>\n" @@ -77,11 +77,17 @@ msgstr "VDR:n versio:" msgid "Supported features in VDR:" msgstr "VDR:n tuetut ominaisuudet:" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "Hakuajastimet (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch-laajennos</a>)" +msgid "EPGSearch" +msgstr "Hakuajastimet" + +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch-laajennos</a>" + +msgid "LiveTV Streaming" +msgstr "Live-kuvan suoratoisto" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "Live-kuvan suoratoisto (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev-laajennos</a>)" +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev-laajennos</a>" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Tallenteiden uudelleennimeäminen (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio-kokoelma</a>)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.0\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <trois.six@free.fr>\n" "Language-Team: French <trois.six@free.fr>\n" @@ -78,11 +78,17 @@ msgstr "Version de VDR :" msgid "Supported features in VDR:" msgstr "Options supportées par VDR :" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "Plugin de Recherche dans les données EPG (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch</a>)" +msgid "EPGSearch" +msgstr "Plugin de Recherche dans les données EPG" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "Plugin de Streaming Live (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev</a>)" +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch</a>" + +msgid "LiveTV Streaming" +msgstr "Plugin de Streaming Live" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev</a>" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Renommer les Enregistrements (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Patch Liemikuutio</a>)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.6\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <vdr-italian@tiscali.it>\n" "Language-Team: Italian <vdr-italian@tiscali.it>\n" @@ -79,11 +79,17 @@ msgstr "Versione VDR:" msgid "Supported features in VDR:" msgstr "Funzioni supportate da VDR:" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "Ricerca EPG (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">Plugin EPGSearch</a>)" +msgid "EPGSearch" +msgstr "Ricerca EPG" + +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">Plugin EPGSearch</a>" + +msgid "LiveTV Streaming" +msgstr "Trasmissione TV dal vivo" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "Trasmissione TV dal vivo (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Plugin Streamdev</a>)" +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Plugin Streamdev</a>" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Rinomina registrazioni (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Patch di Liemikuutio</a>)" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.7\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <roel.koelewijn@gmail.com>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -80,11 +80,17 @@ msgstr "VDR versie:" msgid "Supported features in VDR:" msgstr "Ondersteunde elementen in VDR" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "Autotimer(Vanaf versie 3.5 is de autotimer vervallen en<br> word nu gebruik gemaakt van de plugin \"EPG zoeken\" <a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" +msgid "EPGSearch" +msgstr "EPG zoeken" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Hernoem opnames (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\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 <oleg@roitburd.de>\n" "Language-Team: Russian <LL@li.org>\n" @@ -78,11 +78,17 @@ msgstr "Версия VDR:" msgid "Supported features in VDR:" msgstr "Поддерживаемые улучшения в VDR:" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" -msgstr "EPG Поиск (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" +msgid "EPGSearch" +msgstr "EPG Поиск" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" -msgstr "LiveTV Streaming (<a href=\"http://www.free-x.de/wiki/index.php/Streamdev-plugin\" target=\"_blank\">Streamdev Plugin</a>" +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" +msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "Переименование записей (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" 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 <andreas@vdr-developer.org>\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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -90,10 +90,16 @@ msgstr "" msgid "Supported features in VDR:" msgstr "" -msgid "EPGSearch (<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>)" +msgid "EPGSearch" msgstr "" -msgid "LiveTV Streaming (<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>)" +msgid "<a href=\"http://winni.vdr-developer.org/epgsearch/index_eng.html\" target=\"_blank\">EPGSearch Plugin</a>" +msgstr "" + +msgid "LiveTV Streaming" +msgstr "" + +msgid "<a href=\"http://streamdev.vdr-developer.org/\" target=\"_blank\">Streamdev Plugin</a>" msgstr "" msgid "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/\" target=\"_blank\">Liemikuutio Patch</a>)" 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 @@ <?% ELSE %?> <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> <?% END %?> - <?% gettext('EPGSearch (<a href="http://winni.vdr-developer.org/epgsearch/index_eng.html" target="_blank">EPGSearch Plugin</a>)') %?> - <?% IF features.EPGSEARCH %?> - v<?% features.EPGSEARCH_VERSION_HR %?> - <?% END %?> - <br /> + <?% gettext('EPGSearch') %?> (<?% gettext('<a href="http://winni.vdr-developer.org/epgsearch/index_eng.html" target="_blank">EPGSearch Plugin</a>') %?><?% IF features.EPGSEARCH_VERSION_HR %?> v<?% features.EPGSEARCH_VERSION_HR %?><?% END %?>)<br /> <?% IF features.STREAMDEV %?> <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% ELSE %?> <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> <?% END %?> - <?% gettext('LiveTV Streaming (<a href="http://streamdev.vdr-developer.org/" target="_blank">Streamdev Plugin</a>)') %?><br /> + <?% gettext('LiveTV Streaming') %?> (<?% gettext('<a href="http://streamdev.vdr-developer.org/" target="_blank">Streamdev Plugin</a>') %?><?% IF features.STREAMDEV_VERSION_HR %?> v<?% features.STREAMDEV_VERSION_HR %?><?% END %?>)<br /> <?% IF features.REC_RENAME %?> <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% ELSE %?> 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; } } } |