From 7ef2fd3a49be19a184202292fe3f3df1756d440a Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Tue, 19 Feb 2008 21:04:22 +0100
Subject: Made live compilable with VDR version pre 1.5.7. Updated generated
 i18n.h file.

---
 pages/timerconflicts.ecpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'pages/timerconflicts.ecpp')

diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index 58b1993..e27e6f7 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -56,10 +56,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</tr>
 						<tr class="description">
 							<td class="leftcol"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
-							<td><div class="withmargin"><$ trVDR("Channel") $></div></td>
-							<td><div class="withmargin"><$ trVDR("Start") $></div></td>
-							<td><div class="withmargin"><$ trVDR("Stop") $></div></td>
-							<td><div class="withmargin"><$ trVDR("File") $></div></td>
+							<td><div class="withmargin"><$ tr("Channel") $></div></td>
+							<td><div class="withmargin"><$ tr("Start") $></div></td>
+							<td><div class="withmargin"><$ tr("Stop") $></div></td>
+							<td><div class="withmargin"><$ tr("File") $></div></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
 							<td class="action"><img src="/img/transparent.png" alt="" width="16px" height="16px" /></td>
@@ -68,12 +68,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <%cpp>
 						for (std::list<int>::const_iterator timerIndex = confltimer->concurrentTimerIndices.begin(); timerIndex != confltimer->concurrentTimerIndices.end(); ++timerIndex) {
 							cTimer* timer = Timers.Get(*timerIndex-1);
-							if (!timer) continue;	
+							if (!timer) continue;
 
 							std::list< int >::const_iterator nexttimerIndex = timerIndex;
 							++nexttimerIndex;
 							bool bottom = (nexttimerIndex == confltimer->concurrentTimerIndices.end());
-		
+
 							std::string timerStateImg = "transparent.png";
 							std::string timerStateHint;
 							if (timer->Index() == confltimer->timerIndex-1) {
@@ -97,7 +97,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								title = epgEvent->Title();
 							}
 </%cpp>
-							<tr>							
+							<tr>
 								<td class="leftcol <? bottom ? "bottomrow" ?>"><img src="<$ LiveSetup().GetThemedLink("img", timerStateImg) $>" alt="" <%cpp> if (!timerStateHint.empty()) { </%cpp><& tooltip.hint text=(timerStateHint) &><%cpp> } </%cpp>></img></td>
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><a href="schedule.html?channel=<$ timer->Channel()->Number()$>"><$ timer->Channel()->Name() $></a></div></td>
 								<td class="<? bottom ? "bottomrow" ?>"><div class="withmargin"><$ FormatDateTime(tr("%I:%M %p"), timer->StartTime()) $></div></td>
@@ -112,13 +112,13 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								<td class="action <? bottom ? "bottomrow" ?>"><a href="edit_timer.html?timerid=<$ timers.GetTimerId(*timer) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td>
 								<td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ timers.GetTimerId(*timer) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td>
 							</tr>
-%						}	
+%						}
 </%cpp>
 						<tr class="spacer">
 							<td colspan="9"/>
 						</tr>
 <%cpp>
-					}	
+					}
 				}
 </%cpp>
 			</table>
-- 
cgit v1.2.3