Index: src/main/resources/XWiki/WatchListMessage.xml
===================================================================
--- src/main/resources/XWiki/WatchListMessage.xml	(revision 16224)
+++ src/main/resources/XWiki/WatchListMessage.xml	(working copy)
@@ -14,7 +14,7 @@
 <creationDate>1203938786000</creationDate>
 <date>1205320524000</date>
 <contentUpdateDate>1205320524000</contentUpdateDate>
-<version>4.1</version>
+<version>1.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -79,12 +79,12 @@
 ##
 ##
 &lt;body style="background-color:#F7F7F7;"&gt;
-&lt;b&gt;Hello $pseudo,&lt;/b&gt;&lt;br/&gt;
-&lt;i&gt;This message is sent by XWiki. Here are the documents in your watchlist that have been created or updated since the last notification :&lt;/i&gt;&lt;br/&gt;
+&lt;b&gt;$msg.get("watchlist.mail.hello") $pseudo,&lt;/b&gt;&lt;br/&gt;
+&lt;i&gt;$msg.get("watchlist.mail.intro")&lt;/i&gt;&lt;br/&gt;
 &lt;br/&gt;
 &lt;table width="100%" style="font-family:arial;font-size:14px;" cellpadding="4" cellspacing="0"&gt;
 &lt;tr style="background-color:$DEDEDE;font-weight:bold;"&gt;
-&lt;td&gt;Page&lt;/td&gt;&lt;td&gt;Informations&lt;/td&gt;
+&lt;td&gt;$msg.get("watchlist.mail.page")&lt;/td&gt;&lt;td&gt;$msg.get("watchlist.mail.modifications")&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;&lt;td colspan="2"&gt;&lt;/td&gt;&lt;/tr&gt;
 ## ------------------------------------------
@@ -165,7 +165,7 @@
     #set ($identifiedModification = true)
     &lt;table class="changes-table" width="100%" style="border-color:#CDCDCD;font-family:arial;font-size:12px;text-align:left;"&gt;
       &lt;tr class="changes-table-title"&gt;
-        &lt;th style="border-bottom:1px solid #000000;"&gt;Content&lt;/th&gt;
+        &lt;th style="border-bottom:1px solid #000000;"&gt;$msg.get("watchlist.mail.content")&lt;/th&gt;
       &lt;/tr&gt;
       &lt;tr&gt;
         &lt;td&gt;
@@ -225,7 +225,7 @@
 #set ($identifiedModification = true)
 &lt;table class="changes-table" width="100%" style="border-color:#CDCDCD;font-family:arial;font-size:12px;text-align:left;"&gt;
 &lt;tr class="changes-table-title" style="border-bottom:1px solid #000000;"&gt;
-&lt;th style="border-bottom:1px solid #000000;"&gt;Comment&lt;/th&gt;
+&lt;th style="border-bottom:1px solid #000000;"&gt;$msg.get("watchlist.mail.comment")&lt;/th&gt;
 &lt;/tr&gt;
 #foreach($objdiffs in $newdoc.getObjectDiff($origdoc, $newdoc))
   #set ($wascomment = false)
@@ -253,7 +253,7 @@
   #if ($comment!="")
     &lt;tr&gt;
       &lt;td&gt;
-         Added by $author on $date : &lt;br/&gt;
+         $msg.get("watchlist.mail.addedby") $author $msg.get("watchlist.mail.on") $date : &lt;br/&gt;
          &lt;br/&gt;
          $comment
       &lt;/td&gt;
@@ -270,18 +270,18 @@
 #set ($identifiedModification = true)
   &lt;table class="changes-table" width="100%" style="border-color:#CDCDCD;font-family:arial;font-size:12px;text-align:left;"&gt;
     &lt;tr class="changes-table-title"&gt;
-      &lt;th style="border-bottom:1px solid #000000;"&gt;Attachment&lt;/th&gt;
+      &lt;th style="border-bottom:1px solid #000000;"&gt;$msg.get("watchlist.mail.attachment")&lt;/th&gt;
     &lt;/tr&gt;
     #foreach($attachChange in $attachChanges)
       &lt;tr&gt;
         &lt;td&gt;
           #if(!$attachChange.origVersion)
-            Attachment added : &lt;a href="${externalUrl}$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.newVersion)"&gt;$attachChange.fileName&lt;/a&gt;
+            $msg.get("watchlist.mail.attachment.added") : &lt;a href="${externalUrl}$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.newVersion)"&gt;$attachChange.fileName&lt;/a&gt;
           #elseif(!$attachChange.newVersion)
-            Attachment deleted : $attachChange.fileName
+            $msg.get("watchlist.mail.attachment.deleted") : $attachChange.fileName
           #else
-            Attachment updated from version &lt;a href="${externalUrl}$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.origVersion)"&gt;$attachChange.origVersion&lt;/a&gt;
-            to version &lt;a href="$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.newVersion)"&gt;$attachChange.newVersion&lt;/a&gt;
+            $msg.get("watchlist.mail.attachment.updatedfrom")Attachment updated from version &lt;a href="${externalUrl}$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.origVersion)"&gt;$attachChange.origVersion&lt;/a&gt;
+            $msg.get("watchlist.mail.attachment.updatedto") &lt;a href="$newdoc.getAttachmentRevisionURL($attachChange.fileName,$attachChange.newVersion)"&gt;$attachChange.newVersion&lt;/a&gt;
           #end
         &lt;/td&gt;
       &lt;/tr&gt;
@@ -292,7 +292,7 @@
 ## / Differences
 ##
 #if (!$identifiedModification)
-Modifications on page objects or class
+$msg.get("watchlist.mail.modifications.objectsclasses")
 #end
 &lt;/td&gt;
 &lt;/tr&gt;
@@ -311,11 +311,11 @@
 <language>en</language>
 </property>
 <property>
-<subject>XWiki : Watchlist Updates, #set($format="dd/MM/yyyy")#if ($interval == 1)#set($format="${format} hh:mm")#end$xwiki.formatDate($util.date, $format)</subject>
+<subject>$msg.get("watchlist.mail.subject"), #set($format="dd/MM/yyyy")#if ($interval == 1)#set($format="${format} hh:mm")#end$xwiki.formatDate($util.date, $format)</subject>
 </property>
 <property>
-<text>Hello $pseudo,
-This message is sent by XWiki. Here are the documents in your watchlist that have been created or updated since the last notification :
+<text>$msg.get("watchlist.mail.hello") $pseudo,
+$msg.get("watchlist.mail.intro")
 
 #foreach ($udocname in $documents)
 #set ($udoc = $xwiki.getDocument($udocname))$udoc.getDisplayTitle() : ${udoc.getExternalURL()}