From c58704322fa8fcbee809d4c02643197d05293160 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 9 Sep 2007 16:24:47 +0000
Subject: * Update english translation * Send proper mime header if file not
 modified (on state 304)

---
 html/alist.tmpl            |  4 ++--
 html/clist.tmpl            |  6 +++---
 html/help.tmpl             |  2 +-
 html/mlist.tmpl            |  6 +++---
 html/now.tmpl              |  2 +-
 html/rdisplay.tmpl         |  4 ++--
 html/rlist.tmpl            |  4 ++--
 html/search.tmpl           |  2 +-
 html/tlist.tmpl            | 14 +++++++-------
 html/topten.tmpl           |  2 +-
 html/ulist.tmpl            |  8 ++++----
 html/widgets/password.tmpl |  2 +-
 html/widgets/remote.tmpl   |  2 +-
 html/widgets/vtx.tmpl      |  6 +++---
 14 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'html')

diff --git a/html/alist.tmpl b/html/alist.tmpl
index 9d0f3c1..675d224 100644
--- a/html/alist.tmpl
+++ b/html/alist.tmpl
@@ -2,11 +2,11 @@
 <h1><?% gettext("Wished automated recordings") %?></h1>
 
 <?% IF allow('anew') %?>
-<a href="?cmd=anew">[<?% gettext("Create a new autotimer") %?>]</a>
+<a href="?cmd=anew">[<?% gettext("Create new autotimer") %?>]</a>
 <?% END %?>
 <a href="#" onClick="suche('<?% gettext("Search text") %?>', '?cmd=asearch&data=')"><?% gettext("Search in autotimer") %?></a>
 <?% IF allow('aupdate') %?>
-<a href="?cmd=aupdate">[<?% gettext("Start the autotimer process") %?>]</a>
+<a href="?cmd=aupdate">[<?% gettext("Search autotimer") %?>]</a>
 <?% END %?>
 <p>
 
diff --git a/html/clist.tmpl b/html/clist.tmpl
index c864fae..ea5df04 100644
--- a/html/clist.tmpl
+++ b/html/clist.tmpl
@@ -100,7 +100,7 @@
 <?% INCLUDE 'widgets/referer.tmpl'%?>
 <?% IF allow( 'cnew' ) %?>
       <a href="?cmd=cnew">
-        [<?% gettext("Create a new channel") %?>]
+        [<?% gettext("Create new channel") %?>]
       </a>
 <?% END %?>
 <?% IF allow( 'cupdate' ) %?>
@@ -119,7 +119,7 @@
         <a href="#" onclick="selAll(document.clist,0)">[<?% gettext("Unselect all") %?>]</a>&nbsp;
         <a href="#" onclick="reverse(document.clist)">[<?% gettext("Reverse select") %?>]</a>&nbsp;
         <a href="#" onclick="Delete('<?% gettext("You would delete follow channels?") %?>',
-                            '<?% gettext("You have nothing selected!") %?>','cdelete',document.clist)">
+                            '<?% gettext("Nothing selected!") %?>','cdelete',document.clist)">
                             [<?% gettext("Delete channels") %?>]
         </a>
     </p>
@@ -133,7 +133,7 @@
     <tr><th width="20"><?% PROCESS SortItem row="POS" label="" trunc=5 %?></th>
         <th width="120"><?% PROCESS SortItem row="Name" label=gettext('Name') trunc=20 %?></th>
         <th><?% PROCESS SortItem row="Frequency"  label=gettext('Transponder frequency') trunc=6 %?></th>
-        <th><?% PROCESS SortItem row="Parameters"  label=gettext('Various parameters, depends on signal source') trunc=8 %?></th>
+        <th><?% PROCESS SortItem row="Parameters"  label=gettext('Various parameters, depending on signal source') trunc=8 %?></th>
         <th><?% PROCESS SortItem row="Srate" label=gettext('Symbol rate') trunc=6  %?></th>
         <th><?% PROCESS SortItem row="VPID" label=gettext('Video PID (VPID)') trunc=10  %?></th>
         <th><?% PROCESS SortItem row="APID" label=gettext('Audio PID (APID)') trunc=10  %?></th>
diff --git a/html/help.tmpl b/html/help.tmpl
index 65daa5f..a42ba8e 100644
--- a/html/help.tmpl
+++ b/html/help.tmpl
@@ -59,7 +59,7 @@ var tree = new WebFXTree("XXV", "?cmd=<?% start %?>");
 
 <?% IF allow('cmdlist') %?>tree.add(new WebFXTreeItem("<?% gettext("Commands") %?>",    "?cmd=cmdlist"));<?% END %?>
 
-<?% IF allow('alist') %?>tree.add(new WebFXTreeItem("<?% gettext("AutoTimer") %?>",     "?cmd=alist"));<?% END %?>
+<?% IF allow('alist') %?>tree.add(new WebFXTreeItem("<?% gettext("Autotimer") %?>",     "?cmd=alist"));<?% END %?>
 
 <?% IF allow('tlist') %?>tree.add(new WebFXTreeItem("<?% gettext("Timers") %?>",        "?cmd=tlist"));<?% END %?>
 
diff --git a/html/mlist.tmpl b/html/mlist.tmpl
index 9652c96..5b7847d 100644
--- a/html/mlist.tmpl
+++ b/html/mlist.tmpl
@@ -1,4 +1,4 @@
-<h1><?% gettext("Music Library") %?></h1>
+<h1><?% gettext("Music library") %?></h1>
 <!-- TableTemplate -->
 <form name="musicform" onSubmit="location.href = '?cmd=ml&amp;data=' + 'search:' + document.forms[0].search.value; return false">
 <table width="95%" border=1>
@@ -36,7 +36,7 @@
 
 
 <b>
-<a href="#" onClick="Play('<?% gettext("You have nothing selected!") %?>',document.musicform,'<?% param.proxy %?>')">
+<a href="#" onClick="Play('<?% gettext("Nothing selected!") %?>',document.musicform,'<?% param.proxy %?>')">
 [<?% gettext("Play selected songs") %?>]
 </a>
 <a href="?cmd=mrefresh">[<?% gettext("Update Music Database") %?>]</a>
@@ -62,7 +62,7 @@
         <td colspan=<?% zeile.size %?>>
             <img class="cover" src="?cmd=mcoverimage&amp;data=<?% zeile.0 %?>&amp;__binary=1" alt="<?% zeile.2 %?>" align="right" />&nbsp;
             <?% albummark = "Album"+loop.count %?>
-            <h1>Album: <?% zeile.2 %?>&nbsp;<font size=2><a href="#" onClick="selSwitch(document.musicform, '<?% albummark %?>')">[<?% gettext("Select") %?> album]</a></font></h1>
+            <h1>Album: <?% zeile.2 %?>&nbsp;<font size=2><a href="#" onClick="selSwitch(document.musicform, '<?% albummark %?>')">[<?% gettext("Selection") %?> album]</a></font></h1>
             <h3>
             <?% gettext("Artist") %?>: <?% zeile.1 %?>,&nbsp;
             <?% gettext("Year") %?>: <?% zeile.5 %?>,&nbsp;
diff --git a/html/now.tmpl b/html/now.tmpl
index 170f667..795fc9e 100644
--- a/html/now.tmpl
+++ b/html/now.tmpl
@@ -39,7 +39,7 @@
     <input type="text" name="data" value="<?% t %?>" size="5">
     <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" />
     <input type="submit" value="<?% gettext("Go") %?>">
-    <input type="button" value="<?% gettext("Reload EPG data") %?>" onclick="location.href='?cmd=erestart'">
+    <input type="button" value="<?% gettext("Update EPG data") %?>" onclick="location.href='?cmd=erestart'">
 </form>
 
 <table border="0" width="95%">
diff --git a/html/rdisplay.tmpl b/html/rdisplay.tmpl
index 0f31e28..8cdb4ce 100644
--- a/html/rdisplay.tmpl
+++ b/html/rdisplay.tmpl
@@ -73,7 +73,7 @@
     <td colspan="2"><b>
     <a href="?cmd=rlist">[<?% gettext("Recording list") %?>]</a>&nbsp;
 <?% IF allow('rdelete') %?>
-    <a href="javascript:sure(document.RecordDisplay, '<?% gettext("You will delete this recording") %?>?','?cmd=rdelete&amp;data=<?% data.RecordId %?>')">
+    <a href="javascript:sure(document.RecordDisplay, '<?% gettext("Do you really want to delete these recordings?") %?>?','?cmd=rdelete&amp;data=<?% data.RecordId %?>')">
     [<?% gettext("Delete recording") %?>]
     </a>&nbsp;
 <?% END %?>
@@ -99,7 +99,7 @@
     <br />
     <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=rconvert&amp;data=')">
     <?% c = 0 %?>
-        <option value='0'><?% gettext("Choose an action for this recording") %?>:</option>
+        <option value='0'><?% gettext("Choose a command to edit this recording ...") %?>:</option>
     <?% FOREACH cmd = param.reccmds %?>
         <?% c = c + 1 %?>
         <option value='<?% c %?>_<?% data.RecordId %?>'><?% cmd.split(':').first %?></option>
diff --git a/html/rlist.tmpl b/html/rlist.tmpl
index 5547b00..f6427c2 100644
--- a/html/rlist.tmpl
+++ b/html/rlist.tmpl
@@ -120,8 +120,8 @@
 <form>
         <a href="?cmd=rupdate">[<?% gettext("Update recordings") %?>]</a>&nbsp;
 <?% IF allow('rdelete') %?>
-<a href="#" onClick="Delete('<?% gettext("You would delete follow recordings?") %?>',
-'<?% gettext("You have nothing selected!") %?>','rdelete',document.rlist)">
+<a href="#" onClick="Delete('<?% gettext("Do you want to delete the following recordings?") %?>',
+'<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)">
 [<?% gettext("Delete recordings") %?>]</a>&nbsp;
 <?% END %?>
 		<?% gettext("Search for recordings") %?>:
diff --git a/html/search.tmpl b/html/search.tmpl
index be3eed0..5cb0235 100644
--- a/html/search.tmpl
+++ b/html/search.tmpl
@@ -33,7 +33,7 @@
     <td><?% gettext('Video format') %?>:</td>
     <td>
         <input type="radio" name="__VideoFormat" value="all" <?% IF ! cgi.param('__VideoFormat') || cgi.param('__VideoFormat') == 'all' %?>checked<?% END %?>><?% gettext('All') %?>&nbsp;
-        <input type="radio" name="__VideoFormat" value="widescreen" <?% IF cgi.param('__VideoFormat') == 'widescreen' %?>checked<?% END %?>><?% gettext('16:9 Widescreen') %?>&nbsp;
+        <input type="radio" name="__VideoFormat" value="widescreen" <?% IF cgi.param('__VideoFormat') == 'widescreen' %?>checked<?% END %?>><?% gettext('16:9 Wide screen') %?>&nbsp;
     </td>
 </tr>
 <tr>
diff --git a/html/tlist.tmpl b/html/tlist.tmpl
index ab5c825..2e49875 100644
--- a/html/tlist.tmpl
+++ b/html/tlist.tmpl
@@ -11,7 +11,7 @@
 <?% END %?>
 
 <?% IF allow('tnew') %?>
-<a href="?cmd=tnew">[<?% gettext("Create a new timer") %?>]</a>
+<a href="?cmd=tnew">[<?% gettext("Create new timer") %?>]</a>
 <?% END %?>
 <?% IF allow('tupdate') %?>
 <a href="javascript:tostatus('?cmd=tupdate')">[<?% gettext("Update timers") %?>]</a>
@@ -20,13 +20,13 @@
 <?% INCLUDE 'widgets/referer.tmpl' %?>
 
 <?% IF allow('ttoggle') %?>
-<a href="#" onClick="Toggle('<?% gettext("You have nothing selected!") %?>',document.TimerList)">
+<a href="#" onClick="Toggle('<?% gettext("Nothing selected!") %?>',document.TimerList)">
     [<?% gettext("Toggle timer") %?>]
 </a>
 <?% END %?>
 <?% IF allow('tdelete') %?>
-<a href="#" onClick="Delete('<?% gettext("You would delete follow timers?") %?>',
-'<?% gettext("You have nothing selected!") %?>','tdelete',document.TimerList)">
+<a href="#" onClick="Delete('<?% gettext("Would You like to delete the following timer(s)?") %?>',
+'<?% gettext("Nothing selected!") %?>','tdelete',document.TimerList)">
     [<?% gettext("Delete timer") %?>]
 </a>
 &nbsp;
@@ -47,7 +47,7 @@
             <th><?% field %?></th>
         <?% END %?>
 <?% IF enableform %?>
-            <th><?% gettext("Select") %?></th>
+            <th><?% gettext("Selection") %?></th>
 <?% END %?>
         </tr>
         <?% FOREACH zeile = data %?>
@@ -79,7 +79,7 @@
                         <a href="?cmd=tedit&amp;data=<?% zeile.0 %?>" title="<?% gettext("Edit this timer") %?>"><div class="<?% myclass %?>">[E]</div></a>
     <?% END %?>
     <?% IF allow('tdelete') %?>
-                        <a href="javascript:sure(document.TimerList, '<?% gettext("You will delete this timer") %?> : <?% escape(zeile.7.split('~').first)  %?>','?cmd=tdelete&amp;data=<?% zeile.0 %?>')" title="<?% gettext("Delete this timer") %?>"><div class="<?% myclass %?>">[D]</div></a>
+                        <a href="javascript:sure(document.TimerList, '<?% gettext("Would You like to delete the following timer(s)?") %?> : <?% escape(zeile.7.split('~').first)  %?>','?cmd=tdelete&amp;data=<?% zeile.0 %?>')" title="<?% gettext("Would You like to delete the following timer(s)?") %?>"><div class="<?% myclass %?>">[D]</div></a>
     <?% END %?>
                     </td>
                     <?% ELSIF c == 1; # Id Status %?>
@@ -102,7 +102,7 @@
     		</td>
                     <?% ELSIF c == 2; # Channel Field %?>
                     <td nowrap>
-                        <a href="?cmd=program&amp;data=<?% field %?>" title="<?% gettext("Jump to program guide:") %?> <?% zeile.2 %?>"><div class="<?% myclass %?>"><?% zeile.2 %?></div></a>
+                        <a href="?cmd=program&amp;data=<?% field %?>" title="<?% gettext("Jump to program:") %?> <?% zeile.2 %?>"><div class="<?% myclass %?>"><?% zeile.2 %?></div></a>
                     </td>
                     <?% ELSIF c == 7; # Title %?>
                     <td>
diff --git a/html/topten.tmpl b/html/topten.tmpl
index 3d57a71..b01c220 100644
--- a/html/topten.tmpl
+++ b/html/topten.tmpl
@@ -8,7 +8,7 @@
 
 <!-- TableTemplate -->
 <?% USE date %?>
-<h1><?% gettext("TopTen Entrys") %?></h1>
+<h1><?% gettext("Top Ten entrys") %?></h1>
 <h6><?% gettext("This Screen list the most programmed EPG Events from all XXV Users. Of course, we list only Events these are exists in your EPG Table!") %?></h6>
 <p/>
 <table>
diff --git a/html/ulist.tmpl b/html/ulist.tmpl
index 3081d7b..c61c42e 100644
--- a/html/ulist.tmpl
+++ b/html/ulist.tmpl
@@ -1,7 +1,7 @@
 <!-- TableTemplate -->
-<h1><?% gettext("Administration of User") %?></h1>
+<h1><?% gettext("User administration") %?></h1>
 
-<a href="?cmd=unew">[<?% gettext("Create a new account for user") %?>]</a>
+<a href="?cmd=unew">[<?% gettext("Create new account for user") %?>]</a>
 <p>
 
 <table border="0" width="95%">
@@ -25,8 +25,8 @@
                 <td>
                     <a title="<?% gettext("Edit account of user") %?>" href="?cmd=uedit&amp;data=<?% zeile.0 %?>">
                     [<?% gettext("Edit") %?>]</a>&nbsp;
-                    <a title="<?% gettext("Delete account of user") %?>"
-                       href="javascript:sure(document.UserList, '<?% gettext("You will delete this account of user") %?>: <?% escape(zeile.1) %?>','?cmd=udelete&amp;data=<?% zeile.0 %?>')">
+                    <a title="<?% gettext("Delete user account") %?>"
+                       href="javascript:sure(document.UserList, '<?% gettext("Do you really want to delete this user account?") %?>: <?% escape(zeile.1) %?>','?cmd=udelete&amp;data=<?% zeile.0 %?>')">
                     [<?% gettext("Del") %?>]
                     </a>
                 </td>
diff --git a/html/widgets/password.tmpl b/html/widgets/password.tmpl
index 2455ab1..f6b043e 100644
--- a/html/widgets/password.tmpl
+++ b/html/widgets/password.tmpl
@@ -6,6 +6,6 @@
     <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
         <?% val = cgi.param(data.NAME) || data.def %?>
         <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
-        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?> title='<?% gettext("Entry again") %?>'>
+        <input type="password" name="<?% data.NAME %?>" value="" <?% FOREACH p = param.tags; "$p ";END %?> title='<?% gettext("Repeat entry") %?>'>
     </td>
 </tr>
diff --git a/html/widgets/remote.tmpl b/html/widgets/remote.tmpl
index 633537c..4a9dadc 100644
--- a/html/widgets/remote.tmpl
+++ b/html/widgets/remote.tmpl
@@ -58,7 +58,7 @@ aktiv = window.setInterval("grab()", inter);
 <?% END %?>
   <td colspan="3"><nobr>
   <input type="button" onclick="self.location.href='?cmd=r&monitor=<?% monitor ? 0 : 1 %?>'" name="monitor" value="<?% gettext("Monitor") %?>">
-  <input type="button" onclick="switch_channel('?cmd=remote&data=Power')" name="power" value="<?% gettext("Powerdown") %?>">
+  <input type="button" onclick="switch_channel('?cmd=remote&data=Power')" name="power" value="<?% gettext("Switch off") %?>">
   </td>
 </tr>
 <tr>
diff --git a/html/widgets/vtx.tmpl b/html/widgets/vtx.tmpl
index 9d3e2fd..47640cb 100644
--- a/html/widgets/vtx.tmpl
+++ b/html/widgets/vtx.tmpl
@@ -31,9 +31,9 @@
 </tr>
 </table>
     <?% IF param.toppage != 0 %?><a title="<?% gettext("First page") %?>" href="<?% url %?><?% param.toppage %?>">[^]</a><?% ELSE %?><span class="shadow">[^]</span><?% END %?>&nbsp;
-    <?% IF param.page_prev != 0 %?><a title="<?% gettext("Prior page") %?>"href="<?% url %?><?% param.page_prev %?>">[<<]</a><?% ELSE %?><span class="shadow">[<<]</span><?% END %?>&nbsp;
-    <?% IF param.subpage_prev != 0 %?><a title="<?% gettext("Prior subpage") %?>"href="<?% url %?><?% param.subpage_prev %?>">[<]</a><?% ELSE %?><span class="shadow">[<]</span><?% END %?>&nbsp;
-    <?% IF param.subpage_next != 0 %?><a title="<?% gettext("Next subpage") %?>"href="<?% url %?><?% param.subpage_next %?>">[>]</a><?% ELSE %?><span class="shadow">[>]</span><?% END %?>&nbsp;
+    <?% IF param.page_prev != 0 %?><a title="<?% gettext("Previous page") %?>"href="<?% url %?><?% param.page_prev %?>">[<<]</a><?% ELSE %?><span class="shadow">[<<]</span><?% END %?>&nbsp;
+    <?% IF param.subpage_prev != 0 %?><a title="<?% gettext("Prior sub page") %?>"href="<?% url %?><?% param.subpage_prev %?>">[<]</a><?% ELSE %?><span class="shadow">[<]</span><?% END %?>&nbsp;
+    <?% IF param.subpage_next != 0 %?><a title="<?% gettext("Next sub page") %?>"href="<?% url %?><?% param.subpage_next %?>">[>]</a><?% ELSE %?><span class="shadow">[>]</span><?% END %?>&nbsp;
     <?% IF param.page_next != 0 %?><a title="<?% gettext("Next page") %?>"href="<?% url %?><?% param.page_next %?>">[>>]</a><?% ELSE %?><span class="shadow">[>>]</span><?% END %?>
 <?% END %?>
 
-- 
cgit v1.2.3