22 files changed, 274 insertions, 82 deletions

diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 9944e21..e2f1a0f 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -202,7 +202,18 @@ if (type == "now") {
 			curresults.GetByID(timer->Id());
 			results.merge(curresults);
 		}
+		time_t now = time(NULL);
 		for (SearchResults::iterator result = results.begin(); result != results.end(); ++result) {
+			long diff = result->StartTime() - now;
+			long absdiff = labs(diff);
+			if (absdiff >= 24*60*60) continue; // skip broadcasts more than a day away
+
+			string diffstring = string((diff > 0) ? tr("in") : tr("since")) + " ";
+			if (absdiff >= (60 * 60))
+				diffstring += lexical_cast<std::string>(long(absdiff / (60*60))) + " " + tr("hours");
+			else
+				diffstring += lexical_cast<std::string>(long(absdiff / 60)) + " " + tr("minutes");	
+
 			string epgId = EpgEvents::EncodeDomId(result->Channel(), result->EventId());	
 			string channelname = Channels.GetByChannelID(result->Channel())->Name();
 			int channelnr = Channels.GetByChannelID(result->Channel())->Number();
@@ -212,31 +223,15 @@ if (type == "now") {
 				+ "<br/><br/>" + tr("Click to view details.");
 
 			// last result?
-			bool bottom = false; 
 			SearchResults::iterator nextres = result;
-			nextres++;
-			if (nextres == results.end()) bottom = true;
-			
-			time_t now = time(NULL);
-			long diff = result->StartTime() - now;
-			long absdiff = labs(diff);
-			if (absdiff >= 24*60*60) continue; // skip broadcasts more than a day away
-			string diffstring;
-			if (absdiff >= (60 * 60))
-				diffstring = lexical_cast<std::string>(long(absdiff / (60*60))) + " hours";
-			else
-				diffstring = lexical_cast<std::string>(long(absdiff / 60)) + " minutes";	
-			if (diff > 0)
-				diffstring = "in " + diffstring;
-			else
-				diffstring = "since " + diffstring; 			
+			bool bottom = (++nextres == results.end());
 </%cpp>
 			<tr>
 				<& pageelems.epg_tool_box detail=(0) epgid=(epgId) title=(result->Title()) startTime=(result->StartTime()) endTime=(result->StopTime()) lastCurrentChanel=(bottom ? 1 : 0) &>
 				<td class="topaligned <? bottom ? "bottomrow"?>">
 					<div class="withmargin">
 						<div class="nomargin"><$ (FormatDateTime(tr("%I:%M %p"), result->StartTime())) $> - <$ (FormatDateTime(tr("%I:%M %p"), result->StopTime())) $></div>
-						<$ diffstring $> minutes
+						<$ diffstring $>
 						</div>
 						</td>
 						<td class="topaligned <? bottom ? "bottomrow"?>">
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 45542af..332c188 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -562,9 +562,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -733,6 +730,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 267c651..6ec293f 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 362cab5..42da18b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index eba50a3..5e12058 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -562,9 +562,6 @@ msgstr "Fehlerberichte und Vorschläge"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Für Fehler oder Verbesserungsvorschläge steht unser Bugtracker bereit"
 
-msgid "RecDate"
-msgstr "Aufnahmedatum"
-
 msgid "List of recordings"
 msgstr "Liste der Aufnahmen"
 
@@ -733,6 +730,18 @@ msgstr "Zeige Programm dieses Kanals"
 msgid "more"
 msgstr "mehr"
 
+msgid "in"
+msgstr "in"
+
+msgid "since"
+msgstr "seit"
+
+msgid "hours"
+msgstr "Stunden"
+
+msgid "minutes"
+msgstr "Minuten"
+
 msgid "Now"
 msgstr "Jetzt"
 
@@ -751,3 +760,5 @@ msgstr "Ausführliche Ansicht"
 msgid "List view"
 msgstr "Listenansicht"
 
+#~ msgid "RecDate"
+#~ msgstr "Aufnahmedatum"
diff --git a/po/el_GR.po b/po/el_GR.po
index 19460be..2ff384c 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 78f7dfa..a310953 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 30d033b..f8c8175 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 146dca0..076cb58 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -560,9 +560,6 @@ msgstr "Virheraportoinnit ja parannusehdotukset"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Voit raportoida sekä virheet että parannusehdotukset suoraan havaintotietokantaan"
 
-msgid "RecDate"
-msgstr "Tallenteen päiväys"
-
 msgid "List of recordings"
 msgstr "Tallennelistaus"
 
@@ -731,6 +728,19 @@ msgstr "Näytä ohjelmisto kanavalta"
 msgid "more"
 msgstr "lisätietoja"
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+#, fuzzy
+msgid "hours"
+msgstr "Tekijät"
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr "Nyt"
 
@@ -749,4 +759,5 @@ msgstr "Ruudukkonäkymä"
 msgid "List view"
 msgstr "Listanäkymä"
 
-
+#~ msgid "RecDate"
+#~ msgstr "Tallenteen päiväys"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index df87762..9847a19 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -564,9 +564,6 @@ msgstr "Bogues et suggestions"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Si vous rencontrez n'importe quels bogue ou voudriez suggérer de nouveaux dispositifs, employer notre bugtracker svp"
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr "Liste des enregistrements"
 
@@ -736,6 +733,19 @@ msgstr "Regarder le programme de cette chaîne"
 msgid "more"
 msgstr "plus"
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+#, fuzzy
+msgid "hours"
+msgstr "Auteur"
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr "maintenant"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 373b87b..261da91 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 94c76fb..2a0f7db 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index d6c586f..356bdf9 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -563,9 +563,6 @@ msgstr "Rapporto errori e proposte"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Se riscontri degli errori o vuoi chiedere nuove funzioni utilizza il nostro bugtracker"
 
-msgid "RecDate"
-msgstr "Data reg."
-
 msgid "List of recordings"
 msgstr "Lista registrazioni"
 
@@ -734,6 +731,19 @@ msgstr "Visualizza scheda programmi del canale"
 msgid "more"
 msgstr "altro"
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+#, fuzzy
+msgid "hours"
+msgstr "Autori"
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr "Adesso"
 
@@ -752,3 +762,5 @@ msgstr "Vedi come dettagli"
 msgid "List view"
 msgstr "Vedi come elenco"
 
+#~ msgid "RecDate"
+#~ msgstr "Data reg."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index b680c4a..e5c5d33 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -563,9 +563,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -735,6 +732,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index ebf3b88..ae499ae 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index a85f947..2df7690 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7e6aea7..a23902c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index d990d88..406991f 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 06530e8..1259d0f 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 0fb399b..0408648 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index f18d8a3..66b847f 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -561,9 +561,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -732,6 +729,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 4431a2d..71125a2 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -560,9 +560,6 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
-msgid "RecDate"
-msgstr ""
-
 msgid "List of recordings"
 msgstr ""
 
@@ -731,6 +728,18 @@ msgstr ""
 msgid "more"
 msgstr ""
 
+msgid "in"
+msgstr ""
+
+msgid "since"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
 msgid "Now"
 msgstr ""