From c1fba54007b9b7a7cb20f627d2aeb86f9cdb367f Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 11 Apr 2011 18:03:24 +0200
Subject: [PATCH] bweb: update tpls

---
 gui/bweb/lang/en/tpl/ach_content.tpl         |  4 +-
 gui/bweb/lang/en/tpl/add_media.tpl           |  2 +-
 gui/bweb/lang/en/tpl/begin.tpl               |  7 ++-
 gui/bweb/lang/en/tpl/display_job.tpl         | 10 ++--
 gui/bweb/lang/en/tpl/display_job_zoom.tpl    |  7 ++-
 gui/bweb/lang/en/tpl/display_media.tpl       |  2 +-
 gui/bweb/lang/en/tpl/display_media_zoom.tpl  |  2 +-
 gui/bweb/lang/en/tpl/help_extern_compute.tpl |  2 +-
 gui/bweb/lang/en/tpl/help_intern_compute.tpl |  2 +-
 gui/bweb/lang/en/tpl/run_job_mod.tpl         |  4 ++
 gui/bweb/lang/en/tpl/running_job.tpl         |  2 +-
 gui/bweb/lang/en/tpl/scheduled_job.tpl       |  2 +-
 gui/bweb/lang/es/tpl/ach_content.tpl         | 20 +++----
 gui/bweb/lang/es/tpl/add_media.tpl           |  6 +-
 gui/bweb/lang/es/tpl/begin.tpl               | 49 ++++++++--------
 gui/bweb/lang/es/tpl/display_job.tpl         | 26 +++++----
 gui/bweb/lang/es/tpl/display_job_zoom.tpl    | 39 +++++++------
 gui/bweb/lang/es/tpl/display_media.tpl       | 16 ++---
 gui/bweb/lang/es/tpl/display_media_zoom.tpl  | 20 +++----
 gui/bweb/lang/es/tpl/help_extern_compute.tpl | 14 ++---
 gui/bweb/lang/es/tpl/help_intern_compute.tpl | 12 ++--
 gui/bweb/lang/es/tpl/run_job_mod.tpl         | 26 +++++----
 gui/bweb/lang/es/tpl/running_job.tpl         | 20 +++----
 gui/bweb/lang/es/tpl/scheduled_job.tpl       | 26 ++++-----
 gui/bweb/lang/fr/tpl/ach_content.tpl         | 36 ++++++------
 gui/bweb/lang/fr/tpl/add_media.tpl           | 14 ++---
 gui/bweb/lang/fr/tpl/begin.tpl               | 51 ++++++++--------
 gui/bweb/lang/fr/tpl/display_job.tpl         | 24 ++++----
 gui/bweb/lang/fr/tpl/display_job_zoom.tpl    | 61 ++++++++++----------
 gui/bweb/lang/fr/tpl/display_media.tpl       | 24 ++++----
 gui/bweb/lang/fr/tpl/display_media_zoom.tpl  | 32 +++++-----
 gui/bweb/lang/fr/tpl/help_extern_compute.tpl | 16 ++---
 gui/bweb/lang/fr/tpl/help_intern_compute.tpl | 14 ++---
 gui/bweb/lang/fr/tpl/run_job_mod.tpl         | 32 +++++-----
 gui/bweb/lang/fr/tpl/running_job.tpl         | 22 +++----
 gui/bweb/lang/fr/tpl/scheduled_job.tpl       | 26 ++++-----
 36 files changed, 354 insertions(+), 318 deletions(-)

diff --git a/gui/bweb/lang/en/tpl/ach_content.tpl b/gui/bweb/lang/en/tpl/ach_content.tpl
index afe7bfa830..79e0517b19 100644
--- a/gui/bweb/lang/en/tpl/ach_content.tpl
+++ b/gui/bweb/lang/en/tpl/ach_content.tpl
@@ -24,7 +24,7 @@ Autochanger: <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
 <button type="submit" class="bp" name='action' value='eject'
  title='put selected media on i/o'><img src='/bweb/extern.png' alt=''>Eject</button>
 <button type="submit" class="bp" name='action' value='clear_io'
- title='Clear I/O'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
+ title='clear I/O'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
 </TMPL_IF>
 <button type="submit" class="bp" name='action' value='update_slots'
  title='run update slots'> <img src='/bweb/update.png' alt=''>Update</button>
@@ -72,7 +72,7 @@ human_size(<TMPL_VAR volbytes>),
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/en/tpl/add_media.tpl b/gui/bweb/lang/en/tpl/add_media.tpl
index dd55c52891..2d4630aeaa 100644
--- a/gui/bweb/lang/en/tpl/add_media.tpl
+++ b/gui/bweb/lang/en/tpl/add_media.tpl
@@ -34,7 +34,7 @@
      </tr>
     </table>
     <button type="submit" class="bp" name='action' value='add_media'>
-     <img src='/bweb/add.png' alt=''>Add<button>
+     <img src='/bweb/add.png' alt=''>Add</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/en/tpl/begin.tpl b/gui/bweb/lang/en/tpl/begin.tpl
index 728b8184f6..25b1c272d7 100644
--- a/gui/bweb/lang/en/tpl/begin.tpl
+++ b/gui/bweb/lang/en/tpl/begin.tpl
@@ -76,9 +76,12 @@ if ('Main' == ('_' + '_Main_' + '_')) {
 </TMPL_IF>
 </li>
  <li> <a href="bweb.pl?action=about"> About </a> </li>
- <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
+ <li style="padding: 0.25em 2em;float: right;">&nbsp;
+<TMPL_IF loginname>Logged as <TMPL_VAR loginname></TMPL_IF>
+<TMPL_IF cur_name>on <TMPL_VAR cur_name></TMPL_IF>
+</li>
  <li style="float: right;white-space: nowrap;">
-<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Search media or client"></button></li>
+<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Search media or client"></li>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
diff --git a/gui/bweb/lang/en/tpl/display_job.tpl b/gui/bweb/lang/en/tpl/display_job.tpl
index 7258064596..4e76c2027a 100644
--- a/gui/bweb/lang/en/tpl/display_job.tpl
+++ b/gui/bweb/lang/en/tpl/display_job.tpl
@@ -14,14 +14,15 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 var header = new Array("JobId",
 	               "Client",
-	               "Job Name", 
+	               "Job Name",
+                       "Comment",
 		       "FileSet",
 //                     "Pool",
                        "Level",
                        "StartTime",
 	               "Duration",
                        "JobFiles",
-                       "JobBytes", 
+                       "JobBytes",
                        "Errors",
 	               "Status");
 
@@ -42,12 +43,13 @@ a.appendChild(img);
 data.push( new Array(
 "<TMPL_VAR JobId>",
 "<TMPL_VAR Client>",     
-"<TMPL_VAR JobName>",    
+"<TMPL_VAR JobName>",
+"<TMPL_VAR Comment>",
 "<TMPL_VAR FileSet>",    
 //"<TMPL_VAR Pool>",
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR Duration>",
+human_duration("<TMPL_VAR Duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
 "<TMPL_VAR joberrors>",   
diff --git a/gui/bweb/lang/en/tpl/display_job_zoom.tpl b/gui/bweb/lang/en/tpl/display_job_zoom.tpl
index 44eee8c217..8b38bc74dc 100644
--- a/gui/bweb/lang/en/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/en/tpl/display_job_zoom.tpl
@@ -1,5 +1,6 @@
  <div class='titlediv'>
-  <h1 class='newstitle'>Information about job</h1>
+  <h1 class='newstitle'>Information about job <i><TMPL_VAR JobName></i>
+       <TMPL_IF comment>(<TMPL_VAR comment>)</TMPL_IF></h1>
  </div>
  <div class="bodydiv">
  <table id='id0'></table>
@@ -88,6 +89,7 @@ var header = new Array("JobId",
 	               "Duration",
                        "JobFiles",
                        "JobBytes",
+//                       "Comp",
                        "Errors",
 	               "Pool",
                        "Volume Name",
@@ -108,9 +110,10 @@ data.push( new Array(
 "<TMPL_VAR FileSet>",    
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_duration("<TMPL_VAR duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
+//parseInt(100-100*<TMPL_VAR JobBytes>/(<TMPL_VAR ReadBytes>+0.00001), 10) + "%",
 "<TMPL_VAR joberrors>",
 "<TMPL_VAR poolname>",
 "<TMPL_LOOP volumes><TMPL_VAR VolumeName>\n</TMPL_LOOP>",   
diff --git a/gui/bweb/lang/en/tpl/display_media.tpl b/gui/bweb/lang/en/tpl/display_media.tpl
index b44fdc8505..89d20277e9 100644
--- a/gui/bweb/lang/en/tpl/display_media.tpl
+++ b/gui/bweb/lang/en/tpl/display_media.tpl
@@ -62,7 +62,7 @@ d,
 "<TMPL_VAR poolname>",
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/en/tpl/display_media_zoom.tpl b/gui/bweb/lang/en/tpl/display_media_zoom.tpl
index fc4d0119c0..a79ee10319 100644
--- a/gui/bweb/lang/en/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/en/tpl/display_media_zoom.tpl
@@ -56,7 +56,7 @@ human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 human_sec(<TMPL_VAR volretention>),
 human_sec(<TMPL_VAR voluseduration>),
 "<TMPL_VAR maxvoljobs>"
diff --git a/gui/bweb/lang/en/tpl/help_extern_compute.tpl b/gui/bweb/lang/en/tpl/help_extern_compute.tpl
index 08a95453cd..ef7d51f3c8 100644
--- a/gui/bweb/lang/en/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/en/tpl/help_extern_compute.tpl
@@ -37,7 +37,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/en/tpl/help_intern_compute.tpl b/gui/bweb/lang/en/tpl/help_intern_compute.tpl
index 799ee2fdcc..a3c29409ab 100644
--- a/gui/bweb/lang/en/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/en/tpl/help_intern_compute.tpl
@@ -39,7 +39,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/en/tpl/run_job_mod.tpl b/gui/bweb/lang/en/tpl/run_job_mod.tpl
index 6652800aff..5c555c1a6e 100644
--- a/gui/bweb/lang/en/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/en/tpl/run_job_mod.tpl
@@ -57,7 +57,11 @@
      <option id='level_Incremental' value='Incremental'>Incremental</option>
      <option id='level_Full' value='Full'>Full</option>
      <option id='level_Differential' value='Differential'>Differential</option>
+     <option id='level_Base' value='Base'>Base</option>
    </select>
+   </td></tr><tr><td>Comment: </td><td>
+   <input type='text' title='Comment about this job'
+          size='17' name='comment' value='<TMPL_VAR comment>'>
 
    </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
    <input type='text' title='YYYY-MM-DD HH:MM:SS'
diff --git a/gui/bweb/lang/en/tpl/running_job.tpl b/gui/bweb/lang/en/tpl/running_job.tpl
index c153d99ea0..51bce0cd0d 100644
--- a/gui/bweb/lang/en/tpl/running_job.tpl
+++ b/gui/bweb/lang/en/tpl/running_job.tpl
@@ -54,7 +54,7 @@ data.push( new Array(
 "<TMPL_VAR JobName>",    
 joblevel['<TMPL_VAR Level>'],      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_sec2("<TMPL_VAR duration>"),
 //"<TMPL_VAR JobFiles>",   
 //"<TMPL_VAR JobBytes>",
 a,
diff --git a/gui/bweb/lang/en/tpl/scheduled_job.tpl b/gui/bweb/lang/en/tpl/scheduled_job.tpl
index 165c2e42fe..43f873ddc8 100644
--- a/gui/bweb/lang/en/tpl/scheduled_job.tpl
+++ b/gui/bweb/lang/en/tpl/scheduled_job.tpl
@@ -3,7 +3,7 @@
   <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Next Jobs </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
-    <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
+    <form name='form1' action='?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
      <button type="submit" class="bp" name='action' title='Run now' value='run_job_mod'>
        <img src='/bweb/R.png' alt=''>  Run now </button>
diff --git a/gui/bweb/lang/es/tpl/ach_content.tpl b/gui/bweb/lang/es/tpl/ach_content.tpl
index 228cfa010b..79e0517b19 100644
--- a/gui/bweb/lang/es/tpl/ach_content.tpl
+++ b/gui/bweb/lang/es/tpl/ach_content.tpl
@@ -1,14 +1,14 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
+Autochanger: <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
 <TMPL_IF nb_io><TMPL_VAR nb_io> IMPORT/EXPORT</TMPL_IF>)</h1>
  </div>
  <div class='bodydiv'>
    <form action='?' method='get'>
     <input type='hidden' name='ach' value='<TMPL_VAR name>'>
     <TMPL_IF "Update">
-    <font color='red'> Debe ejecutar el comando update slot, El estado del Autochanger es diferente al de las slots de bacula </font>
+    <font color='red'> You must run update slot, Autochanger status is different from bacula slots </font>
     <br/>
     </TMPL_IF>
     <table border='0'>
@@ -24,10 +24,10 @@ Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
 <button type="submit" class="bp" name='action' value='eject'
  title='put selected media on i/o'><img src='/bweb/extern.png' alt=''>Eject</button>
 <button type="submit" class="bp" name='action' value='clear_io'
- title='Limpiar I/O'> <img src='/bweb/intern.png' alt=''>Limpiar I/O</button>
+ title='clear I/O'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
 </TMPL_IF>
 <button type="submit" class="bp" name='action' value='update_slots'
- title='run update slots'> <img src='/bweb/update.png' alt=''>Actualizar</button>
+ title='run update slots'> <img src='/bweb/update.png' alt=''>Update</button>
 <br/><br/>
 <button type="submit" class="bp" name='action' value='ach_load'
  title='mount drive'> <img src='/bweb/load.png' alt=''>Mount</button>
@@ -42,16 +42,16 @@ Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
     </td>
     </tr>
     </table>
-    <b> Contenido: </b><br/>
+    <b> Content: </b><br/>
     <table id='id_ach'></table>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Slot Real", "Slot", "Nombre Volumen",
-		       "Bytes Vol","Vol Status",
-	               "Tipo Medio","Pool Name","Fecha Escritura", 
+var header = new Array("Real Slot", "Slot", "Volume Name",
+		       "Vol Bytes","Vol Status",
+	               "Media Type","Pool Name","Last Written", 
                        "When expire ?", "Select");
 
 var data = new Array();
@@ -72,7 +72,7 @@ human_size(<TMPL_VAR volbytes>),
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
@@ -101,7 +101,7 @@ nrsTable.setup(
 );
 
 var header = new Array("Index", "Drive Name", 
-		       "Nombre Volumen", "Select");
+		       "Volume Name", "Select");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/es/tpl/add_media.tpl b/gui/bweb/lang/es/tpl/add_media.tpl
index 56ca2663a6..2d4630aeaa 100644
--- a/gui/bweb/lang/es/tpl/add_media.tpl
+++ b/gui/bweb/lang/es/tpl/add_media.tpl
@@ -14,7 +14,7 @@
             </select>
          </td>
      </tr>
-     <tr><td>Almacenamiento :</td> 
+     <tr><td>Storage:</td> 
          <td>
             <select name='storage' size='5' class='formulaire'>
             <TMPL_LOOP storage>
@@ -29,12 +29,12 @@
      <tr><td>Starting number:</td> 
          <td><input size='3' type='text' name='offset' class='formulaire' value='1'></td>
      </tr>
-     <tr><td>Nombre :</td> 
+     <tr><td>Name:</td> 
          <td><input size='8' type='text' name='media' class='formulaire' value='Vol'></td>
      </tr>
     </table>
     <button type="submit" class="bp" name='action' value='add_media'>
-     <img src='/bweb/add.png' alt=''>Add<button>
+     <img src='/bweb/add.png' alt=''>Add</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/es/tpl/begin.tpl b/gui/bweb/lang/es/tpl/begin.tpl
index 969f1ddde6..25b1c272d7 100644
--- a/gui/bweb/lang/es/tpl/begin.tpl
+++ b/gui/bweb/lang/es/tpl/begin.tpl
@@ -16,40 +16,40 @@
 if (navigator.appName == 'Konqueror') {
         alert("Sorry at this moment, bweb works only with mozilla.");
 }
-if ('Principal' == ('_' + '_Main_' + '_')) {
+if ('Main' == ('_' + '_Main_' + '_')) {
 	document.write("<font color='red'>Update your configuration to use the correct tpl directory (You are using devel tpl)</font>");
 } 
 </script>
 
 <ul id="menu">
- <li><a href="bweb.pl?">Principal</a> </li>
- <li><a href="bweb.pl?action=client">Clientes</a>
+ <li><a href="bweb.pl?">Main</a> </li>
+ <li><a href="bweb.pl?action=client">Clients</a>
      <ul>
-       <li><a href="bweb.pl?action=client">Clientes</a> </li>
-       <li><a href="bweb.pl?action=groups">Groupes</a> </li>
+       <li><a href="bweb.pl?action=client">Clients</a> </li>
+       <li><a href="bweb.pl?action=groups">Groups</a> </li>
      </ul>
  </li>
  <li style="padding: 0.25em 2em;">Jobs
    <ul> 
-     <li><a href="bweb.pl?action=run_job">Jobs Definidos</a>
+     <li><a href="bweb.pl?action=run_job">Defined Jobs</a>
      <li><a href="bweb.pl?action=job_group">Jobs by group</a>
      <li><a href="bweb.pl?action=overview">Jobs overview</a>
      <li><a href="bweb.pl?action=missing">Missing Jobs</a>
-     <li><a href="bweb.pl?action=job">Últimos Jobs</a> </li>
-     <li><a href="bweb.pl?action=running">Jobs en Ejecución</a>
-     <li><a href="bweb.pl?action=next_job">Próximos Jobs</a> </li>
-<!-- <li><a href="bweb.pl?action=restore" title="Launch brestore">Recuperación</a> </li> -->
+     <li><a href="bweb.pl?action=job">Last Jobs</a> </li>
+     <li><a href="bweb.pl?action=running">Running Jobs</a>
+     <li><a href="bweb.pl?action=next_job">Next Jobs</a> </li>
+<!-- <li><a href="bweb.pl?action=restore" title="Launch brestore">Restore</a> </li> -->
      <li><a href="/bweb/bresto.html" title="Try bresto">Web Restore</a> </li>
    </ul>
  </li>
- <li style="padding: 0.25em 2em;">Medios
+ <li style="padding: 0.25em 2em;">Media
   <ul>
      <li><a href="bweb.pl?action=pool">Pools</a> </li>
-     <li><a href="bweb.pl?action=location">Ubicaciones</a> </li>
-     <li><a href="bweb.pl?action=media">Todos los Medios</a><hr></li>
+     <li><a href="bweb.pl?action=location">Locations</a> </li>
+     <li><a href="bweb.pl?action=media">All Media</a><hr></li>
      <li><a href="bweb.pl?action=add_media">Add Media</a><hr></li>
-     <li><a href="bweb.pl?action=extern_media">Expulsar Medio</a> </li>
-     <li><a href="bweb.pl?action=intern_media">Cargar Medio</a> </li>
+     <li><a href="bweb.pl?action=extern_media">Eject Media</a> </li>
+     <li><a href="bweb.pl?action=intern_media">Load Media</a> </li>
   </ul>
  </li>
  <li style="padding: 0.25em 2em;">Storages
@@ -60,25 +60,28 @@ if ('Principal' == ('_' + '_Main_' + '_')) {
 </TMPL_LOOP>
   </ul>
  </li>
- <li><a href="bweb.pl?action=graph"> Estadísticas </a>
+ <li><a href="bweb.pl?action=graph"> Statistics </a>
   <ul>
-    <li><a href="bweb.pl?action=graph"> Estadísticas </a>
+    <li><a href="bweb.pl?action=graph"> Statistics </a>
     <li><a href="btime.pl"> Backup Timing </a>
-    <li><a href="bweb.pl?action=group_stats"> Groupes </a>
+    <li><a href="bweb.pl?action=group_stats"> Groups </a>
     <!-- <li><a href="bperf.pl"> Perfs </a> -->
   </ul>
  </li>
- <li> <a href="bweb.pl?action=view_conf"> Configuración </a> 
+ <li> <a href="bweb.pl?action=view_conf"> Configuration </a> 
 <TMPL_IF enable_security>
-  <ul> <li> <a href="bweb.pl?action=view_conf"> Configuración </a> 
+  <ul> <li> <a href="bweb.pl?action=view_conf"> Configuration </a> 
        <li> <a href="bweb.pl?action=users"> Manage users </a>
   </ul>
 </TMPL_IF>
 </li>
- <li> <a href="bweb.pl?action=about"> Acerca </a> </li>
- <li style="padding: 0.25em 2em;float: right;">&nbsp;Usuario <TMPL_VAR NAME=loginname> </li>
+ <li> <a href="bweb.pl?action=about"> About </a> </li>
+ <li style="padding: 0.25em 2em;float: right;">&nbsp;
+<TMPL_IF loginname>Logged as <TMPL_VAR loginname></TMPL_IF>
+<TMPL_IF cur_name>on <TMPL_VAR cur_name></TMPL_IF>
+</li>
  <li style="float: right;white-space: nowrap;">
-<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Search media or client"></button></li>
+<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Search media or client"></li>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
diff --git a/gui/bweb/lang/es/tpl/display_job.tpl b/gui/bweb/lang/es/tpl/display_job.tpl
index e3e068c195..4e76c2027a 100644
--- a/gui/bweb/lang/es/tpl/display_job.tpl
+++ b/gui/bweb/lang/es/tpl/display_job.tpl
@@ -1,5 +1,5 @@
  <div class='titlediv'>
-  <h1 class='newstitle'> Últimos Jobs (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> Last Jobs (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
@@ -13,17 +13,18 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 
 var header = new Array("JobId",
-	               "Cliente",
-	               "Nombre Job", 
+	               "Client",
+	               "Job Name",
+                       "Comment",
 		       "FileSet",
 //                     "Pool",
-                       "Nivel",
-                       "Inicio",
-	               "Archivos Job",
-                       "Bytes Job",
-                       "JobBytes", 
-                       "Errores",
-	               "Estado");
+                       "Level",
+                       "StartTime",
+	               "Duration",
+                       "JobFiles",
+                       "JobBytes",
+                       "Errors",
+	               "Status");
 
 var data = new Array();
 
@@ -42,12 +43,13 @@ a.appendChild(img);
 data.push( new Array(
 "<TMPL_VAR JobId>",
 "<TMPL_VAR Client>",     
-"<TMPL_VAR JobName>",    
+"<TMPL_VAR JobName>",
+"<TMPL_VAR Comment>",
 "<TMPL_VAR FileSet>",    
 //"<TMPL_VAR Pool>",
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR Duration>",
+human_duration("<TMPL_VAR Duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
 "<TMPL_VAR joberrors>",   
diff --git a/gui/bweb/lang/es/tpl/display_job_zoom.tpl b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
index 1dc53248ae..8b38bc74dc 100644
--- a/gui/bweb/lang/es/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
@@ -1,5 +1,6 @@
  <div class='titlediv'>
-  <h1 class='newstitle'>Información acerca jobs</h1>
+  <h1 class='newstitle'>Information about job <i><TMPL_VAR JobName></i>
+       <TMPL_IF comment>(<TMPL_VAR comment>)</TMPL_IF></h1>
  </div>
  <div class="bodydiv">
  <table id='id0'></table>
@@ -8,21 +9,21 @@
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <button type="submit" name='action' class="bp" value='delete' title='delete this job'
  onclick="return confirm('Do you want to delete this job from the catalog?');">
-   <img src='/bweb/purge.png' alt=''>Borrar</button>
+   <img src='/bweb/purge.png' alt=''>Delete</button>
  </form>
  </td><td>
  <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <button type="submit" name='action' value='media' title='Ver medio' class="bp">
-   <img src='/bweb/zoom.png'alt=''>Ver medio</button>
+  <button type="submit" name='action' value='media' title='View media' class="bp">
+   <img src='/bweb/zoom.png'alt=''>View media</button>
  </form>
  </td>
  <td>
  <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Ver jobs</button>
+  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
  </form>
  </td>
  <td>
@@ -31,14 +32,14 @@
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
   <input type='hidden' name='jobname' value='<TMPL_VAR jobname>'>
   <button type="submit" class="bp" name='action' value='graph' title='View trends'>
-   <img src='/bweb/chart.png' alt=''> Ver estadísticas </button>
+   <img src='/bweb/chart.png' alt=''> View stats </button>
  </form>
  </td>
  <td>
  <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='Ver FileSet'> 
- <img src='/bweb/zoom.png' alt=''>Ver FileSet</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'> 
+ <img src='/bweb/zoom.png' alt=''>View FileSet</button>
  </form>
  </td>
  <td>
@@ -80,18 +81,19 @@
 
 <script type="text/javascript" language='JavaScript'>
 var header = new Array("JobId",
-	               "Cliente",
-	               "Nombre Job", 
+	               "Client",
+	               "Job Name", 
 		       "FileSet",
-                       "Nivel",
-                       "Inicio", 
-	               "Archivos Job",
-                       "Bytes Job",
+                       "Level",
+                       "StartTime", 
+	               "Duration",
+                       "JobFiles",
                        "JobBytes",
-                       "Errores",
+//                       "Comp",
+                       "Errors",
 	               "Pool",
-                       "Nombre Volumen",
-	               "Estado");
+                       "Volume Name",
+	               "Status");
 
 var data = new Array();
 
@@ -108,9 +110,10 @@ data.push( new Array(
 "<TMPL_VAR FileSet>",    
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_duration("<TMPL_VAR duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
+//parseInt(100-100*<TMPL_VAR JobBytes>/(<TMPL_VAR ReadBytes>+0.00001), 10) + "%",
 "<TMPL_VAR joberrors>",
 "<TMPL_VAR poolname>",
 "<TMPL_LOOP volumes><TMPL_VAR VolumeName>\n</TMPL_LOOP>",   
diff --git a/gui/bweb/lang/es/tpl/display_media.tpl b/gui/bweb/lang/es/tpl/display_media.tpl
index 46fd4399d2..89d20277e9 100644
--- a/gui/bweb/lang/es/tpl/display_media.tpl
+++ b/gui/bweb/lang/es/tpl/display_media.tpl
@@ -1,6 +1,6 @@
  <div class='titlediv'>
   <h1 class='newstitle'> 
-   Medios
+   Media
   </h1>
  </div>
  <div class='bodydiv'>
@@ -14,7 +14,7 @@ Pool: <a href="?action=pool;pool=<TMPL_VAR Pool>">
 </TMPL_IF>
 <TMPL_IF Location>
 <h2>
-Ubicación : <TMPL_VAR location>
+Location: <TMPL_VAR location>
 </h2>
 </TMPL_IF>
 
@@ -22,8 +22,8 @@ Ubicaci
     <table id='id_pool_<TMPL_VAR ID>'></table>
       <button type="submit" class="bp" name='action' value='extern' title='Move out'> <img src='/bweb/extern.png' onclick='return confirm("Do you want to eject selected media ?");' alt=''>Eject</button>
       <button type="submit" class="bp" name='action' value='intern' title='Move in'> <img src='/bweb/intern.png' alt=''>Load</button>
-      <button type="submit" class="bp" name='action' value='update_media' title='Update medium'> <img src='/bweb/edit.png' alt=''>Editar</button>
-      <button type="submit" class="bp" name='action' value='media_zoom' title='Information'> <img src='/bweb/zoom.png' alt=''>Ver</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='Update media'> <img src='/bweb/edit.png' alt=''>Edit</button>
+      <button type="submit" class="bp" name='action' value='media_zoom' title='Information'> <img src='/bweb/zoom.png' alt=''>View</button>
 <!--
       <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' alt=''>Purge</button>
 -->
@@ -33,9 +33,9 @@ Ubicaci
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Online","Bytes Vol", "Vol Usage", "Vol Status",
-                       "Pool", "Tipo Medio",
-                       "Fecha Escritura", "When expire ?", "Select");
+var header = new Array("Volume Name","Online","Vol Bytes", "Vol Usage", "Vol Status",
+                       "Pool", "Media Type",
+                       "Last Written", "When expire ?", "Select");
 
 var data = new Array();
 var img;
@@ -62,7 +62,7 @@ d,
 "<TMPL_VAR poolname>",
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/es/tpl/display_media_zoom.tpl b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
index 2e4a2eaefe..a79ee10319 100644
--- a/gui/bweb/lang/es/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
@@ -1,16 +1,16 @@
 <table>
 <td valign='top'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Medium : <TMPL_VAR volumename> <TMPL_VAR comment></h1>
+  <h1 class='newstitle'> Volume: <TMPL_VAR volumename> <TMPL_VAR comment></h1>
  </div>
  <div class='bodydiv'>
-    <b> Medium Infos</b><br/>
+    <b> Volume Infos</b><br/>
     <table id='id_info_<TMPL_VAR volumename>'></table>
-    <b> Medium Stats</b><br/>
+    <b> Volume Stats</b><br/>
     <table id='id_media_<TMPL_VAR volumename>'></table>
     <b> Job List </b></br>
     <table id='id_jobs_<TMPL_VAR volumename>'></table>
-    <b> Acciones </b></br>
+    <b> Actions </b></br>
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
@@ -18,7 +18,7 @@
 <TMPL_ELSE>
       <button type="submit" class="bp" name='action' value='intern' title='move in'> <img src='/bweb/intern.png' alt=''>Load</button>
 </TMPL_IF>
-      <button type="submit" class="bp" name='action' value='update_media' title='Actualizar'><img src='/bweb/edit.png' alt=''>Editar</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='Update'><img src='/bweb/edit.png' alt=''>Edit</button>
       <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume?')" alt=''>Purge</button>
       <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
 <TMPL_IF Locationlog>
@@ -40,7 +40,7 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Enabled", "Ubicación","Vol Status", "Bytes Vol", "Expire",
+var header = new Array("Pool","Online","Enabled", "Location","Vol Status", "Vol Bytes", "Expire",
 	               "Retention","Max use duration", "Max jobs" );
 
 var data = new Array();
@@ -56,7 +56,7 @@ human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 human_sec(<TMPL_VAR volretention>),
 human_sec(<TMPL_VAR voluseduration>),
 "<TMPL_VAR maxvoljobs>"
@@ -80,7 +80,7 @@ nrsTable.setup(
 }
 );
 
-var header = new Array( "Vol Mounts", "Recycle count", "Read time", "Write time", "Errores");
+var header = new Array( "Vol Mounts", "Recycle count", "Read time", "Write time", "Errors");
 
 var data = new Array();
 data.push( new Array(
@@ -110,8 +110,8 @@ nrsTable.setup(
 );
 
 
-var header = new Array("JobId","Nombre","Start Time","Tipo",
-	               "Nivel","Files","Bytes","Estado");
+var header = new Array("JobId","Name","Start Time","Type",
+	               "Level","Files","Bytes","Status");
 
 var data = new Array();
 var a;
diff --git a/gui/bweb/lang/es/tpl/help_extern_compute.tpl b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
index 9be659d747..ef7d51f3c8 100644
--- a/gui/bweb/lang/es/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
@@ -1,24 +1,24 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Ayuda para expulsar medios (part 2/2)</h1>
+  <h1 class='newstitle'>Help to eject media (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
-  Ahora puede verificar la selección y expulsar el medio.
+  Now, you can verify the selection and eject the media.
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Volver'> <img src='/bweb/prev.png' alt=''>Volver</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
-    <button type="submit" class="bp" name='action' value='extern' title='Expulsar selección'> <img src='/bweb/extern.png' alt=''>Eject</button>
+    <button type="submit" class="bp" name='action' value='extern' title='Eject selection'> <img src='/bweb/extern.png' alt=''>Eject</button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Vol Status",
-                       "Tipo Medio","Pool Name","Fecha Escritura", 
+var header = new Array("Volume Name","Vol Status",
+                       "Media Type","Pool Name","Last Written", 
                        "When expire ?", "Select");
 
 var data = new Array();
@@ -37,7 +37,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/es/tpl/help_intern_compute.tpl b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
index 8fd39f8a4d..a3c29409ab 100644
--- a/gui/bweb/lang/es/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
@@ -1,14 +1,14 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Ayuda para cargar medios (part 2/2)</h1>
+  <h1 class='newstitle'>Help to load media (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
-  Ahora puede verificar la selección y cargar el medio cargar selección
+  Now, you can verify the selection and load the media.
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Volver'> <img src='/bweb/prev.png' alt=''>Volver</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
     <input type="hidden" name='enabled' value='yes'>
     <button type="submit" class="bp" name='action' value='move_media'> 
@@ -19,8 +19,8 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Vol Status",
-                       "Tipo Medio","Pool Name","Fecha Escritura", 
+var header = new Array("Volume Name","Vol Status",
+                       "Media Type","Pool Name","Last Written", 
                        "When expire ?", "Select");
 
 var data = new Array();
@@ -39,7 +39,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/es/tpl/run_job_mod.tpl b/gui/bweb/lang/es/tpl/run_job_mod.tpl
index 8011826864..5c555c1a6e 100644
--- a/gui/bweb/lang/es/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/es/tpl/run_job_mod.tpl
@@ -1,12 +1,12 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Ejecutar Job : <TMPL_VAR job> on <TMPL_VAR client></h1>
+  <h1 class='newstitle'> Run job: <TMPL_VAR job> on <TMPL_VAR client></h1>
  </div>
  <div class='bodydiv'>
   <form name='form1' action='?' method='GET'>  
   <table border='0'>
 
-   <tr><td>Nombre Job: </td><td>
+   <tr><td>Job Name: </td><td>
    <select name='job'>
     <TMPL_LOOP jobs>
      <option value='<TMPL_VAR name>'>
@@ -24,7 +24,7 @@
      </option>
     </TMPL_LOOP>
    </select>
-   </td></tr><tr><td>Cliente : </td><td>
+   </td></tr><tr><td>Client: </td><td>
 
    <select name='client'>
     <TMPL_LOOP clients>
@@ -43,7 +43,7 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Almacenamiento : </td><td>
+   </td></tr><tr><td>Storage: </td><td>
    <select name='storage'>
     <TMPL_LOOP storages>
      <option value='<TMPL_VAR name>'>
@@ -52,18 +52,22 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Nivel: </td><td>
+   </td></tr><tr><td>Level: </td><td>
    <select name='level'>
      <option id='level_Incremental' value='Incremental'>Incremental</option>
-     <option id='level_Full' value='Full'>Completo</option>
-     <option id='level_Differential' value='Differential'>Diferencial</option>
+     <option id='level_Full' value='Full'>Full</option>
+     <option id='level_Differential' value='Differential'>Differential</option>
+     <option id='level_Base' value='Base'>Base</option>
    </select>
+   </td></tr><tr><td>Comment: </td><td>
+   <input type='text' title='Comment about this job'
+          size='17' name='comment' value='<TMPL_VAR comment>'>
 
-   </td></tr><tr id='more1' style="visibility:hidden"><td>Hora Inicio: </td><td>
+   </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
    <input type='text' title='YYYY-MM-DD HH:MM:SS'
           size='17' name='when' value='<TMPL_VAR when>'>
 
-   </td></tr><tr id='more2' style="visibility:hidden"><td>Prioridad: </td><td>
+   </td></tr><tr id='more2' style="visibility:hidden"><td>Priority: </td><td>
    <input type='text' 
           size='3' name='priority' value='<TMPL_VAR priority>'>
 
@@ -76,8 +80,8 @@
            document.getElementById("more2").style.visibility="visible";'>
   <img title="Display more options" src='/bweb/add.png'>More options</label>
 
-  <button type="submit" class="bp" name='action' value='run_job_now' title='Ejecutar job'><img src='/bweb/R.png' alt=''>Ejecutar Ahora</button>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='Ver FileSet'><img src='/bweb/zoom.png' alt=''>Ver FileSet</button>
+  <button type="submit" class="bp" name='action' value='run_job_now' title='Run job'><img src='/bweb/R.png' alt=''>Run now</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'><img src='/bweb/zoom.png' alt=''>View FileSet</button>
   </form>
  </div>
 
diff --git a/gui/bweb/lang/es/tpl/running_job.tpl b/gui/bweb/lang/es/tpl/running_job.tpl
index 954fd66181..51bce0cd0d 100644
--- a/gui/bweb/lang/es/tpl/running_job.tpl
+++ b/gui/bweb/lang/es/tpl/running_job.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Jobs en Ejecución </h1>
+  <h1 class='newstitle'> Running Jobs </h1>
  </div>
  <div class='bodydiv'>
    <form action='?' method='GET'>
@@ -8,24 +8,24 @@
    <br/>
 <label>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
- title='Ver job'> <img src='/bweb/zoom.png' alt=''>Ver</button>
+ title='View job'> <img src='/bweb/zoom.png' alt=''>View</button>
 <button type="submit" class="bp" type='submit' name='action' value='cancel_job'
  onclick="return confirm('Do you want to cancel the selected job?')"
- title='Cancelar job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
+ title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
    </form>
 
  </div>
 
 <script type="text/javascript" language="JavaScript">
 var header = new Array("JobId",
-                       "Cliente",
-                       "Nombre Job", 
-                       "Nivel",
+                       "Client",
+                       "Job Name", 
+                       "Level",
                        "Start Time", 
-                       "Archivos Job", 
-//                       "Archivos Job",
+                       "Duration", 
+//                       "Job Files",
 //                       "Job Bytes", 
-                       "Estado",
+                       "Status",
                        "Select"
         );
 
@@ -54,7 +54,7 @@ data.push( new Array(
 "<TMPL_VAR JobName>",    
 joblevel['<TMPL_VAR Level>'],      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_sec2("<TMPL_VAR duration>"),
 //"<TMPL_VAR JobFiles>",   
 //"<TMPL_VAR JobBytes>",
 a,
diff --git a/gui/bweb/lang/es/tpl/scheduled_job.tpl b/gui/bweb/lang/es/tpl/scheduled_job.tpl
index ac53e8b7ec..43f873ddc8 100644
--- a/gui/bweb/lang/es/tpl/scheduled_job.tpl
+++ b/gui/bweb/lang/es/tpl/scheduled_job.tpl
@@ -1,15 +1,15 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Próximos Jobs </TMPL_IF></h1>
+  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Next Jobs </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
-    <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
+    <form name='form1' action='?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <button type="submit" class="bp" name='action' title='Ejecutar Ahora' value='run_job_mod'>
-       <img src='/bweb/R.png' alt=''>  Ejecutar Ahora </button>
-      <button type="submit" class="bp" name='action' title='Desactivar' value='disable_job'>
-       <img src='/bweb/inflag0.png' alt=''> Desactivar </button>
-       <button type="submit" onsubmit='document.form1.level.value="all"' class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Ver jobs</button>
+     <button type="submit" class="bp" name='action' title='Run now' value='run_job_mod'>
+       <img src='/bweb/R.png' alt=''>  Run now </button>
+      <button type="submit" class="bp" name='action' title='Disable' value='disable_job'>
+       <img src='/bweb/inflag0.png' alt=''> Disable </button>
+       <button type="submit" onsubmit='document.form1.level.value="all"' class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
 <TMPL_IF missing_mode>
       <button type="submit" class="bp" name='action' title='Mark this job as canceled in job history' value='cancel_future_job'>
        <img src='/bweb/f.png' alt=''> Mark it as canceled </button>
@@ -27,12 +27,12 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Programado",
-                       "Nivel",
-	               "Tipo",
-	               "Prioridad", 
-                       "Nombre",
-                       "Volumen",
+var header = new Array("Scheduled",
+                       "Level",
+	               "Type",
+	               "Priority", 
+                       "Name",
+                       "Volume",
 	               "Select");
 
 var data = new Array();
diff --git a/gui/bweb/lang/fr/tpl/ach_content.tpl b/gui/bweb/lang/fr/tpl/ach_content.tpl
index 603611065c..79e0517b19 100644
--- a/gui/bweb/lang/fr/tpl/ach_content.tpl
+++ b/gui/bweb/lang/fr/tpl/ach_content.tpl
@@ -1,58 +1,58 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-Robotique : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Lecteurs
+Autochanger: <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
 <TMPL_IF nb_io><TMPL_VAR nb_io> IMPORT/EXPORT</TMPL_IF>)</h1>
  </div>
  <div class='bodydiv'>
    <form action='?' method='get'>
     <input type='hidden' name='ach' value='<TMPL_VAR name>'>
     <TMPL_IF "Update">
-    <font color='red'> Vous devez lancer la mise à jour des slots, le contenu de la robotique est différent de ce qui est indiqué dans la base de bacula. </font>
+    <font color='red'> You must run update slot, Autochanger status is different from bacula slots </font>
     <br/>
     </TMPL_IF>
     <table border='0'>
     <tr>
     <td valign='top'>
     <div class='otherboxtitle'>
-     Options
+     Tools
     </div>
     <div class='otherbox'>
 <button type="submit" class="bp" name='action' value='label_barcodes'
- title='Labélisation des médias, (label barcodes)'><img src='/bweb/label.png' alt=''>Label</button>
+ title='run label barcodes'><img src='/bweb/label.png' alt=''>Label</button>
 <TMPL_IF nb_io>
 <button type="submit" class="bp" name='action' value='eject'
- title='Mettre les médias sélectionnés dans le guichet'><img src='/bweb/extern.png' alt=''>Externaliser</button>
+ title='put selected media on i/o'><img src='/bweb/extern.png' alt=''>Eject</button>
 <button type="submit" class="bp" name='action' value='clear_io'
- title='Vider le guichet'> <img src='/bweb/intern.png' alt=''>Vider le guichet</button>
+ title='clear I/O'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
 </TMPL_IF>
 <button type="submit" class="bp" name='action' value='update_slots'
- title='Mettre à jour la base bacula, (update slots)'> <img src='/bweb/update.png' alt=''>Scanner</button>
+ title='run update slots'> <img src='/bweb/update.png' alt=''>Update</button>
 <br/><br/>
 <button type="submit" class="bp" name='action' value='ach_load'
- title='Charger un lecteur'> <img src='/bweb/load.png' alt=''>Mount</button>
+ title='mount drive'> <img src='/bweb/load.png' alt=''>Mount</button>
 <button type="submit" class="bp" name='action' value='ach_unload'
- title='Décharger un lecteur'> <img src='/bweb/unload.png' alt=''>Umount</button>
+ title='umount drive'> <img src='/bweb/unload.png' alt=''>Umount</button>
 
    </div>
     <td width='200'/>
     <td>
-    <b> Lecteurs : </b><br/>
+    <b> Drives: </b><br/>
     <table id='id_drive'></table> <br/>
     </td>
     </tr>
     </table>
-    <b> Contenu : </b><br/>
+    <b> Content: </b><br/>
     <table id='id_ach'></table>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Slot réel", "Slot", "Nom de volume",
-		       "Taille","Vol Statut",
-	               "Type","Nom du Pool","Dernière écriture", 
-                       "Expiration", "Sélection");
+var header = new Array("Real Slot", "Slot", "Volume Name",
+		       "Vol Bytes","Vol Status",
+	               "Media Type","Pool Name","Last Written", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
@@ -72,7 +72,7 @@ human_size(<TMPL_VAR volbytes>),
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
@@ -100,8 +100,8 @@ nrsTable.setup(
 }
 );
 
-var header = new Array("Index", "Lecteurs", 
-		       "Nom de volume", "Sélection");
+var header = new Array("Index", "Drive Name", 
+		       "Volume Name", "Select");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/fr/tpl/add_media.tpl b/gui/bweb/lang/fr/tpl/add_media.tpl
index 852fe5786b..2d4630aeaa 100644
--- a/gui/bweb/lang/fr/tpl/add_media.tpl
+++ b/gui/bweb/lang/fr/tpl/add_media.tpl
@@ -1,11 +1,11 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Ajouter des Medias</h1>
+  <h1 class='newstitle'> Add Media</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
     <table>
-     <tr><td>Pool :</td>
+     <tr><td>Pool:</td>
          <td> 
             <select name='pool' size='5' class='formulaire'>
             <TMPL_LOOP db_pools>
@@ -14,7 +14,7 @@
             </select>
          </td>
      </tr>
-     <tr><td>Storage :</td> 
+     <tr><td>Storage:</td> 
          <td>
             <select name='storage' size='5' class='formulaire'>
             <TMPL_LOOP storage>
@@ -23,18 +23,18 @@
             </select>
          </td>
      </tr>
-     <tr><td>Nombre de média à créer :</td> 
+     <tr><td>Number of media to create:</td> 
          <td><input size='3' type='text' name='nb' value='1' class='formulaire'></td>
      </tr>
-     <tr><td>Numéro de départ :</td> 
+     <tr><td>Starting number:</td> 
          <td><input size='3' type='text' name='offset' class='formulaire' value='1'></td>
      </tr>
-     <tr><td>Nom :</td> 
+     <tr><td>Name:</td> 
          <td><input size='8' type='text' name='media' class='formulaire' value='Vol'></td>
      </tr>
     </table>
     <button type="submit" class="bp" name='action' value='add_media'>
-     <img src='/bweb/add.png' alt=''>Ajouter<button>
+     <img src='/bweb/add.png' alt=''>Add</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/fr/tpl/begin.tpl b/gui/bweb/lang/fr/tpl/begin.tpl
index ba00e54fe7..25b1c272d7 100644
--- a/gui/bweb/lang/fr/tpl/begin.tpl
+++ b/gui/bweb/lang/fr/tpl/begin.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
-<title>Bweb - Interface Web de Bacula</title>
+<title>Bweb - Bacula Web Interface</title>
 <link rel="SHORTCUT ICON" href="/bweb/favicon.ico"/>
 <script type="text/javascript" language="JavaScript" src="/bweb/natcompare.js"></script>
 <script type="text/javascript" language="JavaScript" src="/bweb/nrs_table.js"></script>
@@ -14,42 +14,42 @@
 
 <script type="text/javascript" language="JavaScript">
 if (navigator.appName == 'Konqueror') {
-        alert("Désolé, bweb fonctionne seulement avec mozilla.");
+        alert("Sorry at this moment, bweb works only with mozilla.");
 }
-if ('Accueil' == ('_' + '_Main_' + '_')) {
+if ('Main' == ('_' + '_Main_' + '_')) {
 	document.write("<font color='red'>Update your configuration to use the correct tpl directory (You are using devel tpl)</font>");
 } 
 </script>
 
 <ul id="menu">
- <li><a href="bweb.pl?">Accueil</a> </li>
+ <li><a href="bweb.pl?">Main</a> </li>
  <li><a href="bweb.pl?action=client">Clients</a>
      <ul>
        <li><a href="bweb.pl?action=client">Clients</a> </li>
-       <li><a href="bweb.pl?action=groups">Groupes</a> </li>
+       <li><a href="bweb.pl?action=groups">Groups</a> </li>
      </ul>
  </li>
  <li style="padding: 0.25em 2em;">Jobs
    <ul> 
-     <li><a href="bweb.pl?action=run_job">Jobs définis</a>
-     <li><a href="bweb.pl?action=job_group">Jobs par groupe</a>
+     <li><a href="bweb.pl?action=run_job">Defined Jobs</a>
+     <li><a href="bweb.pl?action=job_group">Jobs by group</a>
      <li><a href="bweb.pl?action=overview">Jobs overview</a>
      <li><a href="bweb.pl?action=missing">Missing Jobs</a>
-     <li><a href="bweb.pl?action=job">Historique</a> </li>
-     <li><a href="bweb.pl?action=running">Jobs en cours</a>
-     <li><a href="bweb.pl?action=next_job">Prochains jobs</a> </li>
-<!-- <li><a href="bweb.pl?action=restore" title="Lancer brestore">Restauration</a> </li> -->
+     <li><a href="bweb.pl?action=job">Last Jobs</a> </li>
+     <li><a href="bweb.pl?action=running">Running Jobs</a>
+     <li><a href="bweb.pl?action=next_job">Next Jobs</a> </li>
+<!-- <li><a href="bweb.pl?action=restore" title="Launch brestore">Restore</a> </li> -->
      <li><a href="/bweb/bresto.html" title="Try bresto">Web Restore</a> </li>
    </ul>
  </li>
- <li style="padding: 0.25em 2em;">Médias
+ <li style="padding: 0.25em 2em;">Media
   <ul>
-     <li><a href="bweb.pl?action=pool">Pools de média</a> </li>
-     <li><a href="bweb.pl?action=location">Localisations</a> </li>
-     <li><a href="bweb.pl?action=media">Tous les Medias</a><hr></li>
-     <li><a href="bweb.pl?action=add_media">Ajouter des Medias</a><hr></li>
-     <li><a href="bweb.pl?action=extern_media">Externaliser</a> </li>
-     <li><a href="bweb.pl?action=intern_media">Internaliser</a> </li>
+     <li><a href="bweb.pl?action=pool">Pools</a> </li>
+     <li><a href="bweb.pl?action=location">Locations</a> </li>
+     <li><a href="bweb.pl?action=media">All Media</a><hr></li>
+     <li><a href="bweb.pl?action=add_media">Add Media</a><hr></li>
+     <li><a href="bweb.pl?action=extern_media">Eject Media</a> </li>
+     <li><a href="bweb.pl?action=intern_media">Load Media</a> </li>
   </ul>
  </li>
  <li style="padding: 0.25em 2em;">Storages
@@ -60,11 +60,11 @@ if ('Accueil' == ('_' + '_Main_' + '_')) {
 </TMPL_LOOP>
   </ul>
  </li>
- <li><a href="bweb.pl?action=graph"> Statistiques </a>
+ <li><a href="bweb.pl?action=graph"> Statistics </a>
   <ul>
-    <li><a href="bweb.pl?action=graph"> Statistiques </a>
+    <li><a href="bweb.pl?action=graph"> Statistics </a>
     <li><a href="btime.pl"> Backup Timing </a>
-    <li><a href="bweb.pl?action=group_stats"> Groupes </a>
+    <li><a href="bweb.pl?action=group_stats"> Groups </a>
     <!-- <li><a href="bperf.pl"> Perfs </a> -->
   </ul>
  </li>
@@ -75,10 +75,13 @@ if ('Accueil' == ('_' + '_Main_' + '_')) {
   </ul>
 </TMPL_IF>
 </li>
- <li> <a href="bweb.pl?action=about"> A propos </a> </li>
- <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
+ <li> <a href="bweb.pl?action=about"> About </a> </li>
+ <li style="padding: 0.25em 2em;float: right;">&nbsp;
+<TMPL_IF loginname>Logged as <TMPL_VAR loginname></TMPL_IF>
+<TMPL_IF cur_name>on <TMPL_VAR cur_name></TMPL_IF>
+</li>
  <li style="float: right;white-space: nowrap;">
-<button type="submit" class="bp" class="button" title="Chercher un media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Chercher un client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Chercher un media ou un client"></button></li>
+<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value='search...' onclick="this.value='';" title="Search media or client"></li>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
diff --git a/gui/bweb/lang/fr/tpl/display_job.tpl b/gui/bweb/lang/fr/tpl/display_job.tpl
index 3ebe6fd002..4e76c2027a 100644
--- a/gui/bweb/lang/fr/tpl/display_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job.tpl
@@ -1,5 +1,5 @@
  <div class='titlediv'>
-  <h1 class='newstitle'> Historique (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> Last Jobs (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
@@ -14,16 +14,17 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 var header = new Array("JobId",
 	               "Client",
-	               "Nom du Job", 
+	               "Job Name",
+                       "Comment",
 		       "FileSet",
 //                     "Pool",
-                       "Niveau",
-                       "Début",
-	               "Durée",
-                       "Fichiers",
-                       "Taille", 
-                       "Erreurs",
-	               "Statut");
+                       "Level",
+                       "StartTime",
+	               "Duration",
+                       "JobFiles",
+                       "JobBytes",
+                       "Errors",
+	               "Status");
 
 var data = new Array();
 
@@ -42,12 +43,13 @@ a.appendChild(img);
 data.push( new Array(
 "<TMPL_VAR JobId>",
 "<TMPL_VAR Client>",     
-"<TMPL_VAR JobName>",    
+"<TMPL_VAR JobName>",
+"<TMPL_VAR Comment>",
 "<TMPL_VAR FileSet>",    
 //"<TMPL_VAR Pool>",
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR Duration>",
+human_duration("<TMPL_VAR Duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
 "<TMPL_VAR joberrors>",   
diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
index 6c7d212c15..8b38bc74dc 100644
--- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
@@ -1,28 +1,29 @@
  <div class='titlediv'>
-  <h1 class='newstitle'>Information sur un job</h1>
+  <h1 class='newstitle'>Information about job <i><TMPL_VAR JobName></i>
+       <TMPL_IF comment>(<TMPL_VAR comment>)</TMPL_IF></h1>
  </div>
  <div class="bodydiv">
  <table id='id0'></table>
  <table><td>
  <form name="delete" action='bweb.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <button type="submit" name='action' class="bp" value='delete' title='Supprimer ce job'
- onclick="return confirm('Voulez vous vraiment supprimer ce job du catalogue ?');">
-   <img src='/bweb/purge.png' alt=''>Supprimer</button>
+  <button type="submit" name='action' class="bp" value='delete' title='delete this job'
+ onclick="return confirm('Do you want to delete this job from the catalog?');">
+   <img src='/bweb/purge.png' alt=''>Delete</button>
  </form>
  </td><td>
  <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <button type="submit" name='action' value='media' title='Voir les médias' class="bp">
-   <img src='/bweb/zoom.png'alt=''>Voir les médias</button>
+  <button type="submit" name='action' value='media' title='View media' class="bp">
+   <img src='/bweb/zoom.png'alt=''>View media</button>
  </form>
  </td>
  <td>
  <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <button type="submit" class="bp" name='action' value='job' title='voir <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Voir les jobs</button>
+  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
  </form>
  </td>
  <td>
@@ -30,15 +31,15 @@
   <input type='hidden' name='age' value='2678400'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
   <input type='hidden' name='jobname' value='<TMPL_VAR jobname>'>
-  <button type="submit" class="bp" name='action' value='graph' title='Voir les tendances'>
-   <img src='/bweb/chart.png' alt=''> Voir les stats </button>
+  <button type="submit" class="bp" name='action' value='graph' title='View trends'>
+   <img src='/bweb/chart.png' alt=''> View stats </button>
  </form>
  </td>
  <td>
  <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='Voir le fileset associé'> 
- <img src='/bweb/zoom.png' alt=''>Voir le fileset associé</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'> 
+ <img src='/bweb/zoom.png' alt=''>View FileSet</button>
  </form>
  </td>
  <td>
@@ -46,14 +47,14 @@
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <input type='hidden' name='where' value='/'>
   <button type="submit" class="bp" name='action' value='bfileview' 
-   title='Répartition des fichiers' 
-   onclick='if (<TMPL_VAR JobFiles> > 50000) { return confirm("Ce traitement peut prendre beaucoup de temps, voulez vous continuer ?")} else { return 1; }'>
-   <img src='/bweb/colorscm.png' alt=''> Répartition des fichiers </button>
+   title='View file usage' 
+   onclick='if (<TMPL_VAR JobFiles> > 50000) { return confirm("It could take long time, do you want to continue?")} else { return 1; }'>
+   <img src='/bweb/colorscm.png' alt=''> View file usage </button>
  </form>
  </td>
 <TMPL_IF wiki_url>
   <td>
-   <a href="<TMPL_VAR wiki_url><TMPL_VAR Client>" title='Documentation'><img src='/bweb/doc.png' alt='Documentation'></a>Documentation
+   <a href="<TMPL_VAR wiki_url><TMPL_VAR Client>" title='View doc'><img src='/bweb/doc.png' alt='View doc'></a>View doc
  </td>
 </TMPL_IF>
  <td>
@@ -64,15 +65,15 @@
   <input type='hidden' name='client' value='<TMPL_VAR client>'>
   <input type='hidden' id="rerun_level" name='level'>
   <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
-  <button type="submit" class="bp" name='action' value='run_job_mod' title='Relancer ce job'>
-   <img src='/bweb/R.png'> Lancer ce job </button>
+  <button type="submit" class="bp" name='action' value='run_job_mod' title='run this job again'>
+   <img src='/bweb/R.png'> Run this job </button>
  </form>
  </td>
 <TMPL_IF joberrors>
  <td>
     <a href="<TMPL_VAR thisurl>;error=1"
-         title="Voir les erreurs">
-    <img src='/bweb/doc.png' alt="View errors"></a> Voir les erreurs
+         title="View only errors">
+    <img src='/bweb/doc.png' alt="View errors"></a> View only errors
   </td>
 </TMPL_IF>
  </table>
@@ -81,17 +82,18 @@
 <script type="text/javascript" language='JavaScript'>
 var header = new Array("JobId",
 	               "Client",
-	               "Nom du Job", 
+	               "Job Name", 
 		       "FileSet",
-                       "Niveau",
-                       "Début", 
-	               "Durée",
-                       "Fichiers",
-                       "Taille",
-                       "Erreurs",
+                       "Level",
+                       "StartTime", 
+	               "Duration",
+                       "JobFiles",
+                       "JobBytes",
+//                       "Comp",
+                       "Errors",
 	               "Pool",
-                       "Nom de volume",
-	               "Statut");
+                       "Volume Name",
+	               "Status");
 
 var data = new Array();
 
@@ -108,9 +110,10 @@ data.push( new Array(
 "<TMPL_VAR FileSet>",    
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_duration("<TMPL_VAR duration>"),
 "<TMPL_VAR JobFiles>",   
 human_size(<TMPL_VAR JobBytes>),
+//parseInt(100-100*<TMPL_VAR JobBytes>/(<TMPL_VAR ReadBytes>+0.00001), 10) + "%",
 "<TMPL_VAR joberrors>",
 "<TMPL_VAR poolname>",
 "<TMPL_LOOP volumes><TMPL_VAR VolumeName>\n</TMPL_LOOP>",   
diff --git a/gui/bweb/lang/fr/tpl/display_media.tpl b/gui/bweb/lang/fr/tpl/display_media.tpl
index cf2e59eed7..89d20277e9 100644
--- a/gui/bweb/lang/fr/tpl/display_media.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media.tpl
@@ -1,31 +1,31 @@
  <div class='titlediv'>
   <h1 class='newstitle'> 
-   Médias
+   Media
   </h1>
  </div>
  <div class='bodydiv'>
 
 <TMPL_IF Pool>
 <h2>
-Pool : <a href="?action=pool;pool=<TMPL_VAR Pool>">
+Pool: <a href="?action=pool;pool=<TMPL_VAR Pool>">
          <TMPL_VAR Pool>
        </a>
 </h2>
 </TMPL_IF>
 <TMPL_IF Location>
 <h2>
-Localisation : <TMPL_VAR location>
+Location: <TMPL_VAR location>
 </h2>
 </TMPL_IF>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <button type="submit" class="bp" name='action' value='extern' title='Externaliser'> <img src='/bweb/extern.png' onclick='return confirm("Voulez vous vraiment éjecter ces médias ?");' alt=''>Externaliser</button>
-      <button type="submit" class="bp" name='action' value='intern' title='Internaliser'> <img src='/bweb/intern.png' alt=''>Load</button>
-      <button type="submit" class="bp" name='action' value='update_media' title='Modifier le media'> <img src='/bweb/edit.png' alt=''>Modifier</button>
-      <button type="submit" class="bp" name='action' value='media_zoom' title='Informations'> <img src='/bweb/zoom.png' alt=''>Voir</button>
+      <button type="submit" class="bp" name='action' value='extern' title='Move out'> <img src='/bweb/extern.png' onclick='return confirm("Do you want to eject selected media ?");' alt=''>Eject</button>
+      <button type="submit" class="bp" name='action' value='intern' title='Move in'> <img src='/bweb/intern.png' alt=''>Load</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='Update media'> <img src='/bweb/edit.png' alt=''>Edit</button>
+      <button type="submit" class="bp" name='action' value='media_zoom' title='Information'> <img src='/bweb/zoom.png' alt=''>View</button>
 <!--
-      <button type="submit" class="bp" name='action' value='purge' title='Purger'> <img src='/bweb/purge.png' alt=''>Purger</button>
+      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' alt=''>Purge</button>
 -->
       <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
    </form>
@@ -33,9 +33,9 @@ Localisation : <TMPL_VAR location>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom de volume","Online","Taille", "Utilisation du volume", "Vol Statut",
-                       "Pool", "Type",
-                       "Dernière écriture", "Expiration", "Sélection");
+var header = new Array("Volume Name","Online","Vol Bytes", "Vol Usage", "Vol Status",
+                       "Pool", "Media Type",
+                       "Last Written", "When expire ?", "Select");
 
 var data = new Array();
 var img;
@@ -62,7 +62,7 @@ d,
 "<TMPL_VAR poolname>",
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
index c4503bd390..a79ee10319 100644
--- a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
@@ -1,35 +1,35 @@
 <table>
 <td valign='top'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Media : <TMPL_VAR volumename> <TMPL_VAR comment></h1>
+  <h1 class='newstitle'> Volume: <TMPL_VAR volumename> <TMPL_VAR comment></h1>
  </div>
  <div class='bodydiv'>
-    <b> Informations</b><br/>
+    <b> Volume Infos</b><br/>
     <table id='id_info_<TMPL_VAR volumename>'></table>
-    <b> Statistiques</b><br/>
+    <b> Volume Stats</b><br/>
     <table id='id_media_<TMPL_VAR volumename>'></table>
-    <b> Contenu </b></br>
+    <b> Job List </b></br>
     <table id='id_jobs_<TMPL_VAR volumename>'></table>
     <b> Actions </b></br>
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
-      <button type="submit" class="bp" name='action' value='extern' onclick='return confirm("Voulez vous vraiment éjecter ce média ?");' title='Externaliser'> <img src='/bweb/extern.png' alt=''>Externaliser</button>
+      <button type="submit" class="bp" name='action' value='extern' onclick='return confirm("Do you want to eject this volume ?");' title='move out'> <img src='/bweb/extern.png' alt=''>Eject</button>
 <TMPL_ELSE>
-      <button type="submit" class="bp" name='action' value='intern' title='Internaliser'> <img src='/bweb/intern.png' alt=''>Load</button>
+      <button type="submit" class="bp" name='action' value='intern' title='move in'> <img src='/bweb/intern.png' alt=''>Load</button>
 </TMPL_IF>
-      <button type="submit" class="bp" name='action' value='update_media' title='Scanner'><img src='/bweb/edit.png' alt=''>Modifier</button>
-      <button type="submit" class="bp" name='action' value='purge' title='Purger'> <img src='/bweb/purge.png' onclick="return confirm('Voulez vous vraiment purger ce média ?')" alt=''>Purger</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='Update'><img src='/bweb/edit.png' alt=''>Edit</button>
+      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume?')" alt=''>Purge</button>
       <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
 <TMPL_IF Locationlog>
-      <a href='#' onclick='document.getElementById("locationlog").style.visibility="visible";'><img title='Voir les déplacements' src='/bweb/zoom.png'></a>
+      <a href='#' onclick='document.getElementById("locationlog").style.visibility="visible";'><img title='View location log' src='/bweb/zoom.png'></a>
 </TMPL_IF>
    </form>
  </div>
 </td>
 <td valign='top'style="visibility:hidden;" id='locationlog'>
  <div class='titlediv'>
-  <h1 class='newstitle'>Log sur les déplacements </h1>
+  <h1 class='newstitle'>Location log </h1>
  </div>
  <div class='bodydiv'>
 <pre>
@@ -40,8 +40,8 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Active", "Localisation","Vol Statut", "Taille", "Expiration",
-	               "Rétention","Temps maxi d'utilisation", "Nombre de jobs maxi :" );
+var header = new Array("Pool","Online","Enabled", "Location","Vol Status", "Vol Bytes", "Expire",
+	               "Retention","Max use duration", "Max jobs" );
 
 var data = new Array();
 var img;
@@ -56,7 +56,7 @@ human_enabled("<TMPL_VAR enabled>"),
 "<TMPL_VAR location>",
 "<TMPL_VAR volstatus>",
 human_size(<TMPL_VAR nb_bytes>),
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 human_sec(<TMPL_VAR volretention>),
 human_sec(<TMPL_VAR voluseduration>),
 "<TMPL_VAR maxvoljobs>"
@@ -80,7 +80,7 @@ nrsTable.setup(
 }
 );
 
-var header = new Array( "Nb montages", "Nb de recyclage", "Temps de lecture", "Temp d'écriture", "Erreurs");
+var header = new Array( "Vol Mounts", "Recycle count", "Read time", "Write time", "Errors");
 
 var data = new Array();
 data.push( new Array(
@@ -110,8 +110,8 @@ nrsTable.setup(
 );
 
 
-var header = new Array("JobId","Nom","Début","Type",
-	               "Niveau","Fichiers","Taille","Statut");
+var header = new Array("JobId","Name","Start Time","Type",
+	               "Level","Files","Bytes","Status");
 
 var data = new Array();
 var a;
diff --git a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
index e65922ff59..ef7d51f3c8 100644
--- a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
@@ -1,25 +1,25 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Assistant d'externalisation de médias (partie 2/2)</h1>
+  <h1 class='newstitle'>Help to eject media (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
-  Maintenant, vous devez vérifier la sélection et éjecter les médias.
+  Now, you can verify the selection and eject the media.
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Précédent'> <img src='/bweb/prev.png' alt=''>Précédent</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
-    <button type="submit" class="bp" name='action' value='extern' title='Externaliser la selection'> <img src='/bweb/extern.png' alt=''>Externaliser</button>
+    <button type="submit" class="bp" name='action' value='extern' title='Eject selection'> <img src='/bweb/extern.png' alt=''>Eject</button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom de volume","Vol Statut",
-                       "Type","Nom du Pool","Dernière écriture", 
-                       "Expiration", "Sélection");
+var header = new Array("Volume Name","Vol Status",
+                       "Media Type","Pool Name","Last Written", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
@@ -37,7 +37,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
index 852da1cd3a..a3c29409ab 100644
--- a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
@@ -1,14 +1,14 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Assistant d'internalisation de médias (partie 2/2)</h1>
+  <h1 class='newstitle'>Help to load media (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
-  Maintenant vous devez vérifier la sélection et charger les médias.
+  Now, you can verify the selection and load the media.
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Précédent'> <img src='/bweb/prev.png' alt=''>Précédent</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
     </td><td style='align: right;'>
     <input type="hidden" name='enabled' value='yes'>
     <button type="submit" class="bp" name='action' value='move_media'> 
@@ -19,9 +19,9 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom de volume","Vol Statut",
-                       "Type","Nom du Pool","Dernière écriture", 
-                       "Expiration", "Sélection");
+var header = new Array("Volume Name","Vol Status",
+                       "Media Type","Pool Name","Last Written", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
@@ -39,7 +39,7 @@ data.push( new Array(
 "<TMPL_VAR mediatype>",
 "<TMPL_VAR name>",
 "<TMPL_VAR lastwritten>",
-"<TMPL_VAR expire>",
+timestamp_to_iso("<TMPL_VAR expire>"),
 chkbox
  )
 );
diff --git a/gui/bweb/lang/fr/tpl/run_job_mod.tpl b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
index e54840afa7..5c555c1a6e 100644
--- a/gui/bweb/lang/fr/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
@@ -1,12 +1,12 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Lancer le job : <TMPL_VAR job> sur <TMPL_VAR client></h1>
+  <h1 class='newstitle'> Run job: <TMPL_VAR job> on <TMPL_VAR client></h1>
  </div>
  <div class='bodydiv'>
   <form name='form1' action='?' method='GET'>  
   <table border='0'>
 
-   <tr><td>Nom du job : </td><td>
+   <tr><td>Job Name: </td><td>
    <select name='job'>
     <TMPL_LOOP jobs>
      <option value='<TMPL_VAR name>'>
@@ -14,7 +14,7 @@
      </option>
     </TMPL_LOOP>
    </select>
-   </td></tr><tr><td>Pool : </td><td>
+   </td></tr><tr><td>Pool: </td><td>
 
    <select name='pool'>	
      <option value=''></option>
@@ -24,7 +24,7 @@
      </option>
     </TMPL_LOOP>
    </select>
-   </td></tr><tr><td>Client : </td><td>
+   </td></tr><tr><td>Client: </td><td>
 
    <select name='client'>
     <TMPL_LOOP clients>
@@ -34,7 +34,7 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>FileSet : </td><td>
+   </td></tr><tr><td>FileSet: </td><td>
    <select name='fileset'>
     <TMPL_LOOP filesets>
      <option value='<TMPL_VAR name>'>
@@ -43,7 +43,7 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Storage : </td><td>
+   </td></tr><tr><td>Storage: </td><td>
    <select name='storage'>
     <TMPL_LOOP storages>
      <option value='<TMPL_VAR name>'>
@@ -52,18 +52,22 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Niveau : </td><td>
+   </td></tr><tr><td>Level: </td><td>
    <select name='level'>
-     <option id='level_Incremental' value='Incremental'>Incr&eacute;mentale</option>
+     <option id='level_Incremental' value='Incremental'>Incremental</option>
      <option id='level_Full' value='Full'>Full</option>
-     <option id='level_Differential' value='Differential'>Diff&eacute;rentielle</option>
+     <option id='level_Differential' value='Differential'>Differential</option>
+     <option id='level_Base' value='Base'>Base</option>
    </select>
+   </td></tr><tr><td>Comment: </td><td>
+   <input type='text' title='Comment about this job'
+          size='17' name='comment' value='<TMPL_VAR comment>'>
 
-   </td></tr><tr id='more1' style="visibility:hidden"><td>Date de d&eacute;marrage : </td><td>
+   </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
    <input type='text' title='YYYY-MM-DD HH:MM:SS'
           size='17' name='when' value='<TMPL_VAR when>'>
 
-   </td></tr><tr id='more2' style="visibility:hidden"><td>Priorité : </td><td>
+   </td></tr><tr id='more2' style="visibility:hidden"><td>Priority: </td><td>
    <input type='text' 
           size='3' name='priority' value='<TMPL_VAR priority>'>
 
@@ -74,10 +78,10 @@
   <label onclick='
            document.getElementById("more1").style.visibility="visible";
            document.getElementById("more2").style.visibility="visible";'>
-  <img title="Display more options" src='/bweb/add.png'>Options</label>
+  <img title="Display more options" src='/bweb/add.png'>More options</label>
 
-  <button type="submit" class="bp" name='action' value='run_job_now' title='Run job'><img src='/bweb/R.png' alt=''>Lancer maintenant</button>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='Voir le fileset associé'><img src='/bweb/zoom.png' alt=''>Voir le fileset associé</button>
+  <button type="submit" class="bp" name='action' value='run_job_now' title='Run job'><img src='/bweb/R.png' alt=''>Run now</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'><img src='/bweb/zoom.png' alt=''>View FileSet</button>
   </form>
  </div>
 
diff --git a/gui/bweb/lang/fr/tpl/running_job.tpl b/gui/bweb/lang/fr/tpl/running_job.tpl
index 11cd1bdb69..51bce0cd0d 100644
--- a/gui/bweb/lang/fr/tpl/running_job.tpl
+++ b/gui/bweb/lang/fr/tpl/running_job.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Jobs en cours </h1>
+  <h1 class='newstitle'> Running Jobs </h1>
  </div>
  <div class='bodydiv'>
    <form action='?' method='GET'>
@@ -8,10 +8,10 @@
    <br/>
 <label>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
- title='Voir le job'> <img src='/bweb/zoom.png' alt=''>Voir</button>
+ title='View job'> <img src='/bweb/zoom.png' alt=''>View</button>
 <button type="submit" class="bp" type='submit' name='action' value='cancel_job'
- onclick="return confirm('Vous voulez vraiment annuler ce job ?')"
- title='Annuler le job'> <img src='/bweb/cancel.png' alt=''>Annuler</button>
+ onclick="return confirm('Do you want to cancel the selected job?')"
+ title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
    </form>
 
  </div>
@@ -19,14 +19,14 @@
 <script type="text/javascript" language="JavaScript">
 var header = new Array("JobId",
                        "Client",
-                       "Nom du Job", 
-                       "Niveau",
-                       "Début", 
-                       "Durée", 
+                       "Job Name", 
+                       "Level",
+                       "Start Time", 
+                       "Duration", 
 //                       "Job Files",
 //                       "Job Bytes", 
-                       "Statut",
-                       "Sélection"
+                       "Status",
+                       "Select"
         );
 
 var data = new Array();
@@ -54,7 +54,7 @@ data.push( new Array(
 "<TMPL_VAR JobName>",    
 joblevel['<TMPL_VAR Level>'],      
 "<TMPL_VAR StartTime>",
-"<TMPL_VAR duration>",
+human_sec2("<TMPL_VAR duration>"),
 //"<TMPL_VAR JobFiles>",   
 //"<TMPL_VAR JobBytes>",
 a,
diff --git a/gui/bweb/lang/fr/tpl/scheduled_job.tpl b/gui/bweb/lang/fr/tpl/scheduled_job.tpl
index c8f56cc1f7..43f873ddc8 100644
--- a/gui/bweb/lang/fr/tpl/scheduled_job.tpl
+++ b/gui/bweb/lang/fr/tpl/scheduled_job.tpl
@@ -1,21 +1,21 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Prochains jobs </TMPL_IF></h1>
+  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Next Jobs </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
-    <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
+    <form name='form1' action='?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <button type="submit" class="bp" name='action' title='Lancer maintenant' value='run_job_mod'>
-       <img src='/bweb/R.png' alt=''>  Lancer maintenant </button>
-      <button type="submit" class="bp" name='action' title='Désactiver' value='disable_job'>
-       <img src='/bweb/inflag0.png' alt=''> Désactiver </button>
-       <button type="submit" onsubmit='document.form1.level.value="all"' class="bp" name='action' value='job' title='voir <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Voir les jobs</button>
+     <button type="submit" class="bp" name='action' title='Run now' value='run_job_mod'>
+       <img src='/bweb/R.png' alt=''>  Run now </button>
+      <button type="submit" class="bp" name='action' title='Disable' value='disable_job'>
+       <img src='/bweb/inflag0.png' alt=''> Disable </button>
+       <button type="submit" onsubmit='document.form1.level.value="all"' class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
 <TMPL_IF missing_mode>
       <button type="submit" class="bp" name='action' title='Mark this job as canceled in job history' value='cancel_future_job'>
        <img src='/bweb/f.png' alt=''> Mark it as canceled </button>
 </TMPL_IF>
 <TMPL_IF wiki_url>
-       <a id='wiki' href="<TMPL_VAR wiki_url>" title='Documentation'><img src='/bweb/doc.png' alt='Documentation'></a>Documentation
+       <a id='wiki' href="<TMPL_VAR wiki_url>" title='View doc'><img src='/bweb/doc.png' alt='View doc'></a>View doc
 </TMPL_IF>
      <input type='hidden' name='pool' value=''>
      <input type='hidden' name='level' value=''>
@@ -27,13 +27,13 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Quand",
-                       "Niveau",
+var header = new Array("Scheduled",
+                       "Level",
 	               "Type",
-	               "Priorité", 
-                       "Nom",
+	               "Priority", 
+                       "Name",
                        "Volume",
-	               "Sélection");
+	               "Select");
 
 var data = new Array();
 var chkbox;
-- 
2.39.2