diff -ur templates/admingroups.vm patches/templates/admingroups.vm
--- templates/admingroups.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/admingroups.vm	2008-08-25 16:08:16.485023006 +0200
@@ -10,8 +10,8 @@
 #if($interface == "new")
 ## url to get the groups for displaying them in the ajax-based table
 #set($url = "?xpage=getgroups")
-<div id="ajax-loader">Loading...<br />
-  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." />
+<div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
+  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get('ui.ajaxTable.loading')" title="$msg.get('ui.ajaxTable.loading')" />
 </div>
 <table id="groupstable">
 <tr><td colspan="3" id="showLimits"></td></tr>
@@ -19,7 +19,7 @@
       <table class="display" cellpadding="3">
        <thead class="theader">
           <tr>
-              <td>Group Name</td><td>Members</td><td>Manage</td>
+              <td>$msg.get("rightsmanager.groupname")</td><td>$msg.get("rightsmanager.members")</td><td>$msg.get("rightsmanager.manage")</td>
           </tr>
           <tr id="table-filters">
               <td><input name="name" type="text" class="filter"/></td>
@@ -28,9 +28,9 @@
                 #if($context.database != "xwiki") #set($mainwk = false) #else #set($mainwk = true) #end
                 #if(!$mainwk) ## display the combobox only in a local wiki
                 <select name="wiki" class="filter">
-                  <option value="local" selected="selected">Local</option>
-                  <option value="global">Global</option>
-                  <option value="both">Both</option>
+                  <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
+                  <option value="global">$msg.get("rightsmanager.global")</option>
+                  <option value="both">$msg.get("rightsmanager.both")</option>
                 </select>
                 #else <input type="hidden" value="local" name="wiki" /> #end
               </td>
diff -ur templates/adminprefs.vm patches/templates/adminprefs.vm
--- templates/adminprefs.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/adminprefs.vm	2008-08-25 16:08:16.485023006 +0200
@@ -40,7 +40,7 @@
 #set($skin = $xwiki.skin)
 #if($skin.indexOf(".")!=-1)
 #set($skindoc = $xwiki.getDocument($skin))
-<span class="xwikibuttonlink"><a href="$skindoc.getURL()">Customize</a></span>
+<span class="xwikibuttonlink"><a href="$skindoc.getURL()">$msg.get("admin.customize")</a></span>
 #end
 #end
 #end
diff -ur templates/adminspaceprefs.vm patches/templates/adminspaceprefs.vm
--- templates/adminspaceprefs.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/adminspaceprefs.vm	2008-08-25 16:08:16.485023006 +0200
@@ -68,7 +68,7 @@
 #set($skin = $xwiki.skin)
 #if($skin.indexOf(".")!=-1)
 #set($skindoc = $xwiki.getDocument($skin))
-<span class="xwikibuttonlink"><a href="$skindoc.getURL()">Customize</a></span>
+<span class="xwikibuttonlink"><a href="$skindoc.getURL()">$msg.get("admin.customize")</a></span>
 #end
 #end
 #end
diff -ur templates/adminusers.vm patches/templates/adminusers.vm
--- templates/adminusers.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/adminusers.vm	2008-08-25 16:08:16.485023006 +0200
@@ -11,8 +11,8 @@
 ## url to get the groups for displaying them in the ajax-based table
 #set($url = "?xpage=getusers")
 
-<div id="ajax-loader">Loading...<br />
-  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." />
+<div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
+  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get('ui.ajaxTable.loading')" title="$msg.get('ui.ajaxTable.loading')" />
 </div>
 
 <table id="userstable">
@@ -20,7 +20,7 @@
 <tr>
  <td style="width:100%;"><table class="display" cellpadding="3">
         <thead class="theader">
-           <tr><td>User Name</td><td>First Name</td><td>Last Name</td><td>Manage</td></tr>
+           <tr><td>$msg.get("rightsmanager.username")</td><td>$msg.get("rightsmanager.firstname")</td><td>$msg.get("rightsmanager.lastname")</td><td>$msg.get("rightsmanager.manage")</td></tr>
            <tr id="table-filters">
               <td><input name="name" type="text" class="filter"/></td>
               <td><input name="first_name" type="text" class="filter"/></td>
diff -ur templates/attributes.vm patches/templates/attributes.vm
--- templates/attributes.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/attributes.vm	2008-08-25 16:08:16.485023006 +0200
@@ -6,9 +6,9 @@
 <li>$msg.get("creator"): $doc.creator</li>
 <li>$msg.get("creationdate"): $doc.creationDate</li>
 <li>$msg.get("lastmodifiedby"): $doc.author on $doc.date</li>
-<li>Comments: $doc.comments.size()</li>
-<li>Attachments: $doc.attachmentList.size()</li>
-#if($doc.backlinks.size()>0) <li>Links to this document:
+<li>$msg.get("comments"): $doc.comments.size()</li>
+<li>$msg.get("attachments"): $doc.attachmentList.size()</li>
+#if($doc.backlinks.size()>0) <li>$msg.get("doc.backlinks"):
 <ul>
 #foreach($item in $doc.backlinks)
 <li>[$item]</li>
@@ -17,7 +17,7 @@
 </li>
 #end
 #*
-#if($doc.linkedPages.size()>0) <li>Links from this document:
+#if($doc.linkedPages.size()>0) <li>$msg.get("doc.linkedpages"):
 <ul>
 #foreach($item in $doc.linkedPages)
 <li>[$item]</li>
@@ -26,13 +26,13 @@
 </li>
 #end
 *#
-##<li>Visited: $doc.getCurrentMonthPageStats("view").uniqueVisitors times</li>
-##<li>Unique visitors: $doc.currentMonthPageStats.uniqueVisitors</li>
-<li>Default langage: $doc.defaultLanguage</li>
-<li>Language: $doc.language</li>
-<li>Real language: $doc.realLanguage</li>
-##<li>Format: $doc.format</li>
-#if($doc.includedMacros.size()>0) <li>Included Pages:
+##<li>$msg.get("doc.visited"): $doc.getCurrentMonthPageStats("view").uniqueVisitors times</li>
+##<li>$msg.get("doc.uniquevisitors"): $doc.currentMonthPageStats.uniqueVisitors</li>
+<li>$msg.get("doc.defaultlanguage"): $doc.defaultLanguage</li>
+<li>$msg.get("doc.language"): $doc.language</li>
+<li>$msg.get("doc.reallanguage"): $doc.realLanguage</li>
+##<li>$msg.get("doc.format"): $doc.format</li>
+#if($doc.includedMacros.size()>0) <li>$msg.get("doc.includedpages"):
 <ul>
 #foreach($item in $doc.includedMacros)
 <li>$item</li>
@@ -40,7 +40,7 @@
 </ul>
 </li>
 #end
-#if($doc.includedPages.size()>0) <li>Included Pages:
+#if($doc.includedPages.size()>0) <li>$msg.get("doc.includedpages"):
 <ul>
 #foreach($item in $doc.includedPages)
 <li>$item</li>
@@ -50,11 +50,11 @@
 #end
 ##<li>$doc.locked (bool) by $doc.lockingDate on </li>
 ##<li>$doc.lockingUser</li>
-<li>Document name: $doc.name</li>
-<li>Document parent: $doc.parent</li>
-<li>Document revisions:$doc.revisions (vector)</li>
-<li>Document template:$doc.template</li>
-<li>Document title:$doc.title</li>
-<li>Document translation list:$doc.translationList (list)</li>
-<li>Document version:$doc.version</li>
+<li>$msg.get("doc.name"): $doc.name</li>
+<li>$msg.get("doc.parent"): $doc.parent</li>
+<li>$msg.get("doc.revisions"):$doc.revisions (vector)</li>
+<li>$msg.get("doc.template"):$doc.template</li>
+<li>$msg.get("doc.title"):$doc.title</li>
+<li>$msg.get("doc.translationlist"):$doc.translationList (list)</li>
+<li>$msg.get("doc.version"):$doc.version</li>
 </ul>
\ Kein Zeilenumbruch am Dateiende.
diff -ur templates/chw/axispage.vm patches/templates/chw/axispage.vm
--- templates/chw/axispage.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/chw/axispage.vm	2008-08-25 16:08:16.488022550 +0200
@@ -1,47 +1,47 @@
         <div id="chwAxesWizard" class="chwInactivePage">
           <div id="chwXAxisTitleDiv" class="chwHidden">
             <fieldset>
-              <legend>Category Axis</legend>
+              <legend>$msg.get("chwcategoryaxis")/legend>
               <input id="chwXAxisTitleEnabled" name="axis_domain_visible" type="checkbox" onchange="window.wizard.flipEnabled('XAxisTitle');" checked="checked" value="true"/>
-              <label for="chwXAxisTitleEnabled">Show category axis label</label><br/>
-              <label for="chwXAxisTitleInput">Label:</label>
+              <label for="chwXAxisTitleEnabled">$msg.get("chwshowcategorylabel")</label><br/>
+              <label for="chwXAxisTitleInput">$msg.get("chwlabellabel"):</label>
               <input type="text" id="chwXAxisTitleInput" name="axis_domain_label"/>
               <div id="chwXAxisTitleAdvancedDiv" class="chwHidden">
-                <label for="chwXAxisTitlePositionInput">Position:</label>
+                <label for="chwXAxisTitlePositionInput">$msg.get("chwposition"):</label>
                 <select id="chwXAxisTitlePositionInput" name="axis_domain_position">
-                  <option selected="selected" value="top">Top</otpion>
-                  <option value="left">Left</otpion>
-                  <option value="bottom">Bottom</otpion>
-                  <option value="right">Right</otpion>
+                  <option selected="selected" value="top">$msg.get("chwtop")</option>
+                  <option value="left">$msg.get("chwleft")</option>
+                  <option value="bottom">$msg.get("chwbottom")</option>
+                  <option value="right">$msg.get("chwright")</option>
                 </select>
                 <br/>
-                <label for="chwXAxisTitleHorizontalAlignmentInput">Horizontal Alignment:</label>
+                <label for="chwXAxisTitleHorizontalAlignmentInput">$msg.get("chwhalignment"):</label>
                 <select id="chwXAxisTitleHorizontalAlignmentInput" name="title_horizontal_alignment">
-                  <option value="left">Left</otpion>
-                  <option selected="selected" value="center">Center</otpion>
-                  <option value="right">Right</otpion>
+                  <option value="left">$msg.get("chwleft")</option>
+                  <option selected="selected" value="center">$msg.get("chwcenter")</option>
+                  <option value="right">$msg.get("chwright")</option>
                 </select>
                 <br/>
-                <label for="chwXAxisTitleVerticalAlignmentInput">Vertical Alignment:</label>
+                <label for="chwXAxisTitleVerticalAlignmentInput">$msg.get("chwvalignment"):</label>
                 <select id="chwXAxisTitleVerticalAlignmentInput" name="title_vertical_alignment">
-                  <option value="top">Top</otpion>
-                  <option selected="selected" value="center">Center</otpion>
-                  <option value="bottom">Bottom</otpion>
+                  <option value="top">$msg.get("chwtop")</option>
+                  <option selected="selected" value="center">$msg.get("chwcenter")</option>
+                  <option value="bottom">$msg.get("chwbottom")</option>
                 </select>
                 <label for="chwXAxisTitle"/>
               </div>
             </fieldset>
           </div>
           <div id="chwYAxisTitleDiv" class="chwHidden">
-            <label for="chwYAxisTitleInput">Y-axis name:</label>
+            <label for="chwYAxisTitleInput">$msg.get("chwYaxisname") :</label>
             <input type="text" id="axis_range_label"/>
           </div>
           <div id="chwXAxisDiv" class="chwHidden">
             <input type="checkbox" id="chwXAxisInput"/>
-            <label for="chwXAxisInput">Show X-axis</label>
+            <label for="chwXAxisInput">$msg.get("chwshowXaxis")</label>
           </div>
           <div id="chwYAxisDiv" class="chwHidden">
             <input type="checkbox" id="chwYAxisInput"/>
-            <label for="chwYAxisInput">Show Y-axis</label>
+            <label for="chwYAxisInput">$msg.get("chwshowYaxis")</label>
           </div>
         </div>
diff -ur templates/chw/colorpicker.vm patches/templates/chw/colorpicker.vm
--- templates/chw/colorpicker.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/chw/colorpicker.vm	2008-08-25 16:08:16.488022550 +0200
@@ -1,8 +1,8 @@
 <div id="chwColorPicker">
   <img src="$xwiki.getSkinFile("chwempty.png")" id="chwColorPickerScreen"/>
   <fieldset id="chwColorPickerFieldset" class="chwLargeFieldset">
-    <legend id="chwColorPickerLegend" class="chwLargeLegend">Color picker</legend>
-    <table summary="Color picker maps layout" id="chwColorpickerTable">
+    <legend id="chwColorPickerLegend" class="chwLargeLegend">$msg.get("chwcolorpickertitletxt")</legend>
+    <table summary="$msg.get('chwmapslayout')" id="chwColorpickerTable">
       <tbody>
         <tr>
           <td class="chwColorpickerHSTd">
@@ -33,7 +33,7 @@
         </tr>
       </tbody>
     </table>
-    <table summary="Color picker output controls layout" id="chwColorpickerControlsTable">
+    <table summary="$msg.get('chwoutputcontrolslayout')" id="chwColorpickerControlsTable">
       <tbody>
         <tr>
           <td class="chwColorpickerComponents" id="chwColorpickerShowContainer">
@@ -59,8 +59,8 @@
         </tr>
         <tr>
           <td colspan="3" class="chwColorpickerButton">
-            <a href="#" onclick="window.colorPicker.OK(event); return false;" title="Use this color" class="chwButton">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;</a>
-            <a href="#" onclick="window.colorPicker.Cancel(event); return false;" title="Cancel" class="chwButton">Cancel</a>
+            <a href="#" onclick="window.colorPicker.OK(event); return false;" title="$msg.get('chwusecolor')" class="chwButton">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;</a>
+            <a href="#" onclick="window.colorPicker.Cancel(event); return false;" title="$msg.get('cancel')" class="chwButton">$msg.get("cancel")</a>
           </td>
         </tr>
       </tbody>
diff -ur templates/chw/tdwwizard.vm patches/templates/chw/tdwwizard.vm
--- templates/chw/tdwwizard.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/chw/tdwwizard.vm	2008-08-25 16:08:16.488022550 +0200
@@ -4,7 +4,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<title>Table data source wizard</title>
+<title>$msg.get("tdwtabledatasource")</title>
 <meta http-equiv="Content-Type" content="text/xhtml+xml; charset=$xwiki.encoding" />
 <meta http-equiv="imagetoolbar" content="no"/>
 $!xwiki.getWebPreference("meta") 
@@ -18,7 +18,7 @@
 #set($baseAddress = $baseAddress.substring(0, $baseAddress.indexOf("Main/WebHome")))
 <body onload="window.wizard.initialize('$baseAddress', '$xwiki.getSkinFile("")', '$saveAddress');">
 <div id="tableWizard">
-  <table id="tdwWizard" summary="Table Datasource Wizard Content">
+  <table id="tdwWizard" summary="$msg.get('tdwtabledatasourcecontent')">
     <tbody>
       <tr>
         <td id="tdwNavigation">
@@ -104,7 +104,7 @@
       </td>
     </tr>
     <tr>
-      <td id="tdwButtons"><a href="#" onclick="window.close(); return false;" title="$msg.get("tdwcanceltitle")" class="tdwButton">$msg.get("tdwcancel")</a><a id="tdwBackButton" href="#" onclick="window.wizard.showPrevPage(); return false;" title="$msg.get("tdwbacktitle")Go to previous wizard page" accesskey="b" class="tdwButtonDisabled">$msg.get("tdwback")</a><a id="tdwNextButton" href="#" onclick="window.wizard.showNextPage(); return false;" title="$msg.get("tdwnexttilte")Go to next wizard page" accesskey="n" class="tdwButton">$msg.get("tdwnext")</a><a id="tdwFinishButton" href="#" onclick="window.wizard.finish(); return false;" title="$msg.get("tdwfinishtitle")" class="tdwButtonDisabled">$msg.get("tdwfinish")</a></td>
+      <td id="tdwButtons"><a href="#" onclick="window.close(); return false;" title="$msg.get("tdwcanceltitle")" class="tdwButton">$msg.get("tdwcancel")</a><a id="tdwBackButton" href="#" onclick="window.wizard.showPrevPage(); return false;" title="$msg.get('tdwbacktitle') accesskey="b" class="tdwButtonDisabled">$msg.get("tdwback")</a><a id="tdwNextButton" href="#" onclick="window.wizard.showNextPage(); return false;" title="$msg.get("tdwnexttilte")Go to next wizard page" accesskey="n" class="tdwButton">$msg.get("tdwnext")</a><a id="tdwFinishButton" href="#" onclick="window.wizard.finish(); return false;" title="$msg.get("tdwfinishtitle")" class="tdwButtonDisabled">$msg.get("tdwfinish")</a></td>
     </tr>
   </tbody>
   </table>
Nur in patches/templates/chw: typepage.vm.
diff -ur templates/chwmain.vm patches/templates/chwmain.vm
--- templates/chwmain.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/chwmain.vm	2008-08-25 16:08:16.485023006 +0200
@@ -36,8 +36,8 @@
       </td>
     </tr>
     <tr>
-      <td id="chwButtons" colspan="2"><a href="#" onclick="history.go(-1); return false;" title="Cancel the chart creation process and return to the previous page" class="chwButton">Cancel</a><a id="chwBackButton" href="#" onclick="window.wizard.showPrevPage(); return false;" title="Go to previous wizard page" accesskey="b" class="chwButtonDisabled">Back</a><a id="chwNextButton" href="#" onclick="window.wizard.showNextPage(); return false;" title="Go to next wizard page" accesskey="n" class="chwButtonDisabled">Next</a><a id="chwFinishButton" href="#" onclick="window.wizard.finish(); return false;" title="Done!" class="chwButtonDisabled">Finish</a></td>
-    </tr>
+      <td id="chwButtons" colspan="2"><a href="#" onclick="history.go(-1); return false;" title="$msg.get('chwhistoryback')" class="chwButton">$msg.get("cancel")</a><a id="chwBackButton" href="#" onclick="window.wizard.showPrevPage(); return false;" title="$msg.get('chwwizardback')" accesskey="b" class="chwButtonDisabled">$msg.get("back")</a><a id="chwNextButton" href="#" onclick="window.wizard.showNextPage(); return false;" title="$msg.get('chwwizardnext')" accesskey="n" class="chwButtonDisabled">$msg.get("next")</a><a id="chwFinishButton" href="#" onclick="window.wizard.finish(); return false;" title="$msg.get('finish')" class="chwButtonDisabled">$msg.get("finish")</a></td>
+    </tr> 
   </tbody>
   </table>
 </div>
diff -ur templates/comments2.vm patches/templates/comments2.vm
--- templates/comments2.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/comments2.vm	2008-08-25 16:08:16.486022854 +0200
@@ -12,7 +12,7 @@
 <div class="xwikidatatitle2">
 <div class="xwikidatatitle1">&nbsp;</div>
 <div class="xwikidatatitle">
-<a href="" onclick="showhide('xwikicommentscontent'); return false">$msg.get("Comments")</a>:
+<a href="" onclick="showhide('xwikicommentscontent'); return false">$msg.get("comments")</a>:
 $!comments.size() $msg.get("comments") #if($comments.size()>0) $msg.get("by")
 $!xwiki.getLocalUserName($doc.display('author','view',$comments.get(0))) ...
 #end
diff -ur templates/copy.vm patches/templates/copy.vm
--- templates/copy.vm	2008-08-25 16:09:39.315426914 +0200
+++ patches/templates/copy.vm	2008-08-25 16:08:16.486022854 +0200
@@ -53,7 +53,7 @@
     #end
     <tr><td>$msg.get("core.copy.targetdoc"):</td>
     <td><input type="text" name="targetdoc" value="$!{request.targetdoc}" size="60" /></td></tr>
-    <tr><td><input type="submit" value="Copy" />
+    <tr><td><input type="submit" value="$msg.get('copy')" />
     </td></tr>
     </table>
     </form>
diff -ur templates/diffall.vm patches/templates/diffall.vm
--- templates/diffall.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/diffall.vm	2008-08-25 16:08:16.486022854 +0200
@@ -38,7 +38,7 @@
 #set($origdoc = $xwiki.getDocument($tdoc, $version))
 #set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
 <div style="width: 100%; background-color: #DDDDDD">
-<h3>$msg.get("From") version $version $msg.get("to") $nextversion
+<h3>$msg.get("from") version $version $msg.get("to") $nextversion
 #if(($origdoc=="")||($newdoc==""))
 #if($newdoc!="")
 $msg.get("by") $xwiki.getLocalUserName($newdoc.author),$doc) $xwiki.formatDate($newdoc.date)
diff -ur templates/editgroup.vm patches/templates/editgroup.vm
--- templates/editgroup.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/editgroup.vm	2008-08-25 16:08:16.486022854 +0200
@@ -1,8 +1,8 @@
 ##check to see if the XWiki.XWkiGroupSheet exists
 #if($xwiki.getDocument("XWiki.XWikiGroupSheet").isNew())
 <div id="groupwrap">
-<div id="ajax-loader">Loading...<br />
-  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." />
+<div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
+  <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get('ui.ajaxTable.loading')" title="$msg.get('ui.ajaxTable.loading')" />
 </div>
 <table id="memberstable">
 <tr><td colspan="3" id="showLimits"></td></tr>
@@ -10,8 +10,8 @@
       <table class="display">
        <thead class="theader">
           <tr>
-        <td class="membername">Member</td>
-              <td id="hgroupmanage">Manage</td>
+        <td class="membername">$msg.get("rightsmanager.members")</td>
+              <td id="hgroupmanage">$msg.get("rightsmanager.manage")</td>
           </tr>
        </thead>
        <tbody id="display1"><tr><td>&nbsp;</td></tr></tbody>
@@ -26,7 +26,7 @@
  <div id="addNewMember">
      <table cellpadding="5" cellspacing="5">
      <tr>
-       <td><strong>Add a new user</strong></td>
+       <td><strong>$msg.get("rightsmanager.addnewuser")</strong></td>
        <td>
          <select name="wiki" onchange="changeWiki(this);">
             <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
@@ -41,11 +41,11 @@
        </td>
     </tr>
     <tr>
-       <td><strong>Add a new group </strong></td>
+       <td><strong>$msg.get("rightsmanager.addnewgroup")</strong></td>
        <td>
          <select name="wiki" onchange="changeWiki(this);">
-         <option value="local" selected="selected">Local</option>
-         <option value="global">Global</option>
+         <option value="local" selected="selected">$msg.get("rightsmanager.local")</option>
+         <option value="global">$msg.get("rightsmanager.global")</option>
          </select>
        </td>
        <td>
diff -ur templates/global.vm patches/templates/global.vm
--- templates/global.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/global.vm	2008-08-25 16:08:16.486022854 +0200
@@ -64,7 +64,7 @@
 #if($searchdoc.isNew()==false)
     <div id="globalsearch">
       <form action="$!searchdoc.getURL("view")">
-        <p><input type="text" name="text" value="" size="15"/>&nbsp;<input type="submit" class="button" value="Search"/></p>
+        <p><input type="text" name="text" value="" size="15"/>&nbsp;<input type="submit" class="button" value="$msg.get('search')"/></p>
       </form>
     </div>
 #end *#
diff -ur templates/historyinline.vm patches/templates/historyinline.vm
--- templates/historyinline.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/historyinline.vm	2008-08-25 16:08:16.486022854 +0200
@@ -93,15 +93,15 @@
           <div class="buttonwrapper"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div>
         #end
         #if($hasAdmin)
-          <div class="buttonwrapper"><input class="button" type="submit" name="deleteversions" value="$msg.get("core.versions.delete.many")"
+          <div class="buttonwrapper"><input class="button" type="submit" name="deleteversions" value="$msg.get('core.versions.delete.many')"
             onclick="document.forms.${formname}.action='$doc.getURL("deleteversions")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();" /></div>
         #end
         #if($xwiki.hasMinorEdit())
           #if(!$request.getParameter("showminor"))
-            <div class="buttonwrapper"><input class="button" type="submit" name="viewminorversions" value="$msg.get("core.minoredit.show")"
+            <div class="buttonwrapper"><input class="button" type="submit" name="viewminorversions" value="$msg.get('core.minoredit.show')"
               onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;showminor=true&amp;$docvariant")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();" /></div>
           #else
-            <div class="buttonwrapper"><input class="button" type="submit" name="hideminorversions" value="$msg.get("core.minoredit.hide")"
+            <div class="buttonwrapper"><input class="button" type="submit" name="hideminorversions" value="$msg.get('core.minoredit.hide')"
               onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;$docvariant")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();" /></div>
           #end
         #end
diff -ur templates/macros.vm patches/templates/macros.vm
--- templates/macros.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/macros.vm	2008-08-25 16:08:16.487022702 +0200
@@ -350,14 +350,14 @@
   #set($diff = $request.get("diff"))
   #set($SpaceName = $request.get("SpaceName"))
 
-  1.1 Space : $SpaceName
+  1.1 $msg.get("wikiweb") : $SpaceName
 
   <form method="POST" action="$doc.getName()?export=2">
 
 #set($docs = $xwiki.getSpaceDocsName($SpaceName))
   <table border="1" style="text-align:center;">
-  <tr><td>Name</td><td>Export</td><td colspan="3">Default Action</td></tr>
-  <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
+  <tr><td>$msg.get("name")</td><td>$msg.get("export")</td><td colspan="3">$msg.get("defaultaction")</td></tr>
+  <tr><td colspan="2"></td><td>$msg.get("overwrite")</td><td>$msg.get("mergeobjects")</td><td>$msg.get("skip")</td></tr>
   #foreach ($doc in $docs)
     #if ($xwiki.hasAccessLevel("view", "${context.database}:${SpaceName}.${doc}"))
 
@@ -370,12 +370,12 @@
   #if($SpaceName != "XWiki")
 
 
-    1.1 Space : XWiki
+    1.1 $msg.get("wikiweb") : XWiki
 
     #set($docs = $xwiki.getSpaceDocsName("XWiki"))
     <table border="1" style="text-align:center;">
-    <tr><td>Name</td><td>Export</td><td colspan="3">Default Action</td></tr>
-    <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
+    <tr><td>$msg.get("name")</td><td>$msg.get("export")</td><td colspan="3">$msg.get("defaultaction")</td></tr>
+    <tr><td colspan="2"></td><td>$msg.get("overwrite")</td><td>$msg.get("mergeobjects")</td><td>$msg.get("skip")</td></tr>
     #foreach ($doc in $docs)
       #if ($xwiki.hasAccessLevel("view", "${context.database}:XWiki.${doc}"))
 
@@ -386,7 +386,7 @@
     </table>
   #end
 
-  <input type="submit" name="submitted" value="Valider">
+  <input type="submit" name="submitted" value="$msg.get('validate')">
   </form>
 
 
@@ -410,7 +410,7 @@
   #end
 
   </select>
-  <input type="submit" name="submitted" value="Valider">
+  <input type="submit" name="submitted" value="$msg.get('validate')">
   </form>
 #end
 #end
@@ -454,25 +454,25 @@
 
     $import.importPackage($oAttach.getContent())
 
-    1.1.1 Infos
+    1.1.1 msg.get("info")
 
-    Author : $import.getAuthor() <br />
-    Name : $import.getName() <br />
-    Description : $import.getDescription() <br />
-    Licence : $import.getLicence() <br />
-    Version : $import.getVersion() <br />
+    msg.get("author") : $import.getAuthor() <br />
+    msg.get("name") : $import.getName() <br />
+    msg.get("description") : $import.getDescription() <br />
+    msg.get("licence") : $import.getLicence() <br />
+    msg.get("version") : $import.getVersion() <br />
 
     #set($canInstall = $import.testInstall())
     install : $import.getTestInstallToString($canInstall)
 
-    1.1.1 Status of each Files
-    #set($docs = $import.getDocuments())
+    1.1.1 msg.get("statusofeachfile")
+    #set($docs = $import.getDocuments())
 
     <form method="POST" action="$request.getRequestURL()?export=1">
     <input type="hidden" name="App" value="$oAttach.getFilename()" />
     <table border="1" style="text-align:center;">
-    <tr><td>Name</td><td>infos</td><td colspan="3">Action</td></tr>
-    <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
+    <tr><td>$msg.get("name")</td><td>$msg.get("info")</td><td colspan="3">$msg.get("action")</td></tr>
+    <tr><td colspan="2"></td><td>$msg.get("overwrite")</td><td>$msg.get("mergeobjects")</td><td>$msg.get("skip")</td></tr>
 
 
     #foreach($docInfo in $docs)
@@ -503,10 +503,10 @@
     #end
     </table>
     #if ($canInstall != 0)
-      1.1.1 You can install this application
-      <input type="submit" name="submitted" value="Valider">
+      1.1.1 $msg.get("caninstallapplication")
+      <input type="submit" name="submitted" value="$msg.get('validate')">
     #else
-      1.1.1 You can't install this application.
+      1.1.1 $msg.get("cannotinstallapplication")
     #end
     </form>
   #end
@@ -585,12 +585,12 @@
   #####    images
   #if($mime.equals("image/svg"))<img src="$xwiki.getSkinFile("mimetypes/vectorgfx.png")" alt="SVG" title="SVG"/>
   #elseif($mime.equals("application/svg+xml"))<img src="$xwiki.getSkinFile("mimetypes/vectorgfx.png")" alt="SVG" title="SVG"/>
-  #elseif($mime.startsWith("image/"))<img src="$xwiki.getSkinFile("mimetypes/jpg.png")" alt="Image" title="Image"/>
+  #elseif($mime.startsWith("image/"))<img src="$xwiki.getSkinFile("mimetypes/jpg.png")" alt="$msg.get('image')" title="msg.get('image')"/>
   #####    text based
-  #elseif($mime.equals("text/plain"))<img src="$xwiki.getSkinFile("mimetypes/txt.png")" alt="Text" title="Text"/>
+  #elseif($mime.equals("text/plain"))<img src="$xwiki.getSkinFile("mimetypes/txt.png")" alt="$msg.get('text')" title="msg.get('text')"/>
   #elseif($mime.equals("text/html"))<img src="$xwiki.getSkinFile("mimetypes/html.png")" alt="HTML" title="HTML"/>
   #elseif($mime.equals("text/css"))<img src="$xwiki.getSkinFile("mimetypes/url.png")" alt="CSS" title="CSS"/>
-  #elseif($mime.startsWith("text/"))<img src="$xwiki.getSkinFile("mimetypes/txt.png")" alt="Text" title="Text"/>
+  #elseif($mime.startsWith("text/"))<img src="$xwiki.getSkinFile("mimetypes/txt.png")" alt="$msg.get('text')" title="msg.get('text')"/>
   #####    documents
   #elseif($mime.equals("application/xml"))<img src="$xwiki.getSkinFile("mimetypes/xml.png")" alt="XML" title="XML"/>
   #elseif($mime.equals("application/pdf"))<img src="$xwiki.getSkinFile("mimetypes/pdf.png")" alt="PDF" title="PDF"/>
@@ -604,8 +604,8 @@
   #elseif($mime.equals("application/x-gzip"))<img src="$xwiki.getSkinFile("mimetypes/tar_gz.png")" alt="GZ" title="GZ"/>
   #elseif($mime.equals("application/java-archive"))<img src="$xwiki.getSkinFile("mimetypes/jar.png")" alt="JAR" title="JAR"/>
   #####    media
-  #elseif($mime.startsWith("audio/"))<img src="$xwiki.getSkinFile("mimetypes/wav.png")" alt="Audio" title="Audio"/>
-  #elseif($mime.startsWith("video/"))<img src="$xwiki.getSkinFile("mimetypes/video.png")" alt="Video" title="Video"/>
+  #elseif($mime.startsWith("audio/"))<img src="$xwiki.getSkinFile("mimetypes/wav.png")" alt="$msg.get('audio')" title="msg.get('audio')"/>
+  #elseif($mime.startsWith("video/"))<img src="$xwiki.getSkinFile("mimetypes/video.png")" alt="$msg.get('video')" title="msg.get('video')"/>
   #####    octet-streams extensions
   #elseif($mime.equals("application/octet-stream"))
     #if($ext.equals("xls"))<img src="$xwiki.getSkinFile("mimetypes/excel.png")" alt="XLS" title="XLS"/>
@@ -615,7 +615,7 @@
     #elseif($ext.equals("odp") || $ext.equals("odt") || $ext.equals("odf") || $ext.equals("sxw") || $ext.equals("stw"))<img src="$xwiki.getSkinFile("mimetypes/openoffice.png")" alt="OpenOffice" title="OpenOffice"/>
     #else<img src="$xwiki.getSkinFile("mimetypes/bin.png")" alt="BIN" title="BIN"/>
     #end
-  #elseif($mime.startsWith("application/"))<img src="$xwiki.getSkinFile("mimetypes/exec.png")" alt="Application" title="Application"/>
+  #elseif($mime.startsWith("application/"))<img src="$xwiki.getSkinFile("mimetypes/exec.png")" alt="$msg.get('application')" title="$msg.get('application')"/>
   #end
 #end
 
diff -ur templates/objects.vm patches/templates/objects.vm
--- templates/objects.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/objects.vm	2008-08-25 16:08:16.487022702 +0200
@@ -2,12 +2,12 @@
 <div class="xwikidatatitle2">
 <div class="xwikidatatitle1">&nbsp;</div>
 <div class="xwikidatatitle">
-<a href="" onclick="showhide('xwikiobjectscontent'); return false">$msg.get("Forms")</a>:
-Forms display not implemented yet.
+<a href="" onclick="showhide('xwikiobjectscontent'); return false">$msg.get("forms")</a>:
+$msg.get("formsnotimplemented").
 </div>
 </div>
 <div id="xwikiobjectscontent" class="xwikidatacontent" style="display:none">
-This will contain the forms that have been attached to this document..
+$msg.get("willcontainattachedforms")
 </div>
 <div class="xwikidatafooter2">
 <div class="xwikidatafooter1">&nbsp;</div>
diff -ur templates/print.vm patches/templates/print.vm
--- templates/print.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/print.vm	2008-08-25 16:08:16.487022702 +0200
@@ -6,7 +6,7 @@
 #template("htmlheader.vm")
 <div id="printheader" class="layoutsection">
   <div id="companylogo">
-    <a href="$xwiki.getURL("Main.WebHome", "view")" title="Home">
+    <a href="$xwiki.getURL("Main.WebHome", "view")" title="$msg.get('home')">
 #set($logo = $!prefdoc.getAttachment("logo"))
 #if(!$logo)
 #set($logourl = $xwiki.getSkinFile("logo.png"))
diff -ur templates/registerinline.vm patches/templates/registerinline.vm
--- templates/registerinline.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/registerinline.vm	2008-08-25 16:08:16.487022702 +0200
@@ -57,7 +57,7 @@
           <dt>$msg.get("core.register.email")</dt>
           <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
         </dl>
-        <span class="buttonwrapper"><input type="submit" value="$msg.get("core.register.submit")"/></span>
+        <span class="buttonwrapper"><input type="submit" value="$msg.get('core.register.submit')"/></span>
       </div>
     </form>
   #end
diff -ur templates/registeruser.vm patches/templates/registeruser.vm
--- templates/registeruser.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/registeruser.vm	2008-08-25 16:08:16.487022702 +0200
@@ -1,23 +1,23 @@
 <div class = "lbcontent">
-  <h1>$msg.get("Registration")</h1>
-#if(!$reg||$reg<0 )
-  <p>$msg.get("registerwelcome")</p>
-#end
-#if($reg && $reg<=0)
-#if($reg==-2)
-#error("$msg.get('passwordmismatch').")
-#elseif($reg==-3)
-#error("$msg.get('useralreadyexists').")
-#elseif($reg==-4)
-#error("$msg.get('invalidusername').")
-#elseif($reg==-8)
-#error("$msg.get('useralreadyexists').")
-#else
-#error("$msg.get('registerfailed') ($msg.get('registerfailedcode') $reg).")
-#end
-#elseif($reg)
-#set($xwname = "XWiki.${request.xwikiname}")
-#info("$xwiki.getUserName($xwname) ($request.xwikiname): $msg.get('registersuccessful').")
+ <h1>$msg.get("core.register.title")</h1>
+#if(!$reg||$reg<0 )
+  <p>$msg.get("core.register.welcome")</p>
+#end
+#if($reg && $reg<=0)
+#if($reg==-2)
+#error("$msg.get('core.register.passwordMismatch').")
+#elseif($reg==-3)
+#error("$msg.get('core.register.userAlreadyExists').")
+#elseif($reg==-4)
+#error("$msg.get('core.register.invalidUsername').")
+#elseif($reg==-8)
+#error("$msg.get('core.register.userAlreadyExists').")
+#else
+#error("$msg.get('core.register.registerFailed')")
+#end
+#elseif($reg)
+#set($xwname = "XWiki.${request.xwikiname}")
+#info("$msg.get('core.register.successful', [$xwiki.getUserName($xwname), $request.xwikiname])")
 #end
 #if(!$reg||$reg<0 )
     <form id="register" name="register" action="" method="post">
@@ -36,26 +36,26 @@
 #end
         <dl>
 #set($prop = $class.first_name)
-          <dt>$msg.get("firstname"):</dt>
-          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
-
-#set($prop = $class.last_name)
-          <dt>$msg.get("lastname"):</dt>
-          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
-          <dt>$msg.get("loginid"):</dt>
-          <dd><input name="xwikiname" type="text" size="20" onfocus=" prepareName(document.forms.register);" /></dd>
-
-#set($prop = $class.password)
-          <dt>$msg.get("password"):</dt>
-          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
-          <dt>$msg.get("passwordrepeat"):</dt>
-          <dd>$doc.displayEdit($prop, "register2_",  $obj)</dd>
-
-#set($prop = $class.email)
-          <dt>$msg.get("email"):</dt>
-          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
-        </dl>
-        <span class="buttonwrapper"><input class="button" type="submit" name="formactionsave" value="$msg.get("save")" onclick=" window.lb.lbSaveForm();"/></span>
+          <dt>$msg.get("core.register.firstName")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+
+#set($prop = $class.last_name)
+          <dt>$msg.get("core.register.lastName")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+          <dt>$msg.get("core.register.username")</dt>
+          <dd><input name="xwikiname" type="text" size="20" onfocus=" prepareName(document.forms.register);" /></dd>
+
+#set($prop = $class.password)
+          <dt>$msg.get("core.register.password")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+          <dt>$msg.get("core.register.passwordRepeat")</dt>
+          <dd>$doc.displayEdit($prop, "register2_",  $obj)</dd>
+
+#set($prop = $class.email)
+          <dt>$msg.get("core.register.email")</dt>
+          <dd>$doc.displayEdit($prop, "register_",  $obj)</dd>
+        </dl>
+        <span class="buttonwrapper"><input class="button" type="submit" name="formactionsave" value="$msg.get('core.register.submit')" onclick=" window.lb.lbSaveForm();"/></span>
         <span class="buttonwrapper"><input class="button" type="submit" name="formactioncancel" value="$msg.get("cancel")" onclick=" window.lb.lbHide(); window.lb.lbClearData(); return false;"/></span>
       </div>
     </form>
diff -ur templates/rightsUI.vm patches/templates/rightsUI.vm
--- templates/rightsUI.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/rightsUI.vm	2008-08-25 16:08:16.487022702 +0200
@@ -88,8 +88,8 @@
                    <thead class="theader">
                       <tr>
 						  <td class="usersorgroupsnames">
-                          <input type="radio" id="uorgg" name="uorg" value="groups" onclick="if(!$('unregistered').hasClassName('hidden')) $('unregistered').addClassName('hidden');" checked="checked" />$msg.get("Groups")&nbsp;&nbsp;
-                          <input type="radio" id="uorgu" name="uorg" value="users" onclick="if($('unregistered').hasClassName('hidden')) $('unregistered').removeClassName('hidden');" />$msg.get("Users")
+                          <input type="radio" id="uorgg" name="uorg" value="groups" onclick="if(!$('unregistered').hasClassName('hidden')) $('unregistered').addClassName('hidden');" checked="checked" />$msg.get("rightsmanager.groups")&nbsp;&nbsp;
+                          <input type="radio" id="uorgu" name="uorg" value="users" onclick="if($('unregistered').hasClassName('hidden')) $('unregistered').removeClassName('hidden');" />$msg.get("rightsmanager.users")
                           </td>
                           #foreach($i in [0..$maxlevel])
                           <td class="rights">$msg.get("rightsmanager.${levelsRights.get($i)}")</td>
@@ -189,7 +189,7 @@
                 <input type="hidden" name="${class.name}_nb" value="$nb" />
                 <table id="xwikirightstable">
                     <tr>
-                        <th>$msg.get("Users")</th><th>$msg.get("Groups")</th><th>$msg.get("Level")</th><th>$msg.get("Allow-Deny")</th><th>$msg.get("Remove")</th>
+                        <th>$msg.get("rightsmanager.users")</th><th>$msg.get("rightsmanager.groups")</th><th>$msg.get("rightsmanager.level")</th><th>$msg.get("rightsmanager.allow_deny")</th><th>$msg.get("rightsmanager.remove")</th>
                     </tr>
                     #foreach ($obj in $doc.getObjects($class.name))
                     #set($class = $obj.xWikiClass)
@@ -198,7 +198,7 @@
                         <td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
                         <td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
                         <td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
-                        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")" onclick="return confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+                        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${util.encodeURI($redirect)}")" onclick="return confirm('$msg.get("confirmobjectremove")')">$msg.get("remove")</a></td>
                     </tr>
                     #end
                   </table>
diff -ur templates/rights.vm patches/templates/rights.vm
--- templates/rights.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/rights.vm	2008-08-25 16:08:16.487022702 +0200
@@ -2,8 +2,8 @@
 <div class="xwikidatatitle2">
 <div class="xwikidatatitle1">&nbsp;</div>
 <div class="xwikidatatitle">
-<a href="" onclick="showhide('xwikirightscontent'); return false">$msg.get("Rights")</a>:
-Rights display not implemented yet.
+<a href="" onclick="showhide('xwikirightscontent'); return false">$msg.get("rights")</a>:
+$msg.get("rightsnotimplemented").
 </div>
 </div>
 <div id="xwikirightscontent" class="xwikidatacontent" style="display:none">
diff -ur templates/status.vm patches/templates/status.vm
--- templates/status.vm	2008-08-25 16:09:39.316426762 +0200
+++ patches/templates/status.vm	2008-08-25 16:08:16.488022550 +0200
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Database Status</title>
+<title>msg.get("status.databasestatus")</title>
 <script type="text/javascript">
 <!--
 function switchView(divname) {
@@ -14,17 +14,17 @@
 </script>
 </head>
 <body>
-<h1>Memory and Database Status</h1>
-<h2>Memory</h2>
+<h1>$msg.get("status.memoryanddatabasestatus")</h1>
+<h2>$msg.get("status.memory")</h2>
 <ul>
-<li>Max: $xwiki.maxMemory()</li>
-<li>Free: $xwiki.freeMemory()</li>
-<li>Total: $xwiki.totalMemory()</li>
+<li>$msg.get("status.max"): $xwiki.maxMemory()</li>
+<li>$msg.get("status.free"): $xwiki.freeMemory()</li>
+<li>$msg.get("status.total"): $xwiki.totalMemory()</li>
 </ul>
-<h2>Active Connections</h2>
+<h2>$msg.get("status.activeconnections")</h2>
 <ul>
-<li />Active: $xwiki.store.store.nbConnections
-<li />Map Size: $xwiki.store.store.connections.size()
+<li />$msg.get("status.active"): $xwiki.store.store.nbConnections
+<li />$msg.get("status.mapsize"): $xwiki.store.store.connections.size()
 </ul>
 <br /><br />
 
@@ -32,22 +32,22 @@
 <h3>$mconn</h3>
 #set($pconn = $mconn.connection)
 <ul>
-<li /><a href="" onclick="switchView('$mconn'); return false;">Time: $mconn.date</a>
+<li /><a href="" onclick="switchView('$mconn'); return false;">$msg.get("status.time"): $mconn.date</a>
 <div id="$mconn" style="display: none">
-The database connection was assigned in the following page:<br />
+$msg.get("status.databaseconnectionassignedin"):<br />
 $mconn.url
 <br /><br />
-StackTrace: <br />
+$msg.get("status.stacktrace"): <br />
 <pre>
 $mconn.exception.getStackTraceAsString()
 </pre>
 </div>
-<li />Closed: $pconn.isClosed()
+<li />$msg.get("status.closed"): $pconn.isClosed()
 #if ( $pconn.closed==false)
-<li />Catalog: $!pconn.catalog
-<li />AutoCommit: $!pconn.autoCommit
-<li />ReadOnline: $!pconn.readOnly
-<li />Warnings: $!pconn.warnings
+<li />$msg.get("status.catalog"): $!pconn.catalog
+<li />$msg.get("status.autocommit"): $!pconn.autoCommit
+<li />$msg.get("status.readonline"): $!pconn.readOnly
+<li />$msg.get("status.warnings"): $!pconn.warnings
 #end
 </ul>
 #end
@@ -57,29 +57,29 @@
 #set($pool = $xwiki.getPrivateField($provider,"connectionPool"))
 
 #if ($pool)
-<h2>Current Pool</h2>
+<h2>$msg.get("status.currentpool")</h2>
 
 
-<h3>Before gc</h3>
+<h3>$msg.get("status.beforegc")</h3>
 <ul>
-<li />Max Active: $pool.maxActive
-<li />Max Idle: $pool.maxIdle
-<li />Max Wait: $pool.maxWait
-<li />Active: $pool.numActive
-<li />Idle: $pool.numIdle
+<li />$msg.get("status.maxactive"): $pool.maxActive
+<li />$msg.get("status.maxidle"): $pool.maxIdle
+<li />$msg.get("status.maxwait"): $pool.maxWait
+<li />$msg.get("status.active"): $pool.numActive
+<li />$msg.get("status.idle"): $pool.numIdle
 </ul>
 
 $xwiki.gc()
 $xwiki.gc()
 $xwiki.gc()
 
-<h3>After gc</h3>
+<h3>$msg.get("status.aftergc")</h3>
 <ul>
-<li />Max Active: $pool.maxActive
-<li />Max Idle: $pool.maxIdle
-<li />Max Wait: $pool.maxWait
-<li />Active: $pool.numActive
-<li />Idle: $pool.numIdle
+<li />$msg.get("status.maxactive"): $pool.maxActive
+<li />$msg.get("status.maxidle"): $pool.maxIdle
+<li />$msg.get("status.maxwait"): $pool.maxWait
+<li />$msg.get("status.active"): $pool.numActive
+<li />$msg.get("status.idle"): $pool.numIdle
 </ul>
 
 
@@ -91,15 +91,15 @@
 <h3>$pconn</h3>
 #set($conn = $pconn.delegate.delegate)
 <ul>
-<li />CurrentTime: $timea
-<li />LastActiveTime: $timeb
+<li />$msg.get("status.currenttime"): $timea
+<li />$msg.get("status.lastactivetime"): $timeb
 <li />$conn
-<li />Closed: $conn.isClosed()
+<li />$msg.get("status.closed"): $conn.isClosed()
 #if ( $conn.closed==false)
-<li />Catalog: $!conn.catalog
-<li />AutoCommit: $!conn.autoCommit
-<li />ReadOnline: $!conn.readOnly
-<li />Warnings: $!conn.warnings
+<li />$msg.get("status.catalog"): $!conn.catalog
+<li />$msg.get("status.autocommit"): $!conn.autoCommit
+<li />$msg.get("status.readonline"): $!conn.readOnly
+<li />$msg.get("status.warnings"): $!conn.warnings
 #end
 </ul>
 #end