[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-517-gbdec90c
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-517-gbdec90c
|
From: GetAway <tux...@ne...> - 2015-04-10 19:14:22
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via bdec90cda38d2ef430676a2b9f62ef43836f4d23 (commit)
from c5ab526db16d9c1a5770044d8dddef2656feb372 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bdec90cda38d2ef430676a2b9f62ef43836f4d23
Author: GetAway <get...@t-...>
Date: Fri Apr 10 21:12:18 2015 +0200
yWeb: more translations
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 73b2544..f38a1af 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -379,10 +379,10 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
channel->name,
(channel->service_type == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "",
channel->channel_id,
- ((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "<img src=\"/images/elist.gif\" alt=\"Programmvorschau\" style=\"border: 0px\" />" : ""));
+ ((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "<img src=\"/images/elist.gif\" alt=\"{=L:9800=}\" style=\"border: 0px\" />" : ""));
if (channel->channel_id == current_channel)
- yresult += string_printf("\n <a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>");
+ yresult += string_printf("\n <a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"{=L:9801=}\" style=\"border: 0px\" /></a>");
yresult += string_printf("</td></tr></table>\n</td>\n</tr>\n");
@@ -440,7 +440,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
yresult += string_printf("<tr><td class=\"%cepg\">",classname);
yresult += string_printf("%s %s "
- "<span style=\"font-size: 8pt; white-space: nowrap\">(%ld von %d min, %d%%)</span>"
+ "<span style=\"font-size: 8pt; white-space: nowrap\">(%ld {=L:9802=} %d {=L:9803=}, %d%%)</span>"
, timestr.c_str()
, event->description.c_str()
, (time(NULL) - event->startTime)/60
@@ -683,9 +683,9 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s
hh->ParamList["tsid"] = itoh(serviceinfo.tsid);
hh->ParamList["vpid"] = itoh(serviceinfo.vpid);
hh->ParamList["apid"] = itoh(serviceinfo.apid);
- hh->ParamList["vtxtpid"] = (serviceinfo.vtxtpid != 0)?itoh(serviceinfo.vtxtpid):"nicht verfügbar";
- hh->ParamList["pmtpid"] = (serviceinfo.pmtpid != 0)?itoh(serviceinfo.pmtpid):"nicht verfügbar";
- hh->ParamList["pcrpid"] = (serviceinfo.pcrpid != 0)?itoh(serviceinfo.pcrpid):"nicht verfügbar";
+ hh->ParamList["vtxtpid"] = (serviceinfo.vtxtpid != 0)?itoh(serviceinfo.vtxtpid):"{=L:9804=}";
+ hh->ParamList["pmtpid"] = (serviceinfo.pmtpid != 0)?itoh(serviceinfo.pmtpid):"{=L:9804=}";
+ hh->ParamList["pcrpid"] = (serviceinfo.pcrpid != 0)?itoh(serviceinfo.pcrpid):"{=L:9804=}";
if (serviceinfo.polarisation != 2) /* only satellite has polarisation */
{
hh->ParamList["tsfrequency"] = string_printf("%d.%03d MHz", serviceinfo.tsfrequency / 1000, serviceinfo.tsfrequency % 1000);
@@ -789,7 +789,7 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler */*hh*/, std::s
{
sAddData = NeutrinoAPI->GetServiceName(timer->channel_id);
if (sAddData.empty())
- sAddData = NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "Unbekannter TV-Kanal" : "Unbekannter Radiokanal";
+ sAddData = NeutrinoAPI->Zapit->isChannelTVChannel(timer->channel_id) ? "{=L:9805=}" : "{=L:9806=}";
if( timer->apids != TIMERD_APIDS_CONF)
{
@@ -829,9 +829,9 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler */*hh*/, std::s
{
sAddData = "Standby: ";
if(timer->standby_on)
- sAddData+= "An";
+ sAddData+= "{=L:0031=}";
else
- sAddData+="Aus";
+ sAddData+="{=L:0032=}";
}
break;
case CTimerd::TIMER_REMIND :
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index bb2ae88..88440e8 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.1.4
-date=06.04.2015
+version=2.8.1.5
+date=10.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
index 5a6dfb2..d14628e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/Deutsch
@@ -997,6 +997,15 @@
4500=Esound Port
4501=Standard
+#========= Tuxbox API
+9800=Programmvorschau
+9801=Streaminfo
+9802=von
+9803=min
+9804=nicht verfügbar
+9805=Unbekannter TV-Kanal
+9806=Unbekannter Radio-Kanal
+
#========= Remote control
9900=Standby / Ausschalten
9901=Stummschalten
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/languages/English b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
index f25357a..0ea7c06 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/languages/English
+++ b/tuxbox/neutrino/daemons/nhttpd/web/languages/English
@@ -997,6 +997,15 @@
4500=Esound Port
4501=default
+#========= Tuxbox API
+9800=Program preview
+9801=Streaminfo
+9802=from
+9803=min
+9804=not available
+9805=Unknown TV-Channel
+9806=Unknown Radio-Channel
+
#========= Remote control
9900=Standby / Shutdown
9901=Mute
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 18 +++++++++---------
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
.../neutrino/daemons/nhttpd/web/languages/Deutsch | 9 +++++++++
.../neutrino/daemons/nhttpd/web/languages/English | 9 +++++++++
4 files changed, 29 insertions(+), 11 deletions(-)
--
Tuxbox-GIT: apps
|
