From 389c6e6dc2e8985a7cfdc2dedd6dcc0aa68d5b54 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 6 Apr 2015 22:59:01 +0200 Subject: [PATCH] - neutrinoyparser.cpp: fix 0f16c9441ee1f9daa6825a71fe5c4c211afe3fe3 --- src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp | 2 +- src/nhttpd/web/languages/Deutsch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index dc3de9151..c0522547c 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -497,7 +497,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: yresult += string_printf("",classname); yresult += string_printf("%s %s " - "(%ld {=L:von=} %d {=L:min=}, %d%%)" + "(%ld {=L:from=} %d {=L:unit.short.minute=}, %d%%)" , timestr.c_str() , event->description.c_str() , (time(NULL) - event->startTime)/60 diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 14d89c519..2ea65e148 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -41,7 +41,7 @@ off=Aus download=Herunterladen back=Zurück date=Datum -from=Von +from=von to=bis program=Sendung others=Sonstiges