Index: D:/Travail/geosource/geonetwork/web/geonetwork/xsl/metadata-validate.xsl
===================================================================
--- D:/Travail/geosource/geonetwork/web/geonetwork/xsl/metadata-validate.xsl	(revision 1091)
+++ D:/Travail/geosource/geonetwork/web/geonetwork/xsl/metadata-validate.xsl	(working copy)
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:geonet="http://www.fao.org/geonetwork">
-
-	<xsl:include href="res.xsl"/>
-	
+	xmlns:geonet="http://www.fao.org/geonetwork">	
+		 <xsl:include href="res.xsl"/>	
 	<!--
 	page content
 	-->
-	<xsl:template name="content">
-		<xsl:choose>
-			<xsl:when test="string(/root/gui/validation/message)='Metadata Validated successfully'">
-				Metadata Validated against XML schema successfully
+	<xsl:template name="content">
+		<xsl:choose>		
+			<xsl:when test="count(/root/gui/validation)>0">
+				<xsl:value-of select='/root/gui/validation/schemaValid'/>
 				<br/><br/>
 				<xsl:choose>
 					<xsl:when test="/root/response/geonet:schematronerrors/geonet:errorFound">
-						<font color="FF0000"><b>BUT Schematron found errors in the Metadata</b></font>
+						<font color="FF0000"><b>
+						<xsl:value-of select='/root/gui/validation/schemaTronError'/>
+						</b></font>
 					</xsl:when>
 					<xsl:otherwise>
-						AND Metadata Validated against Schematron rules successfully.
+						<xsl:value-of select='/root/gui/validation/schemaTronValid'/>
 					</xsl:otherwise>
 				</xsl:choose>
 				<br/><br/>
-				<a href="{/root/gui/url}/schematronCache/SchematronReport{/root/response/id}/schematron-frame.html">Schematron report available here</a>
+				<a href="{/root/gui/url}/schematronCache/SchematronReport{/root/response/id}/schematron-frame.html">
+				<xsl:value-of select="/root/gui/validation/schemaTronReport"/></a>
 				<br/>
 			</xsl:when>
-			<xsl:otherwise>
-				<font color="FF0000">Metadata FAILED to validate against XML schema</font>
+			
+			<xsl:otherwise>
+				<!-- impossible case -->
+				<font color="FF0000"><xsl:value-of select="/root/gui/validation/message"/></font>
 				<br/><br/>
-				<xsl:value-of select="/root/gui/validation/message"/>
+				
 			</xsl:otherwise>
-		</xsl:choose>
+		</xsl:choose>
+	
 	</xsl:template>
 	
 	<!--
@@ -38,13 +42,14 @@
 	<xsl:template mode="title" match="/">
 		<xsl:choose>
 			<xsl:when test="/root/response/geonet:schematronerrors/geonet:errorFound">
-				Validation Error
+				<xsl:value-of select='/root/gui/validation/heading'/>
 			</xsl:when>
 			<xsl:otherwise>
-				Metadata Validation was successful
+				<xsl:value-of select='/root/gui/validation/heading'/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template>
+	</xsl:template>
+	
 
 </xsl:stylesheet>
 
Index: D:/Travail/geosource/geonetwork/web/geonetwork/xsl/res-error.xsl
===================================================================
--- D:/Travail/geosource/geonetwork/web/geonetwork/xsl/res-error.xsl	(revision 1091)
+++ D:/Travail/geosource/geonetwork/web/geonetwork/xsl/res-error.xsl	(working copy)
@@ -9,7 +9,7 @@
 	<xsl:template name="content">
 		<font class="error"><xsl:value-of select="/root/gui/error/message"/></font>
 		<p/>
-		<xsl:value-of select="/root/error/exception/message"/>
+		<xsl:value-of select="/root/error//message"/>
 	</xsl:template>

Index: D:/Travail/geosource/geonetwork/web/geonetwork/loc/en/xml/metadata-validate.xml
===================================================================
--- D:/Travail/geosource/geonetwork/web/geonetwork/loc/en/xml/metadata-validate.xml	(revision 1091)
+++ D:/Travail/geosource/geonetwork/web/geonetwork/loc/en/xml/metadata-validate.xml	(working copy)
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
 	<heading>Metadata Validation</heading>
-	<message>Metadata Validated successfully</message>
+	<schemaValid>Metadata Validated successfully</schemaValid>	
+	<schemaTronError>Error in the schematron validation</schemaTronError>
+	<schemaTronValid>Validation of the schematron rules</schemaTronValid>
+	<schemaTronReport>Schematron report available here</schemaTronReport>	
 </strings>
+
Index: D:/Travail/geosource/geonetwork/web/geonetwork/loc/fr/xml/metadata-validate.xml
===================================================================
--- D:/Travail/geosource/geonetwork/web/geonetwork/loc/fr/xml/metadata-validate.xml	(revision 1091)
+++ D:/Travail/geosource/geonetwork/web/geonetwork/loc/fr/xml/metadata-validate.xml	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
 	<heading>Validation des métadonnées</heading>
-	<message>Validation réussie</message>
+	<schemaValid>Validation réussie au regard du schéma</schemaValid>
+	<schemaTronError>Erreur dans la validation des règles</schemaTronError>
+	<schemaTronValid>Validation des règles</schemaTronValid>
+	<schemaTronReport>Accéder au rapport sur les règles</schemaTronReport>	
 </strings>