5 files changed, 22 insertions, 22 deletions
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index df60cbb..4611dc2 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -588,7 +588,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 							<td class="label leftcol"><div class="withmargin"><$ tr("Use channel" ) $>:</div></td>
 							<td class="rightcol">
 								<select onchange="changedchannelmode(this)" name="usechannel" size="1" id="channel_mode">
-									<option value="0" <{ SELECTIF(usechannel == 0) }> ><$ tr("no") $></option>
+									<option value="0" <{ SELECTIF(usechannel == 0) }> ><$ trVDR("no") $></option>
 									<option value="1" <{ SELECTIF(usechannel == 1) }> ><$ tr("interval") $></option>
 									<option value="2" <{ SELECTIF(usechannel == 2) }> ><$ tr("channel group") $></option>
 									<option value="3" <{ SELECTIF(usechannel == 3) }> ><$ tr("only FTA") $></option>
@@ -688,7 +688,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 							<td class="label leftcol"><div class="withmargin"><$ tr("Use blacklists" ) $>:</div></td>
 							<td class="rightcol">
 								<select onchange="changedblacklistmode(this)" name="blacklistmode" size="1" id="blacklistmode">
-									<option value="0" <{ SELECTIF(blacklistmode == 0) }> ><$ tr("no") $></option>
+									<option value="0" <{ SELECTIF(blacklistmode == 0) }> ><$ trVDR("no") $></option>
 									<option value="1" <{ SELECTIF(blacklistmode == 1) }> ><$ tr("Selection") $></option>
 									<option value="2" <{ SELECTIF(blacklistmode == 2) }> ><$ tr("all") $></option>
 								</select>
@@ -716,8 +716,8 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 							<td class="rightcol">
 								<div>
 									<select onchange="changeduseassearchtimer(this)" name="useassearchtimer" size="1" id="useassearchtimer">
-										<option value="0" <{ SELECTIF(useassearchtimer == 0) }> ><$ tr("no") $></option>
-										<option value="1" <{ SELECTIF(useassearchtimer == 1) }> ><$ tr("yes") $></option>
+										<option value="0" <{ SELECTIF(useassearchtimer == 0) }> ><$ trVDR("no") $></option>
+										<option value="1" <{ SELECTIF(useassearchtimer == 1) }> ><$ trVDR("yes") $></option>
 										<option value="2" <{ SELECTIF(useassearchtimer == 2) }> ><$ tr("user defined") $></option>
 									</select>
 								</div>
@@ -814,22 +814,22 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 										</tr>
 
 										<tr>
-											<td class="label"><div class="withmargin"><$ tr("Priority") $>:</div></td>
+											<td class="label"><div class="withmargin"><$ trVDR("Priority") $>:</div></td>
 											<td><input type="text" name="priority" size="2" value="<$ priority $>"/></td>
 										</tr>
 
 										<tr>
-											<td class="label"><div class="withmargin"><$ tr("Lifetime") $>:</div></td>
+											<td class="label"><div class="withmargin"><$ trVDR("Lifetime") $>:</div></td>
 											<td><input type="text" name="lifetime" size="2" value="<$ lifetime $>"/></td>
 										</tr>
 
 										<tr>
-											<td class="label"><div class="withmargin"><$ tr("Setup.Recording$Margin at start (min)") $>:</div></td>
+											<td class="label"><div class="withmargin"><$ trVDR("Setup.Recording$Margin at start (min)") $>:</div></td>
 											<td><input type="text" name="marginstart" size="2" value="<$ marginstart $>"/></td>
 										</tr>
 
 										<tr>
-											<td class="label"><div class="withmargin"><$ tr("Setup.Recording$Margin at stop (min)") $>:</div></td>
+											<td class="label"><div class="withmargin"><$ trVDR("Setup.Recording$Margin at stop (min)") $>:</div></td>
 											<td><input type="text" name="marginstop" size="2" value="<$ marginstop $>"/></td>
 										</tr>
 
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index 1587f70..e3cdc3b 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -144,21 +144,21 @@ cTimer* timer;
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Active") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Active") $>:</div></td>
 						<td class="rightcol">
 							<div class="dotted">
 								<input id="active_1" name="active" value="1" <{ reply.out() << ( active ? "checked=\"checked\"" : "" ); }> type="radio"></input>
-								<label for="active_1"><$ tr("Yes") $></label>
+								<label for="active_1"><$ trVDR("yes") $></label>
 							</div>
 							<div class="dotted">
 								<input id="active_0" name="active" value="0" <{ reply.out() << ( !active ? "checked=\"checked\"" : "" ); }> type="radio"></input>
-								<label for="active_0"><$ tr("No") $></label>
+								<label for="active_0"><$ trVDR("no") $></label>
 							</div>
 						</td>
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Channel") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Channel") $>:</div></td>
 						<td class="rightcol"><div class="withmargin"><& channels_widget name=("channel") channelid=(true) selected=(channel) &></div></td>
 					</tr>
 
@@ -168,7 +168,7 @@ cTimer* timer;
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Day") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Day") $>:</div></td>
 						<td class="rightcol"><input type="text" name="day" value="<$ day $>" size="2" maxlength="2" /></td>
 					</tr>
 
@@ -207,12 +207,12 @@ cTimer* timer;
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Start") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Start") $>:</div></td>
 						<td class="rightcol"><input type="text" size="2" maxlength="2" name="start_h" value="<$ ZeroPad(start_h) $>" /> : <input type="text" size="2" maxlength="2" name="start_m" value="<$ ZeroPad(start_m) $>" /></td>
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Stop") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Stop") $>:</div></td>
 						<td class="rightcol"><input type="text" size="2" maxlength="2" name="end_h" value="<$ ZeroPad(end_h) $>" /> : <input type="text" size="2" maxlength="2" name="end_m" value="<$ ZeroPad(end_m) $>" /></td>
 					</tr>
 
@@ -222,12 +222,12 @@ cTimer* timer;
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Priority") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Priority") $>:</div></td>
 						<td class="rightcol"><input type="text" size="2" maxlength="2" name="priority" value="<$ priority $>" /></td>
 					</tr>
 
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Lifetime") $>:</div></td>
+						<td class="label leftcol"><div class="withmargin"><$ trVDR("Lifetime") $>:</div></td>
 						<td class="rightcol"><input type="text" size="2" maxlength="2" name="lifetime" value="<$ lifetime $>" /></td>
 					</tr>
 
diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index ff42045..ed51656 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -33,15 +33,15 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 }>
 <div class="menu">
 	  <a href="whats_on.html?type=now" <& menu.setactive current=("whats_on") &>><$ tr("What's on?") $></a>
-	| <a href="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a>
-	| <a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a>
+	| <a href="schedule.html" <& menu.setactive current=("schedule") &>><$ trVDR("Schedule") $></a>
+	| <a href="timers.html" <& menu.setactive current=("timers") &>><$ trVDR("Timers") $></a>
 % if ( LiveFeatures< features::epgsearch >().Recent() ) {
 	| <a href="searchepg.html" <& menu.setactive current=("searchepg") &>><$ tr("Search") $></a>
 	| <a href="searchtimers.html" <& menu.setactive current=("searchtimers") &>><$ tr("Searchtimers") $></a>
 % }
 	| <a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a>
 	| <a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a>
-	| <a href="setup.html" <& menu.setactive current=("setup") &>><$ tr("Setup") $></a>
+	| <a href="setup.html" <& menu.setactive current=("setup") &>><$ trVDR("Setup") $></a>
 <# --- Used by D.H. to test infobox (not part of the released version)
 	| <a href="ibox_status.html" <& menu.setactive current=("status") &>><$ tr("Status Test") $></a>
 --- #>
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 2563eb6..c79fdcb 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -28,7 +28,7 @@ bool logged_in(false);
 if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 </%cpp>
 <%cpp>
-	pageTitle = tr("Schedule");
+	pageTitle = trVDR("Schedule");
 
 	cSchedulesLock schedulesLock;
 	cSchedules const* schedules = cSchedules::Schedules( schedulesLock );
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index ab4d285..db661b2 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -24,7 +24,7 @@ using namespace vdrlive;
 <%cpp>
 	if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 
-	pageTitle = tr("Timers");
+	pageTitle = trVDR("Timers");
 
 	cMutexLock timersLock( &LiveTimerManager() );
 	SortedTimers& timers = LiveTimerManager().GetTimers();