From cc340bc53d99550c34fd1a92b722090415c83081 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 6 Apr 2015 22:59:01 +0200
Subject: [PATCH] neutrinoyparser.cpp: fix
 364afbec332e9934522773e8b8f6cd661af3d8a1

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/389c6e6dc2e8985a7cfdc2dedd6dcc0aa68d5b54
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-06 (Mon, 06 Apr 2015)

Origin message was:
------------------
- neutrinoyparser.cpp: fix 364afbec332e9934522773e8b8f6cd661af3d8a1

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 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("<tr><td class=\"%cepg\">",classname);
 			yresult += string_printf("%s&nbsp;%s&nbsp;"
-					"<span style=\"font-size: 8pt; white-space: nowrap\">(%ld {=L:von=} %d {=L:min=}, %d%%)</span>"
+					"<span style=\"font-size: 8pt; white-space: nowrap\">(%ld {=L:from=} %d {=L:unit.short.minute=}, %d%%)</span>"
 					, 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&uuml;ck
 date=Datum
-from=Von
+from=von
 to=bis
 program=Sendung
 others=Sonstiges