From bd557c60a1bda5397c89ef1cf3b27d53113159b1 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 23 Dec 2007 18:26:46 +0000
Subject: [PATCH] ebl  Update tpl files

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6116 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/lang/en/tpl/change_location.tpl      |   2 +-
 gui/bweb/lang/es/tpl/ach_add.tpl              |   7 +-
 gui/bweb/lang/es/tpl/ach_content.tpl          |  51 +--
 gui/bweb/lang/es/tpl/begin.tpl                |  20 +-
 gui/bweb/lang/es/tpl/change_location.tpl      |  18 +-
 gui/bweb/lang/es/tpl/client_job_status.tpl    |  12 +-
 gui/bweb/lang/es/tpl/client_list.tpl          |  37 +-
 gui/bweb/lang/es/tpl/config_edit.tpl          |  27 +-
 gui/bweb/lang/es/tpl/config_view.tpl          |  45 +-
 gui/bweb/lang/es/tpl/display_client_stats.tpl |  13 +-
 gui/bweb/lang/es/tpl/display_form_job.tpl     |  54 ++-
 gui/bweb/lang/es/tpl/display_form_media.tpl   |  19 +-
 gui/bweb/lang/es/tpl/display_groups.tpl       |  25 +-
 gui/bweb/lang/es/tpl/display_job.tpl          |   8 +-
 gui/bweb/lang/es/tpl/display_job_group.tpl    |   8 +-
 gui/bweb/lang/es/tpl/display_job_zoom.tpl     |  71 ++-
 gui/bweb/lang/es/tpl/display_location.tpl     |  11 +-
 gui/bweb/lang/es/tpl/display_log.tpl          |   2 +-
 gui/bweb/lang/es/tpl/display_media.tpl        |  22 +-
 gui/bweb/lang/es/tpl/display_media_zoom.tpl   |  22 +-
 gui/bweb/lang/es/tpl/display_pool.tpl         |  29 +-
 gui/bweb/lang/es/tpl/error.tpl                |   2 +-
 gui/bweb/lang/es/tpl/general.tpl              |   6 +-
 gui/bweb/lang/es/tpl/graph.tpl                |  37 +-
 gui/bweb/lang/es/tpl/groups_edit.tpl          |   6 +-
 gui/bweb/lang/es/tpl/help_extern.tpl          |  19 +-
 gui/bweb/lang/es/tpl/help_extern_compute.tpl  |  28 +-
 gui/bweb/lang/es/tpl/help_intern.tpl          |   8 +-
 gui/bweb/lang/es/tpl/help_intern_compute.tpl  |  31 +-
 gui/bweb/lang/es/tpl/location_add.tpl         |  17 +-
 gui/bweb/lang/es/tpl/location_edit.tpl        |   9 +-
 gui/bweb/lang/es/tpl/move_media.tpl           |  24 +-
 gui/bweb/lang/es/tpl/run_job.tpl              |  16 +-
 gui/bweb/lang/es/tpl/run_job_mod.tpl          |  22 +-
 gui/bweb/lang/es/tpl/running_job.tpl          |  51 +--
 gui/bweb/lang/es/tpl/scheduled_job.tpl        |  24 +-
 gui/bweb/lang/es/tpl/update_location.tpl      |  20 +-
 gui/bweb/lang/es/tpl/update_media.tpl         |  38 +-
 gui/bweb/lang/fr/fr.pl                        | 431 ------------------
 gui/bweb/lang/fr/tpl/ach_add.tpl              |  10 +-
 gui/bweb/lang/fr/tpl/ach_content.tpl          |  49 +-
 gui/bweb/lang/fr/tpl/begin.tpl                |  26 +-
 gui/bweb/lang/fr/tpl/change_location.tpl      |  21 +-
 gui/bweb/lang/fr/tpl/client_job_status.tpl    |  11 +-
 gui/bweb/lang/fr/tpl/client_list.tpl          |  37 +-
 gui/bweb/lang/fr/tpl/config_edit.tpl          |  42 +-
 gui/bweb/lang/fr/tpl/config_view.tpl          |  39 +-
 gui/bweb/lang/fr/tpl/display_client_stats.tpl |  17 +-
 gui/bweb/lang/fr/tpl/display_form_job.tpl     |  63 ++-
 gui/bweb/lang/fr/tpl/display_form_media.tpl   |  15 +-
 gui/bweb/lang/fr/tpl/display_groups.tpl       |  21 +-
 gui/bweb/lang/fr/tpl/display_job.tpl          |   4 +-
 gui/bweb/lang/fr/tpl/display_job_group.tpl    |   2 +-
 gui/bweb/lang/fr/tpl/display_job_zoom.tpl     |  73 ++-
 gui/bweb/lang/fr/tpl/display_location.tpl     |  13 +-
 gui/bweb/lang/fr/tpl/display_media.tpl        |  18 +-
 gui/bweb/lang/fr/tpl/display_media_zoom.tpl   |  24 +-
 gui/bweb/lang/fr/tpl/display_pool.tpl         |  17 +-
 gui/bweb/lang/fr/tpl/error.tpl                |   2 +-
 gui/bweb/lang/fr/tpl/fileset_view.tpl         |   2 +-
 gui/bweb/lang/fr/tpl/fv_file_attribs.tpl      |  10 +-
 gui/bweb/lang/fr/tpl/graph.tpl                |  51 ++-
 gui/bweb/lang/fr/tpl/groups_edit.tpl          |   6 +-
 gui/bweb/lang/fr/tpl/help_extern.tpl          |  20 +-
 gui/bweb/lang/fr/tpl/help_extern_compute.tpl  |  26 +-
 gui/bweb/lang/fr/tpl/help_intern.tpl          |  13 +-
 gui/bweb/lang/fr/tpl/help_intern_compute.tpl  |  29 +-
 gui/bweb/lang/fr/tpl/location_add.tpl         |  15 +-
 gui/bweb/lang/fr/tpl/location_edit.tpl        |  13 +-
 gui/bweb/lang/fr/tpl/move_media.tpl           |  27 +-
 gui/bweb/lang/fr/tpl/run_job.tpl              |  16 +-
 gui/bweb/lang/fr/tpl/run_job_mod.tpl          |  24 +-
 gui/bweb/lang/fr/tpl/running_job.tpl          |  51 +--
 gui/bweb/lang/fr/tpl/scheduled_job.tpl        |  22 +-
 gui/bweb/lang/fr/tpl/update_location.tpl      |  18 +-
 gui/bweb/lang/fr/tpl/update_media.tpl         |  29 +-
 gui/bweb/po/es.po                             |   5 +-
 gui/bweb/tpl/display_user.tpl                 |   9 +
 78 files changed, 882 insertions(+), 1300 deletions(-)
 delete mode 100644 gui/bweb/lang/fr/fr.pl

diff --git a/gui/bweb/lang/en/tpl/change_location.tpl b/gui/bweb/lang/en/tpl/change_location.tpl
index 45e2bea177..b48051d7d0 100644
--- a/gui/bweb/lang/en/tpl/change_location.tpl
+++ b/gui/bweb/lang/en/tpl/change_location.tpl
@@ -11,7 +11,7 @@
 <tr>
 <td><b>To: </b></td><td><input class='formulaire' name='email' value='<TMPL_VAR email>'></td>
 </tr><tr>
-<td><b>Subject: </b></td><td><input class='formulaire' name='subject' value='__[BACULA] Move media to__ <TMPL_VAR newlocation>' size='80'></td>
+<td><b>Subject: </b></td><td><input class='formulaire' name='subject' value='[BACULA] Move media to <TMPL_VAR newlocation>' size='80'></td>
 </tr><tr>
 <td></td>
 <td>
diff --git a/gui/bweb/lang/es/tpl/ach_add.tpl b/gui/bweb/lang/es/tpl/ach_add.tpl
index ddf03a2645..0da8b618ee 100644
--- a/gui/bweb/lang/es/tpl/ach_add.tpl
+++ b/gui/bweb/lang/es/tpl/ach_add.tpl
@@ -16,7 +16,7 @@
      </tr>
      <tr><td>Pre-comando :</td> 
          <td> <input class="formulaire" type='text' id='precmd' value='sudo'
-           title='can be "sudo" or "ssh storage@storagehost"...' name='precmd'>
+           title='can be "sudo" or "ssh storage\@storagehost"...' name='precmd'>
          </td>
      </tr>
      <tr><td>Comando mtx :</td> 
@@ -35,14 +35,15 @@
      <td><input class='formulaire' type='checkbox' id='drive_<TMPL_VAR name>'
                 name='drives' value='<TMPL_VAR name>'><TMPL_VAR name>
      </td>
-     <td>index <input type='text' title='drive index' class='formulaire'
+     <td>index <input type='text' title='drive index' 
+                class='formulaire'
 		id='index_<TMPL_VAR name>' value='' 
                 name='index_<TMPL_VAR name>' size='3'>
      </td>
     </tr>
     </TMPL_LOOP>
     </table>
-    <input type="image" name='action' value='ach_add' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='ach_add'> <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/es/tpl/ach_content.tpl b/gui/bweb/lang/es/tpl/ach_content.tpl
index 63e61f5233..228cfa010b 100644
--- a/gui/bweb/lang/es/tpl/ach_content.tpl
+++ b/gui/bweb/lang/es/tpl/ach_content.tpl
@@ -18,38 +18,21 @@ Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
      Tools
     </div>
     <div class='otherbox'>
-<label>
-<input type="image" name='action' value='label_barcodes'
-        title='run label barcodes' src='/bweb/label.png'>Label
-</label>
+<button type="submit" class="bp" name='action' value='label_barcodes'
+ title='run label barcodes'><img src='/bweb/label.png' alt=''>Label</button>
 <TMPL_IF nb_io>
-<label>
-<input type="image" name='action' value='eject'
-        title='put selected media on i/o' src='/bweb/extern.png'>
-Exportar
-</label>
-<label>
-<input type="image" name='action' value='clear_io'
-        title='Clear i/o' src='/bweb/intern.png'>
-Limpiar I/O
-</label>
+<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>
 </TMPL_IF>
-<label>
-<input type="image" name='action' value='update_slots'
-        title='run update slots' src='/bweb/update.png'>
-Actualizar
-</label>
+<button type="submit" class="bp" name='action' value='update_slots'
+ title='run update slots'> <img src='/bweb/update.png' alt=''>Actualizar</button>
 <br/><br/>
-<label>
-<input type="image" name='action' value='ach_load'
-	title='mount drive' src='/bweb/load.png'>
-Montar
-</label>
-<label>
-<input type="image" name='action' value='ach_unload'
-	title='umount drive' src='/bweb/unload.png'>
-Desmontar
-</label>
+<button type="submit" class="bp" name='action' value='ach_load'
+ title='mount drive'> <img src='/bweb/load.png' alt=''>Mount</button>
+<button type="submit" class="bp" name='action' value='ach_unload'
+ title='umount drive'> <img src='/bweb/unload.png' alt=''>Umount</button>
 
    </div>
     <td width='200'/>
@@ -66,9 +49,10 @@ Desmontar
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Slot Real", "Slot", "Nombre Volumen","Bytes Vol","Estado Vol",
-	               "Tipo Medio","Nombre Pool","Fecha Escritura", 
-                       "Expiración", "Selección");
+var header = new Array("Slot Real", "Slot", "Nombre Volumen",
+		       "Bytes Vol","Vol Status",
+	               "Tipo Medio","Pool Name","Fecha Escritura", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
@@ -116,7 +100,8 @@ nrsTable.setup(
 }
 );
 
-var header = new Array("Index", "Nombre Drive", "Nombre Volumen", "Selección");
+var header = new Array("Index", "Drive Name", 
+		       "Nombre Volumen", "Select");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/es/tpl/begin.tpl b/gui/bweb/lang/es/tpl/begin.tpl
index a476204a29..3ab9b02df6 100644
--- a/gui/bweb/lang/es/tpl/begin.tpl
+++ b/gui/bweb/lang/es/tpl/begin.tpl
@@ -23,13 +23,14 @@ if (navigator.appName == 'Konqueror') {
  <li><a href="bweb.pl?action=client">Clientes</a>
      <ul>
        <li><a href="bweb.pl?action=client">Clientes</a> </li>
-       <li><a href="bweb.pl?action=groups">Groups</a> </li>
+       <li><a href="bweb.pl?action=groups">Groupes</a> </li>
      </ul>
  </li>
- <li><a href="bweb.pl?action=run_job">Jobs</a>
+ <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=job_group">Jobs by group</a>
+     <li><a href="bweb.pl?action=overview">Jobs overview</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>
@@ -41,12 +42,13 @@ if (navigator.appName == 'Konqueror') {
      <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=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>
   </ul>
  </li>
 <TMPL_IF achs>
- <li style="padding: 0.25em 2em;">Libreria
+ <li style="padding: 0.25em 2em;">Autochanger
   <ul>
 <TMPL_LOOP achs>
    <li><a href="bweb.pl?action=ach_view;ach=<TMPL_VAR name>"><TMPL_VAR name></a></li>
@@ -57,21 +59,21 @@ if (navigator.appName == 'Konqueror') {
  <li><a href="bweb.pl?action=graph"> Estadísticas </a></li>
  <li> <a href="bweb.pl?action=view_conf"> Configuración </a> 
 <TMPL_IF enable_security>
-  <ul> <li> <a href="bweb.pl?action=view_conf"> Configuration </a> 
+  <ul> <li> <a href="bweb.pl?action=view_conf"> Configuración </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 style="padding: 0.25em 2em;float: right;">&nbsp;Usuario <TMPL_VAR NAME=loginname> </li>
  <li style="float: right;white-space: nowrap;">
-<input type="image" class="button" title="buscar medio" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="buscar cliente" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="buscar..." onclick="this.value='';" title="buscar por medio o cliente"></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> </button>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
- <input type="hidden" name="action" value="">
- <input type="hidden" name="re_media" value="">
- <input type="hidden" name="re_client" value="">
+ <input type="hidden" name="action" value=''>
+ <input type="hidden" name="re_media" value=''>
+ <input type="hidden" name="re_client" value=''>
 </form>
 
 <div style="clear: left;">
diff --git a/gui/bweb/lang/es/tpl/change_location.tpl b/gui/bweb/lang/es/tpl/change_location.tpl
index 58d3ae2659..060e1938fe 100644
--- a/gui/bweb/lang/es/tpl/change_location.tpl
+++ b/gui/bweb/lang/es/tpl/change_location.tpl
@@ -1,7 +1,7 @@
 <br/>
 <div class='titlediv'>
   <h1 class='newstitle'> 
-   Mover medio
+   Mover Medio
   </h1>
  </div>
  <div class='bodydiv'>
@@ -11,27 +11,27 @@
 <tr>
 <td><b>Para: </b></td><td><input class='formulaire' name='email' value='<TMPL_VAR email>'></td>
 </tr><tr>
-<td><b>Asunto: </b></td><td><input class='formulaire' name='subject' value='[BACULA] Mover medio a <TMPL_VAR newlocation>' size='80'></td>
+<td><b>Asunto: </b></td><td><input class='formulaire' name='subject' value='__[BACULA] Move media to__ <TMPL_VAR newlocation>' size='80'></td>
 </tr><tr>
 <td></td>
 <td>
 <textarea name='content' class='formulaire' cols='80' rows='32'>
-Estimado,
+Hi,
 
-Puede mover este medio a <TMPL_VAR newlocation>
-Medio :
+Could you move these media to <TMPL_VAR newlocation>
+Media :
 <TMPL_LOOP media>
  - <TMPL_VAR VolumeName>  (<TMPL_VAR location>)
 </TMPL_LOOP>
 
-Cuando finalice, puede actualizar la ubicacion del medio ? 
-(puede usar este link : <TMPL_VAR url>).
+When it's finish, could you update media location?
+(you can use this link: <TMPL_VAR url>).
 
-Gracias
+Thanks
 </textarea>
 </td></tr></table>
 <input class='formulaire' type='submit' name='action' value='move_email'>
 </form>
 <br>
-<a href="<TMPL_VAR url>"><img alt='update now' src='/bweb/update.png'>Actualizar Ahora</a>
+<a href="<TMPL_VAR url>"><img alt='Actualizar Ahora' src='/bweb/update.png'>Actualizar Ahora</a>
 </div>
diff --git a/gui/bweb/lang/es/tpl/client_job_status.tpl b/gui/bweb/lang/es/tpl/client_job_status.tpl
index ecd64e164c..b50a535f01 100644
--- a/gui/bweb/lang/es/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/es/tpl/client_job_status.tpl
@@ -1,7 +1,7 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-	Job ejecutándose <TMPL_VAR JobName> en <TMPL_VAR Client>
+	Job ejecutándose <TMPL_VAR JobName> on <TMPL_VAR Client>
   </h1>
  </div>
  <div class='bodydiv'>
@@ -24,13 +24,13 @@
  </tr>
 </table>
 <form name='form1' action='?' method='GET'>
-<input type="image" name='action' value='dsp_cur_job' 
- src='/bweb/update.png' title='refresh'>&nbsp;
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+> <img src='/bweb/update.png' title='Refresh' alt=''>Refresh</button>
 <input type='hidden' name='client' value='<TMPL_VAR Client>'>
 <input type='hidden' name='jobid' value='<TMPL_VAR JobId>'>
-<input type="image" name='action' value='cancel_job'
-       onclick="return confirm('Do you want to cancel this job ?')"
-        title='Cancel job' src='/bweb/cancel.png'>&nbsp;
+<button type="submit" class="bp" name='action' value='cancel_job'
+       onclick="return confirm('Do you want to cancel this job?')"
+        title='Cancelar job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
 </form>
  </div>
 
diff --git a/gui/bweb/lang/es/tpl/client_list.tpl b/gui/bweb/lang/es/tpl/client_list.tpl
index b200cf915a..ee35e44202 100644
--- a/gui/bweb/lang/es/tpl/client_list.tpl
+++ b/gui/bweb/lang/es/tpl/client_list.tpl
@@ -1,55 +1,50 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Clientes</h1>
+  <h1 class='newstitle'>Clientes</h1>
  </div>
  <div class='bodydiv'>
-<form action='?' method='GET'>
-     <table id='id<TMPL_VAR NAME=ID>'></table>
+<form name="client" action='?' method='GET'>
+     <table id='id<TMPL_VAR ID>'></table>
 	<div class="otherboxtitle">
           Acciones &nbsp;
         </div>
         <div class="otherbox">
 <!--        <h1>Acciones</h1> -->	
-       <label>
-       <input type="image" name='action' value='job' title='Mostrar últimos jobs' src='/bweb/zoom.png'>Últimos Jobs</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='dsp_cur_job' title='Mostrar job actual' src='/bweb/zoom.png'>Jobs Actuales</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_status' title='Mostrar estado del cliente' src='/bweb/zoom.png'>Estado</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_stats' title='Estadísticas del Cliente' src='/bweb/chart.png'>Estadísticas</label> &nbsp;
-       </label>
+       <button type="submit" class="bp" name='action' value='job' title="Mostrar últimos jobs"> <img src='/bweb/zoom.png' alt=''>Last jobs</button>
+       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Show current job'> <img src='/bweb/zoom.png' alt=''>Current jobs</button>
+       <button type="submit" class="bp" name='action' value='client_status' title='Mostrar estado del cliente'> <img src='/bweb/zoom.png' alt=''>Estado </button>
+       <button type="submit" class="bp" name='action' value='client_stats' title='Estadísticas del Cliente'> <img src='/bweb/chart.png' alt=''>Stats </button>
         </div>
 
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Nombre", "Selección", "Descripción", "Auto Prune", "Retención Archivos", "Retención Jobs");
+var header = new Array("Nombre", "Select", "Desc", "Auto Prune", "File Retention", "Job Retention");
 
 var data = new Array();
 var chkbox ;
 
-<TMPL_LOOP NAME=Clients>
+<TMPL_LOOP Clients>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'client';
-chkbox.value = '<TMPL_VAR NAME=Name>';
+chkbox.value = '<TMPL_VAR Name>';
 
 data.push( 
-  new Array( "<TMPL_VAR NAME=Name>", 
+  new Array( "<TMPL_VAR Name>", 
              chkbox,
-	     "<TMPL_VAR NAME=Uname>",
-	     "<TMPL_VAR NAME=AutoPrune>",
-	     human_sec(<TMPL_VAR NAME=FileRetention>),
-	     human_sec(<TMPL_VAR NAME=JobRetention>)
+	     "<TMPL_VAR Uname>",
+	     "<TMPL_VAR AutoPrune>",
+	     human_sec(<TMPL_VAR FileRetention>),
+	     human_sec(<TMPL_VAR JobRetention>)
               )
 ) ; 
 </TMPL_LOOP>
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
diff --git a/gui/bweb/lang/es/tpl/config_edit.tpl b/gui/bweb/lang/es/tpl/config_edit.tpl
index fde3b60149..0e09c4e59c 100644
--- a/gui/bweb/lang/es/tpl/config_edit.tpl
+++ b/gui/bweb/lang/es/tpl/config_edit.tpl
@@ -22,38 +22,41 @@
 
      <tr>  <td><b>Opciones Generales</b></td>  <td/></tr>
 
-     <tr><td>email_media :</td> 
+     <tr><td>email_media:</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR email_media>' name='email_media'> 
          </td></tr>
          </td></tr>
 
      <tr>  <td><b>Configuración Bweb</b></td>  <td/></tr>
 
-     <tr><td>graph_font :</td> 
+     <tr><td>graph_font:</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR graph_font>' size='64' name='graph_font'> 
          </td></tr>
-     <tr><td>template_dir :</td> 
+     <tr><td>template_dir:</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR template_dir>' size='64' name='template_dir'> 
          </td></tr>
-     <tr><td>fv_write_path :</td> 
+     <tr><td>fv_write_path:</td> 
          <td> <input class="formulaire" title="Este directorio debe tener permisos de escritura para el usuario apache y debe ser accesible en /bweb/fv" type='text' value='<TMPL_VAR fv_write_path>' size='64' name='fv_write_path'> 
+     <tr><td>stat_job_table:</td> 
+         <td> <input class="formulaire" title="You can choose the Job table that you want to use to get statistics" type='text' value='<TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF>' size='64' name='stat_job_table'> 
          </td></tr>
-     <tr><td>stat_job_table :</td> 
-         <td> <input class="formulaire" title="You can choose the Job table that you want to use to get statistics" type='text' value='<TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF>' size='64' name='stat_job_table'>
-     <tr><td>bconsole :</td> 
+     <tr><td>bconsole:</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
-     <tr><td>display_log_time :</td>
-         <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
+     <tr><td>wiki_url:</td> 
+         <td> <input class="formulaire" title="Use a wiki for jobs documentation?" size='64' type='text' name='wiki_url' value='<TMPL_VAR wiki_url>'> 
          </td></tr>
-     <tr><td>security :</td> 
+     <tr><td>display_log_time:</td> 
+         <td> <input class="formulaire" title="Display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
+         </td></tr>
+     <tr><td>security:</td> 
          <td> <input class="formulaire" type='checkbox' name='enable_security' title='Use user managment in bweb. Read INSTALL first' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>security acl:</td> 
          <td> <input class="formulaire" type='checkbox' name='enable_security_acl' title='Use user acl in bweb. Read INSTALL first' <TMPL_IF enable_security_acl> checked='checked' value='on' </TMPL_IF> > 
-     <tr><td>debug :</td> 
+     <tr><td>debug:</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
     </table>
-    <input type="image" name='action' value='apply_conf' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='apply_conf'> <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
diff --git a/gui/bweb/lang/es/tpl/config_view.tpl b/gui/bweb/lang/es/tpl/config_view.tpl
index dffc499e0e..92f9666465 100644
--- a/gui/bweb/lang/es/tpl/config_view.tpl
+++ b/gui/bweb/lang/es/tpl/config_view.tpl
@@ -4,25 +4,26 @@
 </div>
 <div class='bodydiv'>
    <table>
-    <tr>  <td><b>Conexión SQL</b></td>  <td/></tr>
+    <tr>  <td><b>SQL Connection</b></td>  <td/></tr>
     <tr><td>DBI :</td>      <td> <TMPL_VAR dbi>      </td></tr>
-    <tr><td>Ususario :</td>     <td> <TMPL_VAR user>     </td></tr>
+    <tr><td>Usuario :</td>     <td> <TMPL_VAR user>     </td></tr>
     <tr><td>Clave :</td> <td> xxxxx </td></tr>
     <tr>  <td><b>Opciones Generales</b></td>  <td/></tr>
-    <tr><td>email_media :</td> <td> <TMPL_VAR email_media> </td></tr>
+    <tr><td>email_media:</td> <td> <TMPL_VAR email_media> </td></tr>
     <tr>  <td><b>Configuración Bweb</b></td>  <td/></tr>
-    <tr><td>config_file :</td> <td> <TMPL_VAR config_file> </td></tr>
-    <tr><td title="/path/a/tu/template_dir">template_dir :</td> <td> <TMPL_VAR template_dir> </td></tr>
-    <tr><td title="/path/a/a/font.ttf">graph_font :</td> <td> <TMPL_VAR graph_font> </td></tr>
-    <tr><td title="Este directorio debe tener permisos de escritura para el usuario apache y debe ser accesible en /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
-    <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
-    <tr><td title="/path/a/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
-    <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
-    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
-    <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
-    <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
+    <tr><td>config_file:</td> <td> <TMPL_VAR config_file> </td></tr>
+    <tr><td title="/path/to/your/template_dir">template_dir:</td> <td> <TMPL_VAR template_dir> </td></tr>
+    <tr><td title="/path/to/a/font.ttf">graph_font:</td> <td> <TMPL_VAR graph_font> </td></tr>
+    <tr><td title="Este directorio debe tener permisos de escritura para el usuario apache y debe ser accesible en /bweb/fv">fv_write_path:</td> <td> <TMPL_VAR fv_write_path> </td></tr>
+    <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table:</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
+    <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole:</td> <td> <TMPL_VAR bconsole> </td></tr>
+    <tr><td title="use a wiki for jobs documentation?">wiki_url:</td> <td> <TMPL_VAR wiki_url> </td></tr>
+    <tr><td title="display timestamp in job log">display_log_time:</td> <td> <TMPL_VAR display_log_time> </td></tr>
+    <tr><td title="user managment">security:</td> <td> <TMPL_VAR enable_security> </td></tr>
+    <tr><td title="user filter">security acl:</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
+    <tr><td>borrar</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
-    <tr>  <td><b>Libreria</b></td>  <td/></tr>
+    <tr>  <td><b>Autochanger</b></td>  <td/></tr>
     <tr>
      <td>
      <form action='?' method='GET'>
@@ -39,9 +40,9 @@
     </table>
    <td>
   
-   <input type="image" name="action" value="ach_edit" title="editar" src='/bweb/edit.png'> 
-   <input type="image" name='action' value='ach_del' title='borrar' src='/bweb/remove.png'>
-   <input type='image' name='action' value='ach_view' title='ver' src='/bweb/zoom.png'>
+   <button type="submit" class="bp" name="action" value='ach_edit' title="Editar"> <img src='/bweb/edit.png' alt=''>Editar</button>
+   <button type="submit" class="bp" name='action' value='ach_del' title='Borrar'> <img src='/bweb/remove.png' alt=''>Borrar</button>
+   <button type="submit" class="bp" name='action' value='ach_view' title='Ver'> <img src='/bweb/zoom.png' alt=''>Ver</button>
     </form>
     </td>
    </tr>
@@ -52,15 +53,11 @@
   </table>
 
   <form action='?' method='GET'>
-   <label>
-   <input name='action' value='edit_conf' type="image" title='Edit' src='/bweb/edit.png'> Editar
-   </label>
-   <label>
-   <input name='action' value='ach_add' type="image" title='Add an autochanger' src='/bweb/add.png'> Agregar libreria
-   </label>
+   <button name='action' value='edit_conf' type="submit" class="bp" title='Editar'> <img src='/bweb/edit.png' alt=''>Editar</button>
+   <button name='action' value='ach_add' type="submit" class="bp" title='Agregar libreria'> <img src='/bweb/add.png' alt=''>Agregar libreria</button>
   </form>
 
   <TMPL_IF error>
-  info :  <TMPL_VAR error> </br>
+  info:  <TMPL_VAR error> </br>
   </TMPL_IF>
 </div>
diff --git a/gui/bweb/lang/es/tpl/display_client_stats.tpl b/gui/bweb/lang/es/tpl/display_client_stats.tpl
index c8b0b8f3f2..dc2a65cecc 100644
--- a/gui/bweb/lang/es/tpl/display_client_stats.tpl
+++ b/gui/bweb/lang/es/tpl/display_client_stats.tpl
@@ -3,20 +3,19 @@
   <h1 class='newstitle'> Cliente : <TMPL_VAR clientname> (<TMPL_VAR label>)</h1>
  </div>
  <div class='bodydiv'>
-<form action='?'
+<form action='?'>
      <table id='id<TMPL_VAR ID>'></table>
      <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_duration;age=2592000;width=420;height=200" alt='Not enough data' > &nbsp;
      <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_rate;age=2592000;width=420;height=200" alt='Not enough data'> &nbsp;
      <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_size;age=2592000;width=420;height=200" alt='Not enough data'> &nbsp;
 <!--	<div class="otherboxtitle">
-          Actions &nbsp;
+          Acciones &nbsp;
         </div>
         <div class="otherbox">
-       <h1>Acciones</h1> 
-       <input type="image" name='action' value='job' title='Mostrar último job'
-        src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='dsp_cur_job' title='Mostrar job actual' src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='client_stat' title='Estadísticas Cliente' src='/bweb/zoom.png'> &nbsp;
+       <h1>Actions</h1> 
+       <button type="submit" class="bp" name='action' value='job' title='Mostrar últimos jobs'> <img src='/bweb/zoom.png' alt=''>View last jobs</button>
+       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Show current job'> <img src='/bweb/zoom.png' alt=''>View current jobs</button>
+       <button type="submit" class="bp" name='action' value='client_stat' title='Estadísticas del Cliente'> <img src='/bweb/zoom.png' alt=''>Ver estadísticas</button>
         </div>
 -->
 </form>
diff --git a/gui/bweb/lang/es/tpl/display_form_job.tpl b/gui/bweb/lang/es/tpl/display_form_job.tpl
index fa49a45d48..8d1143a284 100644
--- a/gui/bweb/lang/es/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/es/tpl/display_form_job.tpl
@@ -25,7 +25,7 @@
       <option id='status_T'   value='T'>Ok</option>
       <option id='status_W'   value='W'>Warning</option>
       <option id='status_f'   value='f'>Error</option>
-      <option id='status_A'   value='A'>Cancelados</option>
+      <option id='status_A'   value='A'>Cancelado</option>
     </select>     
   </td>
 </tr>
@@ -43,19 +43,51 @@
   </td>
 </tr>
 </TMPL_IF>
+<TMPL_UNLESS hide_since>
 <tr>
   <td valign='top'>
     <h2>Tiempo</h2>
-    <select name='age' class='formulaire'>
+    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+     value='<TMPL_VAR since>' class='formulaire'>
+  </td>
+ </tr>
+<tr>
+  <td valign='top'>
+    <h2>Tiempo</h2>
+    <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
       <option id='age_604800'   value='604800'>Esta semana</option>
       <option id='age_2678400'  value='2678400'>Últimos 30 dias</option>
       <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
     </select>     
   </td>
  </tr>
+<TMPL_ELSE>
+<tr>
+  <td valign='top'>
+    <h2>Tiempo</h2>
+    <select name='age' class='formulaire'>
+      <option id='age_604800'   value='604800'>Esta Semana</option>
+      <option id='age_2678400'  value='2678400'>Últimos 30 días</option>
+      <option id='age_15552000' value='15552000'>Últimos 6 meses</option>
+    </select>     
+  </td>
+ </tr>
+</TMPL_UNLESS>
+<TMPL_IF view_time_slice>
+<tr>
+  <td valign='top'>
+    <h2>Time slice</h2>
+    <select name='type' class='formulaire'>
+      <option id='slice_day'   value='day'>Per days</option>
+      <option id='slice_week'  value='week'>Per weeks</option>
+      <option id='slice_month' value='month'>Per months</option>
+    </select>     
+  </td>
+ </tr>
+</TMPL_IF>
  <tr>
   <td valign='bottom'> 
-    <h2>Number of items</h2>
+    <h2>Número de items</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
@@ -99,7 +131,7 @@
 <!--
 <tr>
   <td valign='top'> 
-    <h2>FileSet</h2>
+    <h2>File Set</h2>
     <select name='fileset' size='15' class='formulaire' multiple>
 <TMPL_LOOP db_filesets>
       <option id='client_<TMPL_VAR fileset>'><TMPL_VAR fileset></option>
@@ -109,9 +141,9 @@
 </tr>
 -->
 </table>
-  <input type="image" name='action'
-         value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'
-         src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' 
+    value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'>
+     <img src='/bweb/update.png' alt=''> </button>
 
 </form>
 </div>
@@ -121,6 +153,10 @@
      document.getElementById('client_' + <TMPL_VAR name>).selected = true;
   </TMPL_LOOP>
 
+  <TMPL_LOOP qclient_groups>
+     document.getElementById('group_' + <TMPL_VAR name>).selected = true;
+  </TMPL_LOOP>
+
   <TMPL_IF status>
      document.getElementById('status_<TMPL_VAR status>').selected=true;
   </TMPL_IF>
@@ -133,6 +169,10 @@
      document.getElementById('age_<TMPL_VAR age>').selected=true;
   </TMPL_IF>
 
+  <TMPL_IF type>
+     document.getElementById('slice_<TMPL_VAR type>').selected=true;
+  </TMPL_IF>
+
   <TMPL_IF jobtype>
      document.getElementById('jobtype_<TMPL_VAR jobtype>').selected=true;
   </TMPL_IF>
diff --git a/gui/bweb/lang/es/tpl/display_form_media.tpl b/gui/bweb/lang/es/tpl/display_form_media.tpl
index 46e7f4f57c..be6f90cd72 100644
--- a/gui/bweb/lang/es/tpl/display_form_media.tpl
+++ b/gui/bweb/lang/es/tpl/display_form_media.tpl
@@ -9,7 +9,7 @@
     <h2>Tipo Medio</h2>
     <select name='mediatype' class='formulaire'>
       <option id='mediatype_all' value=''></option>
-<TMPL_LOOP NAME=db_mediatypes>
+<TMPL_LOOP db_mediatypes>
       <option id='mediatype_<TMPL_VAR mediatype>'><TMPL_VAR mediatype></option>
 </TMPL_LOOP>
     </select>     
@@ -20,7 +20,7 @@
     <h2>Ubicación</h2>
     <select name='location' class='formulaire'>
       <option id='location_all>' value=''></option>
-<TMPL_LOOP NAME=db_locations>
+<TMPL_LOOP db_locations>
       <option id='location_<TMPL_VAR location>'><TMPL_VAR location></option>
 </TMPL_LOOP>
     </select>     
@@ -31,11 +31,11 @@
     <h2>Estado</h2>
     <select name='volstatus' class='formulaire'>
       <option id='volstatus_All' value=''></option>
-      <option id='volstatus_Append' value='Append'>Abierta</option>
-      <option id='volstatus_Full'   value='Full'>Llena</option>
+      <option id='volstatus_Append' value='Append'>Append</option>
+      <option id='volstatus_Full'   value='Full'>Full</option>
       <option id='volstatus_Error'  value='Error'>Error</option>
-      <option id='volstatus_Used'   value='Used'>Usada</option>
-      <option id='volstatus_Purged' value='Purged'>Purgada</option>
+      <option id='volstatus_Used'   value='Used'>Used</option>
+      <option id='volstatus_Purged' value='Purged'>Purged</option>
       <option id='volstatus_Recycle' value='Recycle'>Recycle</option>
     </select>     
   </td>
@@ -45,7 +45,7 @@
     <h2>Pool</h2>
     <select name='pool' class='formulaire'>
       <option id='pool_all>' value=''></option>
-<TMPL_LOOP NAME=db_pools>
+<TMPL_LOOP db_pools>
       <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
     </select>     
@@ -65,17 +65,18 @@
     <input type='checkbox' name='expired' <TMPL_IF expired> checked </TMPL_IF> 
 	class='formulaire'>
   </td>
+</tr>
 </tr>
  <tr>
   <td valign='bottom'> 
-    <h2>Number of items</h2>
+    <h2>Número de items</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
 </tr>
 
 </table>
-  <input type="image" name='action' value='media' src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' value='media'> <img src='/bweb/update.png' alt=''>Actualizar</button>
 
 </form>
 </div>
diff --git a/gui/bweb/lang/es/tpl/display_groups.tpl b/gui/bweb/lang/es/tpl/display_groups.tpl
index e7021b50ca..d3ca7534ed 100644
--- a/gui/bweb/lang/es/tpl/display_groups.tpl
+++ b/gui/bweb/lang/es/tpl/display_groups.tpl
@@ -1,32 +1,29 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Groups</h1>
+  <h1 class='newstitle'>Groupes</h1>
  </div>
  <div class="bodydiv">
    <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' onclick='document.form1.reset()' value='groups_edit' title='Add' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='groups_del' 
-     onclick="return confirm('Do you want to delete this group ?');" 
-     title='Supprimer' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='groups_edit' title='Modify' src='/bweb/edit.png'>&nbsp;
+    <button type="submit" class="bp" name='action' onclick='document.form1.reset()' value='groups_edit' title='Add'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='groups_del' 
+     onclick="return confirm('Do you want to delete this group?');" 
+     title='Remove'> <img src='/bweb/remove.png' alt=''>Remove</button>
+    <button type="submit" class="bp" name='action' value='groups_edit' title='Modify'> <img src='/bweb/edit.png' alt=''>Editar</button>
 
-    <input type="image" name='action' value='client' title='View members'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='job' title='View jobs'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='group_stats' title='Estadísticas del groups' src='/bweb/chart.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='client' title='View members'> <img src='/bweb/zoom.png' alt=''>View members</button>
+    <button type="submit" class="bp" name='action' value='job' title='Ver jobs'> <img src='/bweb/zoom.png' alt=''>Ver jobs</button>
+    <button type="submit" class="bp" name='action' value='group_stats' title='Estadísticas'> <img src='/bweb/chart.png' alt=''>Ver estadísticas</button>
    </form>
    <form action='?' method='get'>
     <input type='hidden' name='action' value='client'>
-    <input type="image" name='notingroup' value='yes' title='View non-members'
-     src='/bweb/zoom.png'>&nbsp;
+    <button type="submit" class="bp" name='notingroup' value='yes' title='View non-members'> <img src='/bweb/zoom.png' alt=''>View others</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Name","Selection");
+var header = new Array("Nombre","Selection");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/es/tpl/display_job.tpl b/gui/bweb/lang/es/tpl/display_job.tpl
index 73d97abd30..6ac453c2fe 100644
--- a/gui/bweb/lang/es/tpl/display_job.tpl
+++ b/gui/bweb/lang/es/tpl/display_job.tpl
@@ -12,16 +12,16 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 
 
-var header = new Array("IdJob",
+var header = new Array("JobId",
 	               "Cliente",
 	               "Nombre Job", 
 		       "FileSet",
 //                     "Pool",
                        "Nivel",
                        "Inicio",
-	               "Duración",
-                       "Archivos Job",
-                       "Bytes Job", 
+	               "Archivos Job",
+                       "Bytes Job",
+                       "JobBytes", 
                        "Errores",
 	               "Estado");
 
diff --git a/gui/bweb/lang/es/tpl/display_job_group.tpl b/gui/bweb/lang/es/tpl/display_job_group.tpl
index cb39e97285..d1aff16161 100644
--- a/gui/bweb/lang/es/tpl/display_job_group.tpl
+++ b/gui/bweb/lang/es/tpl/display_job_group.tpl
@@ -17,10 +17,10 @@ var header = new Array("Group",
 	               "Nb Ok",
                        "Nb Err",
 	               "Nb Files", 
-		       "Size",
-		       "Duration",
-                       "Errors",
-	               "Status");
+		       "Tamaño",
+		       "Archivos Job",
+                       "Errores",
+	               "Estado");
 
 var data = new Array();
 var age = <TMPL_VAR age>;
diff --git a/gui/bweb/lang/es/tpl/display_job_zoom.tpl b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
index 3f72329a96..a82edc45c3 100644
--- a/gui/bweb/lang/es/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_job_zoom.tpl
@@ -4,99 +4,92 @@
  <div class="bodydiv">
  <table id='id0'></table>
  <table><td>
- <form action='bweb.pl?'>
+ <form name="delete" action='bweb.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <label>
-  <input type="image" name='action' value='delete' title='delete this job'
- onclick="return confirm('¿ Seguro quiere borrar este job del catálogo ?');"
-   src='/bweb/purge.png'> Borrar
-  </label>
+  <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>
  </form>
  </td><td>
- <form action='bweb.pl?'>
+ <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <label>
-  <input type="image" name='action' value='media' title='view media' 
-   src='/bweb/zoom.png'>Ver medio
-  </label>
+  <button type="submit" name='action' value='media' title='Ver medio' class="bp">
+   <img src='/bweb/zoom.png'alt=''>Ver medio</button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <label>
-  <input type="image" name='action' value='job' title='view <TMPL_VAR Client> jobs' src='/bweb/zoom.png'>Ver jobs
-  </label>
+  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Ver jobs</button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="graph" action='bweb.pl?'>
   <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>'>
-  <label>
-  <input type="image" name='action' value='graph' title='view trends'
-   src='/bweb/chart.png'> Ver estadísticas
-  </label>
+  <button type="submit" class="bp" name='action' value='graph' title='View trends'>
+   <img src='/bweb/chart.png' alt=''> Ver estadísticas </button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='view fileset'
-   src='/bweb/zoom.png'> Ver FileSet
-  </label>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='Ver FileSet'> 
+ <img src='/bweb/zoom.png' alt=''>Ver FileSet</button>
  </form>
  </td>
 <!-- Remove this to activate bfileview 
  <td>
- <form action='bfileview.pl?'>
+ <form name="bfileview" action='bfileview.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <input type='hidden' name='where' value='/'>
-  <label>
-  <input type="image" name='action' value='bfileview' title='view file usage'
-   src='/bweb/colorscm.png' onclick='if (<TMPL_VAR JobFiles> > 50000) { return confirm("Puede demorar, ¿ Seguro quiere continuar ?")} else { return 1; }'> Ver uso de archivos
-  </label>
+  <button type="submit" class="bp" name='action' value='bfileview' 
+   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='View doc'><img src='/bweb/doc.png' alt='View doc'></a>View doc
+ </td>
+</TMPL_IF>
  <td>
- <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+ <form name="rerun" action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
   <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
   <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
   <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
   <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>'>
-  <label>
-  <input type="image" name='action' value='run_job_mod' title='run this job again'
-   src='/bweb/R.png'> Run this job
-  </label>
+  <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="View only errors">
-    <img src='/bweb/doc.png' alt="view errors"></a> View only errors
+    <img src='/bweb/doc.png' alt="View errors"></a> View only errors
   </td>
 </TMPL_IF>
  </table>
 </div>
 
 <script type="text/javascript" language='JavaScript'>
-var header = new Array("IdJob",
+var header = new Array("JobId",
 	               "Cliente",
 	               "Nombre Job", 
 		       "FileSet",
                        "Nivel",
                        "Inicio", 
-	               "Duración",
-                       "Archivos Job",
+	               "Archivos Job",
                        "Bytes Job",
+                       "JobBytes",
                        "Errores",
 	               "Pool",
                        "Nombre Volumen",
diff --git a/gui/bweb/lang/es/tpl/display_location.tpl b/gui/bweb/lang/es/tpl/display_location.tpl
index 14c1d2f903..83e40312a3 100644
--- a/gui/bweb/lang/es/tpl/display_location.tpl
+++ b/gui/bweb/lang/es/tpl/display_location.tpl
@@ -5,18 +5,17 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' value='location_add' title='Agregar Ubicación' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='location_del' title='Remover Ubicación' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='location_edit' title='Editar Ubicación' src='/bweb/edit.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='location_add' title='Agregar Ubicación'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='location_del' onclick='confirm("Do you want to remove this location?")' title='Remove a location'> <img src='/bweb/remove.png' alt=''>Remove</button>
+    <button type="submit" class="bp" name='action' value='location_edit' title='Editar Ubicación'> <img src='/bweb/edit.png' alt=''>Editar</button>
 
-    <input type="image" name='action' value='media' title='Mostrar contenido'
-     src='/bweb/zoom.png'>
+    <button type="submit" class="bp" name='action' value='media' title='Mostrar contenido'> <img src='/bweb/zoom.png' alt=''>Mostrar contenido</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre","Activado", "Cost", "Nb volumes", "Selección");
+var header = new Array("Nombre","Enabled", "Cost", "Nb volumes", "Select");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/es/tpl/display_log.tpl b/gui/bweb/lang/es/tpl/display_log.tpl
index 22164090c0..f351c1a39e 100644
--- a/gui/bweb/lang/es/tpl/display_log.tpl
+++ b/gui/bweb/lang/es/tpl/display_log.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Log : <TMPL_VAR name> en <TMPL_VAR client> (<TMPL_VAR jobid>)</h1>
+  <h1 class='newstitle'> Log: <TMPL_VAR name> on <TMPL_VAR client> (<TMPL_VAR jobid>)</h1>
  </div>
  <div class='bodydiv'>
   <pre id='log'>
diff --git a/gui/bweb/lang/es/tpl/display_media.tpl b/gui/bweb/lang/es/tpl/display_media.tpl
index b19014e581..46fd4399d2 100644
--- a/gui/bweb/lang/es/tpl/display_media.tpl
+++ b/gui/bweb/lang/es/tpl/display_media.tpl
@@ -7,35 +7,35 @@
 
 <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>
-Location : <TMPL_VAR location>
+Ubicación : <TMPL_VAR location>
 </h2>
 </TMPL_IF>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <input type="image" name='action' value='extern' title='Move out' src='/bweb/extern.png' onclick='return confirm("¿Seguro quiere expulsar el medio seleccionado?");'>&nbsp;
-      <input type="image" name='action' value='intern' title='Move in' src='/bweb/intern.png'>&nbsp;
-      <input type="image" name='action' value='update_media' title='Update medium' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='media_zoom' title='Informations' src='/bweb/zoom.png'>&nbsp;
+      <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>
 <!--
-      <input type="image" name='action' value='purge' title='Purge' src='/bweb/purge.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' alt=''>Purge</button>
 -->
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>
+      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Online","Bytes Vol", "Uso Vol", "Estado Vol",
-		       "Pool", "Tipo Medio",
-		       "Fecha Escritura", "Expiración", "Selección");
+var header = new Array("Nombre Volumen","Online","Bytes Vol", "Vol Usage", "Vol Status",
+                       "Pool", "Tipo Medio",
+                       "Fecha Escritura", "When expire ?", "Select");
 
 var data = new Array();
 var img;
diff --git a/gui/bweb/lang/es/tpl/display_media_zoom.tpl b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
index d9ef11eb4f..2e4a2eaefe 100644
--- a/gui/bweb/lang/es/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/es/tpl/display_media_zoom.tpl
@@ -10,17 +10,17 @@
     <table id='id_media_<TMPL_VAR volumename>'></table>
     <b> Job List </b></br>
     <table id='id_jobs_<TMPL_VAR volumename>'></table>
-    <b> Actions </b></br>
+    <b> Acciones </b></br>
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
-      <input type="image" name='action' value='extern' onclick='return confirm("Do you want to eject this medium ?");' title='move out' src='/bweb/extern.png'>&nbsp;
+      <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>
-      <input type="image" name='action' value='intern' title='move in' src='/bweb/intern.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='intern' title='move in'> <img src='/bweb/intern.png' alt=''>Load</button>
 </TMPL_IF>
-      <input type="image" name='action' value='update_media' title='Update' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='purge' title='Purge' src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume ?')">&nbsp;
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>&nbsp;
+      <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='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='View location log' src='/bweb/zoom.png'></a>
 </TMPL_IF>
@@ -29,7 +29,7 @@
 </td>
 <td valign='top'style="visibility:hidden;" id='locationlog'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Location log </h1>
+  <h1 class='newstitle'>Location log </h1>
  </div>
  <div class='bodydiv'>
 <pre>
@@ -40,7 +40,7 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Enabled","Location","Vol Status", "Vol Bytes", "Expire",
+var header = new Array("Pool","Online","Enabled", "Ubicación","Vol Status", "Bytes Vol", "Expire",
 	               "Retention","Max use duration", "Max jobs" );
 
 var data = new Array();
@@ -80,7 +80,7 @@ nrsTable.setup(
 }
 );
 
-var header = new Array( "Vol Mounts", "Recycle count", "Read time", "Write time", "Errors");
+var header = new Array( "Vol Mounts", "Recycle count", "Read time", "Write time", "Errores");
 
 var data = new Array();
 data.push( new Array(
@@ -110,8 +110,8 @@ nrsTable.setup(
 );
 
 
-var header = new Array("IdJob","Nombre","Inicio","Tipo",
-	               "Nivel", "Archivos", "Bytes", "Estado");
+var header = new Array("JobId","Nombre","Start Time","Tipo",
+	               "Nivel","Files","Bytes","Estado");
 
 var data = new Array();
 var a;
diff --git a/gui/bweb/lang/es/tpl/display_pool.tpl b/gui/bweb/lang/es/tpl/display_pool.tpl
index 3540d268ca..e5833325e3 100644
--- a/gui/bweb/lang/es/tpl/display_pool.tpl
+++ b/gui/bweb/lang/es/tpl/display_pool.tpl
@@ -5,19 +5,18 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" type='submit' name='action' value='media' title='Mostrar contenido' src='/bweb/zoom.png'>
-    <input id="mediatype" type='hidden' name='mediatype' value="">
+    <button type="submit" class="bp" type='submit' name='action' value='media' title='Mostrar contenido'> <img src='/bweb/zoom.png' alt=''>Ver</button>
+    <input id="mediatype" type='hidden' name='mediatype' value=''>
    </form>
    <br/>
-   Nota: Para modificar las propiedades de un pool, se debe editar la configuración de Bacula
-   y aplicar el comando "reload", Luego se debe ejecutar "update pool=mypool" con la bconsole.
+   Tips: To modify pool properties, you have to edit your Bacula configuration and reload it. After, you have to run "update pool=mypool" with bconsole.
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre","Media Type","Reciclado","Retención","Use Duration",
-                       "Máx Jobs/Volumen","Máx Archivos/Volumen", 
-                       "Máx Tamaño/Volumen","Nb volumes", "Estado Volumen", "Uso", "Selección");
+var header = new Array("Nombre","Tipo Medio", "Recycle","Retention","Use Duration",
+                       "Max jobs per volume","Max files per volume", 
+                       "Max volume size","Nb volumes", "Vol Status", "Usage", "Select");
 
 var data = new Array();
 var chkbox;
@@ -27,15 +26,15 @@ var img2;
 <TMPL_LOOP Pools>
 
 img = percent_display([
-<TMPL_IF nb_recycle>{ name: "Reciclado", nb: <TMPL_VAR nb_recycle> },</TMPL_IF>
-<TMPL_IF nb_purged> { name: "Purgado", nb: <TMPL_VAR nb_purged> },</TMPL_IF>
-<TMPL_IF nb_append> { name: "Abierto", nb: <TMPL_VAR nb_append> },</TMPL_IF>
-<TMPL_IF nb_full>   { name: "Lleno", nb: <TMPL_VAR nb_full> },    </TMPL_IF>
-<TMPL_IF nb_disabled>   { name: "Disactivado", nb: <TMPL_VAR nb_disabled> },    </TMPL_IF>
+<TMPL_IF nb_recycle>{ name: "Recycle", nb: <TMPL_VAR nb_recycle> },</TMPL_IF>
+<TMPL_IF nb_purged> { name: "Purged", nb: <TMPL_VAR nb_purged> },</TMPL_IF>
+<TMPL_IF nb_append> { name: "Append", nb: <TMPL_VAR nb_append> },</TMPL_IF>
+<TMPL_IF nb_full>   { name: "Full", nb: <TMPL_VAR nb_full> },    </TMPL_IF>
+<TMPL_IF nb_disabled>   { name: "Disabled", nb: <TMPL_VAR nb_disabled> },    </TMPL_IF>
 <TMPL_IF nb_error>  { name: "Error", nb: <TMPL_VAR nb_error> },  </TMPL_IF>
-<TMPL_IF nb_archive>{ name: "Archivado", nb: <TMPL_VAR nb_archive> },</TMPL_IF>
-<TMPL_IF nb_used>   { name: "Usado", nb: <TMPL_VAR nb_used> },    </TMPL_IF>
-<TMPL_IF NAME='nb_read-only'> { name: "Lectura", nb: <TMPL_VAR NAME='nb_read-only'> }, </TMPL_IF>
+<TMPL_IF nb_archive>{ name: "Archive", nb: <TMPL_VAR nb_archive> },</TMPL_IF>
+<TMPL_IF nb_used>   { name: "Used", nb: <TMPL_VAR nb_used> },    </TMPL_IF>
+<TMPL_IF NAME='nb_read-only'> { name: "Read-Only", nb: <TMPL_VAR NAME='nb_read-only'> }, </TMPL_IF>
 {}
 ]);
 
diff --git a/gui/bweb/lang/es/tpl/error.tpl b/gui/bweb/lang/es/tpl/error.tpl
index 56ea6973e7..61f66eae66 100644
--- a/gui/bweb/lang/es/tpl/error.tpl
+++ b/gui/bweb/lang/es/tpl/error.tpl
@@ -1,4 +1,4 @@
 <h1>Un error ha ocurrido :</h1>
 <pre>
-<TMPL_VAR NAME=error>
+<TMPL_VAR error>
 </pre>
diff --git a/gui/bweb/lang/es/tpl/general.tpl b/gui/bweb/lang/es/tpl/general.tpl
index f8da969e54..489f3c2233 100644
--- a/gui/bweb/lang/es/tpl/general.tpl
+++ b/gui/bweb/lang/es/tpl/general.tpl
@@ -4,17 +4,17 @@ bweb_add_refresh();
 </script>
 <div class='titlediv'>
   <h1 class="newstitle">
-   Informaciones
+   Informations
   </h1>
 </div>
 <div class="bodydiv">
   <table>
-   <tr><td>Cantidad Clientes:</td>  <td> <TMPL_VAR nb_client> </td>
+   <tr><td>Cantidad Clientes:</td>      <td> <TMPL_VAR nb_client> </td>
        <td>Bytes Almacenados:</td> <td> <TMPL_VAR nb_bytes> </td>
        <td>Cantidad Medios:</td>        <td> <TMPL_VAR nb_media> </td>
    </tr>
    <tr><td>Tamaño Base de Datos:</td>      <td> <TMPL_VAR db_size> </td>
-       <td>Cantidad Pools:</td>         <td> <TMPL_VAR nb_pool> </td>
+       <td>Total Pool:</td>         <td> <TMPL_VAR nb_pool> </td>
        <td>Cantidad Jobs:</td>         <td> <TMPL_VAR nb_job> </td>
    </tr>
    <tr><td>Jobs fallados (<TMPL_VAR label>):</td> 
diff --git a/gui/bweb/lang/es/tpl/graph.tpl b/gui/bweb/lang/es/tpl/graph.tpl
index 7683901351..f30dbe0d0b 100644
--- a/gui/bweb/lang/es/tpl/graph.tpl
+++ b/gui/bweb/lang/es/tpl/graph.tpl
@@ -49,9 +49,9 @@
 </tr>
 <tr>
   <td valign='top'> 
-    <h2>Clients</h2>
+    <h2>Clientes</h2>
     <select name='client' size='15' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_clients>
+<TMPL_LOOP db_clients>
       <option id='client_<TMPL_VAR clientname>'><TMPL_VAR clientname></option>
 </TMPL_LOOP>
     </select>
@@ -59,8 +59,8 @@
   <td valign='top'> 
     <h2>Nombre Job</h2>
     <select name='jobname' size='15' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_jobnames>
-      <option><TMPL_VAR NAME=jobname></option>
+<TMPL_LOOP db_jobnames>
+      <option><TMPL_VAR jobname></option>
 </TMPL_LOOP>
     </select>
   </td>
@@ -68,12 +68,12 @@
 <tr>
   <td> <h2> Tipo </h2> 
  <select name='graph' class='formulaire'>
-   <option id='job_size'     value='job_size' title="Job size per job for the period">Tamaño Job</option>
-   <option id='job_duration' value='job_duration' title="Job duration per job for the period">Duración Job</option>
-   <option id='job_rate' value='job_rate' title="Job rate per job for the period">Velocidad Job</option>
+   <option id='job_size'     value='job_size' title="Job size per job for the period">Job Size</option>
+   <option id='job_duration' value='job_duration' title="Job duration per job for the period">Job Duration</option>
+   <option id='job_rate' value='job_rate' title="Job rate per job for the period">Job Rate</option>
    <option id='job_file' value='job_file' title="Number of backed files per job for the period">Archivos Job</option>
-   <option id='job_count_phour' value='job_count_phour' title="Number of jobs per hour for the period">Job por hora</option>
-   <option id='job_count_pday' value='job_count_pday' title="Number of jobs per day for the period">Job por dia</option>
+   <option id='job_count_phour' value='job_count_phour' title="Number of jobs per hour for the period">Job per hour</option>
+   <option id='job_count_pday' value='job_count_pday' title="Number of jobs per day for the period">Job per day</option>
    <option id='job_avg_phour' value='job_avg_pday' title="Average backup size per day for the period">Job avg B/hour</option>
    <option id='job_avg_pday' value='job_avg_pday' title="Average backup size per hour for the period">Job avg B/day</option>
    <option id='job_sum_phour' value='job_sum_phour' title="Job size per hour">Job total B/hour</option>
@@ -84,11 +84,14 @@
    <option id='job_avg_day' value='job_avg_day' title="Average backup size per day for the period">Job avg size (d)</option>
    <option id='job_sum_hour' value='job_sum_hour' title="Job size per hour for the period">Job Bytes (h)</option>
    <option id='job_sum_day' value='job_sum_day' title="Job size per day for the period">Job Bytes (d)</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_nb' value='job_time_nb' title="Display Job duration, size and files with balloons">Time,size,files</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_size' value='job_time_size' title="Display Job duration, files and size with balloons">Time,files,size</option>
+
  </select>
   </td>
   <td valign='bottom'> 
     <h2>Número de items</h2>
-    <input type='text' name='limit' value='<TMPL_VAR NAME=limit>' 
+    <input type='text' name='limit' value='<TMPL_VAR limit>' 
         class='formulaire' size='4'>
   </td>
 </tr>
@@ -96,13 +99,13 @@
 <td><h2> Tipo de Gráfico </h2> 
   <select name='gtype' class='formulaire'>
     <option id='gtype_bars' value='bars'>Barras</option>
-<!--  <option id='gtype_bars3d' value='bars3d'>Barras3d</option> -->
+<!--  <option id='gtype_bars3d' value='bars3d'>Bars3d</option> -->
     <option id='gtype_lines' value='lines'>Líneas</option>
+    <option onclick='document.getElementById("job_time_size").selected=true;' id='gtype_balloon' value='balloon'>Balloon</option>
     <option id='gtype_linespoints' value='linespoints'>Líneas y puntos</option>
 </td>
 <td>
-  <input type='hidden' name='action' value='graph'>
-  <input type='submit' name='_action' value='graficar' class='formulaire'> 
+  <input type='submit' name='action' value='graph' class='formulaire'> 
 </td>
 </tr>
 </table>
@@ -116,7 +119,9 @@
  Current &nbsp;
  </div>
  <div class="otherbox">
- <img src='bgraph.pl?<TMPL_VAR NAME=url>' alt='Nothing to display, Try a bigger date range'>
+
+ <img usemap='imggraph' id='imggraph' 
+      alt='Nothing to display, Try a bigger date range'>
  </div>
 
 </td>
@@ -169,4 +174,8 @@
      document.getElementById('gtype_<TMPL_VAR gtype>').selected=true;
   </TMPL_IF>
 
+  <TMPL_IF url>
+   document.getElementById('imggraph').src='bgraph.pl?<TMPL_VAR url>'
+  </TMPL_IF>
+
 </script>
diff --git a/gui/bweb/lang/es/tpl/groups_edit.tpl b/gui/bweb/lang/es/tpl/groups_edit.tpl
index 88a2612488..580972b4f0 100644
--- a/gui/bweb/lang/es/tpl/groups_edit.tpl
+++ b/gui/bweb/lang/es/tpl/groups_edit.tpl
@@ -11,7 +11,7 @@
           <input class="formulaire" type='text' value=<TMPL_VAR client_group> size='15' name='newgroup'> 
          </td>
      </tr>
-     <tr><td>Clients :</td> 
+     <tr><td>Clients:</td> 
          <td>
             <select name='client' size='15' class='formulaire' multiple>
             <TMPL_LOOP db_clients>
@@ -21,8 +21,8 @@
          </td>
      </tr>
     </table>
-    <input type="image" name='action' value='groups_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='groups_save'>
+     <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/es/tpl/help_extern.tpl b/gui/bweb/lang/es/tpl/help_extern.tpl
index 96953c089c..4a0e138315 100644
--- a/gui/bweb/lang/es/tpl/help_extern.tpl
+++ b/gui/bweb/lang/es/tpl/help_extern.tpl
@@ -1,15 +1,14 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Ayuda para expulsar medios (part 1/2)</h1>
+ <h1 class='newstitle'>Ayuda para expulsar medios (part 1/2)</h1>
 </div>
 <div class='bodydiv'>
-Se seleccionará el mejor candidato para expulsar. Se le pedirá
-realizar su selección en la próxima pantalla.
+Se seleccionará el mejor candidato para expulsar. Se le pedirá realizar su selección en la próxima pantalla.
   <form action="?" method='GET'>
    <table>
     <tr><td>Pool:</td>      
         <td><select name='pool' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_pools>
+<TMPL_LOOP db_pools>
              <option selected><TMPL_VAR NAME=name></option>
 </TMPL_LOOP>
            </select>
@@ -17,27 +16,27 @@ realizar su selecci
     </tr>
     <tr><td>Tipo Medio:</td>      
         <td><select name='mediatype' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_mediatypes>
-             <option><TMPL_VAR NAME=mediatype></option>
+<TMPL_LOOP db_mediatypes>
+             <option><TMPL_VAR mediatype></option>
 </TMPL_LOOP>
            </select>
         </td>
     </tr>
     <tr><td> Ubicación : </td>
         <td><select name='location' class='formulaire'>
-  <TMPL_LOOP NAME=db_locations>
-      <option id='loc_<TMPL_VAR NAME=location>' value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+  <TMPL_LOOP db_locations>
+      <option id='loc_<TMPL_VAR location>' value='<TMPL_VAR location>'><TMPL_VAR location></option>
   </TMPL_LOOP>
     </select>
         </td>
     </tr>
     <tr>
-        <td>Número de medio <br/> a expulsar:</td> 
+        <td>Number of media <br/> to eject:</td> 
         <td> <input type='text' name='limit' size='3' class='formulaire' 
               value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_extern_media' title='Siguiente' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_extern_media' title='Siguiente'> <img src='/bweb/next.png' alt=''>Siguiente</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/lang/es/tpl/help_extern_compute.tpl b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
index 2b94db3266..9be659d747 100644
--- a/gui/bweb/lang/es/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_extern_compute.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Ayuda para expulsar medios (part 2/2)</h1>
+  <h1 class='newstitle'>Ayuda para expulsar medios (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
   Ahora puede verificar la selección y expulsar el medio.
@@ -8,36 +8,36 @@
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Volver' src='/bweb/prev.png'>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Volver'> <img src='/bweb/prev.png' alt=''>Volver</button>
     </td><td style='align: right;'>
-    <input type="image" name='action' value='extern' src='/bweb/extern.png' title='Expulsar selección'>
+    <button type="submit" class="bp" name='action' value='extern' title='Expulsar selección'> <img src='/bweb/extern.png' alt=''>Eject</button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Estado Volumen",
-                       "Tipo Medio","Nombre Pool","Fecha Escritura", 
-                       "Expiración", "Selección");
+var header = new Array("Nombre Volumen","Vol Status",
+                       "Tipo Medio","Pool Name","Fecha Escritura", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
-chkbox.value = '<TMPL_VAR NAME=volumename>';
+chkbox.value = '<TMPL_VAR volumename>';
 chkbox.name  = 'media';
 chkbox.checked = 'on';
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=volstatus>",
-"<TMPL_VAR NAME=mediatype>",
-"<TMPL_VAR NAME=name>",
-"<TMPL_VAR NAME=lastwritten>",
-"<TMPL_VAR NAME=expire>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR volstatus>",
+"<TMPL_VAR mediatype>",
+"<TMPL_VAR name>",
+"<TMPL_VAR lastwritten>",
+"<TMPL_VAR expire>",
 chkbox
  )
 );
diff --git a/gui/bweb/lang/es/tpl/help_intern.tpl b/gui/bweb/lang/es/tpl/help_intern.tpl
index 10fa6a1423..e1dc594920 100644
--- a/gui/bweb/lang/es/tpl/help_intern.tpl
+++ b/gui/bweb/lang/es/tpl/help_intern.tpl
@@ -3,8 +3,7 @@
   <h1 class='newstitle'> Ayuda para cargar medios (part 1/2)</h1>
 </div>
 <div class="bodydiv">
-Se seleccionará el mejor candidato para cargar. Se le pedirá
-realizar su selección en la próxima pantalla.
+Se seleccionará el mejor candidato para cargar. Se le pedirá realizar su selección en la próxima pantalla.
   <form action="?" method='GET'>
    <table>
     <tr><td>Pool:</td>      
@@ -38,13 +37,12 @@ realizar su selecci
                 checked> </td>
     </tr>
     <tr>
-        <td>Número de medio <br/> a cargar:</td> 
+        <td>Number of media <br/> to load:</td> 
         <td> <input type='text' name='limit' class='formulaire' 
                 size='3' value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_intern_media' 
-                title='Siguiente' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_intern_media' title='Siguiente'> <img src='/bweb/next.png' alt=''>Siguiente</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/lang/es/tpl/help_intern_compute.tpl b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
index c0731afb92..8cfd46640d 100644
--- a/gui/bweb/lang/es/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/es/tpl/help_intern_compute.tpl
@@ -1,26 +1,27 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Ayuda para cargar medios (part 2/2)</h1>
+  <h1 class='newstitle'>Ayuda para cargar medios (part 2/2)</h1>
  </div>
  <div class='bodydiv'>
-  Ahora puede verificar la selección y cargar el medio
+  Ahora puede verificar la selección y cargar el medio cargar selección
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Volver' src='/bweb/prev.png'>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Volver'> <img src='/bweb/prev.png' alt=''>Volver</button>
     </td><td style='align: right;'>
-    <input type="hidden" name='enabled' value="yes">
-    <input type="image" name='action' value='move_media' title='Cargar selección' src='/bweb/intern.png'>
+    <input type="hidden" name='enabled' value='yes'>
+    <button type="submit" class="bp" name='action' value='move_media'> 
+     <img src='/bweb/intern.png' alt=''></button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen","Estado Volumen",
-                       "Tipo de Medio","Nombre Pool","Fecha Escritura", 
-                       "Expiración", "Selección");
+var header = new Array("Nombre Volumen","Vol Status",
+                       "Tipo Medio","Pool Name","Fecha Escritura", 
+                       "When expire ?", "Select");
 
 var data = new Array();
 var chkbox;
@@ -29,16 +30,16 @@ var chkbox;
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'media';
-chkbox.value= '<TMPL_VAR NAME=volumename>';
+chkbox.value= '<TMPL_VAR volumename>';
 chkbox.checked = 'on';
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=volstatus>",
-"<TMPL_VAR NAME=mediatype>",
-"<TMPL_VAR NAME=name>",
-"<TMPL_VAR NAME=lastwritten>",
-"<TMPL_VAR NAME=expire>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR volstatus>",
+"<TMPL_VAR mediatype>",
+"<TMPL_VAR name>",
+"<TMPL_VAR lastwritten>",
+"<TMPL_VAR expire>",
 chkbox
  )
 );
diff --git a/gui/bweb/lang/es/tpl/location_add.tpl b/gui/bweb/lang/es/tpl/location_add.tpl
index 7b5ab200e4..2d8f8ef2d8 100644
--- a/gui/bweb/lang/es/tpl/location_add.tpl
+++ b/gui/bweb/lang/es/tpl/location_add.tpl
@@ -14,15 +14,18 @@
          <td> <input class="formulaire" type='text' value='10' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Activado :</td> 
-         <td> <input class="formulaire" type='checkbox' value='10' name='enabled'>
-         </td>
-     </tr>
+    <tr><td>Activado :</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>yes</option>
+           <option value='no'>no</option>
+           <option value='archived'>archived</option>
+           </select>
+        </td>
+    </tr>
     </table>
-    <input type="image" name='action' value='location_add' title="save"
-      src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_add' title="Save" ><img src='/bweb/save.png' alt=''>Save</button>
    </form>
 
-Tips: It's a good idea to have a location per autochanger. 
+Tips: It's a good idea to have a location per autochanger.
 
 </div>
diff --git a/gui/bweb/lang/es/tpl/location_edit.tpl b/gui/bweb/lang/es/tpl/location_edit.tpl
index 16cdde2ef3..4cc3ba0949 100644
--- a/gui/bweb/lang/es/tpl/location_edit.tpl
+++ b/gui/bweb/lang/es/tpl/location_edit.tpl
@@ -15,19 +15,20 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>Activado :</td> 
+    <tr><td>Activado :</td>
         <td> <select name='enabled' class='formulaire'>
            <option value='yes'>yes</option>
            <option value='no'>no</option>
            <option value='archived'>archived</option>
            </select>
         </td>
-     </tr>
+    </tr>
     </table>
-    <input type="image" name='action' value='location_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_save'>
+      <img src='/bweb/save.png' alt=''>Save</button>
    </form>
 </div>
+
 <script type="text/javascript" language='JavaScript'>
 ok=1;
 for (var i=0; ok && i < document.form1.enabled.length; ++i) {
diff --git a/gui/bweb/lang/es/tpl/move_media.tpl b/gui/bweb/lang/es/tpl/move_media.tpl
index 00c0bb99c9..f0171b1637 100644
--- a/gui/bweb/lang/es/tpl/move_media.tpl
+++ b/gui/bweb/lang/es/tpl/move_media.tpl
@@ -4,15 +4,15 @@
  </div>
  <div class="bodydiv">
    <form name='form1' action='?' method='get'>
-    <table id='id<TMPL_VAR NAME=ID>'></table>
+    <table id='id<TMPL_VAR ID>'></table>
     <table border='0'>
     <tr><td> Nueva Ubicación: </td><td>
 <select name='newlocation' class='formulaire'>
-    <TMPL_LOOP NAME=db_locations>
-    <option value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+    <TMPL_LOOP db_locations>
+    <option value='<TMPL_VAR location>'><TMPL_VAR location></option>
     </TMPL_LOOP>
 </select>
-    </td></tr><tr><td> Enabled: </td><td>
+    </td></tr><tr><td> Activado : </td><td>
 <select name='enabled' class='formulaire'>
     <option value='no'>no</option>
     <option value='yes'>yes</option>
@@ -25,29 +25,27 @@
 <textarea name="comment" class='formulaire'></textarea>
     </td></tr>
     </table>
-    <label>
-    <input type="image" type='submit' name='action' value='change_location' src='/bweb/apply.png'> Mover
-    </label>
+    <button type="submit" class="bp" type='submit' name='action' value='change_location'> <img src='/bweb/apply.png' alt=''> Mover </button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre Volumen", "Ubicación", "Selección");
+var header = new Array("Nombre Volumen", "Ubicación", "Select");
 
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
-chkbox.value = '<TMPL_VAR name=volumename>';
+chkbox.value = '<TMPL_VAR volumename>';
 chkbox.name  = 'media';
 chkbox.checked = 1;
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=location>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR location>",
 chkbox
  )
 );
@@ -55,7 +53,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
diff --git a/gui/bweb/lang/es/tpl/run_job.tpl b/gui/bweb/lang/es/tpl/run_job.tpl
index f0692e4331..a14d0a6074 100644
--- a/gui/bweb/lang/es/tpl/run_job.tpl
+++ b/gui/bweb/lang/es/tpl/run_job.tpl
@@ -17,17 +17,9 @@
    </td></tr>
    </table>
    <br/>
-   <label>
-   <input type="image" name='action' value='enable_job' title='Activar'
-    src='/bweb/inflag1.png'> Activado
-   </label>
-   <label>
-   <input type="image" name='action' value='disable_job' title='Desactivar'
-    src='/bweb/inflag0.png'> Desactivado
-   </label>
-   <label>
-   <input type="image" name='action' value='run_job_mod' title='Ejecutar Ahora'
-    src='/bweb/R.png'> Ejecutar Ahora
-   </label>
+   <button type="submit" class="bp" name='action' value='enable_job' title='Activar'> <img src='/bweb/inflag1.png' alt=''> Activar </button>
+   <button type="submit" class="bp" name='action' value='disable_job' title='Desactivar' > <img src='/bweb/inflag0.png' alt=''> Desactivar </button>
+   <button type="submit" class="bp" name='action' value='next_job2' title='Show schedule' > <img src='/bweb/zoom.png' alt=''> Show schedule  </button>
+   <button type="submit" class="bp" name='action' value='run_job_mod' title='Ejecutar Ahora' > <img src='/bweb/R.png' alt=''> Ejecutar Ahora  </button>
   </form>
  </div>
diff --git a/gui/bweb/lang/es/tpl/run_job_mod.tpl b/gui/bweb/lang/es/tpl/run_job_mod.tpl
index 70f47ce7d9..8011826864 100644
--- a/gui/bweb/lang/es/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/es/tpl/run_job_mod.tpl
@@ -6,7 +6,7 @@
   <form name='form1' action='?' method='GET'>  
   <table border='0'>
 
-   <tr><td>Nombre del Job: </td><td>
+   <tr><td>Nombre Job: </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>Cliente : </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>Almacenamiento : </td><td>
    <select name='storage'>
     <TMPL_LOOP storages>
      <option value='<TMPL_VAR name>'>
@@ -70,18 +70,14 @@
    </td></tr>
    </table>
    <br/>
+
   <label onclick='
            document.getElementById("more1").style.visibility="visible";
            document.getElementById("more2").style.visibility="visible";'>
-  <img title='Muestra más opciones' src='/bweb/add.png'>Más opciones</label>
-  <label>
-  <input type="image" name='action' value='run_job_now' title='Ejecutar job'
-   src='/bweb/R.png'>Ejecutar Ahora
-  </label>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='Ver FileSet'
-   src='/bweb/zoom.png'>Ver FileSet
-  </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='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>
   </form>
  </div>
 
@@ -123,7 +119,7 @@
      }
   </TMPL_IF>
   <TMPL_IF level>
-     document.getElementById('level_<TMPL_VAR level>').selected=true;
+     document.getElementById('level_<TMPL_VAR level>').selected=true; 
   </TMPL_IF>
   <TMPL_IF fileset>
      ok=1;
diff --git a/gui/bweb/lang/es/tpl/running_job.tpl b/gui/bweb/lang/es/tpl/running_job.tpl
index 7acda4e640..954fd66181 100644
--- a/gui/bweb/lang/es/tpl/running_job.tpl
+++ b/gui/bweb/lang/es/tpl/running_job.tpl
@@ -4,17 +4,14 @@
  </div>
  <div class='bodydiv'>
    <form action='?' method='GET'>
-   <table id='id<TMPL_VAR NAME=ID>'></table>
+   <table id='id<TMPL_VAR ID>'></table>
    <br/>
 <label>
-<input type='image' name='action' value='dsp_cur_job' 
- title='Ver job' src='/bweb/zoom.png'>
-</label>
-<label>
-<input type="image" type='submit' name='action' value='cancel_job'
- onclick="return confirm('Esta seguro que quiere cancelar el Job?')"
- title='Cancelar job' src='/bweb/cancel.png'>
-</label>
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+ title='Ver job'> <img src='/bweb/zoom.png' alt=''>Ver</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>
    </form>
 
  </div>
@@ -24,42 +21,42 @@ var header = new Array("JobId",
                        "Cliente",
                        "Nombre Job", 
                        "Nivel",
-                       "Inicio", 
-                       "Duración", 
+                       "Start Time", 
+                       "Archivos Job", 
 //                       "Archivos Job",
-//                       "Bytes Job", 
+//                       "Job Bytes", 
                        "Estado",
-                       "Selección"
+                       "Select"
         );
 
 var data = new Array();
 var chkbox;
 var img;
 
-<TMPL_LOOP NAME=Jobs>
+<TMPL_LOOP Jobs>
 a = document.createElement('A');
 a.href='?action=dsp_cur_job;jobid=<TMPL_VAR JobId>';
 
 img = document.createElement("IMG");
-img.src = '/bweb/<TMPL_VAR NAME=JobStatus>.png';
-img.title = jobstatus['<TMPL_VAR NAME=JobStatus>'];
+img.src = '/bweb/<TMPL_VAR JobStatus>.png';
+img.title = jobstatus['<TMPL_VAR JobStatus>'];
 
 a.appendChild(img);
 
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'radio';
 chkbox.name = 'jobid';
-chkbox.value = '<TMPL_VAR NAME=jobid>';
+chkbox.value = '<TMPL_VAR jobid>';
 
 data.push( new Array(
-"<TMPL_VAR NAME=JobId>",
-"<TMPL_VAR NAME=ClientName>",     
-"<TMPL_VAR NAME=JobName>",    
-joblevel['<TMPL_VAR NAME=Level>'],      
-"<TMPL_VAR NAME=StartTime>",
-"<TMPL_VAR NAME=duration>",
-//"<TMPL_VAR NAME=JobFiles>",   
-//"<TMPL_VAR NAME=JobBytes>",
+"<TMPL_VAR JobId>",
+"<TMPL_VAR ClientName>",     
+"<TMPL_VAR JobName>",    
+joblevel['<TMPL_VAR Level>'],      
+"<TMPL_VAR StartTime>",
+"<TMPL_VAR duration>",
+//"<TMPL_VAR JobFiles>",   
+//"<TMPL_VAR JobBytes>",
 a,
 chkbox
  )
@@ -68,7 +65,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
@@ -89,7 +86,7 @@ nrsTable.setup(
 );
 
 // get newest backup first
-nrsTables['id<TMPL_VAR NAME=ID>'].fieldSort(0);
+nrsTables['id<TMPL_VAR ID>'].fieldSort(0);
 
 bweb_add_refresh();
 
diff --git a/gui/bweb/lang/es/tpl/scheduled_job.tpl b/gui/bweb/lang/es/tpl/scheduled_job.tpl
index d71c4e0d5c..beb50ebfcd 100644
--- a/gui/bweb/lang/es/tpl/scheduled_job.tpl
+++ b/gui/bweb/lang/es/tpl/scheduled_job.tpl
@@ -3,16 +3,15 @@
   <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Próximos Jobs </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
-    <form action='<TMPL_VAR cginame>?' method='GET'>
+    <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <label>
-     <input type="image" name='action' value='run_job_mod'
-      src='/bweb/R.png' title='Ejecutar Ahora'>  Ejecutar Ahora
-     </label>
-     <label>
-      <input type="image" name='action' value='disable_job'
-       src='/bweb/inflag0.png' title='Desactivar'> Desactivar
-      </label>
+     <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>
+     <input type='hidden' name='pool' value=''>
+     <input type='hidden' name='level' value=''>
+     <input type='hidden' name='media' value=''>
     </form>
  </div>
 
@@ -24,7 +23,7 @@ var header = new Array("Programado",
 	               "Prioridad", 
                        "Nombre",
                        "Volumen",
-	               "Selección");
+	               "Select");
 
 var data = new Array();
 var chkbox;
@@ -34,6 +33,11 @@ chkbox = document.createElement('INPUT');
 chkbox.type  = 'radio';
 chkbox.name = 'job';
 chkbox.value = '<TMPL_VAR name>';
+chkbox.onclick = function() { 
+ document.form1.level.value = '<TMPL_VAR level>';
+ document.form1.pool.value = '<TMPL_VAR pool>';
+ document.form1.media.value = '<TMPL_VAR volume>';
+} ;
 
 data.push( new Array(
 "<TMPL_VAR date>",    
diff --git a/gui/bweb/lang/es/tpl/update_location.tpl b/gui/bweb/lang/es/tpl/update_location.tpl
index 5e54c0935c..825e31799c 100644
--- a/gui/bweb/lang/es/tpl/update_location.tpl
+++ b/gui/bweb/lang/es/tpl/update_location.tpl
@@ -4,24 +4,24 @@
  </div> 
  <div class="bodydiv">
    <form action='?' method='get'>
-    <table id='id<TMPL_VAR NAME=ID>'></table>
-    New location : <select class='formulaire' name='newlocation'>
-   <TMPL_LOOP NAME=db_locations>
-      <option id='loc_<TMPL_VAR NAME=location>' value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+    <table id='id<TMPL_VAR ID>'></table>
+    Nueva Ubicación: <select class='formulaire' name='newlocation'>
+   <TMPL_LOOP db_locations>
+      <option id='loc_<TMPL_VAR location>' value='<TMPL_VAR location>'><TMPL_VAR location></option>
    </TMPL_LOOP>
   </select>
-  <input type="image" name='action' value='save_location' src='/bweb/apply.png'>
+  <button type="submit" class="bp" name='action' value='save_location'> <img src='/bweb/apply.png' alt=''>Apply</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nombre del Volumen", "Ubicación", "Selección");
+var header = new Array("Nombre Volumen", "Ubicación", "Select");
 
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
@@ -29,8 +29,8 @@ chkbox.name  = 'media';
 chkbox.checked = 1;
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=location>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR location>",
 chkbox
  )
 );
@@ -38,7 +38,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
diff --git a/gui/bweb/lang/es/tpl/update_media.tpl b/gui/bweb/lang/es/tpl/update_media.tpl
index 2ce07c7e62..2bcd69a355 100644
--- a/gui/bweb/lang/es/tpl/update_media.tpl
+++ b/gui/bweb/lang/es/tpl/update_media.tpl
@@ -1,12 +1,12 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Actualizar Medio <TMPL_VAR volumename></h1>
+ <h1 class='newstitle'>Update medium <TMPL_VAR volumename></h1>
 </div>
 <div class='bodydiv'>
   <form name='form1' action="?" method='GET'>
    <table>
-    <tr><td>Nombre del Volumen:</td>
-        <td><input type='text' name='media' class='formulaire' value='<TMPL_VAR volumename>' title='Change this to update an other media'>
+    <tr><td>Volume Name:</td>
+        <td><input type='text' name='media' class='formulaire' value='<TMPL_VAR volumename>' title='Change this to update an other volume'>
         </td>
     </tr>
     <tr><td>Pool:</td>
@@ -19,14 +19,14 @@
     </tr>
     <tr><td>Estado:</td>
         <td><select name='volstatus' class='formulaire'>
-           <option value='Append'>Listo</option>
-           <option value='Archive'>Archivado</option>
-           <option value='Disabled'>Desactivado</option>
-           <option value='Cleaning'>Limpieza</option>
+           <option value='Append'>Append</option>
+           <option value='Archive'>Archive</option>
+           <option value='Disabled'>Disabled</option>
+           <option value='Cleaning'>Cleaning</option>
            <option value='Error'>Error</option>
-	   <option value='Full'>Lleno</option>
-           <option value='Read-Only'>Lectura</option>
-           <option value='Used'>Usado</option>
+	   <option value='Full'>Full</option>
+           <option value='Read-Only'>Read-Only</option>
+           <option value='Used'>Used</option>
 	   <option value='Recycle'>Recycle</option>
            </select>
         </td>
@@ -46,7 +46,7 @@
         </td>
     </tr>
 
-    <tr><td>Enabled:</td>
+    <tr><td>Activado :</td>
         <td> <select name='enabled' class='formulaire'>
            <option value='yes'>yes</option>
            <option value='no'>no</option>
@@ -112,22 +112,16 @@
     </table>
 <table>
  <td>
- <label>
-  <input type="image" name='action' value='do_update_media' src='/bweb/apply.png'> Apply
-  </label>
-  <label>
-  <input type="image" name='action' title='Update from pool'
-    value='update_from_pool' src='/bweb/update.png'> Actualizar del Pool
-  </label>
+  <button type="submit" class="bp" name='action' value='do_update_media'> <img src='/bweb/apply.png' alt=''> Apply </button>
+  <button type="submit" class="bp" name='action' title='Actualizar del Pool'
+    value='update_from_pool'> <img src='/bweb/update.png' alt=''> Actualizar del Pool </button>
  </form>
  </td>
  <td>
   <form action='?' method='GET'>
    <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
-   <label>
-    <input type="image" name='action' value='media'
-     src='/bweb/zoom.png'> Ver Pool
-   </label>
+    <button type="submit" class="bp" name='action' value='media'>
+     <img src='/bweb/zoom.png' alt=''>Ver Pool </button>
   </form>
  </td>
 </table>
diff --git a/gui/bweb/lang/fr/fr.pl b/gui/bweb/lang/fr/fr.pl
deleted file mode 100644
index bf4c369ff7..0000000000
--- a/gui/bweb/lang/fr/fr.pl
+++ /dev/null
@@ -1,431 +0,0 @@
-$VAR1 = {
-          'Nb Files' => 'Nb Fichiers',
-          'Size,time,files' => '',
-          'put selected media on i/o' => 'Mettre les médias sélectionnés dans le guichet',
-          'Volume:' => 'Media :',
-          'YYYY-MM-DD HH:MM:SS' => 'AAAA-MM-JJ HH:MM:SS',
-          'When expire ?' => 'Expiration',
-          'Update media' => 'Modifier le media',
-          'Last Jobs' => 'Historique',
-          '1 week' => 'Cette semaine',
-          'Autochanger:' => 'Robotique :',
-          'Autochanger' => 'Robotique (Autochanger)',
-          'JobId' => 'JobId',
-          'General Options' => 'Options Générales',
-          'Bytes:' => 'Taille :',
-          'Nb Jobs' => 'Nb Jobs',
-          'user:' => 'user :',
-          'Show client status' => '',
-          'Logged as' => 'Logged as',
-          '6 months' => '6 derniers mois',
-          'Files Examined:' => 'Fichiers vus :',
-          'B/s' => 'B/s',
-          'Roles:' => '',
-          'Job size per day' => 'Job size per day',
-          'Use user acl in bweb. Read INSTALL first' => '',
-          'excluded' => 'excluded',
-          'New location:' => 'Nouvelle localisation :',
-          'Graph' => '',
-          'Jobs' => 'Jobs',
-          'Filter' => 'Filtre',
-          '30 days' => '30 derniers jours',
-          'Full' => 'Full',
-          'Mount' => 'Mount',
-          'Database size:' => 'Taille de la base :',
-          'Differential' => 'Diff&eacute;rentielle',
-          'Job per day' => 'Job per day',
-          'New' => 'Nouvelle',
-          'Recycle' => 'Recyclage',
-          'Configuration' => 'Configuration',
-          'Clear I/O' => 'Vider le guichet',
-          'Client:' => 'Client :',
-          'Pre-command:' => 'Pre-commande :',
-          'display timestamp in job log' => '',
-          'To:' => 'To:',
-          'ex: 10M, 11G' => 'ex: 10M, 11G',
-          'View media' => 'Voir les médias',
-          'Update media location' => 'Mise à jour de la localisation d\'un média',
-          'Job Name' => 'Nom du Job',
-          'Job Retention' => 'Rétention des jobs',
-          'Job Duration' => 'Durée',
-          'Use duration:' => 'Durée d\'utilisation :',
-	  'view' => 'voir',
-	  'jobs' => 'jobs',
-	  'Number of media <br/> to load:' => 'Nombre de médias <br/> à internaliser :',
-	  'Number of media <br/> to eject:' => 'Nombre de médias <br/> à externaliser :',
-          'View members' => 'Voir les membres',
-          'Vol Mounts' => 'Nb recyclages',
-          'Scheduled' => 'Quand',
-          'Average backup size per day for the period' => 'Average backup size per day for the period',
-          'Name:' => 'Nom :',
-          'Groups' => 'Groupes',
-          'Users' => '',
-          'Job size per hour for the period' => 'Job size per hour for the period',
-          'You have to create a Location which will have the same name.' => 'Vous devez créer une Location du même nom que votre robotique.',
-          'no' => 'non',
-          'FileSet:' => 'FileSet :',
-          'Job Rate' => 'Débit',
-          'Bytes' => 'Taille',
-          'user filter' => 'user filter',
-          'Defined jobs:' => 'Jobs définis :',
-          'Jobs Count (d)' => 'Jobs Count (d)',
-          'Bars' => 'Barres',
-          'Volume Infos' => 'Informations',
-          'Nb volumes' => 'Statut',
-          'Bweb Configuration' => 'Configuration Bweb',
-          'Media Type' => 'Type',
-          'archived' => 'archivé',
-          'Ok' => 'Ok',
-          'Number of jobs per day for the period' => 'Number of job per day for the period',
-          'Job Name:' => 'Nom du job :',
-          'Start Time:' => 'Date de d&eacute;marrage :',
-          'Job Size' => 'Taille des Job',
-          'Job Bytes' => 'Job Bytes',
-          'View jobs' => 'Voir les jobs',
-          'You must run update slot, Autochanger status is different from bacula slots' => '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.',
-          'Change this to update an other volume' => 'Modifiez ce champs pour mettre à jour un autre média',
-          'Update now' => 'Mettre à jour maintenant',
-          'View stats' => 'Voir les stats',
-          'security acl:' => 'security acl :',
-          'You want to:' => '',
-          'Media Type:' => 'Type de média :',
-          'Write time' => '',
-          'View non-members' => 'Voir les clients sans groupe',
-          'This week' => 'Cette semaine',
-          'Usage' => 'Usage',
-          'Lines' => 'Lignes',
-          'Selection' => 'Selection',
-          'File Retention' => 'Rétention des fichiers',
-          'Timing Statistics' => '',
-          'Warning' => 'Warning',
-          'Device:' => 'Périphérique :',
-          'Eject Media' => 'Externaliser',
-          'Information about' => 'Informations sur',
-          'mtx command:' => 'commande mtx :',
-          'it. After, you have to run "update pool=mypool" with bconsole.' => 'devez lancer "update pool=mypool" sur la bconsole.',
-          'View location log' => 'Voir les déplacements',
-          'Purged' => 'Purged',
-          'Group summary' => 'Vue par groupe',
-          'Tips: To modify pool properties, you have to edit your Bacula configuration and reload it. After, you have to run "update pool=mypool" with bconsole.' => 'Tips : Pour modifier les options d\'un pool, vous devez éditer la configuration bacula et la recharger (reload). Après vous devez lancer "update pool=mypool" sur la bconsole.',
-          'Show current job' => 'Voir les jobs courants',
-          'Number of media<br/> to load' => 'Nombre de médias<br/> à internaliser',
-          'yes' => 'oui',
-          'ctime :' => 'ctime :',
-          'View doc' => 'Documentation',
-          'Made a safe backup set' => '',
-          'Help to load media (part 2/2)' => 'Assistant d\'internalisation de médias (partie 2/2)',
-          'Restore' => 'Restauration',
-          'Or like an existing user:' => '',
-          'on' => 'sur',
-          'Actions' => 'Actions',
-          'Size' => 'Taille',
-          'Help ejecting media (part 1/2)' => 'Assistant d\'externalisation de médias (partie 1/2)',
-          'Help ejecting media' => '',
-          'Max Jobs:' => 'Nombre de jobs maxi :',
-          'Delete' => 'Supprimer',
-          'Information' => 'Informations',
-          'Max jobs' => 'Nb montages',
-          'Job duration per job for the period' => 'Durée des jobs pour la période',
-          'Max jobs per volume' => 'Nb job maxi par média',
-          'Umount' => 'Umount',
-          'Storage:' => 'Storage :',
-          'Current jobs' => 'Jobs courants',
-          'New location' => 'Ajouter une localisation',
-          'Files' => '',
-          'An error has occurred:' => 'Une erreur s\'est produite :',
-          'View job' => 'Voir le job',
-          'What is included:' => 'Ce qui est inclus :',
-          'Max files per volume' => 'Nb fichier maxi par média',
-          'ex: 3 days, 1 month' => 'ex: 3 days, 1 month',
-          'Error' => 'Erreur',
-          'production' => '',
-	  'Number of media to create:' => 'Nombre de média à créer :',
-	  'Starting number:' => 'Numéro de départ :',
-          'Add Media' => 'Ajouter des Medias',
-          'JobFiles' => 'Fichiers',
-          'Backup' => 'Backup',
-          'Last 30 days' => '30 derniers jours',
-          'Nothing to display, Try a bigger date range' => 'Rien n\'a afficher, essayer avec une autre période',
-          'Manage users' => 'Manage users',
-          'DBI:' => 'DBI :',
-          'Information about job' => 'Information sur un job',
-          'Clients' => 'Clients',
-          'Name' => 'Nom',
-          'Options' => 'Options',
-          'Per weeks' => '',
-          'User:' => 'Utilisateur :',
-          'Content:' => 'Contenu :',
-          'What is excluded:' => 'Ce qui est exclus :',
-          'Archive' => 'Archive',
-          'Vol Bytes' => 'Taille',
-          'Job per hour' => 'Job per hour',
-          'Add a location' => '',
-          'Job List' => 'Contenu',
-          'Username:' => '',
-          'Cost:' => 'Coût :',
-          'View others' => 'Voir les clients sans groupe',
-          'Width:' => 'Largeur :',
-          'Enabled' => 'Enabled',
-          'Lines points' => 'Lignes avec points',
-          'Average backup size per hour for the period' => 'Average backup size per hour for the period',
-          'Job size per hour' => 'Job size per hour',
-          'move out' => '',
-          'Prune' => 'Prune',
-          'Any' => 'Tous',
-          'InChanger Flag:' => 'En ligne :',
-          'Client stats' => 'Statistiques',
-          'Run job:' => 'Lancer le job :',
-          'Processing file:' => 'Fichier en cours :',
-          'View errors' => '',
-          'Drive usage' => '',
-          'Nothing to display' => 'Rien a afficher',
-          'Pool:' => 'Pool :',
-          'Job avg size (d)' => 'Job avg size (d)',
-          'included' => 'included',
-          'Max use duration' => 'Nb de job maxi',
-          'Stats' => '',
-          'Total' => 'Nombre',
-          'Last 6 months' => '',
-          'Use Duration' => '',
-          'umount drive' => 'Décharger un lecteur',
-          'Move in' => 'Internaliser',
-          'Priority:' => 'Priorité :',
-          'Index' => 'Index',
-          'Volume Name' => 'Nom de volume',
-          'SQL Connection' => 'Connexion SQL',
-          'Job size per job for the period' => 'Taille des jobs pour la période',
-          'Current' => '',
-          'Eject media' => '',
-          'Number of jobs per hour for the period' => 'Number of job per hour for the period',
-          'Max volume size' => 'Nb volumes',
-          'View clients' => '',
-          'Load' => '',
-          'Launch brestore' => 'Lancer brestore',
-          'Now, you can verify the selection and load the media.' => 'Maintenant vous devez vérifier la sélection et charger les médias.',
-          'Number of media<br/> to eject' => 'Nombre de médias <br/> à externaliser :',
-          'ex: 10' => 'ex: 10',
-          'Cleaning' => 'Cleaning',
-          'Cancel' => 'Annuler',
-          'Search media or client' => 'Chercher un media ou un client',
-          'Expire' => 'Expiration',
-          'Pool' => 'Pool',
-	  'Total Pool:' => 'Nombre de Pools :',
-          'View trends' => 'Voir les tendances',
-          'Job total B/day' => 'Job total B/day',
-          'Group' => 'Groupe',
-          'info:' => 'info :',
-          'Enable' => 'Activer',
-          'Display Job size, duration and number of files with a balloon' => '',
-          'Nb Err' => 'Nb Err',
-          'Number of backed files per job for the period' => 'Nombre de fichier sauvegardé par job pour la période',
-          'Total Job:' => 'Nombre de Jobs :',
-          'Locations' => 'Localisations',
-          'Eject' => 'Ejecter',
-          'Show last job' => 'Voir l\'historique',
-          'Height:' => 'Hauteur :',
-          'Last jobs' => 'Historique',
-	  'Display log timestamp' => 'Afficher l\'heure des logs',
-	  'Do you want to delete this group?' => 'Voulez vous vraiment supprimer ce groupe ?',
-          'Number of items' => 'Nombre d\'&eacute;l&eacute;ments',
-          'Errors' => 'Erreurs',
-          'Location' => 'Localisation',
-          'Duration' => 'Durée',
-          'Edit a location' => 'Modifier',
-          'Drives:' => 'Lecteurs :',
-          'Real Slot' => 'Slot réel',
-          'display_log_time:' => '',
-          'Disable' => 'Désactiver',
-	  'Sorry at this moment, bweb works only with mozilla.' => 'Désolé, bweb fonctionne seulement avec mozilla.',
-          'a comment' => 'un commentaire',
-          'Job Type' => 'Type',
-          'Next' => 'Suivant',
-          'Retention period:' => 'Période de rétention :',
-          'Update from pool' => 'Mettre à jour à partir du pool',
-          'index' => 'index',
-          'Level' => 'Niveau',
-	  'View last jobs' => 'Voir l\'historique',
-          'View only errors' => 'Voir les erreurs',
-          'filter:' => '',
-          'Running job' => 'Job',
-          'Search client' => 'Chercher un client',
-          'Tips: It\'s a good idea to have a location per autochanger.' => 'Tips: Vous devez avoir une localisation par robotique.',
-          'size :' => 'taille :',
-          'Not enough data' => 'Données insufisantes',
-          'Since' => 'Hier',
-          'You can choose the Job table that you want to use to get statistics' => 'Vous pouvez utiliser une autre table que Job pour vos statistiques',
-          'Status' => 'Statut',
-          'Media' => 'Médias',
-          'user managment' => '',
-          'Remove' => 'Supprimer',
-          'Location:' => 'Localisation :',
-          'administrator' => '',
-          'Disabled' => 'Disabled',
-          'Group:' => 'Groupe :',
-          'Username' => '',
-          'Slot:' => 'Slot :',
-          'Client' => 'Client',
-          'Time limits' => '',
-          'Job' => 'Job',
-	  'Do you want to remove this location?' => 'Voulez vous supprimer cette localisation ?',
-	  'File Set' => 'File Set',
-	  'search...' => 'rechercher...',
-	  'View file usage' => 'Répartition des fichiers',
-          'View FileSet' => 'Voir le fileset associé',
-          'Run now' => 'Lancer maintenant',
-          'Desc' => 'Description',
-          'Edit' => 'Modifier',
-          'Display more options' => 'Affiche plus d\'options',
-          'Customer' => '',
-          'Read time' => '',
-          'Per months' => '',
-          'Save' => 'Sauver',
-          'Running Jobs' => 'Jobs en cours',
-          'Job size per day for the period' => 'Job size per day for the period',
-          'This tool will select the best candidates to eject. You will be asked to make your selection on the next screen.' => 'Cet outil va sélectionner pour vous les meilleurs cartouches à externaliser. Vous devrez choisir parmi la sélection de l\'écran suivant.',
-          'Expired:' => 'Expirés',
-          'Level:' => 'Niveau :',
-          'Defined Jobs' => 'Jobs définis',
-          'Use groups' => '',
-	  'Use groups filter:' => '',
-	  'View current jobs' => 'Voir les jobs en cours',
-	  'View content' => 'Voir le contenu',
-          'Next Jobs' => 'Prochains jobs',
-          'Back' => 'Précédent',
-          'Max Files:' => 'Nombre de fichiers maxi :',
-          'Show schedule' => '',
-          'Jobs Count (h)' => 'Jobs Count (h)',
-          'Used' => 'Used',
-	  'Do you want to purge this volume?' => 'Vous voulez vraiment purger ce volume ?',
-	  'Do you want to cancel the selected job?' => 'Vous voulez vraiment annuler ce job ?',
-	  'It could take long time, do you want to continue?' => 'Ce traitement peut prendre beaucoup de temps, voulez vous continuer ?',
-          'This tool will select the best candidates to load. You will be asked to make your selection on the next screen.' => 'Cet outil va sélectionner pour vous les meilleurs cartouches à internaliser. Vous devrez choisir parmi la sélection de l\'écran suivant.',
-          'Job Files' => 'Job Files',
-          'Bweb - Bacula Web Interface' => 'Bweb - Interface Web de Bacula',
-          'All Media' => 'Tous les Medias',
-          'Show content' => 'Afficher le contenu',
-          'Append' => 'Append',
-          'Canceled' => 'Annul&eacute;',
-          'Filter;' => 'Filtre',
-          'run this job again' => 'Relancer ce job',
-          'customer' => '',
-          'All' => 'P&eacute;riode',
-          'move in' => 'Internaliser',
-          'run update slots' => 'Mettre à jour la base bacula, (update slots)',
-          'This folder must be writable by apache user and must be accessible on /bweb/fv' => 'Ce répertoire doit être accessible en ecriture pour apache et être sous /bweb/fv',
-          'About' => 'A propos',
-          'md5 :' => 'md5 :',
-          'Age' => 'Période',
-          'Add autochanger' => 'Ajouter une robotique',
-          'Move' => 'Déplacer',
-          'Eject selection' => 'Externaliser la selection',
-          'Use user managment in bweb. Read INSTALL first' => 'Active la gestion des utilisateurs dans bweb. Lire le manuel avant.',
-          'View' => 'Voir',
-          'Auto Prune' => 'Purge automatique',
-          'Job Bytes (h)' => 'Job Bytes (h)',
-          'Time slice' => '',
-          'Remove a location' => 'Supprimer',
-          'Use a wiki for jobs documentation?' => '',
-          'Subject:' => 'Subject:',
-          'Modify' => 'Modifier',
-          'Tools' => 'Options',
-          'Incremental' => 'Incr&eacute;mentale',
-          'Per days' => '',
-          'Pools' => 'Pools de média',
-          'Retention' => 'Rétention',
-          'mount drive' => 'Charger un lecteur',
-          'Clients:' => 'Clients :',
-          'More options' => 'Options',
-          'delete this job' => 'Supprimer ce job',
-          'Move out' => 'Externaliser',
-          'Total clients:' => 'Nombre de clients :',
-          'ex: 10000' => 'ex: 10000',
-          'IMPORT/EXPORT' => 'IMPORT/EXPORT',
-          'Recycle count' => 'Temps de lecture',
-          'Job failed' => 'Job en erreur',
-          'Online' => 'En ligne',
-          'Last Written' => 'Dernière écriture',
-          'Status:' => 'Statut :',
-          'Comment:' => 'Commentaire :',
-          'Cancel job' => 'Annuler le job',
-          'FileSet' => 'FileSet',
-          'Nb Errors' => 'Nb Erreurs',
-          'Informations' => 'Informations',
-          'Main' => 'Accueil',
-          'debug:' => 'debug :',
-          'Expired media' => 'Médias expirés',
-          'atime :' => 'atime :',
-	  'Pool usage' => 'Utilisation du pool',
-          'Pool Name' => 'Pool',
-          'Read-Only' => 'Read-Only',
-          'Volume Stats' => 'Statistiques',
-	  'Hide Job' => 'Cacher les jobs',
-          'Run this job' => 'Lancer ce job',
-          'StartTime' => 'Début',
-          'Job total B/hour' => 'Job total B/hour',
-          'Select' => 'Sélection',
-          'Statistics' => 'Statistiques',
-          'End:' => '',
-          'Refresh' => 'Rafraîchir',
-          'Total media:' => 'Nombre de medias :',
-          'Nb Bytes' => 'Taille',
-          'Drive Name' => 'Nom du lecteur',
-          'Recycle Pool:' => 'Pool de recyclage :',
-          'Job avg B/day' => 'Job avg B/day',
-          'Move media' => 'Déplacer des médias',
-          'Total bytes stored:' => 'Total des sauvegardes :',
-          'mtime :' => 'mtime :',
-          'drive index' => 'drive index',
-          'Slot' => 'Slot',
-          'Volume' => 'Volume',
-	  'Do you want to delete this job from the catalog?' => 'Voulez vous vraiment supprimer ce job du catalogue ?',
-	  'Do you want to cancel this job?' => 'Vous voulez annuler ce job ?',
-          'Tips: Warning, this is the current fileset, it could have changed ...' => 'Tips : Attention ceci est le FileSet courant. Il peut avoir changà sur une ancienne sauvegarde.',
-          'can be "sudo" or "ssh storage@storagehost"...' => 'peut être "sudo" ou "ssh storage@storagehost"...',
-          'Volume Name:' => 'Nom du volume :',
-          'Administrator' => '',
-          'Type' => 'Type',
-          'View Pool' => 'Voir le pool',
-          'Balloon' => '',
-          'JobBytes' => 'Taille',
-          'use a wiki for jobs documentation ?' => 'affiche les heures dans le log des jobs',
-          'Location log' => 'Log sur les déplacements',
-          'Job Bytes (d)' => 'Job Bytes (d)',
-          'Add' => 'Ajouter',
-          'Run job' => '',
-          'Job rate per job for the period' => 'Débit des job pour la période',
-	  'Do you want to eject this volume ?' => 'Voulez vous vraiment éjecter ce média ?',
-	  'Do you want to eject selected media ?' => 'Voulez vous vraiment éjecter ces médias ?',
-          'Help to eject media (part 2/2)' => 'Assistant d\'externalisation de médias (partie 2/2)',
-          'Enabled:' => 'En ligne :',
-          'Job avg B/hour' => 'Job avg B/hour',
-          'Purge' => 'Purger',
-          'Log:' => 'Log :',
-          'Priority' => 'Priorité',
-          'Load Media' => 'Internaliser',
-          'Jobs overview' => '',
-          'Vol Usage' => 'Utilisation',
-          'password:' => 'password :',
-          'Password:' => 'Password :',
-          'Graph type' => 'Type de graphique',
-          'Groups:' => '',
-          'Label' => 'Labéliser',
-          'Nb Ok' => 'Nb Ok',
-          'Update' => 'Scanner',
-          'Jobs by group' => 'Jobs par groupe',
-          'Start Time' => 'Début',
-          'Now, you can verify the selection and eject the media.' => 'Maintenant, vous devez vérifier la sélection et éjecter les médias.',
-          'Last 6 month' => '6 derniers mois',
-          'Apply' => 'Appliquer',
-          'Drives' => 'Lecteurs',
-          'Help loading media (part 1/2)' => 'Assistant d\'internalisation de médias (partie 1/2)',
-          'Vol Status' => 'Statut',
-          'run label barcodes' => 'Labélisation des médias, (label barcodes)',
-          'Speed:' => 'Vitesse :',
-          'Search media' => 'Chercher un media',
-          'Job avg size (h)' => 'Job avg size (h)',
-          'Profile:' => '',
-          'Max Bytes:' => 'Taille maxi :',
-          'security:' => 'security:',
-          'Cost' => 'Coût',
-          'Begin:' => ''
-        };
diff --git a/gui/bweb/lang/fr/tpl/ach_add.tpl b/gui/bweb/lang/fr/tpl/ach_add.tpl
index c9d90b3439..d089349150 100644
--- a/gui/bweb/lang/fr/tpl/ach_add.tpl
+++ b/gui/bweb/lang/fr/tpl/ach_add.tpl
@@ -1,9 +1,10 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'><TMPL_UNLESS name>Nouvelle</TMPL_UNLESS> Robotique (Autochanger) </h1>
+  <h1 class='newstitle'><TMPL_UNLESS name>Nouvelle</TMPL_UNLESS> Autochanger </h1>
 </div>
 <div class='bodydiv'>
    Vous devez créer une Location du même nom que votre robotique.<br/><br/>
+
    <form name='form1' action="?" method='get'>
     <table>
      <tr><td>Nom :</td>     
@@ -15,7 +16,7 @@
      </tr>
      <tr><td>Pre-commande :</td> 
          <td> <input class="formulaire" type='text' id='precmd' value='sudo'
-           title='peut être "sudo" ou "ssh storage@storagehost"...' name='precmd'>
+           title='peut être "sudo" ou "ssh storage\@storagehost"...' name='precmd'>
          </td>
      </tr>
      <tr><td>commande mtx :</td> 
@@ -34,14 +35,15 @@
      <td><input class='formulaire' type='checkbox' id='drive_<TMPL_VAR name>'
                 name='drives' value='<TMPL_VAR name>'><TMPL_VAR name>
      </td>
-     <td>index <input type='text' title='drive index' class='formulaire'
+     <td>Index <input type='text' title='drive index' 
+                class='formulaire'
 		id='index_<TMPL_VAR name>' value='' 
                 name='index_<TMPL_VAR name>' size='3'>
      </td>
     </tr>
     </TMPL_LOOP>
     </table>
-    <input type="image" name='action' value='ach_add' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='ach_add'> <img src='/bweb/save.png' alt=''>Sauver</button>
    </form>
 </div>
 
diff --git a/gui/bweb/lang/fr/tpl/ach_content.tpl b/gui/bweb/lang/fr/tpl/ach_content.tpl
index 4a1cfdacaf..603611065c 100644
--- a/gui/bweb/lang/fr/tpl/ach_content.tpl
+++ b/gui/bweb/lang/fr/tpl/ach_content.tpl
@@ -18,38 +18,21 @@ Robotique : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Lecteurs
      Options
     </div>
     <div class='otherbox'>
-<label>
-<input type="image" name='action' value='label_barcodes'
-        title='Labélisation des médias, (label barcodes)' src='/bweb/label.png'>Labéliser
-</label>
+<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>
 <TMPL_IF nb_io>
-<label>
-<input type="image" name='action' value='eject'
-        title='Mettre les médias sélectionnés dans le guichet' src='/bweb/extern.png'>
-Ejecter
-</label>
-<label>
-<input type="image" name='action' value='clear_io'
-        title='Vider le guichet' src='/bweb/intern.png'>
-Vider le guichet
-</label>
+<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>
+<button type="submit" class="bp" name='action' value='clear_io'
+ title='Vider le guichet'> <img src='/bweb/intern.png' alt=''>Vider le guichet</button>
 </TMPL_IF>
-<label>
-<input type="image" name='action' value='update_slots'
-        title='Mettre à jour la base bacula, (update slots)' src='/bweb/update.png'>
-Scanner
-</label>
+<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>
 <br/><br/>
-<label>
-<input type="image" name='action' value='ach_load'
-	title='Charger un lecteur' src='/bweb/load.png'>
-Mount
-</label>
-<label>
-<input type="image" name='action' value='ach_unload'
-	title='Décharger un lecteur' src='/bweb/unload.png'>
-Umount
-</label>
+<button type="submit" class="bp" name='action' value='ach_load'
+ title='Charger un lecteur'> <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>
 
    </div>
     <td width='200'/>
@@ -66,8 +49,9 @@ Umount
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Slot réel", "Slot", "Nom de volume","Taille","Statut",
-	               "Type","Pool","Dernière écriture", 
+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 data = new Array();
@@ -116,7 +100,8 @@ nrsTable.setup(
 }
 );
 
-var header = new Array("Index", "Nom du lecteur", "Nom de volume", "Sélection");
+var header = new Array("Index", "Lecteurs", 
+		       "Nom de volume", "Sélection");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/fr/tpl/begin.tpl b/gui/bweb/lang/fr/tpl/begin.tpl
index 27d2e603df..e90b4dcd68 100644
--- a/gui/bweb/lang/fr/tpl/begin.tpl
+++ b/gui/bweb/lang/fr/tpl/begin.tpl
@@ -14,7 +14,7 @@
 
 <script type="text/javascript" language="JavaScript">
 if (navigator.appName == 'Konqueror') {
-	alert("Désolé, bweb fonctionne seulement avec mozilla.");
+        alert("Désolé, bweb fonctionne seulement avec mozilla.");
 }
 </script>
 
@@ -26,27 +26,29 @@ if (navigator.appName == 'Konqueror') {
        <li><a href="bweb.pl?action=groups">Groupes</a> </li>
      </ul>
  </li>
- <li><a href="bweb.pl?action=run_job">Jobs</a>
+ <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=overview">Jobs overview</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=next_job">Prochains jobs</a> </li>
      <li><a href="bweb.pl?action=restore" title="Lancer brestore">Restauration</a> </li>
    </ul>
  </li>
- <li style="padding: 0.25em 2em;">Medias
+ <li style="padding: 0.25em 2em;">Médias
   <ul>
-     <li><a href="bweb.pl?action=pool">Pools</a> </li>
+     <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>
   </ul>
  </li>
 <TMPL_IF achs>
- <li style="padding: 0.25em 2em;">Robotiques
+ <li style="padding: 0.25em 2em;">Autochanger
   <ul>
 <TMPL_LOOP achs>
    <li><a href="bweb.pl?action=ach_view;ach=<TMPL_VAR name>"><TMPL_VAR name></a></li>
@@ -55,23 +57,23 @@ if (navigator.appName == 'Konqueror') {
  </li>
 </TMPL_IF> 
  <li><a href="bweb.pl?action=graph"> Statistiques </a></li>
- <li> <a href="bweb.pl?action=view_conf"> Configuration </a>
+ <li> <a href="bweb.pl?action=view_conf"> Configuration </a> 
 <TMPL_IF enable_security>
   <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>
  <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 style="float: right;white-space: nowrap;">
-<input type="image" class="button" title="chercher un media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="chercher un client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="rechercher..." onclick="this.value='';" title="chercher un media ou un client"></li>
+<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"></li> </button>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>
- <input type="hidden" name="action" value="">
- <input type="hidden" name="re_media" value="">
- <input type="hidden" name="re_client" value="">
+ <input type="hidden" name="action" value=''>
+ <input type="hidden" name="re_media" value=''>
+ <input type="hidden" name="re_client" value=''>
 </form>
 
 <div style="clear: left;">
diff --git a/gui/bweb/lang/fr/tpl/change_location.tpl b/gui/bweb/lang/fr/tpl/change_location.tpl
index 1f7c52937b..022ac1b0cf 100644
--- a/gui/bweb/lang/fr/tpl/change_location.tpl
+++ b/gui/bweb/lang/fr/tpl/change_location.tpl
@@ -11,30 +11,27 @@
 <tr>
 <td><b>To: </b></td><td><input class='formulaire' name='email' value='<TMPL_VAR email>'></td>
 </tr><tr>
-<td><b>Subject: </b></td><td><input class='formulaire' name='subject' value='[BACULA] Deplacement des medias vers <TMPL_VAR newlocation>' size='80'></td>
+<td><b>Subject: </b></td><td><input class='formulaire' name='subject' value='__[BACULA] Move media to__ <TMPL_VAR newlocation>' size='80'></td>
 </tr><tr>
 <td></td>
 <td>
 <textarea name='content' class='formulaire' cols='80' rows='32'>
-Bonjour,
+Hi,
 
-Pouvez vous déplacer ces médias vers <TMPL_VAR newlocation> ?
-Média :
+Could you move these media to <TMPL_VAR newlocation>
+Media :
 <TMPL_LOOP media>
  - <TMPL_VAR VolumeName>  (<TMPL_VAR location>)
 </TMPL_LOOP>
 
-Quand cela sera terminé, pouvez vous cliquer sur le lien ci-dessous pour mettre à jour la localisation ?
-(Vous pouvez utiliser ce lien : 
-<TMPL_VAR url>
-).
+When it's finish, could you update media location?
+(you can use this link: <TMPL_VAR url>).
 
-Merci
+Thanks
 </textarea>
 </td></tr></table>
-<input type="hidden" name='action' value='move_email'>
-<input class='formulaire' type='submit' name='bp' value='Envoyer'>
+<input class='formulaire' type='submit' name='action' value='move_email'>
 </form>
 <br>
-<a href="<TMPL_VAR url>"><img alt='update now' src='/bweb/update.png'>Mettre à jour maintenant</a>
+<a href="<TMPL_VAR url>"><img alt='Mettre à jour maintenant' src='/bweb/update.png'>Mettre à jour maintenant</a>
 </div>
diff --git a/gui/bweb/lang/fr/tpl/client_job_status.tpl b/gui/bweb/lang/fr/tpl/client_job_status.tpl
index 1269b4642d..1f29b3fe04 100644
--- a/gui/bweb/lang/fr/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/fr/tpl/client_job_status.tpl
@@ -1,7 +1,7 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-	Job <TMPL_VAR JobName> en cours sur <TMPL_VAR Client>
+	Job <TMPL_VAR JobName> sur <TMPL_VAR Client>
   </h1>
  </div>
  <div class='bodydiv'>
@@ -24,16 +24,17 @@
  </tr>
 </table>
 <form name='form1' action='?' method='GET'>
-<input type="image" name='action' value='dsp_cur_job' 
- src='/bweb/update.png' title='refresh'>&nbsp;
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+> <img src='/bweb/update.png' title='Rafraîchir' alt=''>Rafraîchir</button>
 <input type='hidden' name='client' value='<TMPL_VAR Client>'>
 <input type='hidden' name='jobid' value='<TMPL_VAR JobId>'>
-<input type="image" name='action' value='cancel_job'
+<button type="submit" class="bp" name='action' value='cancel_job'
        onclick="return confirm('Vous voulez annuler ce job ?')"
-        title='Annuler ce job' src='/bweb/cancel.png'>&nbsp;
+        title='Annuler le job'> <img src='/bweb/cancel.png' alt=''>Annul&eacute;</button>
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
   bweb_add_refresh();
 </script>
+
diff --git a/gui/bweb/lang/fr/tpl/client_list.tpl b/gui/bweb/lang/fr/tpl/client_list.tpl
index 614dfad168..d1d8746c27 100644
--- a/gui/bweb/lang/fr/tpl/client_list.tpl
+++ b/gui/bweb/lang/fr/tpl/client_list.tpl
@@ -1,55 +1,50 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Clients</h1>
+  <h1 class='newstitle'>Clients</h1>
  </div>
  <div class='bodydiv'>
-<form action='?' method='GET'>
-     <table id='id<TMPL_VAR NAME=ID>'></table>
+<form name="client" action='?' method='GET'>
+     <table id='id<TMPL_VAR ID>'></table>
 	<div class="otherboxtitle">
           Actions &nbsp;
         </div>
         <div class="otherbox">
 <!--        <h1>Actions</h1> -->	
-       <label>
-       <input type="image" name='action' value='job' title="Voir l'historique" src='/bweb/zoom.png'>Historique</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='dsp_cur_job' title='Voir les jobs courants' src='/bweb/zoom.png'>Jobs courants</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_status' title='Statut' src='/bweb/zoom.png'>Statut</label> &nbsp;
-       <label>
-       <input type="image" name='action' value='client_stats' title='Statistiques' src='/bweb/chart.png'>Statistiques</h1></label> &nbsp;
-       </label>
+       <button type="submit" class="bp" name='action' value='job' title="Voir l'historique"> <img src='/bweb/zoom.png' alt=''>Historique</button>
+       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Jobs courants</button>
+       <button type="submit" class="bp" name='action' value='client_status' title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Statut </button>
+       <button type="submit" class="bp" name='action' value='client_stats' title='Statistiques'> <img src='/bweb/chart.png' alt=''>Stats </button>
         </div>
 
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Nom", "Sélection", "Description", "Purge automatique", "Rétention des fichiers", "Rétention des jobs");
+var header = new Array("Nom", "Sélection", "Description", "Prune automatique", "Rétention des fichiers", "Rétention");
 
 var data = new Array();
 var chkbox ;
 
-<TMPL_LOOP NAME=Clients>
+<TMPL_LOOP Clients>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'client';
-chkbox.value = '<TMPL_VAR NAME=Name>';
+chkbox.value = '<TMPL_VAR Name>';
 
 data.push( 
-  new Array( "<TMPL_VAR NAME=Name>", 
+  new Array( "<TMPL_VAR Name>", 
              chkbox,
-	     "<TMPL_VAR NAME=Uname>",
-	     "<TMPL_VAR NAME=AutoPrune>",
-	     human_sec(<TMPL_VAR NAME=FileRetention>),
-	     human_sec(<TMPL_VAR NAME=JobRetention>)
+	     "<TMPL_VAR Uname>",
+	     "<TMPL_VAR AutoPrune>",
+	     human_sec(<TMPL_VAR FileRetention>),
+	     human_sec(<TMPL_VAR JobRetention>)
               )
 ) ; 
 </TMPL_LOOP>
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
diff --git a/gui/bweb/lang/fr/tpl/config_edit.tpl b/gui/bweb/lang/fr/tpl/config_edit.tpl
index 98a562c88a..f8db73c91b 100644
--- a/gui/bweb/lang/fr/tpl/config_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/config_edit.tpl
@@ -9,52 +9,54 @@
  
      <tr><td>DBI :</td>     
          <td> 
-          <input class="formulaire" type='text' value='<TMPL_VAR NAME=dbi>' size='64' name='dbi'> 
+          <input class="formulaire" type='text' value='<TMPL_VAR dbi>' size='64' name='dbi'> 
          </td>
      </tr>
      <tr><td>user :</td> 
-         <td> <input class="formulaire" type='text' value='<TMPL_VAR NAME=user>' name='user'>
+         <td> <input class="formulaire" type='text' value='<TMPL_VAR user>' name='user'>
          </td>
      </tr>
      <tr><td>password :</td> 
-         <td> <input class="formulaire" type='password' value='<TMPL_VAR NAME=password>' name='password'> 
+         <td> <input class="formulaire" type='password' value='<TMPL_VAR password>' name='password'> 
          </td></tr>
 
      <tr>  <td><b>Options Générales</b></td>  <td/></tr>
 
-     <tr><td>email_media :</td> 
-         <td> <input class="formulaire" type='text' value='<TMPL_VAR NAME=email_media>' name='email_media'> 
+     <tr><td>email_media:</td> 
+         <td> <input class="formulaire" type='text' value='<TMPL_VAR email_media>' name='email_media'> 
          </td></tr>
          </td></tr>
 
      <tr>  <td><b>Configuration Bweb</b></td>  <td/></tr>
 
-     <tr><td>graph_font :</td> 
-         <td> <input class="formulaire" title="/chemin/vers/une/font.ttf" type='text' value='<TMPL_VAR NAME=graph_font>' size='64' name='graph_font'> 
+     <tr><td>graph_font:</td> 
+         <td> <input class="formulaire" type='text' value='<TMPL_VAR graph_font>' size='64' name='graph_font'> 
          </td></tr>
-     <tr><td>template_dir :</td> 
-         <td> <input class="formulaire" title="/chemin/vers/votre/template_dir" type='text' value='<TMPL_VAR NAME=template_dir>' size='64' name='template_dir'> 
+     <tr><td>template_dir:</td> 
+         <td> <input class="formulaire" type='text' value='<TMPL_VAR template_dir>' size='64' name='template_dir'> 
          </td></tr>
-     <tr><td>fv_write_path :</td> 
-         <td> <input class="formulaire" title="Ce répertoire doit être accessible en écriture pour apache et être sous /bweb/fv" type='text' value='<TMPL_VAR fv_write_path>' size='64' name='fv_write_path'> 
+     <tr><td>fv_write_path:</td> 
+         <td> <input class="formulaire" title="Ce répertoire doit être accessible en ecriture pour apache et être sous /bweb/fv" type='text' value='<TMPL_VAR fv_write_path>' size='64' name='fv_write_path'> 
+     <tr><td>stat_job_table:</td> 
+         <td> <input class="formulaire" title="Vous pouvez utiliser une autre table que Job pour vos statistiques" type='text' value='<TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF>' size='64' name='stat_job_table'> 
          </td></tr>
-     <tr><td>stat_job_table :</td> 
-         <td> <input class="formulaire" title="Vous pouvez choisir une autre table que Job pour calculer vos statisques" type='text' value='<TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF>' size='64' name='stat_job_table'> 
+     <tr><td>bconsole:</td> 
+         <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
-     <tr><td>bconsole :</td> 
-         <td> <input class="formulaire" title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf" type='text' value='<TMPL_VAR NAME=bconsole>' size='64' name='bconsole'> 
+     <tr><td>wiki_url:</td> 
+         <td> <input class="formulaire" title="Utiliser un wiki pour documenter les jobs ?" size='64' type='text' name='wiki_url' value='<TMPL_VAR wiki_url>'> 
          </td></tr>
-     <tr><td>display_log_time :</td>
-         <td> <input class="formulaire" title="affiche les heures dans les logs" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
+     <tr><td>display_log_time:</td> 
+         <td> <input class="formulaire" title="Afficher l'heure des logs" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
-     <tr><td>security :</td> 
+     <tr><td>security:</td> 
          <td> <input class="formulaire" type='checkbox' name='enable_security' title='Active la gestion des utilisateurs dans bweb. Lire le manuel avant.' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>security acl:</td> 
          <td> <input class="formulaire" type='checkbox' name='enable_security_acl' title='Use user acl in bweb. Read INSTALL first' <TMPL_IF enable_security_acl> checked='checked' value='on' </TMPL_IF> > 
-     <tr><td>debug :</td> 
+     <tr><td>debug:</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
     </table>
-    <input type="image" name='action' value='apply_conf' src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='apply_conf'> <img src='/bweb/save.png' alt=''>Sauver</button>
    </form>
 </div>
diff --git a/gui/bweb/lang/fr/tpl/config_view.tpl b/gui/bweb/lang/fr/tpl/config_view.tpl
index 3ca01a2ab3..3c8813453f 100644
--- a/gui/bweb/lang/fr/tpl/config_view.tpl
+++ b/gui/bweb/lang/fr/tpl/config_view.tpl
@@ -7,22 +7,23 @@
     <tr>  <td><b>Connexion SQL</b></td>  <td/></tr>
     <tr><td>DBI :</td>      <td> <TMPL_VAR dbi>      </td></tr>
     <tr><td>user :</td>     <td> <TMPL_VAR user>     </td></tr>
-    <tr><td>password :</td> <td> xxxxxxxx </td></tr>
+    <tr><td>password :</td> <td> xxxxx </td></tr>
     <tr>  <td><b>Options Générales</b></td>  <td/></tr>
-    <tr><td>email_media :</td> <td> <TMPL_VAR email_media> </td></tr>
+    <tr><td>email_media:</td> <td> <TMPL_VAR email_media> </td></tr>
     <tr>  <td><b>Configuration Bweb</b></td>  <td/></tr>
-    <tr><td>config_file :</td> <td> <TMPL_VAR config_file> </td></tr>
-    <tr><td title="/chemin/vers/votre/template_dir">template_dir :</td> <td> <TMPL_VAR template_dir> </td></tr>
-    <tr><td title="/chemin/vers/une/font.ttf">graph_font :</td> <td> <TMPL_VAR graph_font> </td></tr>
-    <tr><td title="Ce répertoire doit être accessible en ecriture pour apache et être sous /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
-    <tr><td title="Vous pouvez utiliser une autre table que Job pour vos statistiques">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
-    <tr><td title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
-    <tr><td title="affiche les heures dans le log des jobs">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
-    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
-    <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
+    <tr><td>config_file:</td> <td> <TMPL_VAR config_file> </td></tr>
+    <tr><td title="/path/to/your/template_dir">template_dir:</td> <td> <TMPL_VAR template_dir> </td></tr>
+    <tr><td title="/path/to/a/font.ttf">graph_font:</td> <td> <TMPL_VAR graph_font> </td></tr>
+    <tr><td title="Ce répertoire doit être accessible en ecriture pour apache et être sous /bweb/fv">fv_write_path:</td> <td> <TMPL_VAR fv_write_path> </td></tr>
+    <tr><td title="Vous pouvez utiliser une autre table que Job pour vos statistiques">stat_job_table:</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
+    <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole:</td> <td> <TMPL_VAR bconsole> </td></tr>
+    <tr><td title="Utiliser un wiki pour documenter les jobs ?">wiki_url:</td> <td> <TMPL_VAR wiki_url> </td></tr>
+    <tr><td title="display timestamp in job log">display_log_time:</td> <td> <TMPL_VAR display_log_time> </td></tr>
+    <tr><td title="user managment">security:</td> <td> <TMPL_VAR enable_security> </td></tr>
+    <tr><td title="user filter">security acl:</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
-    <tr>  <td><b>Robotique (Autochanger)</b></td>  <td/></tr>
+    <tr>  <td><b>Autochanger</b></td>  <td/></tr>
     <tr>
      <td>
      <form action='?' method='GET'>
@@ -39,9 +40,9 @@
     </table>
    <td>
   
-   <input type="image" name="action" value="ach_edit" title="modifier" src='/bweb/edit.png'> 
-   <input type="image" name='action' value='ach_del' title='supprimer' src='/bweb/remove.png'>
-   <input type='image' name='action' value='ach_view' title='voir' src='/bweb/zoom.png'>
+   <button type="submit" class="bp" name="action" value='ach_edit' title="Modifier"> <img src='/bweb/edit.png' alt=''>Modifier</button>
+   <button type="submit" class="bp" name='action' value='ach_del' title='Supprimer'> <img src='/bweb/remove.png' alt=''>Supprimer</button>
+   <button type="submit" class="bp" name='action' value='ach_view' title='Voir'> <img src='/bweb/zoom.png' alt=''>Voir</button>
     </form>
     </td>
    </tr>
@@ -52,12 +53,8 @@
   </table>
 
   <form action='?' method='GET'>
-   <label>
-   <input name='action' value='edit_conf' type="image" title='Modifier' src='/bweb/edit.png'> Modifier
-   </label>
-   <label>
-   <input name='action' value='ach_add' type="image" title='Ajouter une robotique' src='/bweb/add.png'> Ajouter une robotique
-   </label>
+   <button name='action' value='edit_conf' type="submit" class="bp" title='Modifier'> <img src='/bweb/edit.png' alt=''>Modifier</button>
+   <button name='action' value='ach_add' type="submit" class="bp" title='Ajouter une robotique'> <img src='/bweb/add.png' alt=''>Ajouter une robotique</button>
   </form>
 
   <TMPL_IF error>
diff --git a/gui/bweb/lang/fr/tpl/display_client_stats.tpl b/gui/bweb/lang/fr/tpl/display_client_stats.tpl
index 501c2880c3..d94ac0ddba 100644
--- a/gui/bweb/lang/fr/tpl/display_client_stats.tpl
+++ b/gui/bweb/lang/fr/tpl/display_client_stats.tpl
@@ -3,27 +3,26 @@
   <h1 class='newstitle'> Client : <TMPL_VAR clientname> (<TMPL_VAR label>)</h1>
  </div>
  <div class='bodydiv'>
-<form action='?'
+<form action='?'>
      <table id='id<TMPL_VAR ID>'></table>
-     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_duration;age=2592000;width=420;height=200" alt='Données insufisantes' > &nbsp;
-     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_rate;age=2592000;width=420;height=200" alt='Données insufisantes'> &nbsp;
-     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_size;age=2592000;width=420;height=200" alt='Données insufisantes'> &nbsp;
+     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_duration;age=2592000;width=420;height=200" alt='Not enough data' > &nbsp;
+     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_rate;age=2592000;width=420;height=200" alt='Not enough data'> &nbsp;
+     <img src="bgraph.pl?<TMPL_VAR grapharg>=<TMPL_VAR clientname>;graph=job_size;age=2592000;width=420;height=200" alt='Not enough data'> &nbsp;
 <!--	<div class="otherboxtitle">
           Actions &nbsp;
         </div>
         <div class="otherbox">
        <h1>Actions</h1> 
-       <input type="image" name='action' value='job' title="Voir l'historique"
-        src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='dsp_cur_job' title='Voir les job en cours' src='/bweb/zoom.png'> &nbsp;
-       <input type="image" name='action' value='client_stat' title='Statistiques' src='/bweb/zoom.png'> &nbsp;
+       <button type="submit" class="bp" name='action' value='job' title='Voir l'historique'> <img src='/bweb/zoom.png' alt=''>Voir les anciens jobs</button>
+       <button type="submit" class="bp" name='action' value='dsp_cur_job' title='Voir les jobs en cours'> <img src='/bweb/zoom.png' alt=''>Voir les jobs en cours</button>
+       <button type="submit" class="bp" name='action' value='client_stat' title='Statistiques'> <img src='/bweb/zoom.png' alt=''>Voir les stats</button>
         </div>
 -->
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Nom", "Nb Jobs", "Taille", "Nb Fichiers", "Nb Erreurs");
+var header = new Array("Nom", "Nb Jobs", "Nb Bytes", "Nb Fichiers", "Nb Erreurs");
 
 var data = new Array();
 
diff --git a/gui/bweb/lang/fr/tpl/display_form_job.tpl b/gui/bweb/lang/fr/tpl/display_form_job.tpl
index d4bd3981b6..cf4fdf4c3c 100644
--- a/gui/bweb/lang/fr/tpl/display_form_job.tpl
+++ b/gui/bweb/lang/fr/tpl/display_form_job.tpl
@@ -35,7 +35,7 @@
  <td valign='top'>
     <h2>Pool</h2>
     <select name='pool' class='formulaire'>
-      <option id='pool_tout' value=''>Tous</option>
+      <option id='pool_all' value=''>P&eacute;riode</option>
 <TMPL_LOOP db_pools>
       <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
@@ -43,17 +43,48 @@
   </td>
 </tr>
 </TMPL_IF>
+<TMPL_UNLESS hide_since>
 <tr>
   <td valign='top'>
-    <h2>P&eacute;riode</h2>
-    <select name='age' class='formulaire'>
-      <option id='age_86400'   value='86400'>Hier</option>
+    <h2>Hier</h2>
+    <input type='text' id='since' name='since' size='17' title='YYYY-MM-DD'
+     value='<TMPL_VAR since>' class='formulaire'>
+  </td>
+ </tr>
+<tr>
+  <td valign='top'>
+    <h2>Période</h2>
+    <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
       <option id='age_604800'   value='604800'>Cette semaine</option>
       <option id='age_2678400'  value='2678400'>30 derniers jours</option>
       <option id='age_15552000' value='15552000'>6 derniers mois</option>
     </select>     
   </td>
  </tr>
+<TMPL_ELSE>
+<tr>
+  <td valign='top'>
+    <h2>Période</h2>
+    <select name='age' class='formulaire'>
+      <option id='age_604800'   value='604800'>Cette semaine</option>
+      <option id='age_2678400'  value='2678400'>30 derniers jours</option>
+      <option id='age_15552000' value='15552000'>Last 6 months</option>
+    </select>     
+  </td>
+ </tr>
+</TMPL_UNLESS>
+<TMPL_IF view_time_slice>
+<tr>
+  <td valign='top'>
+    <h2>Time slice</h2>
+    <select name='type' class='formulaire'>
+      <option id='slice_day'   value='day'>Per days</option>
+      <option id='slice_week'  value='week'>Per weeks</option>
+      <option id='slice_month' value='month'>Per months</option>
+    </select>     
+  </td>
+ </tr>
+</TMPL_IF>
  <tr>
   <td valign='bottom'> 
     <h2>Nombre d'&eacute;l&eacute;ments</h2>
@@ -91,16 +122,28 @@
     <h2>Groupes</h2>
     <select name='client_group' size='10' class='formulaire' multiple>
 <TMPL_LOOP db_client_groups>
-	<option id= 'group_<TMPL_VAR name>'><TMPL_VAR name></option>
+        <option id= 'group_<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
     </select>
   </td>
 </tr>
 </TMPL_IF>
+<!--
+<tr>
+  <td valign='top'> 
+    <h2>File Set</h2>
+    <select name='fileset' size='15' class='formulaire' multiple>
+<TMPL_LOOP db_filesets>
+      <option id='client_<TMPL_VAR fileset>'><TMPL_VAR fileset></option>
+</TMPL_LOOP>
+    </select>
+  </td>
+</tr>
+-->
 </table>
-  <input type="image" name='action'
-         value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'
-         src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' 
+    value='<TMPL_IF action><TMPL_VAR action><TMPL_ELSE>job</TMPL_IF>'>
+     <img src='/bweb/update.png' alt=''> </button>
 
 </form>
 </div>
@@ -126,6 +169,10 @@
      document.getElementById('age_<TMPL_VAR age>').selected=true;
   </TMPL_IF>
 
+  <TMPL_IF type>
+     document.getElementById('slice_<TMPL_VAR type>').selected=true;
+  </TMPL_IF>
+
   <TMPL_IF jobtype>
      document.getElementById('jobtype_<TMPL_VAR jobtype>').selected=true;
   </TMPL_IF>
diff --git a/gui/bweb/lang/fr/tpl/display_form_media.tpl b/gui/bweb/lang/fr/tpl/display_form_media.tpl
index d5ab73c83a..6f986831f8 100644
--- a/gui/bweb/lang/fr/tpl/display_form_media.tpl
+++ b/gui/bweb/lang/fr/tpl/display_form_media.tpl
@@ -6,10 +6,10 @@
 <table border='0'>
 <tr>
   <td valign='top'>
-    <h2>Type de Média</h2>
+    <h2>Type</h2>
     <select name='mediatype' class='formulaire'>
       <option id='mediatype_all' value=''></option>
-<TMPL_LOOP NAME=db_mediatypes>
+<TMPL_LOOP db_mediatypes>
       <option id='mediatype_<TMPL_VAR mediatype>'><TMPL_VAR mediatype></option>
 </TMPL_LOOP>
     </select>     
@@ -20,7 +20,7 @@
     <h2>Localisation</h2>
     <select name='location' class='formulaire'>
       <option id='location_all>' value=''></option>
-<TMPL_LOOP NAME=db_locations>
+<TMPL_LOOP db_locations>
       <option id='location_<TMPL_VAR location>'><TMPL_VAR location></option>
 </TMPL_LOOP>
     </select>     
@@ -45,7 +45,7 @@
     <h2>Pool</h2>
     <select name='pool' class='formulaire'>
       <option id='pool_all>' value=''></option>
-<TMPL_LOOP NAME=db_pools>
+<TMPL_LOOP db_pools>
       <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
     </select>     
@@ -53,7 +53,7 @@
 </tr>
  <tr>
   <td valign='bottom'> 
-    <h2>Label</h2>
+    <h2>Nom</h2>
     <input type='text' name='re_media' 
       <TMPL_IF qre_media>value=<TMPL_VAR qre_media></TMPL_IF>
 	class='formulaire' size='8'>
@@ -65,17 +65,18 @@
     <input type='checkbox' name='expired' <TMPL_IF expired> checked </TMPL_IF> 
 	class='formulaire'>
   </td>
+</tr>
 </tr>
  <tr>
   <td valign='bottom'> 
-    <h2>Nombre d'éléments</h2>
+    <h2>Nombre d'&eacute;l&eacute;ments</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
 </tr>
 
 </table>
-  <input type="image" name='action' value='media' src='/bweb/update.png'>
+  <button type="submit" class="bp" name='action' value='media'> <img src='/bweb/update.png' alt=''>Scanner</button>
 
 </form>
 </div>
diff --git a/gui/bweb/lang/fr/tpl/display_groups.tpl b/gui/bweb/lang/fr/tpl/display_groups.tpl
index 910ff0dd85..72c8c86290 100644
--- a/gui/bweb/lang/fr/tpl/display_groups.tpl
+++ b/gui/bweb/lang/fr/tpl/display_groups.tpl
@@ -5,28 +5,25 @@
  <div class="bodydiv">
    <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' onclick='document.form1.reset()' value='groups_edit' title='Ajouter' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='groups_del' 
+    <button type="submit" class="bp" name='action' onclick='document.form1.reset()' value='groups_edit' title='Ajouter'> <img src='/bweb/add.png' alt=''>Ajouter</button>
+    <button type="submit" class="bp" name='action' value='groups_del' 
      onclick="return confirm('Voulez vous vraiment supprimer ce groupe ?');" 
-     title='Supprimer' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='groups_edit' title='Modifier' src='/bweb/edit.png'>&nbsp;
+     title='Supprimer'> <img src='/bweb/remove.png' alt=''>Supprimer</button>
+    <button type="submit" class="bp" name='action' value='groups_edit' title='Modifier'> <img src='/bweb/edit.png' alt=''>Modifier</button>
 
-    <input type="image" name='action' value='client' title='Voir les membres'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='job' title='Voir les jobs'
-     src='/bweb/zoom.png'>&nbsp;
-    <input type="image" name='action' value='group_stats' title='Statistiques sur le groupe' src='/bweb/chart.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='client' title='Voir les membres'> <img src='/bweb/zoom.png' alt=''>Voir les membres</button>
+    <button type="submit" class="bp" name='action' value='job' title='Voir les jobs'> <img src='/bweb/zoom.png' alt=''>Voir les jobs</button>
+    <button type="submit" class="bp" name='action' value='group_stats' title='Statistiques'> <img src='/bweb/chart.png' alt=''>Voir les stats</button>
    </form>
    <form action='?' method='get'>
     <input type='hidden' name='action' value='client'>
-    <input type="image" name='notingroup' value='yes' title='Voir les clients sans groupe'
-     src='/bweb/zoom.png'>&nbsp;
+    <button type="submit" class="bp" name='notingroup' value='yes' title='Voir les clients sans groupe'> <img src='/bweb/zoom.png' alt=''>Voir les autres</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom","Selection");
+var header = new Array("Nom","Sélection");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/fr/tpl/display_job.tpl b/gui/bweb/lang/fr/tpl/display_job.tpl
index 4006714a35..b5f68dd0e2 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 des Jobs (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> Historique (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
@@ -20,7 +20,7 @@ var header = new Array("JobId",
                        "Niveau",
                        "Début",
 	               "Durée",
-                       "Nb Fichier",
+                       "Fichiers",
                        "Taille", 
                        "Erreurs",
 	               "Statut");
diff --git a/gui/bweb/lang/fr/tpl/display_job_group.tpl b/gui/bweb/lang/fr/tpl/display_job_group.tpl
index 49671dae3e..7ccc053c67 100644
--- a/gui/bweb/lang/fr/tpl/display_job_group.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_group.tpl
@@ -18,7 +18,7 @@ var header = new Array("Groupe",
                        "Nb Err",
 	               "Nb Fichiers", 
 		       "Taille",
-		       "Duree",
+		       "Durée",
                        "Erreurs",
 	               "Statut");
 
diff --git a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
index a464fa1f5b..534bfad6d3 100644
--- a/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_job_zoom.tpl
@@ -4,86 +4,77 @@
  <div class="bodydiv">
  <table id='id0'></table>
  <table><td>
- <form action='bweb.pl?'>
+ <form name="delete" action='bweb.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <label>
-  <input type="image" name='action' value='delete' title='Supprimer ce job'
- onclick="return confirm('Voulez vous vraiment supprimer ce job du catalogue ?');"
-   src='/bweb/purge.png'> Purger
-  </label>
+  <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>
  </form>
  </td><td>
- <form action='bweb.pl?'>
+ <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <label>
-  <input type="image" name='action' value='media' title='Voir les médias associés' 
-   src='/bweb/zoom.png'>Voir les médias
-  </label>
+  <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>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <label>
-  <input type="image" name='action' value='job' title='Voir les jobs de <TMPL_VAR Client>' src='/bweb/zoom.png'>Voir les jobs
-  </label>
+  <button type="submit" class="bp" name='action' value='job' title='voir <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>Voir les jobs</button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="graph" action='bweb.pl?'>
   <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>'>
-  <label>
-  <input type="image" name='action' value='graph' title='Voir les tendances'
-   src='/bweb/chart.png'> Voir les stats
-  </label>
+  <button type="submit" class="bp" name='action' value='graph' title='Voir les tendances'>
+   <img src='/bweb/chart.png' alt=''> Voir les stats </button>
  </form>
  </td>
  <td>
- <form action='bweb.pl?'>
+ <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='Voir le fileset associé'
-   src='/bweb/zoom.png'> Voir le FileSet
-  </label>
+  <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>
  </form>
  </td>
-<!-- Enlever ce commentaire pour activer le bfileview
+<!-- Remove this to activate bfileview 
  <td>
- <form action='bfileview.pl?'>
+ <form name="bfileview" action='bfileview.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <input type='hidden' name='where' value='/'>
-  <label>
-  <input type="image" name='action' value='bfileview' 
-   title="Voir la répartition des fichiers"
-   onclick='if (<TMPL_VAR JobFiles> > 5000) { return confirm("Ce traitement peut prendre beaucoup de temps, voulez vous continuer ?")} else { return 1;}'
-   src='/bweb/colorscm.png'> Voir la répartition des fichiers
-  </label>
+  <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>
  </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
+ </td>
+</TMPL_IF>
  <td>
- <form action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
+ <form name="rerun" action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
   <input type='hidden' name='storage' value='<TMPL_VAR storage>'>
   <input type='hidden' name='fileset' value='<TMPL_VAR fileset>'>
   <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
   <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>'>
-  <label>
-  <input type="image" name='action' value='run_job_mod' title='Relancer ce job'
-   src='/bweb/R.png'> Relancer ce job
-  </label>
+  <button type="submit" class="bp" name='action' value='run_job_mod' title='Relancer ce job'>
+   <img src='/bweb/R.png'> Lancer ce job </button>
  </form>
  </td>
 <TMPL_IF joberrors>
  <td>
     <a href="<TMPL_VAR thisurl>;error=1"
-         title="Voir seulement les erreurs">
-    <img src='/bweb/doc.png' alt="Voir les erreurs"></a> Voir les erreurs
+         title="Voir les erreurs">
+    <img src='/bweb/doc.png' alt="View errors"></a> Voir les erreurs
   </td>
 </TMPL_IF>
  </table>
@@ -101,7 +92,7 @@ var header = new Array("JobId",
                        "Taille",
                        "Erreurs",
 	               "Pool",
-                       "Volumes utilisés",
+                       "Nom de volume",
 	               "Statut");
 
 var data = new Array();
diff --git a/gui/bweb/lang/fr/tpl/display_location.tpl b/gui/bweb/lang/fr/tpl/display_location.tpl
index 5637780baf..35820e6dae 100644
--- a/gui/bweb/lang/fr/tpl/display_location.tpl
+++ b/gui/bweb/lang/fr/tpl/display_location.tpl
@@ -1,22 +1,21 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Localisation</h1>
+  <h1 class='newstitle'>Localisations</h1>
  </div>
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" name='action' value='location_add' title='Ajouter' src='/bweb/add.png'>&nbsp;
-    <input type="image" name='action' value='location_del' title='Supprimer' src='/bweb/remove.png'>&nbsp;
-    <input type="image" name='action' value='location_edit' title='Modifier' src='/bweb/edit.png'>&nbsp;
+    <button type="submit" class="bp" name='action' value='location_add' title='Add a location'> <img src='/bweb/add.png' alt=''>Ajouter</button>
+    <button type="submit" class="bp" name='action' value='location_del' onclick='confirm("Voulez vous supprimer cette localisation ?")' title='Remove a location'> <img src='/bweb/remove.png' alt=''>Supprimer</button>
+    <button type="submit" class="bp" name='action' value='location_edit' title='Modifier'> <img src='/bweb/edit.png' alt=''>Modifier</button>
 
-    <input type="image" name='action' value='media' title='Voir les médias'
-     src='/bweb/zoom.png'>
+    <button type="submit" class="bp" name='action' value='media' title='Voir le contenu'> <img src='/bweb/zoom.png' alt=''>Voir le contenu</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom","Enabled", "Coût", "Nb de volumes", "Sélection");
+var header = new Array("Nom","Active", "Coût", "Nb médias", "Sélection");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/lang/fr/tpl/display_media.tpl b/gui/bweb/lang/fr/tpl/display_media.tpl
index b5e9eb257b..cf2e59eed7 100644
--- a/gui/bweb/lang/fr/tpl/display_media.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media.tpl
@@ -20,22 +20,22 @@ Localisation : <TMPL_VAR location>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <input type="image" name='action' value='extern' title='Externaliser' src='/bweb/extern.png' onclick='return confirm("Voulez vous vraiment éjecter les médias sélectionnés ?");'>&nbsp;
-      <input type="image" name='action' value='intern' title='Internaliser' src='/bweb/intern.png'>&nbsp;
-      <input type="image" name='action' value='update_media' title='Mettre à jour' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='media_zoom' title='Informations' src='/bweb/zoom.png'>&nbsp;
+      <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>
 <!--
-      <input type="image" name='action' value='purge' title='Purger' src='/bweb/purge.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='purge' title='Purger'> <img src='/bweb/purge.png' alt=''>Purger</button>
 -->
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>
+      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom du volume","En ligne","Taille", "Utilisation", "Statut",
-		       "Pool", "Type",
-		       "Dernière écriture", "Expiration", "Sélection");
+var header = new Array("Nom de volume","Online","Taille", "Utilisation du volume", "Vol Statut",
+                       "Pool", "Type",
+                       "Dernière écriture", "Expiration", "Sélection");
 
 var data = new Array();
 var img;
diff --git a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
index 7e392008bd..c4503bd390 100644
--- a/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
+++ b/gui/bweb/lang/fr/tpl/display_media_zoom.tpl
@@ -4,9 +4,9 @@
   <h1 class='newstitle'> Media : <TMPL_VAR volumename> <TMPL_VAR comment></h1>
  </div>
  <div class='bodydiv'>
-    <b> Informations </b><br/>
+    <b> Informations</b><br/>
     <table id='id_info_<TMPL_VAR volumename>'></table>
-    <b> Statistiques </b><br/>
+    <b> Statistiques</b><br/>
     <table id='id_media_<TMPL_VAR volumename>'></table>
     <b> Contenu </b></br>
     <table id='id_jobs_<TMPL_VAR volumename>'></table>
@@ -14,13 +14,13 @@
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
-      <input type="image" name='action' value='extern' onclick='return confirm("Voulez vous vraiment éjecter ce média ?");' title='Externaliser' src='/bweb/extern.png'>&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>
 <TMPL_ELSE>
-      <input type="image" name='action' value='intern' title='Internaliser' src='/bweb/intern.png'>&nbsp;
+      <button type="submit" class="bp" name='action' value='intern' title='Internaliser'> <img src='/bweb/intern.png' alt=''>Load</button>
 </TMPL_IF>
-      <input type="image" name='action' value='update_media' title='Mettre à jour' src='/bweb/edit.png'>&nbsp;
-      <input type="image" name='action' value='purge' title='Purger' src='/bweb/purge.png' onclick="return confirm('Vous voulez vraiment purger ce volume ?')">&nbsp;
-      <input type="image" name='action' value='prune' title='Prune' src='/bweb/prune.png'>&nbsp;
+      <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='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>
 </TMPL_IF>
@@ -29,7 +29,7 @@
 </td>
 <td valign='top'style="visibility:hidden;" id='locationlog'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Log sur les déplacements </h1>
+  <h1 class='newstitle'>Log sur les déplacements </h1>
  </div>
  <div class='bodydiv'>
 <pre>
@@ -40,8 +40,8 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","En ligne","Enabled","Localisation","Statut", "Taille", "Expiration",
-	               "Rétention","Temps maxi d'utilisation", "Nb de job maxi" );
+var header = new Array("Pool","Online","Active", "Localisation","Vol Statut", "Taille", "Expiration",
+	               "Rétention","Temps maxi d'utilisation", "Nombre de jobs maxi :" );
 
 var data = new Array();
 var img;
@@ -80,7 +80,7 @@ nrsTable.setup(
 }
 );
 
-var header = new Array( "Nb montages", "Nb recyclages", "Temps de lecture", "Temps d'écriture", "Erreurs");
+var header = new Array( "Nb montages", "Nb de recyclage", "Temps de lecture", "Temp d'écriture", "Erreurs");
 
 var data = new Array();
 data.push( new Array(
@@ -111,7 +111,7 @@ nrsTable.setup(
 
 
 var header = new Array("JobId","Nom","Début","Type",
-	               "Niveau", "Nb Fichiers", "Taille", "Statut");
+	               "Niveau","Fichiers","Taille","Statut");
 
 var data = new Array();
 var a;
diff --git a/gui/bweb/lang/fr/tpl/display_pool.tpl b/gui/bweb/lang/fr/tpl/display_pool.tpl
index 4609c73d79..623ef72b0f 100644
--- a/gui/bweb/lang/fr/tpl/display_pool.tpl
+++ b/gui/bweb/lang/fr/tpl/display_pool.tpl
@@ -5,19 +5,18 @@
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <input type="image" type='submit' name='action' value='media' title='Afficher le contenu' src='/bweb/zoom.png'>
+    <button type="submit" class="bp" type='submit' name='action' value='media' title='Afficher le contenu'> <img src='/bweb/zoom.png' alt=''>Voir</button>
     <input id="mediatype" type='hidden' name='mediatype' value=''>
    </form>
    <br/>
-   Tips : Pour modifier les options d'un pool, vous devez éditer la configuration bacula et
-   la recharger (reload). Après vous devez lancer "update pool=mypool" sur la bconsole.
+   Tips : Pour modifier les options d'un pool, vous devez éditer la configuration bacula et la recharger (reload). Après vous devez lancer "update pool=mypool" sur la bconsole.
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom","Type","Recyclage","Rétention","Durée d'utilisation",
-//	               "Nb job maxi par média","Nb fichier maxi par média","Taille maxi d'un média",
-	               "Nb volumes", "Statut", "Utilisation", "Sélection");
+var header = new Array("Nom","Type", "Recyclé","Rétention","Durée d'utilisation :",
+                       "Nb job maxi par média","Nb job maxi par média", 
+                       "Nb volumes","Nb médias", "Vol Statut", "Utilisation", "Sélection");
 
 var data = new Array();
 var chkbox;
@@ -53,9 +52,9 @@ data.push( new Array(
 "<TMPL_VAR Recycle>",
 human_sec(<TMPL_VAR VolRetention>),
 human_sec(<TMPL_VAR VolUseDuration>),
-//"<TMPL_VAR MaxVolJobs>",
-//"<TMPL_VAR MaxVolFiles>",
-//human_size(<TMPL_VAR MaxVolBytes>),
+"<TMPL_VAR MaxVolJobs>",
+"<TMPL_VAR MaxVolFiles>",
+human_size(<TMPL_VAR MaxVolBytes>),
 "<TMPL_VAR VolNum>",
 img,
 img2,
diff --git a/gui/bweb/lang/fr/tpl/error.tpl b/gui/bweb/lang/fr/tpl/error.tpl
index f14c4b412a..5327028d21 100644
--- a/gui/bweb/lang/fr/tpl/error.tpl
+++ b/gui/bweb/lang/fr/tpl/error.tpl
@@ -1,4 +1,4 @@
 <h1>Une erreur s'est produite :</h1>
 <pre>
-<TMPL_VAR NAME=error>
+<TMPL_VAR error>
 </pre>
diff --git a/gui/bweb/lang/fr/tpl/fileset_view.tpl b/gui/bweb/lang/fr/tpl/fileset_view.tpl
index 3ac58e2cbf..f81ccf1a04 100644
--- a/gui/bweb/lang/fr/tpl/fileset_view.tpl
+++ b/gui/bweb/lang/fr/tpl/fileset_view.tpl
@@ -15,6 +15,6 @@
 <TMPL_LOOP E><TMPL_VAR file>
 </TMPL_LOOP></pre>
 
-Tips : Attention ceci est le FileSet courant. Il peut avoir changà sur une ancienne sauvegarde.
+Tips : Attention ceci est le FileSet courant. Il peut avoir changé sur une ancienne sauvegarde.
 
  </div>
diff --git a/gui/bweb/lang/fr/tpl/fv_file_attribs.tpl b/gui/bweb/lang/fr/tpl/fv_file_attribs.tpl
index f40954ad76..1dc911f6a4 100644
--- a/gui/bweb/lang/fr/tpl/fv_file_attribs.tpl
+++ b/gui/bweb/lang/fr/tpl/fv_file_attribs.tpl
@@ -3,10 +3,10 @@
 </div>
 <div class='bodydiv'>
    <table>
-    <tr><td>taille : </td> <td> <TMPL_VAR size>  </td></tr>
-    <tr><td>ctime :  </td> <td> <TMPL_VAR atime> </td></tr>
-    <tr><td>mtime :  </td> <td> <TMPL_VAR mtime> </td></tr>
-    <tr><td>atime :  </td> <td> <TMPL_VAR atime> </td></tr>
-    <tr><td>md5 :    </td> <td> <TMPL_VAR md5>   </td></tr>
+    <tr><td>size : </td> <td> <TMPL_VAR size>  </td></tr>
+    <tr><td>ctime :</td> <td> <TMPL_VAR atime> </td></tr>
+    <tr><td>mtime :</td> <td> <TMPL_VAR mtime> </td></tr>
+    <tr><td>atime :</td> <td> <TMPL_VAR atime> </td></tr>
+    <tr><td>md5 :  </td> <td> <TMPL_VAR md5>   </td></tr>
    </table>
 </div>
diff --git a/gui/bweb/lang/fr/tpl/graph.tpl b/gui/bweb/lang/fr/tpl/graph.tpl
index 25e82aa984..345ee71804 100644
--- a/gui/bweb/lang/fr/tpl/graph.tpl
+++ b/gui/bweb/lang/fr/tpl/graph.tpl
@@ -6,7 +6,7 @@
 <table border='0'>
 <td>
 <form name='form1' action='?' method='GET'>
-	<div class="otherboxtitle">
+        <div class="otherboxtitle">
           Options &nbsp;
         </div>
         <div class="otherbox">
@@ -17,8 +17,8 @@
     <select name='level' class='formulaire'>
       <option id='level_Any' value='Any'>Tous</option>
       <option id='level_F' value='F'>Full</option>
-      <option id='level_D' value='D'>Differentielle</option>
-      <option id='level_I' value='I'>Incrémentale</option>
+      <option id='level_D' value='D'>Diff&eacute;rentielle</option>
+      <option id='level_I' value='I'>Incr&eacute;mentale</option>
     </select>     
   </td><td valign='top'>
     <h2>Statut</h2>
@@ -26,7 +26,7 @@
       <option id='status_Any' value='Any'>Tous</option>
       <option id='status_T'   value='T'>Ok</option>
       <option id='status_f'   value='f'>Erreur</option>
-      <option id='status_A'   value='A'>Annulé</option>
+      <option id='status_A'   value='A'>Annul&eacute;</option>
     </select>   
   </td>
 </tr>
@@ -36,31 +36,31 @@
     <select name='age' class='formulaire'>
       <option id='age_604800'   value='604800'>Cette semaine</option>
       <option id='age_2678400'  value='2678400'>30 derniers jours</option>
-      <option id='age_15552000' value='15552000'>6 derniers mois</option>
+      <option id='age_15552000' value='15552000'>Last 6 months</option>
     </select>     
   </td>
   <td  valign='top'>
     <h2>Taille</h2>
      Largeur : &nbsp;<input class='formulaire' type='text' 
-			 name='width' value='<TMPL_VAR width>' size='4'><br/>
+                         name='width' value='<TMPL_VAR width>' size='4'><br/>
      Hauteur :  <input type='text' class='formulaire' 
-		name='height' value='<TMPL_VAR height>' size='4'><br/>
+                name='height' value='<TMPL_VAR height>' size='4'><br/>
   </td>
 </tr>
 <tr>
   <td valign='top'> 
     <h2>Clients</h2>
     <select name='client' size='15' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_clients>
+<TMPL_LOOP db_clients>
       <option id='client_<TMPL_VAR clientname>'><TMPL_VAR clientname></option>
 </TMPL_LOOP>
     </select>
   </td>
   <td valign='top'> 
-    <h2>Job</h2>
+    <h2>Nom du Job</h2>
     <select name='jobname' size='15' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_jobnames>
-      <option><TMPL_VAR NAME=jobname></option>
+<TMPL_LOOP db_jobnames>
+      <option><TMPL_VAR jobname></option>
 </TMPL_LOOP>
     </select>
   </td>
@@ -68,11 +68,11 @@
 <tr>
   <td> <h2> Type </h2> 
  <select name='graph' class='formulaire'>
-   <option id='job_size'     value='job_size' title="Taille des jobs pour la période">Taille des Job </option>
+   <option id='job_size'     value='job_size' title="Taille des jobs pour la période">Taille des job</option>
    <option id='job_duration' value='job_duration' title="Durée des jobs pour la période">Durée</option>
-   <option id='job_rate' value='job_rate' title="Débit des job pour la période">Débit</option>
-   <option id='job_file' value='job_file' title="Nombre de fichier sauvegardé par job pour la période">Nb fichiers</option>
-   <option id='job_count_phour' value='job_count_phour' title="Number of job per hour for the period">Job per hour</option>
+   <option id='job_rate' value='job_rate' title="Débit des job pour la période">Débit des Jobs</option>
+   <option id='job_file' value='job_file' title="Nombre de fichier sauvegardé par job pour la période">Job Files</option>
+   <option id='job_count_phour' value='job_count_phour' title="Number of job per hour for the period">Job par heure</option>
    <option id='job_count_pday' value='job_count_pday' title="Number of job per day for the period">Job per day</option>
    <option id='job_avg_phour' value='job_avg_pday' title="Average backup size per day for the period">Job avg B/hour</option>
    <option id='job_avg_pday' value='job_avg_pday' title="Average backup size per hour for the period">Job avg B/day</option>
@@ -84,12 +84,15 @@
    <option id='job_avg_day' value='job_avg_day' title="Average backup size per day for the period">Job avg size (d)</option>
    <option id='job_sum_hour' value='job_sum_hour' title="Job size per hour for the period">Job Bytes (h)</option>
    <option id='job_sum_day' value='job_sum_day' title="Job size per day for the period">Job Bytes (d)</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_nb' value='job_time_nb' title="Affiche la durée, la taille et le nombre de fichier avec des cercles">Time,size,files</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_size' value='job_time_size' title="Affiche la durée, le nombre de fichier et la taille avec des cercles">Time,files,size</option>
+
  </select>
   </td>
   <td valign='bottom'> 
-    <h2>Nombre d'élément</h2>
-    <input type='text' name='limit' value='<TMPL_VAR NAME=limit>' 
-	class='formulaire' size='4'>
+    <h2>Nombre d'&eacute;l&eacute;ments</h2>
+    <input type='text' name='limit' value='<TMPL_VAR limit>' 
+        class='formulaire' size='4'>
   </td>
 </tr>
 <tr>
@@ -98,6 +101,7 @@
     <option id='gtype_bars' value='bars'>Barres</option>
 <!--  <option id='gtype_bars3d' value='bars3d'>Bars3d</option> -->
     <option id='gtype_lines' value='lines'>Lignes</option>
+    <option onclick='document.getElementById("job_time_size").selected=true;' id='gtype_balloon' value='balloon'>Balloon</option>
     <option id='gtype_linespoints' value='linespoints'>Lignes avec points</option>
 </td>
 <td>
@@ -112,10 +116,12 @@
 <td>
 
  <div class="otherboxtitle">
- Graphique &nbsp;
+ Current &nbsp;
  </div>
  <div class="otherbox">
- <img src='bgraph.pl?<TMPL_VAR NAME=url>' alt="Rien n'a afficher, essayer avec une autre période">
+
+ <img usemap='imggraph' id='imggraph' 
+      alt='Rien n a afficher, essayer avec une autre période'>
  </div>
 
 </td>
@@ -168,5 +174,8 @@
      document.getElementById('gtype_<TMPL_VAR gtype>').selected=true;
   </TMPL_IF>
 
-</script>
+  <TMPL_IF url>
+   document.getElementById('imggraph').src='bgraph.pl?<TMPL_VAR url>'
+  </TMPL_IF>
 
+</script>
diff --git a/gui/bweb/lang/fr/tpl/groups_edit.tpl b/gui/bweb/lang/fr/tpl/groups_edit.tpl
index 9f27bd8bcd..4d3c692287 100644
--- a/gui/bweb/lang/fr/tpl/groups_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/groups_edit.tpl
@@ -21,8 +21,8 @@
          </td>
      </tr>
     </table>
-    <input type="image" name='action' value='groups_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='groups_save'>
+     <img src='/bweb/save.png' alt=''>Sauver</button>
    </form>
 </div>
 
@@ -30,4 +30,4 @@
   <TMPL_LOOP client_group_member>
      document.getElementById('client_<TMPL_VAR name>').selected = true;
   </TMPL_LOOP>
-</script>
\ No newline at end of file
+</script>
diff --git a/gui/bweb/lang/fr/tpl/help_extern.tpl b/gui/bweb/lang/fr/tpl/help_extern.tpl
index 9385b40003..42f9b742c8 100644
--- a/gui/bweb/lang/fr/tpl/help_extern.tpl
+++ b/gui/bweb/lang/fr/tpl/help_extern.tpl
@@ -1,33 +1,31 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Assistant d'externalisation de médias (partie 1/2)</h1>
+ <h1 class='newstitle'>Assistant d'externalisation de médias (partie 1/2)</h1>
 </div>
 <div class='bodydiv'>
-Cet outil va sélectionner pour vous les meilleurs cartouches à externaliser.
-Vous devrez choisir parmi la sélection de l'écran suivant.
-
+Cet outil va sélectionner pour vous les meilleurs cartouches à externaliser. Vous devrez choisir parmi la sélection de l'écran suivant.
   <form action="?" method='GET'>
    <table>
     <tr><td>Pool :</td>      
         <td><select name='pool' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_pools>
+<TMPL_LOOP db_pools>
              <option selected><TMPL_VAR NAME=name></option>
 </TMPL_LOOP>
            </select>
         </td>
     </tr>
-    <tr><td>Type de média:</td>      
+    <tr><td>Type de média :</td>      
         <td><select name='mediatype' class='formulaire' multiple>
-<TMPL_LOOP NAME=db_mediatypes>
-             <option><TMPL_VAR NAME=mediatype></option>
+<TMPL_LOOP db_mediatypes>
+             <option><TMPL_VAR mediatype></option>
 </TMPL_LOOP>
            </select>
         </td>
     </tr>
     <tr><td> Localisation : </td>
         <td><select name='location' class='formulaire'>
-  <TMPL_LOOP NAME=db_locations>
-      <option id='loc_<TMPL_VAR NAME=location>' value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+  <TMPL_LOOP db_locations>
+      <option id='loc_<TMPL_VAR location>' value='<TMPL_VAR location>'><TMPL_VAR location></option>
   </TMPL_LOOP>
     </select>
         </td>
@@ -38,7 +36,7 @@ Vous devrez choisir parmi la s
               value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_extern_media' title='Suivant' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_extern_media' title='Suivant'> <img src='/bweb/next.png' alt=''>Suivant</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
index 23379d44c0..e65922ff59 100644
--- a/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_extern_compute.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Assistant d'externalisation de médias (partie 2/2)</h1>
+  <h1 class='newstitle'>Assistant d'externalisation de médias (partie 2/2)</h1>
  </div>
  <div class='bodydiv'>
   Maintenant, vous devez vérifier la sélection et éjecter les médias.
@@ -8,36 +8,36 @@
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Précédent' src='/bweb/prev.png'>
+    <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>
     </td><td style='align: right;'>
-    <input type="image" name='action' value='extern' src='/bweb/extern.png' title='Externaliser la selection'>
+    <button type="submit" class="bp" name='action' value='extern' title='Externaliser la selection'> <img src='/bweb/extern.png' alt=''>Externaliser</button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom de volume","Statut",
-	               "Type de média","Pool","Dernière écriture", 
+var header = new Array("Nom de volume","Vol Statut",
+                       "Type","Nom du Pool","Dernière écriture", 
                        "Expiration", "Sélection");
 
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
-chkbox.value = '<TMPL_VAR NAME=volumename>';
+chkbox.value = '<TMPL_VAR volumename>';
 chkbox.name  = 'media';
 chkbox.checked = 'on';
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=volstatus>",
-"<TMPL_VAR NAME=mediatype>",
-"<TMPL_VAR NAME=name>",
-"<TMPL_VAR NAME=lastwritten>",
-"<TMPL_VAR NAME=expire>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR volstatus>",
+"<TMPL_VAR mediatype>",
+"<TMPL_VAR name>",
+"<TMPL_VAR lastwritten>",
+"<TMPL_VAR expire>",
 chkbox
  )
 );
diff --git a/gui/bweb/lang/fr/tpl/help_intern.tpl b/gui/bweb/lang/fr/tpl/help_intern.tpl
index ea06a08c1b..e587381401 100644
--- a/gui/bweb/lang/fr/tpl/help_intern.tpl
+++ b/gui/bweb/lang/fr/tpl/help_intern.tpl
@@ -3,9 +3,7 @@
   <h1 class='newstitle'> Assistant d'internalisation de médias (partie 1/2)</h1>
 </div>
 <div class="bodydiv">
-Cet outil va sélectionner pour vous les meilleurs cartouches à internaliser.
-Vous devrez choisir parmi la sélection de l'écran suivant.
-
+Cet outil va sélectionner pour vous les meilleurs cartouches à internaliser. Vous devrez choisir parmi la sélection de l'écran suivant.
   <form action="?" method='GET'>
    <table>
     <tr><td>Pool :</td>      
@@ -34,18 +32,17 @@ Vous devrez choisir parmi la s
     </td>
     </tr>
     <tr>
-        <td>Choisir des médias <br/> expirés :</td> 
+        <td>Expirés</td> 
         <td> <input type='checkbox' name='expired' class='formulaire' 
-		checked> </td>
+                checked> </td>
     </tr>
     <tr>
         <td>Nombre de médias <br/> à internaliser :</td> 
         <td> <input type='text' name='limit' class='formulaire' 
-		size='3' value='10'> </td>
+                size='3' value='10'> </td>
     </tr>
     <tr>
-        <td><input type="image" name='action' value='compute_intern_media' 
-		title='Suivant' src='/bweb/next.png'>
+        <td><button type="submit" class="bp" name='action' value='compute_intern_media' title='Suivant'> <img src='/bweb/next.png' alt=''>Suivant</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
index 3db60ef71f..b658aa0994 100644
--- a/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
+++ b/gui/bweb/lang/fr/tpl/help_intern_compute.tpl
@@ -1,27 +1,26 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Assistant d'internalisation de médias (partie 2/2)</h1>
+  <h1 class='newstitle'>Assistant d'internalisation de médias (partie 2/2)</h1>
  </div>
  <div class='bodydiv'>
   Maintenant vous devez vérifier la sélection et charger les médias.
-
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <input type="image" onclick='javascript:window.history.go(-2);' title='Précédent' src='/bweb/prev.png'>
+    <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>
     </td><td style='align: right;'>
-    <input type="hidden" name='enabled' value="yes">
-    <input type="image" name='action' value='move_media'
-     src='/bweb/intern.png'>
+    <input type="hidden" name='enabled' value='yes'>
+    <button type="submit" class="bp" name='action' value='move_media'> 
+     <img src='/bweb/intern.png' alt=''></button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Nom de volume","Statut",
-	               "Type de media","Pool","Dernière écriture", 
+var header = new Array("Nom de volume","Vol Statut",
+                       "Type","Nom du Pool","Dernière écriture", 
                        "Expiration", "Sélection");
 
 var data = new Array();
@@ -31,16 +30,16 @@ var chkbox;
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.name = 'media';
-chkbox.value= '<TMPL_VAR NAME=volumename>';
+chkbox.value= '<TMPL_VAR volumename>';
 chkbox.checked = 'on';
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=volstatus>",
-"<TMPL_VAR NAME=mediatype>",
-"<TMPL_VAR NAME=name>",
-"<TMPL_VAR NAME=lastwritten>",
-"<TMPL_VAR NAME=expire>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR volstatus>",
+"<TMPL_VAR mediatype>",
+"<TMPL_VAR name>",
+"<TMPL_VAR lastwritten>",
+"<TMPL_VAR expire>",
 chkbox
  )
 );
diff --git a/gui/bweb/lang/fr/tpl/location_add.tpl b/gui/bweb/lang/fr/tpl/location_add.tpl
index 49b5c5529f..7fa01de5e0 100644
--- a/gui/bweb/lang/fr/tpl/location_add.tpl
+++ b/gui/bweb/lang/fr/tpl/location_add.tpl
@@ -14,13 +14,16 @@
          <td> <input class="formulaire" type='text' value='10' name='cost' size='3'>
          </td>
      </tr>
-     <tr><td>En ligne :</td> 
-         <td> <input class="formulaire" type='checkbox' value='10' name='enabled'>
-         </td>
-     </tr>
+    <tr><td>En ligne :</td>
+        <td> <select name='enabled' class='formulaire'>
+           <option value='yes'>oui</option>
+           <option value='no'>non</option>
+           <option value='archived'>archivé</option>
+           </select>
+        </td>
+    </tr>
     </table>
-    <input type="image" name='action' value='location_add' title="Sauvegarder"
-      src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_add' title="Sauver" ><img src='/bweb/save.png' alt=''>Sauver</button>
    </form>
 
 Tips: Vous devez avoir une localisation par robotique.
diff --git a/gui/bweb/lang/fr/tpl/location_edit.tpl b/gui/bweb/lang/fr/tpl/location_edit.tpl
index 117359e6b5..7c350e5230 100644
--- a/gui/bweb/lang/fr/tpl/location_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/location_edit.tpl
@@ -15,19 +15,20 @@
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-    <tr><td>Enabled:</td>
+    <tr><td>En ligne :</td>
         <td> <select name='enabled' class='formulaire'>
-           <option value='yes'>yes</option>
-           <option value='no'>no</option>
-           <option value='archived'>archived</option>
+           <option value='yes'>oui</option>
+           <option value='no'>non</option>
+           <option value='archived'>archivé</option>
            </select>
         </td>
     </tr>
     </table>
-    <input type="image" name='action' value='location_save'
-     src='/bweb/save.png'>
+    <button type="submit" class="bp" name='action' value='location_save'>
+      <img src='/bweb/save.png' alt=''>Sauver</button>
    </form>
 </div>
+
 <script type="text/javascript" language='JavaScript'>
 ok=1;
 for (var i=0; ok && i < document.form1.enabled.length; ++i) {
diff --git a/gui/bweb/lang/fr/tpl/move_media.tpl b/gui/bweb/lang/fr/tpl/move_media.tpl
index 25223a38ab..ffe2a64b6c 100644
--- a/gui/bweb/lang/fr/tpl/move_media.tpl
+++ b/gui/bweb/lang/fr/tpl/move_media.tpl
@@ -1,22 +1,22 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Déplacer un média</h1>
+  <h1 class='newstitle'>Déplacer des médias</h1>
  </div>
  <div class="bodydiv">
    <form name='form1' action='?' method='get'>
-    <table id='id<TMPL_VAR NAME=ID>'></table>
+    <table id='id<TMPL_VAR ID>'></table>
     <table border='0'>
     <tr><td> Nouvelle localisation : </td><td>
 <select name='newlocation' class='formulaire'>
-    <TMPL_LOOP NAME=db_locations>
-    <option value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+    <TMPL_LOOP db_locations>
+    <option value='<TMPL_VAR location>'><TMPL_VAR location></option>
     </TMPL_LOOP>
 </select>
-    </td></tr><tr><td> Enabled: </td><td>
+    </td></tr><tr><td> En ligne : </td><td>
 <select name='enabled' class='formulaire'>
     <option value='no'>non</option>
     <option value='yes'>oui</option>
-    <option value='archived'>archive</option>
+    <option value='archived'>archivé</option>
 </select>
     </td><tr><td> Utilisateur : </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
@@ -25,9 +25,7 @@
 <textarea name="comment" class='formulaire'></textarea>
     </td></tr>
     </table>
-    <label>
-    <input type="image" type='submit' name='action' value='change_location' src='/bweb/apply.png'> Déplacer
-    </label>
+    <button type="submit" class="bp" type='submit' name='action' value='change_location'> <img src='/bweb/apply.png' alt=''> Déplacer </button>
    </form>
  </div>
 
@@ -38,16 +36,16 @@ var header = new Array("Nom de volume", "Localisation", "S
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
-chkbox.value = '<TMPL_VAR name=volumename>';
+chkbox.value = '<TMPL_VAR volumename>';
 chkbox.name  = 'media';
 chkbox.checked = 1;
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=location>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR location>",
 chkbox
  )
 );
@@ -55,7 +53,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
@@ -74,7 +72,6 @@ nrsTable.setup(
  rows_per_page: rows_per_page
 }
 );
-
 <TMPL_IF enabled>
 ok=1;
 for (var i=0; ok && i < document.form1.enabled.length; ++i) {
diff --git a/gui/bweb/lang/fr/tpl/run_job.tpl b/gui/bweb/lang/fr/tpl/run_job.tpl
index bda7494722..600dee7a52 100644
--- a/gui/bweb/lang/fr/tpl/run_job.tpl
+++ b/gui/bweb/lang/fr/tpl/run_job.tpl
@@ -17,17 +17,9 @@
    </td></tr>
    </table>
    <br/>
-   <label>
-   <input type="image" name='action' value='enable_job' title='Activer'
-    src='/bweb/inflag1.png'> Activer
-   </label>
-   <label>
-   <input type="image" name='action' value='disable_job' title='Désactiver'
-    src='/bweb/inflag0.png'> Désactiver
-   </label>
-   <label>
-   <input type="image" name='action' value='run_job_mod' title='Lancer maintenant'
-    src='/bweb/R.png'> Lancer maintenant
-   </label>
+   <button type="submit" class="bp" name='action' value='enable_job' title='Activer'> <img src='/bweb/inflag1.png' alt=''> Activer </button>
+   <button type="submit" class="bp" name='action' value='disable_job' title='Désactiver' > <img src='/bweb/inflag0.png' alt=''> Désactiver </button>
+   <button type="submit" class="bp" name='action' value='next_job2' title='Show schedule' > <img src='/bweb/zoom.png' alt=''> Show schedule  </button>
+   <button type="submit" class="bp" name='action' value='run_job_mod' title='Lancer maintenant' > <img src='/bweb/R.png' alt=''> Lancer maintenant  </button>
   </form>
  </div>
diff --git a/gui/bweb/lang/fr/tpl/run_job_mod.tpl b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
index 5afe00b32f..e54840afa7 100644
--- a/gui/bweb/lang/fr/tpl/run_job_mod.tpl
+++ b/gui/bweb/lang/fr/tpl/run_job_mod.tpl
@@ -54,12 +54,13 @@
 
    </td></tr><tr><td>Niveau : </td><td>
    <select name='level'>
-     <option id='level_Incremental' value='Incremental'>Incrémentale</option>
+     <option id='level_Incremental' value='Incremental'>Incr&eacute;mentale</option>
      <option id='level_Full' value='Full'>Full</option>
-     <option id='level_Differential' value='Differential'>Différentielle</option>
+     <option id='level_Differential' value='Differential'>Diff&eacute;rentielle</option>
    </select>
+
    </td></tr><tr id='more1' style="visibility:hidden"><td>Date de d&eacute;marrage : </td><td>
-   <input type='text' title='AAAA-MM-JJ HH:MM:SS'
+   <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>
@@ -69,19 +70,14 @@
    </td></tr>
    </table>
    <br/>
+
   <label onclick='
            document.getElementById("more1").style.visibility="visible";
            document.getElementById("more2").style.visibility="visible";'>
-  <img title="Affiche plus d'options" src='/bweb/add.png'>Options</label>
-  <label>
-  <label>
-  <input type="image" name='action' value='run_job_now' title='Lancer maintenant'
-   src='/bweb/R.png'>Lancer maintenant
-  </label>
-  <label>
-  <input type="image" name='action' value='fileset_view' title='Voir le FileSet'
-   src='/bweb/zoom.png'>Voir le FileSet
-  </label>
+  <img title="Display more options" src='/bweb/add.png'>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>
   </form>
  </div>
 
@@ -123,7 +119,7 @@
      }
   </TMPL_IF>
   <TMPL_IF level>
-    document.getElementById('level_<TMPL_VAR level>').selected=true;
+     document.getElementById('level_<TMPL_VAR level>').selected=true; 
   </TMPL_IF>
   <TMPL_IF fileset>
      ok=1;
diff --git a/gui/bweb/lang/fr/tpl/running_job.tpl b/gui/bweb/lang/fr/tpl/running_job.tpl
index 9d9ffac8c3..e5e077f307 100644
--- a/gui/bweb/lang/fr/tpl/running_job.tpl
+++ b/gui/bweb/lang/fr/tpl/running_job.tpl
@@ -4,62 +4,59 @@
  </div>
  <div class='bodydiv'>
    <form action='?' method='GET'>
-   <table id='id<TMPL_VAR NAME=ID>'></table>
+   <table id='id<TMPL_VAR ID>'></table>
    <br/>
 <label>
-<input type='image' name='action' value='dsp_cur_job' 
- title='Voir le job' src='/bweb/zoom.png'>
-</label>
-<label>
-<input type="image" type='submit' name='action' value='cancel_job'
+<button type="submit" class="bp" name='action' value='dsp_cur_job' 
+ title='Voir le job'> <img src='/bweb/zoom.png' alt=''>Voir</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' src='/bweb/cancel.png'>
-</label>
+ title='Annuler le job'> <img src='/bweb/cancel.png' alt=''>Annul&eacute;</button>
    </form>
 
  </div>
 
 <script type="text/javascript" language="JavaScript">
 var header = new Array("JobId",
-	               "Client",
-	               "Nom du Job", 
+                       "Client",
+                       "Nom du Job", 
                        "Niveau",
                        "Début", 
                        "Durée", 
 //                       "Job Files",
 //                       "Job Bytes", 
-	               "Statut",
-	               "Sélection"
-	);
+                       "Statut",
+                       "Sélection"
+        );
 
 var data = new Array();
 var chkbox;
 var img;
 
-<TMPL_LOOP NAME=Jobs>
+<TMPL_LOOP Jobs>
 a = document.createElement('A');
 a.href='?action=dsp_cur_job;jobid=<TMPL_VAR JobId>';
 
 img = document.createElement("IMG");
-img.src = '/bweb/<TMPL_VAR NAME=JobStatus>.png';
-img.title = jobstatus['<TMPL_VAR NAME=JobStatus>'];
+img.src = '/bweb/<TMPL_VAR JobStatus>.png';
+img.title = jobstatus['<TMPL_VAR JobStatus>'];
 
 a.appendChild(img);
 
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'radio';
 chkbox.name = 'jobid';
-chkbox.value = '<TMPL_VAR NAME=jobid>';
+chkbox.value = '<TMPL_VAR jobid>';
 
 data.push( new Array(
-"<TMPL_VAR NAME=JobId>",
-"<TMPL_VAR NAME=ClientName>",     
-"<TMPL_VAR NAME=JobName>",    
-joblevel['<TMPL_VAR NAME=Level>'],      
-"<TMPL_VAR NAME=StartTime>",
-"<TMPL_VAR NAME=duration>",
-//"<TMPL_VAR NAME=JobFiles>",   
-//"<TMPL_VAR NAME=JobBytes>",
+"<TMPL_VAR JobId>",
+"<TMPL_VAR ClientName>",     
+"<TMPL_VAR JobName>",    
+joblevel['<TMPL_VAR Level>'],      
+"<TMPL_VAR StartTime>",
+"<TMPL_VAR duration>",
+//"<TMPL_VAR JobFiles>",   
+//"<TMPL_VAR JobBytes>",
 a,
 chkbox
  )
@@ -68,7 +65,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
@@ -89,7 +86,7 @@ nrsTable.setup(
 );
 
 // get newest backup first
-nrsTables['id<TMPL_VAR NAME=ID>'].fieldSort(0);
+nrsTables['id<TMPL_VAR ID>'].fieldSort(0);
 
 bweb_add_refresh();
 
diff --git a/gui/bweb/lang/fr/tpl/scheduled_job.tpl b/gui/bweb/lang/fr/tpl/scheduled_job.tpl
index 0d38f6531d..e03b641bdc 100644
--- a/gui/bweb/lang/fr/tpl/scheduled_job.tpl
+++ b/gui/bweb/lang/fr/tpl/scheduled_job.tpl
@@ -3,16 +3,15 @@
   <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Prochains jobs </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
-    <form action='<TMPL_VAR cginame>?' method='GET'>
+    <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <label>
-     <input type="image" name='action' value='run_job_mod'
-      src='/bweb/R.png' title='Lancer maintenant'> Lancer maintenant
-     </label>
-     <label>
-      <input type="image" name='action' value='disable_job'
-       src='/bweb/inflag0.png' title='Désactiver'> Désactiver
-      </label>
+     <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>
+     <input type='hidden' name='pool' value=''>
+     <input type='hidden' name='level' value=''>
+     <input type='hidden' name='media' value=''>
     </form>
  </div>
 
@@ -34,6 +33,11 @@ chkbox = document.createElement('INPUT');
 chkbox.type  = 'radio';
 chkbox.name = 'job';
 chkbox.value = '<TMPL_VAR name>';
+chkbox.onclick = function() { 
+ document.form1.level.value = '<TMPL_VAR level>';
+ document.form1.pool.value = '<TMPL_VAR pool>';
+ document.form1.media.value = '<TMPL_VAR volume>';
+} ;
 
 data.push( new Array(
 "<TMPL_VAR date>",    
diff --git a/gui/bweb/lang/fr/tpl/update_location.tpl b/gui/bweb/lang/fr/tpl/update_location.tpl
index 48ac5de29a..04ce44f82b 100644
--- a/gui/bweb/lang/fr/tpl/update_location.tpl
+++ b/gui/bweb/lang/fr/tpl/update_location.tpl
@@ -1,16 +1,16 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Mise à jour de la localisation d'un média</h1>
+  <h1 class='newstitle'>Mise à jour de la localisation des médias</h1>
  </div> 
  <div class="bodydiv">
    <form action='?' method='get'>
-    <table id='id<TMPL_VAR NAME=ID>'></table>
+    <table id='id<TMPL_VAR ID>'></table>
     Nouvelle localisation : <select class='formulaire' name='newlocation'>
-   <TMPL_LOOP NAME=db_locations>
-      <option id='loc_<TMPL_VAR NAME=location>' value='<TMPL_VAR NAME=location>'><TMPL_VAR NAME=location></option>
+   <TMPL_LOOP db_locations>
+      <option id='loc_<TMPL_VAR location>' value='<TMPL_VAR location>'><TMPL_VAR location></option>
    </TMPL_LOOP>
   </select>
-  <input type="image" name='action' value='save_location' src='/bweb/apply.png'>
+  <button type="submit" class="bp" name='action' value='save_location'> <img src='/bweb/apply.png' alt=''>Appliquer</button>
    </form>
  </div>
 
@@ -21,7 +21,7 @@ var header = new Array("Nom de volume", "Localisation", "S
 var data = new Array();
 var chkbox;
 
-<TMPL_LOOP NAME=media>
+<TMPL_LOOP media>
 chkbox = document.createElement('INPUT');
 chkbox.type  = 'checkbox';
 chkbox.value = '<TMPL_VAR name=volumename>';
@@ -29,8 +29,8 @@ chkbox.name  = 'media';
 chkbox.checked = 1;
 
 data.push( new Array(
-"<TMPL_VAR NAME=volumename>",
-"<TMPL_VAR NAME=location>",
+"<TMPL_VAR volumename>",
+"<TMPL_VAR location>",
 chkbox
  )
 );
@@ -38,7 +38,7 @@ chkbox
 
 nrsTable.setup(
 {
- table_name:     "id<TMPL_VAR NAME=ID>",
+ table_name:     "id<TMPL_VAR ID>",
  table_header: header,
  table_data: data,
  up_icon: up_icon,
diff --git a/gui/bweb/lang/fr/tpl/update_media.tpl b/gui/bweb/lang/fr/tpl/update_media.tpl
index 211fc5fe57..2294550cc6 100644
--- a/gui/bweb/lang/fr/tpl/update_media.tpl
+++ b/gui/bweb/lang/fr/tpl/update_media.tpl
@@ -1,6 +1,6 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Modifier le media <TMPL_VAR volumename></h1>
+ <h1 class='newstitle'>Modifier le media <TMPL_VAR volumename></h1>
 </div>
 <div class='bodydiv'>
   <form name='form1' action="?" method='GET'>
@@ -46,18 +46,18 @@
         </td>
     </tr>
 
-    <tr><td>Enabled :</td>
+    <tr><td>En ligne :</td>
         <td> <select name='enabled' class='formulaire'>
            <option value='yes'>oui</option>
            <option value='no'>non</option>
-           <option value='archived'>archive</option>
+           <option value='archived'>archivé</option>
            </select>
         </td>
     </tr>
 
     <tr><td> Localisation : </td>
         <td><select name='location' class='formulaire'>
-      <option value=''></option>
+        <option value=''></option>
   <TMPL_LOOP db_locations>
       <option value='<TMPL_VAR location>'><TMPL_VAR location></option>
   </TMPL_LOOP>
@@ -108,25 +108,20 @@
                name='comment' value='<TMPL_VAR comment>'>
         </td>
     </tr>
+
     </table>
 <table>
  <td>
- <label>
-  <input type="image" name='action' value='do_update_media' src='/bweb/apply.png'> Appliquer
-  </label>
-  <label>
-  <input type="image" name='action' title='Mettre à jour à partir du pool'
-    value='update_from_pool' src='/bweb/update.png'> Reinitialiser
-  </label>
+  <button type="submit" class="bp" name='action' value='do_update_media'> <img src='/bweb/apply.png' alt=''> Appliquer </button>
+  <button type="submit" class="bp" name='action' title='Mettre à jour à partir du pool'
+    value='update_from_pool'> <img src='/bweb/update.png' alt=''> Mettre à jour à partir du pool </button>
  </form>
  </td>
  <td>
   <form action='?' method='GET'>
    <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
-   <label>
-    <input type="image" name='action' value='media'
-     src='/bweb/zoom.png'>Voir le pool
-   </label>
+    <button type="submit" class="bp" name='action' value='media'>
+     <img src='/bweb/zoom.png' alt=''>Voir le pool </button>
   </form>
  </td>
 </table>
@@ -140,13 +135,15 @@ for (var i=0; ok && i < document.form1.pool.length; ++i) {
       ok=0;
    }
 }
+
 ok=1;
-for (var i=0; ok && i < document.form1.poolrecycle.length; ++i) {
+for (var i=0; ok && i < document.form1.pool.length; ++i) {
    if (document.form1.poolrecycle[i].value == '<TMPL_VAR poolrecycle>') {
       document.form1.poolrecycle[i].selected = true;
       ok=0;
    }
 }
+
 ok=1;
 for (var i=0; ok && i < document.form1.location.length; ++i) {
    if (document.form1.location[i].value == '<TMPL_VAR location>') {
diff --git a/gui/bweb/po/es.po b/gui/bweb/po/es.po
index c4f8ba80bd..43b7a67814 100644
--- a/gui/bweb/po/es.po
+++ b/gui/bweb/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Bweb VERSION\n"
-"PO-Revision-Date: 2007-12-22 19:24+0100\n"
+"PO-Revision-Date: 2007-12-22 19:27+0100\n"
 "Last-Translator: Eric Bollengier <eric@eb.homelinux.org>\n"
 "Language-Team: Eric Bollengier <eric@eb.homelinux.org>\n"
 "MIME-Version: 1.0\n"
@@ -581,12 +581,10 @@ msgid "Show last job"
 msgstr "Mostrar últimos jobs"
 
 #: ../tpl/client_list.tpl:13
-#, fuzzy
 msgid "Last jobs"
 msgstr "Últimos Jobs"
 
 #: ../tpl/client_list.tpl:14 ../tpl/display_client_stats.tpl:17
-#, fuzzy
 msgid "Show current job"
 msgstr "Mostrar job actual"
 
@@ -604,7 +602,6 @@ msgid "Client stats"
 msgstr "Estadísticas del Cliente"
 
 #: ../tpl/client_list.tpl:16
-#, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
diff --git a/gui/bweb/tpl/display_user.tpl b/gui/bweb/tpl/display_user.tpl
index e21d8c5785..626b97d0b9 100644
--- a/gui/bweb/tpl/display_user.tpl
+++ b/gui/bweb/tpl/display_user.tpl
@@ -14,6 +14,15 @@
  </tr><tr>
   <td>__Comment:__</td> <td> <input class="formulaire" type="text" name="comment" value='<TMPL_VAR comment>'> </td>
  </tr><tr>
+  <td>__Lang:__</td> 
+   <td> 
+ <select name="lang" id='lang' class="formulaire">
+  <option value='en'>english</option>
+  <option value='fr'>french</option>
+  <option value='es'>spanish</option>
+ </select>
+   </td>
+ </tr><tr>
 <td> __Profile:__</td><td>
  <select name="profile" id='profile' class="formulaire">
   <option onclick='set_role("")'></option>
-- 
2.39.5