From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 21 Dec 2007 21:02:27 +0000 (+0000)
Subject: ebl  Add markups to do automatique translation instead of having multiple tpl dirs
X-Git-Tag: Release-3.0.0~2128
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8857c2e512e62e09cbf56cea858999de7ad06a86;p=bacula%2Fbacula

ebl  Add markups to do automatique translation instead of having multiple tpl dirs


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6083 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/gui/bweb/tpl/about.tpl b/gui/bweb/tpl/about.tpl
index e45868a318..41e8a4bcde 100644
--- a/gui/bweb/tpl/about.tpl
+++ b/gui/bweb/tpl/about.tpl
@@ -1,6 +1,6 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> About </h1>
+  <h1 class='newstitle'> __About__ </h1>
 </div>
 <div class='bodydiv'>
 <pre>
diff --git a/gui/bweb/tpl/ach_add.tpl b/gui/bweb/tpl/ach_add.tpl
index 6c5912c621..b427397379 100644
--- a/gui/bweb/tpl/ach_add.tpl
+++ b/gui/bweb/tpl/ach_add.tpl
@@ -1,48 +1,49 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'><TMPL_UNLESS name>New</TMPL_UNLESS> Autochanger </h1>
+  <h1 class='newstitle'><TMPL_UNLESS name>__New__</TMPL_UNLESS> __Autochanger__ </h1>
 </div>
 <div class='bodydiv'>
-   You have to create a Location which will have the same name.<br/><br/>
+   __You have to create a Location which will have the same name.__<br/><br/>
 
    <form name='form1' action="?" method='get'>
     <table>
-     <tr><td>Name :</td>     
+     <tr><td>__Name:__</td>     
          <td>
           <select name='ach' class='formulaire' id='ach'>
 <TMPL_LOOP devices><option value='<TMPL_VAR name>'><TMPL_VAR name></option></TMPL_LOOP>
           </select>
          </td>
      </tr>
-     <tr><td>Pre-command :</td> 
+     <tr><td>__Pre-command:__</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>mtx command :</td> 
+     <tr><td>__mtx command:__</td> 
          <td> <input class="formulaire" type='text' name='mtxcmd' size='32'
                value='/usr/sbin/mtx' id='mtxcmd'>
          </td>
      </tr>
-     <tr><td>Device :</td> 
+     <tr><td>__Device:__</td> 
          <td> <input class="formulaire" type='text' name='device' 
                value='/dev/changer' id='device'>
          </td>
      </tr>
-    <tr><td><b>Drives</b></td><td/></tr>
+    <tr><td><b>__Drives__</b></td><td/></tr>
     <TMPL_LOOP devices>
     <tr>
      <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>
-    <button type="submit" class="bp" name='action' value='ach_add'> <img src='/bweb/save.png' alt=''>Save</button>
+    <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/tpl/ach_content.tpl b/gui/bweb/tpl/ach_content.tpl
index 9092581298..ac81e69745 100644
--- a/gui/bweb/tpl/ach_content.tpl
+++ b/gui/bweb/tpl/ach_content.tpl
@@ -1,57 +1,58 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-Autochanger : <TMPL_VAR Name> (<TMPL_VAR nb_drive> Drives
-<TMPL_IF nb_io><TMPL_VAR nb_io> IMPORT/EXPORT</TMPL_IF>)</h1>
+__Autochanger:__ <TMPL_VAR Name> (<TMPL_VAR nb_drive> __Drives__
+<TMPL_IF nb_io><TMPL_VAR nb_io> __IMPORT/EXPORT__</TMPL_IF>)</h1>
  </div>
  <div class='bodydiv'>
    <form action='?' method='get'>
     <input type='hidden' name='ach' value='<TMPL_VAR name>'>
     <TMPL_IF "Update">
-    <font color='red'> You must run update slot, Autochanger status is different from bacula slots </font>
+    <font color='red'> __You must run update slot, Autochanger status is different from bacula slots__ </font>
     <br/>
     </TMPL_IF>
     <table border='0'>
     <tr>
     <td valign='top'>
     <div class='otherboxtitle'>
-     Tools
+     __Tools__
     </div>
     <div class='otherbox'>
 <button type="submit" class="bp" name='action' value='label_barcodes'
- title='run label barcodes'><img src='/bweb/label.png' alt=''>Label</button>
+ title='__run label barcodes__'><img src='/bweb/label.png' alt=''>__Label__</button>
 <TMPL_IF nb_io>
 <button type="submit" class="bp" name='action' value='eject'
- title='put selected media on i/o'><img src='/bweb/extern.png' alt=''>Eject</button>
+ title='__put selected media on i/o__'><img src='/bweb/extern.png' alt=''>__Eject__</button>
 <button type="submit" class="bp" name='action' value='clear_io'
- title='Clear i/o'> <img src='/bweb/intern.png' alt=''>Clear I/O</button>
+ title='__Clear I/O__'> <img src='/bweb/intern.png' alt=''>__Clear I/O__</button>
 </TMPL_IF>
 <button type="submit" class="bp" name='action' value='update_slots'
- title='run update slots'> <img src='/bweb/update.png' alt=''>Update</button>
+ title='__run update slots__'> <img src='/bweb/update.png' alt=''>__Update__</button>
 <br/><br/>
 <button type="submit" class="bp" name='action' value='ach_load'
- title='mount drive'> <img src='/bweb/load.png' alt=''>Mount</button>
+ 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>
+ title='__umount drive__'> <img src='/bweb/unload.png' alt=''>__Umount__</button>
 
    </div>
     <td width='200'/>
     <td>
-    <b> Drives: </b><br/>
+    <b> __Drives:__ </b><br/>
     <table id='id_drive'></table> <br/>
     </td>
     </tr>
     </table>
-    <b> Content: </b><br/>
+    <b> __Content:__ </b><br/>
     <table id='id_ach'></table>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Real Slot", "Slot", "Volume Name","Vol Bytes","Vol Status",
-	               "Media Type","Pool Name","Last Written", 
-                       "When expire ?", "Select");
+var header = new Array("__Real Slot__", "__Slot__", "__Volume Name__",
+		       "__Vol Bytes__","__Vol Status__",
+	               "__Media Type__","__Pool Name__","__Last Written__", 
+                       "__When expire ?__", "__Select__");
 
 var data = new Array();
 var chkbox;
@@ -99,7 +100,8 @@ nrsTable.setup(
 }
 );
 
-var header = new Array("Index", "Drive Name", "Volume Name", "Select");
+var header = new Array("__Index__", "__Drive Name__", 
+		       "__Volume Name__", "__Select__");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/tpl/add_media.tpl b/gui/bweb/tpl/add_media.tpl
index 3c455f2242..8ec2a5f620 100644
--- a/gui/bweb/tpl/add_media.tpl
+++ b/gui/bweb/tpl/add_media.tpl
@@ -1,11 +1,11 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Add media</h1>
+  <h1 class='newstitle'> __Add media__</h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
     <table>
-     <tr><td>Pool :</td>
+     <tr><td>__Pool:__</td>
          <td> 
             <select name='pool' size='5' class='formulaire'>
             <TMPL_LOOP db_pools>
@@ -14,7 +14,7 @@
             </select>
          </td>
      </tr>
-     <tr><td>Storage :</td> 
+     <tr><td>__Storage:__</td> 
          <td>
             <select name='storage' size='5' class='formulaire'>
             <TMPL_LOOP storage>
@@ -23,18 +23,18 @@
             </select>
          </td>
      </tr>
-     <tr><td>Number of media to create :</td> 
+     <tr><td>__Number of media to create:__</td> 
          <td><input size='3' type='text' name='nb' value='1' class='formulaire'></td>
      </tr>
-     <tr><td>Starting number :</td> 
+     <tr><td>__Starting number:__</td> 
          <td><input size='3' type='text' name='offset' class='formulaire' value='1'></td>
      </tr>
-     <tr><td>Name :</td> 
+     <tr><td>__Name:__</td> 
          <td><input size='8' type='text' name='media' class='formulaire' value='Vol'></td>
      </tr>
     </table>
     <button type="submit" class="bp" name='action' value='add_media'>
-     <img src='/bweb/add.png' alt=''>Add<button>
+     <img src='/bweb/add.png' alt=''>__Add__<button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/begin.tpl b/gui/bweb/tpl/begin.tpl
index 2fc7fb5188..06b995382a 100644
--- a/gui/bweb/tpl/begin.tpl
+++ b/gui/bweb/tpl/begin.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
-<title>Bweb - Bacula Web Interface</title>
+<title>__Bweb - Bacula Web Interface__</title>
 <link rel="SHORTCUT ICON" href="/bweb/favicon.ico">
 <script type="text/javascript" language="JavaScript" src="/bweb/natcompare.js"></script>
 <script type="text/javascript" language="JavaScript" src="/bweb/nrs_table.js"></script>
@@ -14,41 +14,41 @@
 
 <script type="text/javascript" language="JavaScript">
 if (navigator.appName == 'Konqueror') {
-        alert("Sorry at this moment, bweb works only with mozilla.");
+        alert("__Sorry at this moment, bweb works only with mozilla.__");
 }
 </script>
 
 <ul id="menu">
- <li><a href="bweb.pl?">Main</a> </li>
- <li><a href="bweb.pl?action=client">Clients</a>
+ <li><a href="bweb.pl?">__Main__</a> </li>
+ <li><a href="bweb.pl?action=client">__Clients__</a>
      <ul>
-       <li><a href="bweb.pl?action=client">Clients</a> </li>
-       <li><a href="bweb.pl?action=groups">Groups</a> </li>
+       <li><a href="bweb.pl?action=client">__Clients__</a> </li>
+       <li><a href="bweb.pl?action=groups">__Groups__</a> </li>
      </ul>
  </li>
- <li style="padding: 0.25em 2em;">Jobs
+ <li style="padding: 0.25em 2em;">__Jobs__
    <ul> 
-     <li><a href="bweb.pl?action=run_job">Defined Jobs</a>
-     <li><a href="bweb.pl?action=job_group">Jobs by group</a>
-     <li><a href="bweb.pl?action=overview">Jobs overview</a>
-     <li><a href="bweb.pl?action=job">Last Jobs</a> </li>
-     <li><a href="bweb.pl?action=running">Running Jobs</a>
-     <li><a href="bweb.pl?action=next_job">Next Jobs</a> </li>
-     <li><a href="bweb.pl?action=restore" title="Launch brestore">Restore</a> </li>
+     <li><a href="bweb.pl?action=run_job">__Defined Jobs__</a>
+     <li><a href="bweb.pl?action=job_group">__Jobs by group__</a>
+     <li><a href="bweb.pl?action=overview">__Jobs overview__</a>
+     <li><a href="bweb.pl?action=job">__Last Jobs__</a> </li>
+     <li><a href="bweb.pl?action=running">__Running Jobs__</a>
+     <li><a href="bweb.pl?action=next_job">__Next Jobs__</a> </li>
+     <li><a href="bweb.pl?action=restore" title="__Launch brestore__">__Restore__</a> </li>
    </ul>
  </li>
- <li style="padding: 0.25em 2em;">Media
+ <li style="padding: 0.25em 2em;">__Media__
   <ul>
-     <li><a href="bweb.pl?action=pool">Pools</a> </li>
-     <li><a href="bweb.pl?action=location">Locations</a> </li>
-     <li><a href="bweb.pl?action=media">All Media</a><hr></li>
-     <li><a href="bweb.pl?action=add_media">Add Media</a><hr></li>
-     <li><a href="bweb.pl?action=extern_media">Eject Media</a> </li>
-     <li><a href="bweb.pl?action=intern_media">Load Media</a> </li>
+     <li><a href="bweb.pl?action=pool">__Pools__</a> </li>
+     <li><a href="bweb.pl?action=location">__Locations__</a> </li>
+     <li><a href="bweb.pl?action=media">__All Media__</a><hr></li>
+     <li><a href="bweb.pl?action=add_media">__Add Media__</a><hr></li>
+     <li><a href="bweb.pl?action=extern_media">__Eject Media__</a> </li>
+     <li><a href="bweb.pl?action=intern_media">__Load Media__</a> </li>
   </ul>
  </li>
 <TMPL_IF achs>
- <li style="padding: 0.25em 2em;">Autochanger
+ <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>
@@ -56,24 +56,24 @@ if (navigator.appName == 'Konqueror') {
   </ul>
  </li>
 </TMPL_IF> 
- <li><a href="bweb.pl?action=graph"> Statistics </a></li>
- <li> <a href="bweb.pl?action=view_conf"> Configuration </a> 
+ <li><a href="bweb.pl?action=graph"> __Statistics__ </a></li>
+ <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> <li> <a href="bweb.pl?action=view_conf"> __Configuration__ </a> 
+       <li> <a href="bweb.pl?action=users"> __Manage users__ </a>
   </ul>
 </TMPL_IF>
 </li>
- <li> <a href="bweb.pl?action=about"> About </a> </li>
- <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
+ <li> <a href="bweb.pl?action=about"> __About__ </a> </li>
+ <li style="padding: 0.25em 2em;float: right;">&nbsp;__Logged as__ <TMPL_VAR NAME=loginname> </li>
  <li style="float: right;white-space: nowrap;">
-<button type="submit" class="bp" class="button" title="Search media" onclick="search_media();"><img src="/bweb/tape.png" alt=''></button><button type="submit" title="Search client" onclick="search_client();" class='bp'><img src="/bweb/client.png" alt=''></button><input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="Search media or client"></li> </button>
+<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/tpl/btime.tpl b/gui/bweb/tpl/btime.tpl
index 53d254b234..d377d426ba 100644
--- a/gui/bweb/tpl/btime.tpl
+++ b/gui/bweb/tpl/btime.tpl
@@ -1,25 +1,25 @@
  <div class='titlediv'>
-  <h1 class='newstitle'>Timing Statistics</h1>
+  <h1 class='newstitle'>__Timing Statistics__</h1>
  </div>
  <div class='bodydiv'>
 <table border='0' valign='top'>
 <td>
 <form name='form1' action='?' method='GET'>
 	<div class="otherboxtitle" valign='top'>
-          Options &nbsp;
+          __Options__ &nbsp;
         </div>
         <div class="otherbox">
 <table border='0'>
 <tr>
   <td>
-    <h2>Time limits</h2>
+    <h2>__Time limits__</h2>
      <table>
-      <tr><td> Begin: </td> <td><input class='formulaire' type='text' 
+      <tr><td> __Begin:__ </td> <td><input class='formulaire' type='text' 
            id='iso_begin' name='iso_begin' title='YYYY-MM-DD HH:MM' 
            <TMPL_IF qiso_begin> value=<TMPL_VAR qiso_begin> </TMPL_IF> 
            size='16'>
       </td></tr>
-      <tr><td> End: </td><td> <input type='text' class='formulaire' 
+      <tr><td> __End:__ </td><td> <input type='text' class='formulaire' 
 	id='iso_end' name='iso_end' title='YYYY-MM-DD HH:MM'
 	<TMPL_IF qiso_end> value=<TMPL_VAR qiso_end> </TMPL_IF>
         size='16'>
@@ -29,20 +29,20 @@
 </tr>
 <tr>
   <td>
-    <h2>Graph</h2>
+    <h2>__Graph__</h2>
       <input type='checkbox' 
-             <TMPL_IF qusage>checked="checked" value='on'</TMPL_IF> 
-             name="usage"> Drive usage<br/>
+             <TMPL_IF qusage>checked</TMPL_IF> 
+             name="usage"> __Drive usage__<br/>
       <input type='checkbox' 
-             <TMPL_IF qpool>checked="checked" value='on'</TMPL_IF> 
-             name="pool"> Pool usage<br/>
+             <TMPL_IF qpool>checked</TMPL_IF> 
+             name="pool"> __Pool usage__<br/>
       <input type='checkbox' 
-             <TMPL_IF qnojob>checked="checked" value='on'</TMPL_IF> 
-             name="nojob"> Hide Job<br/>
+             <TMPL_IF qnojob>checked</TMPL_IF> 
+             name="nojob"> __Hide Job__<br/>
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>
-    <h2>Groups</h2>
+    <h2>__Groups__</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>
@@ -55,43 +55,43 @@
 </tr>
 <!--
   <td valign='top'>
-    <h2>Level</h2>
+    <h2>__Level__</h2>
     <select name='level' class='formulaire'>
-      <option id='level_Any' value='Any'>Any</option>
-      <option id='level_F' value='F'>Full</option>
-      <option id='level_D' value='D'>Differential</option>
-      <option id='level_I' value='I'>Incremental</option>
+      <option id='level_Any' value='Any'>__Any__</option>
+      <option id='level_F' value='F'>__Full__</option>
+      <option id='level_D' value='D'>__Differential__</option>
+      <option id='level_I' value='I'>__Incremental__</option>
     </select>     
   </td><td valign='top'>
-    <h2>Status</h2>
+    <h2>__Status__</h2>
     <select name='status' class='formulaire'>
-      <option id='status_Any' value='Any'>Any</option>
-      <option id='status_T'   value='T'>Ok</option>
-      <option id='status_f'   value='f'>Error</option>
-      <option id='status_A'   value='A'>Canceled</option>
+      <option id='status_Any' value='Any'>__Any__</option>
+      <option id='status_T'   value='T'>__Ok__</option>
+      <option id='status_f'   value='f'>__Error__</option>
+      <option id='status_A'   value='A'>__Canceled__</option>
     </select>   
   </td>
 </tr>
 <tr>
   <td valign='top'>
-    <h2>Age</h2>
+    <h2>__Age__</h2>
     <select name='age' class='formulaire'>
-      <option id='age_604800'   value='604800'>This week</option>
-      <option id='age_2678400'  value='2678400'>Last 30 days</option>
-      <option id='age_15552000' value='15552000'>Last 6 month</option>
+      <option id='age_604800'   value='604800'>__This week__</option>
+      <option id='age_2678400'  value='2678400'>__Last 30 days__</option>
+      <option id='age_15552000' value='15552000'>__Last 6 month__</option>
     </select>     
   </td>
   <td  valign='top'>
-    <h2>Size</h2>
-     Width: &nbsp;<input class='formulaire' type='text' 
+    <h2>__Size__</h2>
+     __Width:__ &nbsp;<input class='formulaire' type='text' 
 			 name='width' value='<TMPL_VAR width>' size='4'><br/>
-     Height:  <input type='text' class='formulaire' 
+     __Height:__  <input type='text' class='formulaire' 
 		name='height' value='<TMPL_VAR height>' size='4'><br/>
   </td>
 </tr>
 <tr>
   <td valign='top'> 
-    <h2>Clients</h2>
+    <h2>__Clients__</h2>
     <select name='client' size='15' class='formulaire' multiple>
 <TMPL_LOOP NAME=db_clients>
       <option id='client_<TMPL_VAR clientname>'><TMPL_VAR clientname></option>
@@ -99,7 +99,7 @@
     </select>
   </td>
   <td valign='top'> 
-    <h2>Job Name</h2>
+    <h2>__Job Name__</h2>
     <select name='jobname' size='15' class='formulaire' multiple>
 <TMPL_LOOP NAME=db_jobnames>
       <option><TMPL_VAR NAME=jobname></option>
@@ -121,10 +121,10 @@
 <td>
 
  <div class="otherboxtitle">
- Current &nbsp;
+ __Current__ &nbsp;
  </div>
  <div class="otherbox">
- <img src='<TMPL_VAR result>' alt='Nothing to display, Try a bigger date range'>
+ <img src='<TMPL_VAR result>' alt='__Nothing to display, Try a bigger date range__'>
  </div>
 
 </td>
diff --git a/gui/bweb/tpl/change_location.tpl b/gui/bweb/tpl/change_location.tpl
index e804e060f5..a9a516a62a 100644
--- a/gui/bweb/tpl/change_location.tpl
+++ b/gui/bweb/tpl/change_location.tpl
@@ -1,7 +1,7 @@
 <br/>
 <div class='titlediv'>
   <h1 class='newstitle'> 
-   Move media
+   __Move media__
   </h1>
  </div>
  <div class='bodydiv'>
@@ -9,9 +9,9 @@
 <form action="?" method='GET'>
 <table>
 <tr>
-<td><b>To: </b></td><td><input class='formulaire' name='email' value='<TMPL_VAR email>'></td>
+<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>
@@ -33,5 +33,5 @@ Thanks
 <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'>Update now</a>
+<a href="<TMPL_VAR url>"><img alt='__Update now__' src='/bweb/update.png'>__Update now__</a>
 </div>
diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index 28b0024ad3..2ccf5f0061 100644
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -1,36 +1,36 @@
 <br/>
  <div class='titlediv'>
   <h1 class='newstitle'> 
-	Running job <TMPL_VAR JobName> on <TMPL_VAR Client>
+	__Running job__ <TMPL_VAR JobName> __on__ <TMPL_VAR Client>
   </h1>
  </div>
  <div class='bodydiv'>
 
 <table>
  <tr>
-  <td> <b> JobName: </b> <td> <td> <TMPL_VAR jobname> (<TMPL_VAR jobid>) <td> 
+  <td> <b> __Job Name:__ </b> <td> <td> <TMPL_VAR jobname> (<TMPL_VAR jobid>) <td> 
  </tr>
  <tr>
-  <td> <b> Processing file: </b> <td> <td> <TMPL_VAR "processing file"> </td>
+  <td> <b> __Processing file:__ </b> <td> <td> <TMPL_VAR "processing file"> </td>
  </tr>
  <tr>
-  <td> <b> Speed: </b> <td> <td> <TMPL_VAR "bytes/sec"> B/s</td>
+  <td> <b> __Speed:__ </b> <td> <td> <TMPL_VAR "bytes/sec"> B/s</td>
  </tr>
  <tr>
-  <td> <b> Files Examined: </b> <td> <td> <TMPL_VAR "files examined"></td>
+  <td> <b> __Files Examined:__ </b> <td> <td> <TMPL_VAR "files examined"></td>
  </tr>
  <tr>
-  <td> <b> Bytes: </b> <td> <td> <TMPL_VAR bytes></td>
+  <td> <b> __Bytes:__ </b> <td> <td> <TMPL_VAR bytes></td>
  </tr>
 </table>
 <form name='form1' action='?' method='GET'>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
-> <img src='/bweb/update.png' title='refresh' alt=''>Refresh</button>
+> <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>'>
 <button type="submit" class="bp" name='action' value='cancel_job'
-       onclick="return confirm('Do you want to cancel this job ?')"
-        title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
+       onclick="return confirm('__Do you want to cancel this job?__')"
+        title='__Cancel job__'> <img src='/bweb/cancel.png' alt=''>__Cancel__</button>
 </form>
  </div>
 
diff --git a/gui/bweb/tpl/client_list.tpl b/gui/bweb/tpl/client_list.tpl
index 523436a979..30c0e47557 100644
--- a/gui/bweb/tpl/client_list.tpl
+++ b/gui/bweb/tpl/client_list.tpl
@@ -1,50 +1,50 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Clients</h1>
+  <h1 class='newstitle'>__Clients__</h1>
  </div>
  <div class='bodydiv'>
 <form name="client" action='?' method='GET'>
-     <table id='id<TMPL_VAR NAME=ID>'></table>
+     <table id='id<TMPL_VAR ID>'></table>
 	<div class="otherboxtitle">
-          Actions &nbsp;
+          __Actions__ &nbsp;
         </div>
         <div class="otherbox">
-<!--        <h1>Actions</h1> -->	
-       <button type="submit" class="bp" name='action' value='job' title='Show last job'> <img src='/bweb/zoom.png' alt=''>Last jobsView 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='Show client status'> <img src='/bweb/zoom.png' alt=''>Status </button>
-       <button type="submit" class="bp" name='action' value='client_stats' title='Client stats'> <img src='/bweb/chart.png' alt=''>Stats </button>
+<!--        <h1>__Actions__</h1> -->	
+       <button type="submit" class="bp" name='action' value='job' title='__Show last job__'> <img src='/bweb/zoom.png' alt=''>__Last jobsView 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='__Show client status__'> <img src='/bweb/zoom.png' alt=''>__Status__ </button>
+       <button type="submit" class="bp" name='action' value='client_stats' title='__Client stats__'> <img src='/bweb/chart.png' alt=''>__Stats__ </button>
         </div>
 
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Name", "Select", "Desc", "Auto Prune", "File Retention", "Job Retention");
+var header = new Array("__Name__", "__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/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index 5d4f793820..44890a1a0f 100644
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -1,62 +1,62 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> Configuration </h1>
+  <h1 class='newstitle'> __Configuration__ </h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='post'>
     <table>
-     <tr>  <td><b>SQL Connection</b></td>  <td/></tr>
+     <tr>  <td><b>__SQL Connection__</b></td>  <td/></tr>
  
-     <tr><td>DBI :</td>     
+     <tr><td>__DBI:__</td>     
          <td> 
           <input class="formulaire" type='text' value='<TMPL_VAR dbi>' size='64' name='dbi'> 
          </td>
      </tr>
-     <tr><td>user :</td> 
+     <tr><td>__user:__</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR user>' name='user'>
          </td>
      </tr>
-     <tr><td>password :</td> 
+     <tr><td>__password:__</td> 
          <td> <input class="formulaire" type='password' value='<TMPL_VAR password>' name='password'> 
          </td></tr>
 
-     <tr>  <td><b>General Options</b></td>  <td/></tr>
+     <tr>  <td><b>__General Options__</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>Bweb Configuration</b></td>  <td/></tr>
+     <tr>  <td><b>__Bweb Configuration__</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> 
-         <td> <input class="formulaire" title="This folder must be writable by apache user and must be accessible on /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'> 
+     <tr><td>fv_write_path:</td> 
+         <td> <input class="formulaire" title="__This folder must be writable by apache user and must be accessible on /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>bconsole :</td> 
+     <tr><td>bconsole:</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
-     <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>'> 
+     <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>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>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:</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> 
+         <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> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
     </table>
-    <button type="submit" class="bp" name='action' value='apply_conf'> <img src='/bweb/save.png' alt=''>Save</button>
+    <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/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index 8d13bef34b..2902faddde 100644
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -1,29 +1,29 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> Configuration </h1>
+  <h1 class='newstitle'> __Configuration__ </h1>
 </div>
 <div class='bodydiv'>
    <table>
-    <tr>  <td><b>SQL Connection</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> xxxxx </td></tr>
-    <tr>  <td><b>General Options</b></td>  <td/></tr>
-    <tr><td>email_media :</td> <td> <TMPL_VAR email_media> </td></tr>
-    <tr>  <td><b>Bweb Configuration</b></td>  <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="This folder must be writable by apache user and must be accessible on /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>debug :</td> <td> <TMPL_VAR debug> </td></tr>
+    <tr>  <td><b>__SQL Connection__</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> xxxxx </td></tr>
+    <tr>  <td><b>__General Options__</b></td>  <td/></tr>
+    <tr><td>email_media:</td> <td> <TMPL_VAR email_media> </td></tr>
+    <tr>  <td><b>__Bweb Configuration__</b></td>  <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="__This folder must be writable by apache user and must be accessible on /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>__debug:__</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
-    <tr>  <td><b>Autochanger</b></td>  <td/></tr>
+    <tr>  <td><b>__Autochanger__</b></td>  <td/></tr>
     <tr>
      <td>
      <form action='?' method='GET'>
@@ -40,9 +40,9 @@
     </table>
    <td>
   
-   <button type="submit" class="bp" name="action" value="ach_edit" title="edit"> <img src='/bweb/edit.png' alt=''>Edit</button>
-   <button type="submit" class="bp" name='action' value='ach_del' title='delete'> <img src='/bweb/remove.png' alt=''>Delete</button>
-   <button type="submit" class="bp" name='action' value='ach_view' title='view'> <img src='/bweb/zoom.png' alt=''>View</button>
+   <button type="submit" class="bp" name="action" value='ach_edit' title="__Edit__"> <img src='/bweb/edit.png' alt=''>__Edit__</button>
+   <button type="submit" class="bp" name='action' value='ach_del' title='__Delete__'> <img src='/bweb/remove.png' alt=''>__Delete__</button>
+   <button type="submit" class="bp" name='action' value='ach_view' title='__View__'> <img src='/bweb/zoom.png' alt=''>__View__</button>
     </form>
     </td>
    </tr>
@@ -53,11 +53,11 @@
   </table>
 
   <form action='?' method='GET'>
-   <button name='action' value='edit_conf' type="submit" class="bp" title='Edit'> <img src='/bweb/edit.png' alt=''>Edit</button>
-   <button name='action' value='ach_add' type="submit" class="bp" title='Add an autochanger'> <img src='/bweb/add.png' alt=''>Add autochanger</button>
+   <button name='action' value='edit_conf' type="submit" class="bp" title='__Edit__'> <img src='/bweb/edit.png' alt=''>__Edit__</button>
+   <button name='action' value='ach_add' type="submit" class="bp" title='__Add autochanger__'> <img src='/bweb/add.png' alt=''>__Add autochanger__</button>
   </form>
 
   <TMPL_IF error>
-  info :  <TMPL_VAR error> </br>
+  __info:__  <TMPL_VAR error> </br>
   </TMPL_IF>
 </div>
diff --git a/gui/bweb/tpl/display_client_stats.tpl b/gui/bweb/tpl/display_client_stats.tpl
index dc6dd46f8e..00a1dc7de5 100644
--- a/gui/bweb/tpl/display_client_stats.tpl
+++ b/gui/bweb/tpl/display_client_stats.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Client : <TMPL_VAR clientname> (<TMPL_VAR label>)</h1>
+  <h1 class='newstitle'> __Client:__ <TMPL_VAR clientname> (<TMPL_VAR label>)</h1>
  </div>
  <div class='bodydiv'>
 <form action='?'>
@@ -9,20 +9,20 @@
      <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;
+          __Actions__ &nbsp;
         </div>
         <div class="otherbox">
        <h1>Actions</h1> 
-       <button type="submit" class="bp" name='action' value='job' title='Show last job'> <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='Client stats'> <img src='/bweb/zoom.png' alt=''>View stats</button>
+       <button type="submit" class="bp" name='action' value='job' title='__Show last job__'> <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='__Client stats__'> <img src='/bweb/zoom.png' alt=''>__View stats__</button>
         </div>
 -->
 </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
-var header = new Array("Name", "Nb Jobs", "Nb Bytes", "Nb Files", "Nb Errors");
+var header = new Array("__Name__", "__Nb Jobs__", "__Nb Bytes__", "__Nb Files__", "__Nb Errors__");
 
 var data = new Array();
 
diff --git a/gui/bweb/tpl/display_form_job.tpl b/gui/bweb/tpl/display_form_job.tpl
index 973348bd7b..cf28b484f3 100644
--- a/gui/bweb/tpl/display_form_job.tpl
+++ b/gui/bweb/tpl/display_form_job.tpl
@@ -1,31 +1,31 @@
 <br/>
 <div class="otherboxtitle">
-  Filter &nbsp;
+  __Filter__ &nbsp;
 </div>
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
 <tr>
   <td valign='top'>
-    <h2>Level</h2>
+    <h2>__Level__</h2>
     <select name='level' class='formulaire'>
-      <option id='level_Any' value='Any'>Any</option>
-      <option id='level_F' value='F'>Full</option>
-      <option id='level_D' value='D'>Differential</option>
-      <option id='level_I' value='I'>Incremental</option>
+      <option id='level_Any' value='Any'>__Any__</option>
+      <option id='level_F' value='F'>__Full__</option>
+      <option id='level_D' value='D'>__Differential__</option>
+      <option id='level_I' value='I'>__Incremental__</option>
     </select>     
   </td>
 </tr>
 <TMPL_UNLESS hide_status>
 <tr>
  <td valign='top'>
-    <h2>Status</h2>
+    <h2>__Status__</h2>
     <select name='status' class='formulaire'>
-      <option id='status_Any' value='Any'>Any</option>
-      <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'>Canceled</option>
+      <option id='status_Any' value='Any'>__Any__</option>
+      <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'>__Canceled__</option>
     </select>     
   </td>
 </tr>
@@ -33,9 +33,9 @@
 <TMPL_IF db_pools>
 <tr>
  <td valign='top'>
-    <h2>Pool</h2>
+    <h2>__Pool__</h2>
     <select name='pool' class='formulaire'>
-      <option id='pool_all' value=''>All</option>
+      <option id='pool_all' value=''>__All__</option>
 <TMPL_LOOP db_pools>
       <option id='pool_<TMPL_VAR name>'><TMPL_VAR name></option>
 </TMPL_LOOP>
@@ -46,29 +46,29 @@
 <TMPL_UNLESS hide_since>
 <tr>
   <td valign='top'>
-    <h2>Since</h2>
-    <input type='text' id='since' name='since' size='17' title='YYY-MM-DD'
+    <h2>__Since__</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>Age</h2>
+    <h2>__Age__</h2>
     <select name='age' class='formulaire' onclick='document.getElementById("since").value="";'>
-      <option id='age_604800'   value='604800'>1 week</option>
-      <option id='age_2678400'  value='2678400'>30 days</option>
-      <option id='age_15552000' value='15552000'>6 month</option>
+      <option id='age_604800'   value='604800'>__1 week__</option>
+      <option id='age_2678400'  value='2678400'>__30 days__</option>
+      <option id='age_15552000' value='15552000'>__6 months__</option>
     </select>     
   </td>
  </tr>
 <TMPL_ELSE>
 <tr>
   <td valign='top'>
-    <h2>Age</h2>
+    <h2>__Age__</h2>
     <select name='age' class='formulaire'>
-      <option id='age_604800'   value='604800'>This week</option>
-      <option id='age_2678400'  value='2678400'>Last 30 days</option>
-      <option id='age_15552000' value='15552000'>Last 6 month</option>
+      <option id='age_604800'   value='604800'>__This week__</option>
+      <option id='age_2678400'  value='2678400'>__Last 30 days__</option>
+      <option id='age_15552000' value='15552000'>__Last 6 months__</option>
     </select>     
   </td>
  </tr>
@@ -76,18 +76,18 @@
 <TMPL_IF view_time_slice>
 <tr>
   <td valign='top'>
-    <h2>Time slice</h2>
+    <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>
+      <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>__Number of items__</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
@@ -95,11 +95,11 @@
 <TMPL_UNLESS hide_type>
 <tr>
   <td valign='top'> 
-    <h2>Job Type</h2>
+    <h2>__Job Type__</h2>
     <select name='jobtype' class='formulaire'>
-      <option id='jobtype_any' value='all type'>Any</option>
-      <option id='jobtype_B' value='B'>Backup</option>
-      <option id='jobtype_R' value='R'>Restore</option>
+      <option id='jobtype_any' value='all type'>__Any__</option>
+      <option id='jobtype_B' value='B'>__Backup__</option>
+      <option id='jobtype_R' value='R'>__Restore__</option>
     </select>
   </td>
 </tr>
@@ -107,7 +107,7 @@
 <TMPL_IF db_clients>
 <tr>
   <td valign='top'> 
-    <h2>Clients</h2>
+    <h2>__Clients__</h2>
     <select name='client' size='15' class='formulaire' multiple>
 <TMPL_LOOP db_clients>
       <option id='client_<TMPL_VAR clientname>'><TMPL_VAR clientname></option>
@@ -119,7 +119,7 @@
 <TMPL_IF db_client_groups>
 <tr>
   <td valign='top'>
-    <h2>Groups</h2>
+    <h2>__Groups__</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>
@@ -131,7 +131,7 @@
 <!--
 <tr>
   <td valign='top'> 
-    <h2>File Set</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>
diff --git a/gui/bweb/tpl/display_form_media.tpl b/gui/bweb/tpl/display_form_media.tpl
index f343a474d2..3c7fa15a99 100644
--- a/gui/bweb/tpl/display_form_media.tpl
+++ b/gui/bweb/tpl/display_form_media.tpl
@@ -1,15 +1,15 @@
 <div class="otherboxtitle">
-  Filter &nbsp;
+  __Filter__ &nbsp;
 </div>
 <div class="otherbox">
 <form name='form1' action='?' method='GET'>
 <table border='0'>
 <tr>
   <td valign='top'>
-    <h2>Media Type</h2>
+    <h2>__Media 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>     
@@ -17,10 +17,10 @@
 </tr>
 <tr>
   <td valign='top'>
-    <h2>Location</h2>
+    <h2>__Location__</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>     
@@ -28,7 +28,7 @@
 </tr>
 <tr>
  <td valign='top'>
-    <h2>Status</h2>
+    <h2>__Status__</h2>
     <select name='volstatus' class='formulaire'>
       <option id='volstatus_All' value=''></option>
       <option id='volstatus_Append' value='Append'>Append</option>
@@ -42,10 +42,10 @@
 </tr>
 <tr>
  <td valign='top'>
-    <h2>Pool</h2>
+    <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>Name</h2>
+    <h2>__Name__</h2>
     <input type='text' name='re_media' 
       <TMPL_IF qre_media>value=<TMPL_VAR qre_media></TMPL_IF>
 	class='formulaire' size='8'>
@@ -61,7 +61,7 @@
 </tr>
  <tr>
   <td valign='bottom'> 
-    <h2>Expired media</h2>
+    <h2>__Expired media__</h2>
     <input type='checkbox' name='expired' <TMPL_IF expired> checked </TMPL_IF> 
 	class='formulaire'>
   </td>
@@ -69,14 +69,14 @@
 </tr>
  <tr>
   <td valign='bottom'> 
-    <h2>Number of items</h2>
+    <h2>__Number of items__</h2>
     <input type='text' name='limit' value='<TMPL_VAR limit>' 
 	class='formulaire' size='4'>
   </td>
 </tr>
 
 </table>
-  <button type="submit" class="bp" name='action' value='media'> <img src='/bweb/update.png' alt=''>Update</button>
+  <button type="submit" class="bp" name='action' value='media'> <img src='/bweb/update.png' alt=''>__Update__</button>
 
 </form>
 </div>
diff --git a/gui/bweb/tpl/display_groups.tpl b/gui/bweb/tpl/display_groups.tpl
index a3c1682167..215f71963e 100644
--- a/gui/bweb/tpl/display_groups.tpl
+++ b/gui/bweb/tpl/display_groups.tpl
@@ -1,29 +1,29 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Groups</h1>
+  <h1 class='newstitle'>__Groups__</h1>
  </div>
  <div class="bodydiv">
    <form name='form1' action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <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' 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='Supprimer'> <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=''>Edit</button>
+     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=''>__Edit__</button>
 
-    <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='View jobs'> <img src='/bweb/zoom.png' alt=''>View jobs</button>
-    <button type="submit" class="bp" name='action' value='group_stats' title='Statistics'> <img src='/bweb/chart.png' alt=''>View stats</button>
+    <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='__View jobs__'> <img src='/bweb/zoom.png' alt=''>__View jobs__</button>
+    <button type="submit" class="bp" name='action' value='group_stats' title='__Statistics__'> <img src='/bweb/chart.png' alt=''>__View stats__</button>
    </form>
    <form action='?' method='get'>
     <input type='hidden' name='action' value='client'>
-    <button type="submit" class="bp" name='notingroup' value='yes' title='View non-members'> <img src='/bweb/zoom.png' alt=''>View others</button>
+    <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("__Name__","__Selection__");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/tpl/display_job.tpl b/gui/bweb/tpl/display_job.tpl
index d89b77abdc..87da20674a 100644
--- a/gui/bweb/tpl/display_job.tpl
+++ b/gui/bweb/tpl/display_job.tpl
@@ -1,5 +1,5 @@
  <div class='titlediv'>
-  <h1 class='newstitle'> Last Jobs (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> __Last Jobs__ (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
@@ -13,17 +13,17 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 
 var header = new Array("JobId",
-	               "Client",
-	               "Job Name", 
-		       "FileSet",
-//                     "Pool",
-                       "Level",
-                       "StartTime",
-	               "Duration",
-                       "JobFiles",
-                       "JobBytes", 
-                       "Errors",
-	               "Status");
+	               "__Client__",
+	               "__Job Name__", 
+		       "__FileSet__",
+//                     "__Pool__",
+                       "__Level__",
+                       "__StartTime__",
+	               "__Duration__",
+                       "__JobFiles__",
+                       "__JobBytes__", 
+                       "__Errors__",
+	               "__Status__");
 
 var data = new Array();
 
diff --git a/gui/bweb/tpl/display_job_group.tpl b/gui/bweb/tpl/display_job_group.tpl
index cb39e97285..35c4737047 100644
--- a/gui/bweb/tpl/display_job_group.tpl
+++ b/gui/bweb/tpl/display_job_group.tpl
@@ -1,5 +1,5 @@
  <div class='titlediv'>
-  <h1 class='newstitle'> Group summary (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> __Group summary__ (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
@@ -12,15 +12,15 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 
 
-var header = new Array("Group",
-	               "Nb Jobs",
-	               "Nb Ok",
-                       "Nb Err",
-	               "Nb Files", 
-		       "Size",
-		       "Duration",
-                       "Errors",
-	               "Status");
+var header = new Array("__Group__",
+	               "__Nb Jobs__",
+	               "__Nb Ok__",
+                       "__Nb Err__",
+	               "__Nb Files__", 
+		       "__Size__",
+		       "__Duration__",
+                       "__Errors__",
+	               "__Status__");
 
 var data = new Array();
 var age = <TMPL_VAR age>;
diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index 80e58d463c..e47ecc3a86 100644
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -1,28 +1,28 @@
  <div class='titlediv'>
-  <h1 class='newstitle'>Information about job</h1>
+  <h1 class='newstitle'>__Information about job__</h1>
  </div>
  <div class="bodydiv">
  <table id='id0'></table>
  <table><td>
  <form name="delete" action='bweb.pl?'>
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
-  <button type="submit" name='action' class="bp" value='delete' title='delete this job'
- onclick="return confirm('Do you want to delete this job from the catalog ?');">
-   <img src='/bweb/purge.png' alt=''> Delete </button>
+  <button type="submit" name='action' class="bp" value='delete' title='__delete this job__'
+ onclick="return confirm('__Do you want to delete this job from the catalog?__');">
+   <img src='/bweb/purge.png' alt=''>__Delete__</button>
  </form>
  </td><td>
  <form name="media" action='bweb.pl?'>
   <TMPL_LOOP volumes>
    <input type='hidden' name='media' value='<TMPL_VAR VolumeName>'>
   </TMPL_LOOP>   
-  <button type="submit" name='action' value='media' title='view media' class="bp">
-   <img src='/bweb/zoom.png'alt=''>View media </button>
+  <button type="submit" name='action' value='media' title='__View media__' class="bp">
+   <img src='/bweb/zoom.png'alt=''>__View media__</button>
  </form>
  </td>
  <td>
  <form name="job" action='bweb.pl?'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
-  <button type="submit" class="bp" name='action' value='job' title='view <TMPL_VAR Client> jobs'><img src='/bweb/zoom.png'>View jobs</button>
+  <button type="submit" class="bp" name='action' value='job' title='__view__ <TMPL_VAR Client> __jobs__'><img src='/bweb/zoom.png'>__View jobs__</button>
  </form>
  </td>
  <td>
@@ -30,15 +30,15 @@
   <input type='hidden' name='age' value='2678400'>
   <input type='hidden' name='client' value='<TMPL_VAR Client>'>
   <input type='hidden' name='jobname' value='<TMPL_VAR jobname>'>
-  <button type="submit" class="bp" name='action' value='graph' title='view trends'>
-   <img src='/bweb/chart.png' alt=''> View stats </button>
+  <button type="submit" class="bp" name='action' value='graph' title='__View trends__'>
+   <img src='/bweb/chart.png' alt=''> __View stats__ </button>
  </form>
  </td>
  <td>
  <form name="fileset_view" action='bweb.pl?'>
   <input type='hidden' name='fileset' value='<TMPL_VAR FileSet>'>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='view fileset'> 
- <img src='/bweb/zoom.png' alt=''> View FileSet</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='__View Fileset__'> 
+ <img src='/bweb/zoom.png' alt=''>__View FileSet__</button>
  </form>
  </td>
 <!-- Remove this to activate bfileview 
@@ -47,15 +47,15 @@
   <input type='hidden' name='jobid' value='<TMPL_VAR jobid>'>
   <input type='hidden' name='where' value='/'>
   <button type="submit" class="bp" name='action' value='bfileview' 
-   title='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>
+   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
+   <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>
@@ -66,15 +66,15 @@
   <input type='hidden' name='client' value='<TMPL_VAR client>'>
   <input type='hidden' id="rerun_level" name='level'>
   <input type='hidden' name='job' value='<TMPL_VAR jobname>'>
-  <button type="submit" class="bp" name='action' value='run_job_mod' title='run this job again'>
-   <img src='/bweb/R.png'> Run this job </button>
+  <button type="submit" class="bp" name='action' value='run_job_mod' title='__run this job again__'>
+   <img src='/bweb/R.png'> __Run this job__ </button>
  </form>
  </td>
 <TMPL_IF joberrors>
  <td>
     <a href="<TMPL_VAR thisurl>;error=1"
-         title="View only errors">
-    <img src='/bweb/doc.png' alt="view errors"></a> View only errors
+         title="__View only errors__">
+    <img src='/bweb/doc.png' alt="__View errors__"></a> __View only errors__
   </td>
 </TMPL_IF>
  </table>
@@ -82,18 +82,18 @@
 
 <script type="text/javascript" language='JavaScript'>
 var header = new Array("JobId",
-	               "Client",
-	               "Job Name", 
-		       "FileSet",
-                       "Level",
-                       "StartTime", 
-	               "Duration",
-                       "JobFiles",
-                       "JobBytes",
-                       "Errors",
-	               "Pool",
-                       "Volume Name",
-	               "Status");
+	               "__Client__",
+	               "__Job Name__", 
+		       "__FileSet__",
+                       "__Level__",
+                       "__StartTime__", 
+	               "__Duration__",
+                       "__JobFiles__",
+                       "__JobBytes__",
+                       "__Errors__",
+	               "__Pool__",
+                       "__Volume Name__",
+	               "__Status__");
 
 var data = new Array();
 
diff --git a/gui/bweb/tpl/display_location.tpl b/gui/bweb/tpl/display_location.tpl
index 1dbc824a7a..24bb31bfff 100644
--- a/gui/bweb/tpl/display_location.tpl
+++ b/gui/bweb/tpl/display_location.tpl
@@ -1,21 +1,21 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Locations</h1>
+  <h1 class='newstitle'>__Locations__</h1>
  </div>
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <button type="submit" class="bp" name='action' value='location_add' title='Add a location'> <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='Edit a location'> <img src='/bweb/edit.png' alt=''>Edit</button>
+    <button type="submit" class="bp" name='action' value='location_add' title='__Add a location__'> <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='__Edit a location__'> <img src='/bweb/edit.png' alt=''>__Edit__</button>
 
-    <button type="submit" class="bp" name='action' value='media' title='Show content'> <img src='/bweb/zoom.png' alt=''>View content</button>
+    <button type="submit" class="bp" name='action' value='media' title='__View content__'> <img src='/bweb/zoom.png' alt=''>__View content__</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Name","Enabled", "Cost", "Nb volumes", "Select");
+var header = new Array("__Name__","__Enabled__", "__Cost__", "__Nb volumes__", "__Select__");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/tpl/display_log.tpl b/gui/bweb/tpl/display_log.tpl
index 28ec41acdf..41960da98b 100644
--- a/gui/bweb/tpl/display_log.tpl
+++ b/gui/bweb/tpl/display_log.tpl
@@ -1,6 +1,6 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Log : <TMPL_VAR name> on <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/tpl/display_media.tpl b/gui/bweb/tpl/display_media.tpl
index 19ef23920e..89adcec886 100644
--- a/gui/bweb/tpl/display_media.tpl
+++ b/gui/bweb/tpl/display_media.tpl
@@ -1,41 +1,41 @@
  <div class='titlediv'>
   <h1 class='newstitle'> 
-   Media
+   __Media__
   </h1>
  </div>
  <div class='bodydiv'>
 
 <TMPL_IF Pool>
 <h2>
-Pool : <a href="?action=pool;pool=<TMPL_VAR Pool>">
+__Pool:__ <a href="?action=pool;pool=<TMPL_VAR Pool>">
          <TMPL_VAR Pool>
        </a>
 </h2>
 </TMPL_IF>
 <TMPL_IF Location>
 <h2>
-Location : <TMPL_VAR location>
+__Location:__ <TMPL_VAR location>
 </h2>
 </TMPL_IF>
 
    <form action='?action=test' method='get'>
     <table id='id_pool_<TMPL_VAR ID>'></table>
-      <button type="submit" class="bp" name='action' value='extern' title='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=''>Edit</button>
-      <button type="submit" class="bp" name='action' value='media_zoom' title='Information'> <img src='/bweb/zoom.png' alt=''>View</button>
+      <button type="submit" class="bp" name='action' value='extern' title='__Move out__'> <img src='/bweb/extern.png' onclick='return confirm("__Do you want to eject selected media ?__");' alt=''>__Eject__</button>
+      <button type="submit" class="bp" name='action' value='intern' title='__Move in__'> <img src='/bweb/intern.png' alt=''>__Load__</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='__Update media__'> <img src='/bweb/edit.png' alt=''>__Edit__</button>
+      <button type="submit" class="bp" name='action' value='media_zoom' title='__Information__'> <img src='/bweb/zoom.png' alt=''>__View__</button>
 <!--
-      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' alt=''>Purge</button>
+      <button type="submit" class="bp" name='action' value='purge' title='__Purge__'> <img src='/bweb/purge.png' alt=''>__Purge__</button>
 -->
-      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
+      <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("Volume Name","Online","Vol Bytes", "Vol Usage", "Vol Status",
-                       "Pool", "Media Type",
-                       "Last Written", "When expire ?", "Select");
+var header = new Array("__Volume Name__","__Online__","__Vol Bytes__", "__Vol Usage__", "__Vol Status__",
+                       "__Pool__", "__Media Type__",
+                       "__Last Written__", "__When expire ?__", "__Select__");
 
 var data = new Array();
 var img;
diff --git a/gui/bweb/tpl/display_media_zoom.tpl b/gui/bweb/tpl/display_media_zoom.tpl
index 94d9d4ecbf..655da33a55 100644
--- a/gui/bweb/tpl/display_media_zoom.tpl
+++ b/gui/bweb/tpl/display_media_zoom.tpl
@@ -1,35 +1,35 @@
 <table>
 <td valign='top'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Medium : <TMPL_VAR volumename> <TMPL_VAR comment></h1>
+  <h1 class='newstitle'> __Volume:__ <TMPL_VAR volumename> <TMPL_VAR comment></h1>
  </div>
  <div class='bodydiv'>
-    <b> Medium Infos</b><br/>
+    <b> __Volume Infos__</b><br/>
     <table id='id_info_<TMPL_VAR volumename>'></table>
-    <b> Medium Stats</b><br/>
+    <b> __Volume Stats__</b><br/>
     <table id='id_media_<TMPL_VAR volumename>'></table>
-    <b> Job List </b></br>
+    <b> __Job List__ </b></br>
     <table id='id_jobs_<TMPL_VAR volumename>'></table>
-    <b> Actions </b></br>
+    <b> __Actions__ </b></br>
    <form action='?' method='get'>
       <input type='hidden' name='media' value='<TMPL_VAR volumename>'>
 <TMPL_IF online>&nbsp;
-      <button type="submit" class="bp" name='action' value='extern' onclick='return confirm("Do you want to eject this volume ?");' title='move out'> <img src='/bweb/extern.png' alt=''>Eject</button>
+      <button type="submit" class="bp" name='action' value='extern' onclick='return confirm("__Do you want to eject this volume ?__");' title='__move out__'> <img src='/bweb/extern.png' alt=''>__Eject__</button>
 <TMPL_ELSE>
-      <button type="submit" class="bp" name='action' value='intern' title='move in'> <img src='/bweb/intern.png' alt=''>Load</button>
+      <button type="submit" class="bp" name='action' value='intern' title='__move in__'> <img src='/bweb/intern.png' alt=''>__Load__</button>
 </TMPL_IF>
-      <button type="submit" class="bp" name='action' value='update_media' title='Update'><img src='/bweb/edit.png' alt=''>Edit</button>
-      <button type="submit" class="bp" name='action' value='purge' title='Purge'> <img src='/bweb/purge.png' onclick="return confirm('Do you want to purge this volume ?')" alt=''>Purge</button>
-      <button type="submit" class="bp" name='action' value='prune' title='Prune'> <img src='/bweb/prune.png' alt=''>Prune</button>
+      <button type="submit" class="bp" name='action' value='update_media' title='__Update__'><img src='/bweb/edit.png' alt=''>__Edit__</button>
+      <button type="submit" class="bp" name='action' value='purge' title='__Purge__'> <img src='/bweb/purge.png' onclick="return confirm('__Do you want to purge this volume?__')" alt=''>__Purge__</button>
+      <button type="submit" class="bp" name='action' value='prune' title='__Prune__'> <img src='/bweb/prune.png' alt=''>__Prune__</button>
 <TMPL_IF Locationlog>
-      <a href='#' onclick='document.getElementById("locationlog").style.visibility="visible";'><img title='View location log' src='/bweb/zoom.png'></a>
+      <a href='#' onclick='document.getElementById("locationlog").style.visibility="visible";'><img title='__View location log__' src='/bweb/zoom.png'></a>
 </TMPL_IF>
    </form>
  </div>
 </td>
 <td valign='top'style="visibility:hidden;" id='locationlog'>
  <div class='titlediv'>
-  <h1 class='newstitle'> Location log </h1>
+  <h1 class='newstitle'>__Location log__ </h1>
  </div>
  <div class='bodydiv'>
 <pre>
@@ -40,8 +40,8 @@
 </table>
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Pool","Online","Enabled", "Location","Vol Status", "Vol Bytes", "Expire",
-	               "Retention","Max use duration", "Max jobs" );
+var header = new Array("__Pool__","__Online__","__Enabled__", "__Location__","__Vol Status__", "__Vol Bytes__", "__Expire__",
+	               "__Retention__","__Max use duration__", "__Max jobs__" );
 
 var data = new Array();
 var img;
@@ -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__", "__Errors__");
 
 var data = new Array();
 data.push( new Array(
@@ -110,8 +110,8 @@ nrsTable.setup(
 );
 
 
-var header = new Array("JobId","Name","Start Time","Type",
-	               "Level", "Files", "Bytes", "Status");
+var header = new Array("JobId","__Name__","__Start Time__","__Type__",
+	               "__Level__","__Files__","__Bytes__","__Status__");
 
 var data = new Array();
 var a;
diff --git a/gui/bweb/tpl/display_pool.tpl b/gui/bweb/tpl/display_pool.tpl
index 852f2cd5e2..69d865d24e 100644
--- a/gui/bweb/tpl/display_pool.tpl
+++ b/gui/bweb/tpl/display_pool.tpl
@@ -1,23 +1,22 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Pools</h1>
+  <h1 class='newstitle'>__Pools__</h1>
  </div>
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <button type="submit" class="bp" type='submit' name='action' value='media' title='Show content'> <img src='/bweb/zoom.png' alt=''>View</button>
+    <button type="submit" class="bp" type='submit' name='action' value='media' title='__Show content__'> <img src='/bweb/zoom.png' alt=''>__View__</button>
     <input id="mediatype" type='hidden' name='mediatype' value=''>
    </form>
    <br/>
-   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: 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("Name","Media Type", "Recycle","Retention","Use Duration",
-                       "Max jobs per volume","Max files per volume", 
-                       "Max volume size","Nb volumes", "Vol Status", "Usage", "Select");
+var header = new Array("__Name__","__Media Type__", "__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;
diff --git a/gui/bweb/tpl/display_user.tpl b/gui/bweb/tpl/display_user.tpl
index 435de7d873..e21d8c5785 100644
--- a/gui/bweb/tpl/display_user.tpl
+++ b/gui/bweb/tpl/display_user.tpl
@@ -1,47 +1,47 @@
 <div class='titlediv'>
-  <h1 class='newstitle'> User: <TMPL_VAR username></h1>
+  <h1 class='newstitle'>__User:__ <TMPL_VAR username></h1>
 </div>
 <div class='bodydiv'>
 
 <form name="form1" action="?">
-<input type="hidden" value="1" name="create">
+<input type="hidden" value='1' name="create">
  <table>
  <tr>
-  <td>Username:</td> <td> <input class="formulaire" type="text" name="username" value="<TMPL_VAR username>"> </td>
+  <td>__Username:__</td> <td> <input class="formulaire" type="text" name="username" value='<TMPL_VAR username>'> </td>
 <!-- </tr><tr>
-  <td>Password:</td> <td> <input class="formulaire" type="password" name="passwd" value="<TMPL_VAR passwd>"> </td>
+  <td>__Password:__</td> <td> <input class="formulaire" type="password" name="passwd" value='<TMPL_VAR passwd>'> </td>
 -->
  </tr><tr>
-  <td>Comment:</td> <td> <input class="formulaire" type="text" name="comment" value="<TMPL_VAR comment>"> </td>
+  <td>__Comment:__</td> <td> <input class="formulaire" type="text" name="comment" value='<TMPL_VAR comment>'> </td>
  </tr><tr>
-<td> Profile:</td><td>
+<td> __Profile:__</td><td>
  <select name="profile" id='profile' class="formulaire">
   <option onclick='set_role("")'></option>
-  <option onclick='set_role("administrator")'>Administrator</option>
-  <option onclick='set_role("customer")'>Customer</option>
+  <option onclick='set_role("administrator")'>__Administrator__</option>
+  <option onclick='set_role("customer")'>__Customer__</option>
  </select>
-</td><td>Or like an existing user: </td><td>
+</td><td>__Or like an existing user:__ </td><td>
  <select name="copy_username" class="formulaire">
   <option onclick="disable_sel(false)"></option>
  <TMPL_LOOP db_usernames>
-  <option title="<TMPL_VAR comment>" onclick="disable_sel(true)" value="<TMPL_VAR username>"><TMPL_VAR username></option>
+  <option title="<TMPL_VAR comment>" onclick="disable_sel(true)" value='<TMPL_VAR username>'><TMPL_VAR username></option>
  </TMPL_LOOP>
  </select>
 </td>
  </tr><tr>
  </tr><tr>
-<td> Roles:</td><td>
+<td> __Roles:__</td><td>
  <select name="rolename" id='rolename' multiple class="formulaire" size=15>
  <TMPL_LOOP db_roles>
-  <option title="<TMPL_VAR comment>" value="<TMPL_VAR rolename>" <TMPL_IF userid>selected</TMPL_IF> ><TMPL_VAR rolename></option>
+  <option title="<TMPL_VAR comment>" value='<TMPL_VAR rolename>' <TMPL_IF userid>selected</TMPL_IF> ><TMPL_VAR rolename></option>
  </TMPL_LOOP>
  </select>
  </td>
 </tr><tr>
-<td> Use groups filter:</td><td>
+<td> __Use groups filter:__</td><td>
 <input class="formulaire" onclick="disable_group(this.checked == false)" type="checkbox" name="use_acl" <TMPL_IF use_acl> checked </TMPL_IF> > </td>
 </tr><tr>
-<td> Groups:</td><td>
+<td> __Groups:__</td><td>
  <select name="client_group" id='client_group' multiple class="formulaire" size=15>
 <TMPL_LOOP db_client_groups>
         <option id='group_<TMPL_VAR name>'><TMPL_VAR name></option>
diff --git a/gui/bweb/tpl/display_users.tpl b/gui/bweb/tpl/display_users.tpl
index e34163ac22..13c0d87450 100644
--- a/gui/bweb/tpl/display_users.tpl
+++ b/gui/bweb/tpl/display_users.tpl
@@ -1,24 +1,24 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Users</h1>
+  <h1 class='newstitle'>__Users__</h1>
  </div>
  <div class="bodydiv">
    <form action='?' method='get'>
     <table id='id<TMPL_VAR ID>'></table>
-    <button type="submit" class="bp" name='action' value='user_add' title='Add'> <img src='/bweb/add.png' alt=''>Add</button>
+    <button type="submit" class="bp" name='action' value='user_add' title='__Add__'> <img src='/bweb/add.png' alt=''>__Add__</button>
     <button type="submit" class="bp" name='action' value='user_del' 
      onclick="return confirm('Do you want to delete this user ?');" 
-     title='Remove'> <img src='/bweb/remove.png' alt=''>Remove </button>
-    <button type="submit" class="bp" name='action' value='user_edit' title='Modify'> <img src='/bweb/edit.png' alt=''>Edit </button>
+     title='__Remove__'> <img src='/bweb/remove.png' alt=''>__Remove__ </button>
+    <button type="submit" class="bp" name='action' value='user_edit' title='__Edit__'> <img src='/bweb/edit.png' alt=''>__Edit__ </button>
 
-    <button type="submit" class="bp" name='action' value='client' title='View clients'> <img src='/bweb/zoom.png' alt=''>View clients</button>
-    <button type="submit" class="bp" name='action' value='job' title='View jobs'> <img src='/bweb/zoom.png' alt=''>View jobs</button>
+    <button type="submit" class="bp" name='action' value='client' title='__View clients__'> <img src='/bweb/zoom.png' alt=''>__View clients__</button>
+    <button type="submit" class="bp" name='action' value='job' title='__View jobs__'> <img src='/bweb/zoom.png' alt=''>__View jobs__</button>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Username","Selection");
+var header = new Array("__Username__","__Selection__");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/tpl/error.tpl b/gui/bweb/tpl/error.tpl
index e8d15f134e..7018ce70f2 100644
--- a/gui/bweb/tpl/error.tpl
+++ b/gui/bweb/tpl/error.tpl
@@ -1,4 +1,4 @@
-<h1>An error has occurred :</h1>
+<h1>__An error has occurred:__</h1>
 <pre>
-<TMPL_VAR NAME=error>
+<TMPL_VAR error>
 </pre>
diff --git a/gui/bweb/tpl/fileset_view.tpl b/gui/bweb/tpl/fileset_view.tpl
index 3a53cc3f8d..d14aad6517 100644
--- a/gui/bweb/tpl/fileset_view.tpl
+++ b/gui/bweb/tpl/fileset_view.tpl
@@ -1,20 +1,20 @@
  <div class='titlediv'>
   <h1 class='newstitle'> 
-   FileSet <TMPL_VAR fileset>
+   __FileSet__ <TMPL_VAR fileset>
   </h1>
  </div>
  <div class='bodydiv'>
 
- <img src="/bweb/add.png" alt="included"> What is included :
+ <img src="/bweb/add.png" alt="included"> __What is included:__
  <pre>
 <TMPL_LOOP I><TMPL_VAR file>
 </TMPL_LOOP></pre>
 
- <img src="/bweb/remove.png" alt="excluded"> What is excluded :
+ <img src="/bweb/remove.png" alt="excluded"> __What is excluded:__
  <pre>
 <TMPL_LOOP E><TMPL_VAR file>
 </TMPL_LOOP></pre>
 
-Tips: Warning, this is the current fileset, it could have changed ...
+__Tips: Warning, this is the current fileset, it could have changed ...__
 
  </div>
diff --git a/gui/bweb/tpl/fv_file_attribs.tpl b/gui/bweb/tpl/fv_file_attribs.tpl
index 858e7bdac3..ca0db47b86 100644
--- a/gui/bweb/tpl/fv_file_attribs.tpl
+++ b/gui/bweb/tpl/fv_file_attribs.tpl
@@ -1,5 +1,5 @@
 <div class='titlediv'>
-  <h1 class='newstitle'> Information about <TMPL_VAR filename> </h1>
+  <h1 class='newstitle'> __Information about__ <TMPL_VAR filename> </h1>
 </div>
 <div class='bodydiv'>
    <table>
diff --git a/gui/bweb/tpl/general.tpl b/gui/bweb/tpl/general.tpl
index a8629395be..ea0e8442b2 100644
--- a/gui/bweb/tpl/general.tpl
+++ b/gui/bweb/tpl/general.tpl
@@ -4,20 +4,20 @@ bweb_add_refresh();
 </script>
 <div class='titlediv'>
   <h1 class="newstitle">
-   Information
+   Informations
   </h1>
 </div>
 <div class="bodydiv">
   <table>
-   <tr><td>Total clients:</td>      <td> <TMPL_VAR nb_client> </td>
-       <td>Total bytes stored:</td> <td> <TMPL_VAR nb_bytes> </td>
-       <td>Total media:</td>        <td> <TMPL_VAR nb_media> </td>
+   <tr><td>__Total clients:__</td>      <td> <TMPL_VAR nb_client> </td>
+       <td>__Total bytes stored:__</td> <td> <TMPL_VAR nb_bytes> </td>
+       <td>__Total media:__</td>        <td> <TMPL_VAR nb_media> </td>
    </tr>
-   <tr><td>Database size:</td>      <td> <TMPL_VAR db_size> </td>
-       <td>Total Pool:</td>         <td> <TMPL_VAR nb_pool> </td>
-       <td>Total Job:</td>         <td> <TMPL_VAR nb_job> </td>
+   <tr><td>__Database size:__</td>      <td> <TMPL_VAR db_size> </td>
+       <td>__Total Pool:__</td>         <td> <TMPL_VAR nb_pool> </td>
+       <td>__Total Job:__</td>         <td> <TMPL_VAR nb_job> </td>
    </tr>
-   <tr><td>Job failed (<TMPL_VAR label>):</td> 
+   <tr><td>__Job failed__ (<TMPL_VAR label>):</td> 
        
 <td <TMPL_IF nb_err> class='joberr' </TMPL_IF>>
    <TMPL_VAR nb_err> 
diff --git a/gui/bweb/tpl/graph.tpl b/gui/bweb/tpl/graph.tpl
index 16ccaa97cc..493ac99808 100644
--- a/gui/bweb/tpl/graph.tpl
+++ b/gui/bweb/tpl/graph.tpl
@@ -1,107 +1,107 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Statistics</h1>
+  <h1 class='newstitle'>__Statistics__</h1>
  </div>
  <div class='bodydiv'>
 <table border='0'>
 <td>
 <form name='form1' action='?' method='GET'>
         <div class="otherboxtitle">
-          Options &nbsp;
+          __Options__ &nbsp;
         </div>
         <div class="otherbox">
 <table border='0'>
 <tr>
   <td valign='top'>
-    <h2>Level</h2>
+    <h2>__Level__</h2>
     <select name='level' class='formulaire'>
-      <option id='level_Any' value='Any'>Any</option>
-      <option id='level_F' value='F'>Full</option>
-      <option id='level_D' value='D'>Differential</option>
-      <option id='level_I' value='I'>Incremental</option>
+      <option id='level_Any' value='Any'>__Any__</option>
+      <option id='level_F' value='F'>__Full__</option>
+      <option id='level_D' value='D'>__Differential__</option>
+      <option id='level_I' value='I'>__Incremental__</option>
     </select>     
   </td><td valign='top'>
-    <h2>Status</h2>
+    <h2>__Status__</h2>
     <select name='status' class='formulaire'>
-      <option id='status_Any' value='Any'>Any</option>
-      <option id='status_T'   value='T'>Ok</option>
-      <option id='status_f'   value='f'>Error</option>
-      <option id='status_A'   value='A'>Canceled</option>
+      <option id='status_Any' value='Any'>__Any__</option>
+      <option id='status_T'   value='T'>__Ok__</option>
+      <option id='status_f'   value='f'>__Error__</option>
+      <option id='status_A'   value='A'>__Canceled__</option>
     </select>   
   </td>
 </tr>
 <tr>
   <td valign='top'>
-    <h2>Age</h2>
+    <h2>__Age__</h2>
     <select name='age' class='formulaire'>
-      <option id='age_604800'   value='604800'>This week</option>
-      <option id='age_2678400'  value='2678400'>Last 30 days</option>
-      <option id='age_15552000' value='15552000'>Last 6 month</option>
+      <option id='age_604800'   value='604800'>__This week__</option>
+      <option id='age_2678400'  value='2678400'>__Last 30 days__</option>
+      <option id='age_15552000' value='15552000'>__Last 6 month__</option>
     </select>     
   </td>
   <td  valign='top'>
-    <h2>Size</h2>
-     Width: &nbsp;<input class='formulaire' type='text' 
+    <h2>__Size__</h2>
+     __Width:__ &nbsp;<input class='formulaire' type='text' 
                          name='width' value='<TMPL_VAR width>' size='4'><br/>
-     Height:  <input type='text' class='formulaire' 
+     __Height:__  <input type='text' class='formulaire' 
                 name='height' value='<TMPL_VAR height>' size='4'><br/>
   </td>
 </tr>
 <tr>
   <td valign='top'> 
-    <h2>Clients</h2>
+    <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 Name</h2>
+    <h2>__Job Name__</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>
 </tr>
 <tr>
-  <td> <h2> Type </h2> 
+  <td> <h2> __Type__ </h2> 
  <select name='graph' class='formulaire'>
-   <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">Job Files</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>
-   <option id='job_sum_pday' value='job_sum_pday' title="Job size per day">Job total B/day</option>
-   <option id='job_count_hour' value='job_count_hour' title="Number of jobs per hour for the period">Jobs Count (h)</option>
-   <option id='job_count_day' value='job_count_day' title="Number of jobs per day for the period">Jobs Count (d)</option>
-   <option id='job_avg_hour' value='job_avg_hour' title="Average backup size per hour for the period">Job avg size (h)</option>
-   <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_size' value='job_time_size' title="Display Job size, duration and number of files with a balloon">Size,time,files</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__">__Job Files__</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>
+   <option id='job_sum_pday' value='job_sum_pday' title="__Job size per day__">__Job total B/day__</option>
+   <option id='job_count_hour' value='job_count_hour' title="__Number of jobs per hour for the period__">__Jobs Count (h)__</option>
+   <option id='job_count_day' value='job_count_day' title="__Number of jobs per day for the period__">__Jobs Count (d)__</option>
+   <option id='job_avg_hour' value='job_avg_hour' title="__Average backup size per hour for the period__">__Job avg size (h)__</option>
+   <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_size' value='job_time_size' title="__Display Job size, duration and number of files with a balloon__">__Size,time,files__</option>
 
  </select>
   </td>
   <td valign='bottom'> 
-    <h2>Number of items</h2>
-    <input type='text' name='limit' value='<TMPL_VAR NAME=limit>' 
+    <h2>__Number of items__</h2>
+    <input type='text' name='limit' value='<TMPL_VAR limit>' 
         class='formulaire' size='4'>
   </td>
 </tr>
 <tr>
-<td><h2> Graph type </h2> 
+<td><h2> __Graph type__ </h2> 
   <select name='gtype' class='formulaire'>
-    <option id='gtype_bars' value='bars'>Bars</option>
-<!--  <option id='gtype_bars3d' value='bars3d'>Bars3d</option> -->
-    <option id='gtype_lines' value='lines'>Lines</option>
-    <option onclick='document.getElementById("job_time_size").selected=true;' id='gtype_balloon' value='balloon'>Balloon</option>
-    <option id='gtype_linespoints' value='linespoints'>Lines points</option>
+    <option id='gtype_bars' value='bars'>__Bars__</option>
+<!--  <option id='gtype_bars3d' value='bars3d'>__Bars3d__</option> -->
+    <option id='gtype_lines' value='lines'>__Lines__</option>
+    <option onclick='document.getElementById("job_time_size").selected=true;' id='gtype_balloon' value='balloon'>__Balloon__</option>
+    <option id='gtype_linespoints' value='linespoints'>__Lines points__</option>
 </td>
 <td>
   <input type='submit' name='action' value='graph' class='formulaire'> 
@@ -115,12 +115,12 @@
 <td>
 
  <div class="otherboxtitle">
- Current &nbsp;
+ __Current__ &nbsp;
  </div>
  <div class="otherbox">
 
  <img usemap='imggraph' id='imggraph' 
-      alt='Nothing to display, Try a bigger date range'>
+      alt='__Nothing to display, Try a bigger date range__'>
  </div>
 
 </td>
@@ -174,7 +174,7 @@
   </TMPL_IF>
 
   <TMPL_IF url>
-   document.getElementById('imggraph').src='bgraph.pl?<TMPL_VAR NAME=url>'
+   document.getElementById('imggraph').src='bgraph.pl?<TMPL_VAR url>'
   </TMPL_IF>
 
 </script>
diff --git a/gui/bweb/tpl/groups_edit.tpl b/gui/bweb/tpl/groups_edit.tpl
index ffa3ee9ba3..d0febe588f 100644
--- a/gui/bweb/tpl/groups_edit.tpl
+++ b/gui/bweb/tpl/groups_edit.tpl
@@ -1,17 +1,17 @@
 
 <div class='titlediv'>
-  <h1 class='newstitle'> Group : <TMPL_VAR client_group></h1>
+  <h1 class='newstitle'> __Group:__ <TMPL_VAR client_group></h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
     <input type='hidden' name='client_group' value=<TMPL_VAR client_group>>
     <table>
-     <tr><td>Group :</td>
+     <tr><td>__Group:__</td>
          <td> 
           <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>
@@ -22,7 +22,7 @@
      </tr>
     </table>
     <button type="submit" class="bp" name='action' value='groups_save'>
-     <img src='/bweb/save.png' alt=''>Save</button>
+     <img src='/bweb/save.png' alt=''>__Save__</button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/help_extern.tpl b/gui/bweb/tpl/help_extern.tpl
index 5e543c6918..29b1800efc 100644
--- a/gui/bweb/tpl/help_extern.tpl
+++ b/gui/bweb/tpl/help_extern.tpl
@@ -1,43 +1,42 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Help ejecting media (part 1/2)</h1>
+ <h1 class='newstitle'>__Help ejecting media (part 1/2)__</h1>
 </div>
 <div class='bodydiv'>
-This tool will select the best candidates to eject. You will
-be asked to make your selection on the next screen. 
+__This tool will select the best candidates to eject. You will be asked to make your selection on the next screen.__
   <form action="?" method='GET'>
    <table>
-    <tr><td>Pool:</td>      
+    <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>Media Type:</td>      
+    <tr><td>__Media Type:__</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> Location : </td>
+    <tr><td> __Location:__ </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>Number of media <br/> to eject:</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><button type="submit" class="bp" name='action' value='compute_extern_media' title='Next'> <img src='/bweb/next.png' alt=''> </button>
+        <td><button type="submit" class="bp" name='action' value='compute_extern_media' title='__Next__'> <img src='/bweb/next.png' alt=''>__Next__</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/tpl/help_extern_compute.tpl b/gui/bweb/tpl/help_extern_compute.tpl
index 5809395f83..dc9be23886 100644
--- a/gui/bweb/tpl/help_extern_compute.tpl
+++ b/gui/bweb/tpl/help_extern_compute.tpl
@@ -1,43 +1,43 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Help to eject media (part 2/2)</h1>
+  <h1 class='newstitle'>__Help to eject media (part 2/2)__</h1>
  </div>
  <div class='bodydiv'>
-  Now, you can verify the selection and eject the media.
+  __Now, you can verify the selection and eject the media.__
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='__Back__'> <img src='/bweb/prev.png' alt=''>__Back__</button>
     </td><td style='align: right;'>
-    <button type="submit" class="bp" name='action' value='extern' title='Eject selection'> <img src='/bweb/extern.png' alt=''>Eject</button>
+    <button type="submit" class="bp" name='action' value='extern' title='__Eject selection__'> <img src='/bweb/extern.png' alt=''>__Eject__</button>
    </td></tr>
    </form>
  </div>
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Volume Name","Vol Status",
-                       "Media Type","Pool Name","Last Written", 
-                       "When expire ?", "Select");
+var header = new Array("__Volume Name__","__Vol Status__",
+                       "__Media Type__","__Pool Name__","__Last Written__", 
+                       "__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/tpl/help_intern.tpl b/gui/bweb/tpl/help_intern.tpl
index f4ac188c70..613d42f1ec 100644
--- a/gui/bweb/tpl/help_intern.tpl
+++ b/gui/bweb/tpl/help_intern.tpl
@@ -1,13 +1,12 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> Help loading media (part 1/2)</h1>
+  <h1 class='newstitle'> __Help loading media (part 1/2)__</h1>
 </div>
 <div class="bodydiv">
-This tool will select the best candidates to load. You will
-be asked to make your selection on the next screen. 
+__This tool will select the best candidates to load. You will be asked to make your selection on the next screen.__
   <form action="?" method='GET'>
    <table>
-    <tr><td>Pool:</td>      
+    <tr><td>__Pool:__</td>      
         <td><select name='pool' class='formulaire' multiple>
 <TMPL_LOOP db_pools>
              <option selected><TMPL_VAR name></option>
@@ -15,7 +14,7 @@ be asked to make your selection on the next screen.
            </select>
         </td>
     </tr>
-    <tr><td>Media Type:</td>      
+    <tr><td>__Media Type:__</td>      
         <td><select name='mediatype' class='formulaire' multiple>
 <TMPL_LOOP db_mediatypes>
              <option><TMPL_VAR mediatype></option>
@@ -24,7 +23,7 @@ be asked to make your selection on the next screen.
         </td>
     </tr>
     <tr><td>
-    Location : 
+    __Location:__ 
     </td><td><select name='location' class='formulaire'>
   <TMPL_LOOP db_locations>
       <option value='<TMPL_VAR location>'><TMPL_VAR location></option>
@@ -33,17 +32,17 @@ be asked to make your selection on the next screen.
     </td>
     </tr>
     <tr>
-        <td>Expired :</td> 
+        <td>__Expired:__</td> 
         <td> <input type='checkbox' name='expired' class='formulaire' 
                 checked> </td>
     </tr>
     <tr>
-        <td>Number of media <br/> to load:</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><button type="submit" class="bp" name='action' value='compute_intern_media' title='Next'> <img src='/bweb/next.png' alt=''>Next</button>
+        <td><button type="submit" class="bp" name='action' value='compute_intern_media' title='__Next__'> <img src='/bweb/next.png' alt=''>__Next__</button>
         </td><td/>
     </tr>
    </table>
diff --git a/gui/bweb/tpl/help_intern_compute.tpl b/gui/bweb/tpl/help_intern_compute.tpl
index 2f2de98d6a..f5e8c66b9c 100644
--- a/gui/bweb/tpl/help_intern_compute.tpl
+++ b/gui/bweb/tpl/help_intern_compute.tpl
@@ -1,16 +1,16 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Help to load media (part 2/2)</h1>
+  <h1 class='newstitle'>__Help to load media (part 2/2)__</h1>
  </div>
  <div class='bodydiv'>
-  Now, you can verify the selection and load the media.
+  __Now, you can verify the selection and load the media.__
    <form action='?' method='get'>
     <table id='compute'></table>
     <table><tr>
     <td style='align: left;'>
-    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='Back'> <img src='/bweb/prev.png' alt=''>Back</button>
+    <button type="submit" class="bp" onclick='javascript:window.history.go(-2);' title='__Back__'> <img src='/bweb/prev.png' alt=''>__Back__</button>
     </td><td style='align: right;'>
-    <input type="hidden" name='enabled' value="yes">
+    <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>
@@ -19,9 +19,9 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Volume Name","Vol Status",
-                       "Media Type","Pool Name","Last Written", 
-                       "When expire ?", "Select");
+var header = new Array("__Volume Name__","__Vol Status__",
+                       "__Media Type__","__Pool Name__","__Last Written__", 
+                       "__When expire ?__", "__Select__");
 
 var data = new Array();
 var chkbox;
@@ -30,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/tpl/install.tpl b/gui/bweb/tpl/install.tpl
deleted file mode 100644
index 749c5d2447..0000000000
--- a/gui/bweb/tpl/install.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<br/>
-<div class='titlediv'>
-  <h1 class='newstitle'> Install notes </h1>
-</div>
-<div class='bodydiv'>
-
-
-
-</div>
diff --git a/gui/bweb/tpl/location_add.tpl b/gui/bweb/tpl/location_add.tpl
index 5fb28d02f4..5cdfc3b065 100644
--- a/gui/bweb/tpl/location_add.tpl
+++ b/gui/bweb/tpl/location_add.tpl
@@ -1,31 +1,31 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> New location </h1>
+  <h1 class='newstitle'> __New location__ </h1>
 </div>
 <div class='bodydiv'>
    <form action="?" method='get'>
     <table>
-     <tr><td>Location :</td>     
+     <tr><td>__Location:__</td>     
          <td> 
           <input class="formulaire" type='text' value='' size='32' name='location'> 
          </td>
      </tr>
-     <tr><td>Cost :</td> 
+     <tr><td>__Cost:__</td> 
          <td> <input class="formulaire" type='text' value='10' name='cost' size='3'>
          </td>
      </tr>
-    <tr><td>Enabled:</td>
+    <tr><td>__Enabled:__</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'>__yes__</option>
+           <option value='no'>__no__</option>
+           <option value='archived'>__archived__</option>
            </select>
         </td>
     </tr>
     </table>
-    <button type="submit" class="bp" name='action' value='location_add' title="save" ><img src='/bweb/save.png' alt=''>Save</button>
+    <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/tpl/location_edit.tpl b/gui/bweb/tpl/location_edit.tpl
index fa11cb14d0..f06e05b48c 100644
--- a/gui/bweb/tpl/location_edit.tpl
+++ b/gui/bweb/tpl/location_edit.tpl
@@ -1,31 +1,31 @@
 <br/>
 <div class='titlediv'>
-  <h1 class='newstitle'> Location : <TMPL_VAR Location></h1>
+  <h1 class='newstitle'> __Location:__ <TMPL_VAR Location></h1>
 </div>
 <div class='bodydiv'>
    <form name='form1' action="?" method='get'>
     <input type='hidden' name='location' value='<TMPL_VAR location>'>
     <table>
-     <tr><td>Location :</td>     
+     <tr><td>__Location:__</td>     
          <td> 
           <input class="formulaire" type='text' value='<TMPL_VAR location>' size='32' name='newlocation'> 
          </td>
      </tr>
-     <tr><td>Cost :</td> 
+     <tr><td>__Cost:__</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR cost>' name='cost' size='3'>
          </td>
      </tr>
-    <tr><td>Enabled:</td>
+    <tr><td>__Enabled:__</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'>__yes__</option>
+           <option value='no'>__no__</option>
+           <option value='archived'>__archived__</option>
            </select>
         </td>
     </tr>
     </table>
     <button type="submit" class="bp" name='action' value='location_save'>
-      <img src='/bweb/save.png' alt=''>Save</button>
+      <img src='/bweb/save.png' alt=''>__Save__</button>
    </form>
 </div>
 
diff --git a/gui/bweb/tpl/move_media.tpl b/gui/bweb/tpl/move_media.tpl
index 78b75664e0..48b0f333d2 100644
--- a/gui/bweb/tpl/move_media.tpl
+++ b/gui/bweb/tpl/move_media.tpl
@@ -1,27 +1,27 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Move media</h1>
+  <h1 class='newstitle'>__Move media__</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> New location: </td><td>
+    <tr><td> __New location:__ </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> __Enabled:__ </td><td>
 <select name='enabled' class='formulaire'>
-    <option value='no'>no</option>
-    <option value='yes'>yes</option>
-    <option value='archived'>archived</option>
+    <option value='no'>__no__</option>
+    <option value='yes'>__yes__</option>
+    <option value='archived'>__archived__</option>
 </select>
-    </td><tr><td> User: </td><td>
+    </td><tr><td> __User:__ </td><td>
 <input type='text' name='user' value='<TMPL_VAR loginname>' class='formulaire'>
     </td></tr>
-    </td></tr><tr><td> Comment: </td><td>
+    </td></tr><tr><td> __Comment:__ </td><td>
 <textarea name="comment" class='formulaire'></textarea>
     </td></tr>
     </table>
@@ -31,21 +31,21 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Volume Name", "Location", "Select");
+var header = new Array("__Volume Name__", "__Location__", "__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
  )
 );
@@ -53,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/tpl/overview.tpl b/gui/bweb/tpl/overview.tpl
index 9f44534259..b8a6d132f6 100644
--- a/gui/bweb/tpl/overview.tpl
+++ b/gui/bweb/tpl/overview.tpl
@@ -23,7 +23,7 @@ table.sample td {
 }
 </style>
  <div class='titlediv'>
-  <h1 class='newstitle'> Jobs overview (<TMPL_VAR label>)</h1>
+  <h1 class='newstitle'> __Jobs overview__ (<TMPL_VAR label>)</h1>
  </div>
  <div class='bodydiv'>
   <table class='sample' id='report'>
diff --git a/gui/bweb/tpl/run_job.tpl b/gui/bweb/tpl/run_job.tpl
index 0f7893d151..abb0d0e284 100644
--- a/gui/bweb/tpl/run_job.tpl
+++ b/gui/bweb/tpl/run_job.tpl
@@ -1,12 +1,12 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Defined jobs : </h1>
+  <h1 class='newstitle'> __Defined jobs:__ </h1>
  </div>
  <div class='bodydiv'>
   <form name='form1' action='?' method='GET'>  
   <table border='0'>
 
-   <tr><td>Job Name: </td><td>
+   <tr><td>__Job Name:__ </td><td>
    <select name='job'>
     <TMPL_LOOP jobs>
      <option value='<TMPL_VAR name>'>
@@ -17,9 +17,9 @@
    </td></tr>
    </table>
    <br/>
-   <button type="submit" class="bp" name='action' value='enable_job' title='Enable'> <img src='/bweb/inflag1.png' alt=''> Enable </button>
-   <button type="submit" class="bp" name='action' value='disable_job' title='Disable' > <img src='/bweb/inflag0.png' alt=''> Disable </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='Run now' > <img src='/bweb/R.png' alt=''> Run now  </button>
+   <button type="submit" class="bp" name='action' value='enable_job' title='__Enable__'> <img src='/bweb/inflag1.png' alt=''> __Enable__ </button>
+   <button type="submit" class="bp" name='action' value='disable_job' title='__Disable__' > <img src='/bweb/inflag0.png' alt=''> __Disable__ </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='__Run now__' > <img src='/bweb/R.png' alt=''> __Run now__  </button>
   </form>
  </div>
diff --git a/gui/bweb/tpl/run_job_mod.tpl b/gui/bweb/tpl/run_job_mod.tpl
index db11dbb65e..bc69ff5b25 100644
--- a/gui/bweb/tpl/run_job_mod.tpl
+++ b/gui/bweb/tpl/run_job_mod.tpl
@@ -1,12 +1,12 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Run job : <TMPL_VAR job> on <TMPL_VAR client></h1>
+  <h1 class='newstitle'> __Run job:__ <TMPL_VAR job> __on__ <TMPL_VAR client></h1>
  </div>
  <div class='bodydiv'>
   <form name='form1' action='?' method='GET'>  
   <table border='0'>
 
-   <tr><td>Job Name: </td><td>
+   <tr><td>__Job Name:__ </td><td>
    <select name='job'>
     <TMPL_LOOP jobs>
      <option value='<TMPL_VAR name>'>
@@ -14,7 +14,7 @@
      </option>
     </TMPL_LOOP>
    </select>
-   </td></tr><tr><td>Pool: </td><td>
+   </td></tr><tr><td>__Pool:__ </td><td>
 
    <select name='pool'>	
      <option value=''></option>
@@ -24,7 +24,7 @@
      </option>
     </TMPL_LOOP>
    </select>
-   </td></tr><tr><td>Client: </td><td>
+   </td></tr><tr><td>__Client:__ </td><td>
 
    <select name='client'>
     <TMPL_LOOP clients>
@@ -34,7 +34,7 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>FileSet: </td><td>
+   </td></tr><tr><td>__FileSet:__ </td><td>
    <select name='fileset'>
     <TMPL_LOOP filesets>
      <option value='<TMPL_VAR name>'>
@@ -43,7 +43,7 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Storage: </td><td>
+   </td></tr><tr><td>__Storage:__ </td><td>
    <select name='storage'>
     <TMPL_LOOP storages>
      <option value='<TMPL_VAR name>'>
@@ -52,18 +52,18 @@
     </TMPL_LOOP>
    </select>
 
-   </td></tr><tr><td>Level: </td><td>
+   </td></tr><tr><td>__Level:__ </td><td>
    <select name='level'>
-     <option id='level_Incremental' value='Incremental'>Incremental</option>
-     <option id='level_Full' value='Full'>Full</option>
-     <option id='level_Differential' value='Differential'>Differential</option>
+     <option id='level_Incremental' value='Incremental'>__Incremental__</option>
+     <option id='level_Full' value='Full'>__Full__</option>
+     <option id='level_Differential' value='Differential'>__Differential__</option>
    </select>
 
-   </td></tr><tr id='more1' style="visibility:hidden"><td>Start Time: </td><td>
+   </td></tr><tr id='more1' style="visibility:hidden"><td>__Start Time:__ </td><td>
    <input type='text' title='YYYY-MM-DD HH:MM:SS'
           size='17' name='when' value='<TMPL_VAR when>'>
 
-   </td></tr><tr id='more2' style="visibility:hidden"><td>Priority: </td><td>
+   </td></tr><tr id='more2' style="visibility:hidden"><td>__Priority:__ </td><td>
    <input type='text' 
           size='3' name='priority' value='<TMPL_VAR priority>'>
 
@@ -74,10 +74,10 @@
   <label onclick='
            document.getElementById("more1").style.visibility="visible";
            document.getElementById("more2").style.visibility="visible";'>
-  <img title='Display more options' src='/bweb/add.png'>More options</label>
+  <img title='Display more options' src='/bweb/add.png'>__More options__</label>
 
-  <button type="submit" class="bp" name='action' value='run_job_now' title='Run job'><img src='/bweb/R.png' alt=''>Run now</button>
-  <button type="submit" class="bp" name='action' value='fileset_view' title='View FileSet'><img src='/bweb/zoom.png' alt=''>View FileSet</button>
+  <button type="submit" class="bp" name='action' value='run_job_now' title='__Run job__'><img src='/bweb/R.png' alt=''>__Run now__</button>
+  <button type="submit" class="bp" name='action' value='fileset_view' title='__View FileSet__'><img src='/bweb/zoom.png' alt=''>__View FileSet__</button>
   </form>
  </div>
 
diff --git a/gui/bweb/tpl/running_job.tpl b/gui/bweb/tpl/running_job.tpl
index c8d194deb4..60967e59b5 100644
--- a/gui/bweb/tpl/running_job.tpl
+++ b/gui/bweb/tpl/running_job.tpl
@@ -1,62 +1,62 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Running Jobs </h1>
+  <h1 class='newstitle'> __Running Jobs__ </h1>
  </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>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
- title='View job'> <img src='/bweb/zoom.png' alt=''>View</button>
+ title='__View job__'> <img src='/bweb/zoom.png' alt=''>__View__</button>
 <button type="submit" class="bp" type='submit' name='action' value='cancel_job'
- onclick="return confirm('Do you want to cancel the selected job?')"
- title='Cancel job'> <img src='/bweb/cancel.png' alt=''>Cancel</button>
+ onclick="return confirm('__Do you want to cancel the selected job?__')"
+ title='__Cancel job__'> <img src='/bweb/cancel.png' alt=''>__Cancel__</button>
    </form>
 
  </div>
 
 <script type="text/javascript" language="JavaScript">
 var header = new Array("JobId",
-                       "Client",
-                       "Job Name", 
-                       "Level",
-                       "Start Time", 
-                       "Duration", 
-//                       "Job Files",
-//                       "Job Bytes", 
-                       "Status",
-                       "Select"
+                       "__Client__",
+                       "__Job Name__", 
+                       "__Level__",
+                       "__Start Time__", 
+                       "__Duration__", 
+//                       "__Job Files__",
+//                       "__Job Bytes__", 
+                       "__Status__",
+                       "__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
  )
@@ -65,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,
@@ -86,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/tpl/scheduled_job.tpl b/gui/bweb/tpl/scheduled_job.tpl
index c944fec91f..497e467265 100644
--- a/gui/bweb/tpl/scheduled_job.tpl
+++ b/gui/bweb/tpl/scheduled_job.tpl
@@ -1,14 +1,14 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Next Jobs </TMPL_IF></h1>
+  <h1 class='newstitle'> <TMPL_IF title><TMPL_VAR title><TMPL_ELSE>__Next Jobs__ </TMPL_IF></h1>
  </div>
  <div class='bodydiv'>
     <form name='form1' action='<TMPL_VAR cginame>?' method='GET'>
      <table id='id<TMPL_VAR ID>'></table>
-     <button type="submit" class="bp" name='action' title='Run now' value='run_job_mod'>
-       <img src='/bweb/R.png' alt=''>  Run now </button>
-      <button type="submit" class="bp" name='action' title='Disable' value='disable_job'>
-       <img src='/bweb/inflag0.png' alt=''> Disable </button>
+     <button type="submit" class="bp" name='action' title='__Run now__' value='run_job_mod'>
+       <img src='/bweb/R.png' alt=''>  __Run now__ </button>
+      <button type="submit" class="bp" name='action' title='__Disable__' value='disable_job'>
+       <img src='/bweb/inflag0.png' alt=''> __Disable__ </button>
      <input type='hidden' name='pool' value=''>
      <input type='hidden' name='level' value=''>
      <input type='hidden' name='media' value=''>
@@ -17,13 +17,13 @@
 
 <script type="text/javascript" language="JavaScript">
 
-var header = new Array("Scheduled",
-                       "Level",
-	               "Type",
-	               "Priority", 
-                       "Name",
-                       "Volume",
-	               "Select");
+var header = new Array("__Scheduled__",
+                       "__Level__",
+	               "__Type__",
+	               "__Priority__", 
+                       "__Name__",
+                       "__Volume__",
+	               "__Select__");
 
 var data = new Array();
 var chkbox;
diff --git a/gui/bweb/tpl/stats.tpl b/gui/bweb/tpl/stats.tpl
index 15fd57d99a..c389671bcb 100644
--- a/gui/bweb/tpl/stats.tpl
+++ b/gui/bweb/tpl/stats.tpl
@@ -1,9 +1,9 @@
 <div class='titlediv'>
-  <h1 class='newstitle'> Statistics </h1>
+  <h1 class='newstitle'> __Statistics__ </h1>
 </div>
 <div class='bodydiv'>
 <a href='?action=job;age=172800;jobtype=B'>
-<img width='450' height='200' src='bgraph.pl?age=2678400;width=450;height=200;graph=job_sum_day;limit=500;action=graph;legend=off' alt='Nothing to display'>
+<img width='450' height='200' src='bgraph.pl?age=2678400;width=450;height=200;graph=job_sum_day;limit=500;action=graph;legend=off' alt='__Nothing to display__'>
 </a>
 </div>
 
diff --git a/gui/bweb/tpl/update_location.tpl b/gui/bweb/tpl/update_location.tpl
index 90bcacdf8d..dc50eaf95a 100644
--- a/gui/bweb/tpl/update_location.tpl
+++ b/gui/bweb/tpl/update_location.tpl
@@ -1,27 +1,27 @@
 <br/>
  <div class='titlediv'>
-  <h1 class='newstitle'>Update media location</h1>
+  <h1 class='newstitle'>__Update media location__</h1>
  </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>
+    __New location:__ <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>
-  <button type="submit" class="bp" name='action' value='save_location'> <img src='/bweb/apply.png' alt=''>Apply</button>
+  <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("Volume Name", "Location", "Select");
+var header = new Array("__Volume Name__", "__Location__", "__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/tpl/update_media.tpl b/gui/bweb/tpl/update_media.tpl
index cf4269799a..9a868cee87 100644
--- a/gui/bweb/tpl/update_media.tpl
+++ b/gui/bweb/tpl/update_media.tpl
@@ -1,15 +1,15 @@
 <br/>
 <div class='titlediv'>
- <h1 class='newstitle'> Update media <TMPL_VAR volumename></h1>
+ <h1 class='newstitle'>__Update media__ <TMPL_VAR volumename></h1>
 </div>
 <div class='bodydiv'>
   <form name='form1' action="?" method='GET'>
    <table>
-    <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'>
+    <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>
+    <tr><td>__Pool:__</td>
         <td><select name='pool' class='formulaire'>
 <TMPL_LOOP db_pools>
              <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
@@ -17,7 +17,7 @@
            </select>
         </td>
     </tr>
-    <tr><td>Status:</td>
+    <tr><td>__Status:__</td>
         <td><select name='volstatus' class='formulaire'>
            <option value='Append'>Append</option>
            <option value='Archive'>Archive</option>
@@ -32,30 +32,30 @@
         </td>
     </tr>
 
-    <tr><td>Slot:</td>
+    <tr><td>__Slot:__</td>
         <td> 
           <input class='formulaire' type='text' 
                  name='slot' value='<TMPL_VAR slot>'>
         </td>
     </tr>
 
-    <tr><td>InChanger Flag:</td>
+    <tr><td>__InChanger Flag:__</td>
         <td> 
           <input class='formulaire' type='checkbox' 
                name='inchanger' <TMPL_IF inchanger>checked</TMPL_IF>>
         </td>
     </tr>
 
-    <tr><td>Enabled:</td>
+    <tr><td>__Enabled:__</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'>__yes__</option>
+           <option value='no'>__no__</option>
+           <option value='archived'>__archived__</option>
            </select>
         </td>
     </tr>
 
-    <tr><td> Location : </td>
+    <tr><td> __Location:__ </td>
         <td><select name='location' class='formulaire'>
         <option value=''></option>
   <TMPL_LOOP db_locations>
@@ -64,37 +64,37 @@
     </select>
         </td>
     </tr>
-    <tr><td> Retention period: </td>
+    <tr><td> __Retention period:__ </td>
         <td>
-          <input class='formulaire' type='text' title='ex: 3 days, 1 month'
+          <input class='formulaire' type='text' title='__ex: 3 days, 1 month__'
                name='volretention' value='<TMPL_VAR volretention>'>
         </td>
     </tr>
-    <tr><td> Use duration: </td>
+    <tr><td> __Use duration:__ </td>
         <td>
-          <input class='formulaire' type='text' title='ex: 3 days, 1 month'
+          <input class='formulaire' type='text' title='__ex: 3 days, 1 month__'
                name='voluseduration' value='<TMPL_VAR voluseduration>'>
         </td>
     </tr>
-    <tr><td> Max Jobs: </td>
+    <tr><td> __Max Jobs:__ </td>
         <td>
-          <input class='formulaire' type='text' title='ex: 10'
+          <input class='formulaire' type='text' title='__ex: 10__'
                name='maxvoljobs' value='<TMPL_VAR maxvoljobs>'>
         </td>
     </tr>
-    <tr><td> Max Files: </td>
+    <tr><td> __Max Files:__ </td>
         <td>
-          <input class='formulaire' type='text' title='ex: 10000'
+          <input class='formulaire' type='text' title='__ex: 10000__'
                name='maxvolfiles' value='<TMPL_VAR maxvolfiles>'>
         </td>
     </tr>
-    <tr><td> Max Bytes: </td>
+    <tr><td> __Max Bytes:__ </td>
         <td>
-          <input class='formulaire' type='text' title='ex: 10M, 11G'
+          <input class='formulaire' type='text' title='__ex: 10M, 11G__'
                name='maxvolbytes' value='<TMPL_VAR maxvolbytes>'>
         </td>
     </tr>
-    <tr><td>Recycle Pool:</td>
+    <tr><td>__Recycle Pool:__</td>
         <td><select name='poolrecycle' class='formulaire'>
 <TMPL_LOOP db_pools>
              <option value='<TMPL_VAR name>'><TMPL_VAR name></option>
@@ -102,9 +102,9 @@
            </select>
         </td>
     </tr>
-    <tr><td> Comment: </td>
+    <tr><td> __Comment:__ </td>
         <td>
-          <input class='formulaire' type='text' title='a comment'
+          <input class='formulaire' type='text' title='__a comment__'
                name='comment' value='<TMPL_VAR comment>'>
         </td>
     </tr>
@@ -112,16 +112,16 @@
     </table>
 <table>
  <td>
-  <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='Update from pool'
-    value='update_from_pool'> <img src='/bweb/update.png' alt=''> Update from pool </button>
+  <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='__Update from pool__'
+    value='update_from_pool'> <img src='/bweb/update.png' alt=''> __Update from pool__ </button>
  </form>
  </td>
  <td>
   <form action='?' method='GET'>
    <input type='hidden' name='pool' value='<TMPL_VAR poolname>'>
     <button type="submit" class="bp" name='action' value='media'>
-     <img src='/bweb/zoom.png' alt=''>View Pool </button>
+     <img src='/bweb/zoom.png' alt=''>__View Pool__ </button>
   </form>
  </td>
 </table>