merge

3 files changed, 53 insertions, 2 deletions

diff --git a/i18n.cpp b/i18n.cpp
index ba27c03..f9430a1 100644
--- a/i18n.cpp
+++ b/i18n.cpp
@@ -3,7 +3,50 @@
 namespace vdrlive {
 
 const tI18nPhrase Phrases[] = {
-	// The name of the language
+  { "What's running at",
+    "Was läuft um",
+    "", // Slovenski
+    "", // Italiono
+    "", // Nederlands
+    "", // Português
+    "", // Français
+    "", // Norsk
+    "", // Finnish
+    "", // Polski
+    "", // Español
+    "", // Greek
+    "", // Svenska
+    "", // Românã
+    "", // Magyar
+    "", // Català
+    "", // Russian
+    "", // Hrvatski
+    "", // Eesti
+    "", // Dansk
+    "", //Czech
+  },
+  { "o'clock",
+    "Uhr",
+    "", // Slovenski
+    "", // Italiono
+    "", // Nederlands
+    "", // Português
+    "", // Français
+    "", // Norsk
+    "", // Finnish
+    "", // Polski
+    "", // Español
+    "", // Greek
+    "", // Svenska
+    "", // Românã
+    "", // Magyar
+    "", // Català
+    "", // Russian
+    "", // Hrvatski
+    "", // Eesti
+    "", // Dansk
+    "", //Czech
+  },
 	/*
 	{ "English",
 	  "Deutsch",
diff --git a/styles.css b/styles.css
index 118b1ef..1e44ba9 100644
--- a/styles.css
+++ b/styles.css
@@ -59,3 +59,11 @@ div.event .station {
 	margin: 0;
 	padding: 3px 3px 3px 10px;
 }
+
+div.event .title {
+	font-weight: bold;
+}
+
+div.event .short {
+	font-size: 11px;
+}
diff --git a/whats_on_now.ecpp b/whats_on_now.ecpp
index 2ceb44c..e0fe5b0 100644
--- a/whats_on_now.ecpp
+++ b/whats_on_now.ecpp
@@ -25,7 +25,7 @@ const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
 		</div>
 		<div class="inhalt">
 			<div class="head_box">
-				Was l&auml;uft jetzt um Uhr
+				<$ tr("What's running at") $> <$ tr("o'clock") $>
 			</div>
 
 <{