Index: wiki/src/main/resources/ColorThemes/BlueSky.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/BlueSky.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/BlueSky.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Blue Sky</title>
+<title>$msg.get('xe.themes.color.blueSky')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/Bordo.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/Bordo.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/Bordo.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Bordo</title>
+<title>$msg.get('xe.themes.color.bordo')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/ColorThemeClass.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/ColorThemeClass.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/ColorThemeClass.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Class for defining skin color themes</title>
+<title>$msg.get('xe.themes.class.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/ColorThemeSheet.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/ColorThemeSheet.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/ColorThemeSheet.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Sheet for color themes</title>
+<title>$msg.get('xe.themes.sheet.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
@@ -1310,7 +1310,7 @@
     #if("$!{propnames}" != '' &amp;&amp; $propnames.size() &gt; 0)
     &lt;div id="colorthemewizard-${element}-trigger" class="colorthemewizard-trigger"&gt;
       &lt;div class="colorthemewizard-tip"&gt;
-        Choose:
+        $msg.get('xe.themes.wizard.choose'):
         &lt;ul&gt;
           #foreach($propname in $propnames)
             &lt;li&gt;#printPropertyPrettyname($propname)&lt;/li&gt;
@@ -1424,13 +1424,13 @@
 {{html clean="false" wiki="false"}}
 ##
 ##
-#if($context.action == 'inline')&lt;div class="colorthemewizard-reset"&gt;&lt;input type="reset" value="Reset"/&gt;&lt;/div&gt;#end
+#if($context.action == 'inline')&lt;div class="colorthemewizard-reset"&gt;&lt;input type="reset" value="$msg.get('xe.themes.wizard.reset')"/&gt;&lt;/div&gt;#end
 &lt;div #elementMetaData('page')&gt;
   #printColorThemeWizard('page')
   ## Main menu
   &lt;div #elementMetaData('mainmenu')&gt;
    &lt;div&gt;
-    Main Menu
+    $msg.get('xe.themes.wizard.mainMenu')
     &lt;span #elementMetaData('menuentry')&gt;entry#1&lt;/span&gt;
     &lt;span #elementMetaData('menuentry')&gt;entry#2&lt;/span&gt;
    &lt;/div&gt;
@@ -1448,7 +1448,7 @@
         ## For this, $logourl is already set in global.vm
         #set($themeLogoImage = "$!{logourl}")
       #end
-      &lt;img id="colorthemewizard-logo" src="$themeLogoImage" alt="Wiki Logo"/&gt;
+      &lt;img id="colorthemewizard-logo" src="$themeLogoImage" alt="$msg.get('xe.themes.wizard.logo')"/&gt;
     &lt;/div&gt;
     #printColorThemeWizard('headerbox')
   &lt;/div&gt;
@@ -1458,18 +1458,18 @@
     &lt;div #elementMetaData('panel')&gt;
       ## Expanded panel header
       &lt;div #elementMetaData('panelheader')&gt;
-        &lt;div&gt;Panel&lt;/div&gt;
+        &lt;div&gt;$msg.get('xe.themes.wizard.panel')&lt;/div&gt;
         #printColorThemeWizard('panelheader')
       &lt;/div&gt;
       ## Expanded panel contents
       &lt;div #elementMetaData('panelcontents')&gt;
-        &lt;div&gt;&lt;span #elementMetaData('text')&gt;Panel Text&lt;/span&gt; | &lt;span  #elementMetaData('link')&gt;Panel Link&lt;/span&gt;&lt;/div&gt;
+        &lt;div&gt;&lt;span #elementMetaData('text')&gt;$msg.get('xe.themes.wizard.panel.text')&lt;/span&gt; | &lt;span  #elementMetaData('link')&gt;$msg.get('xe.themes.wizard.panel.link')&lt;/span&gt;&lt;/div&gt;
         #printColorThemeWizard('panelcontents')
       &lt;/div&gt;
     &lt;/div&gt;
     ## Collapsed panel
     &lt;div #elementMetaData('collapsedpanel')&gt;
-      &lt;div&gt;Collapsed Panel&lt;/div&gt;
+      &lt;div&gt;$msg.get('xe.themes.wizard.panel.collapsed')&lt;/div&gt;
       #printColorThemeWizard('collapsedpanel')
     &lt;/div&gt;
   &lt;/div&gt; ##panels
@@ -1477,50 +1477,50 @@
     ## XWiki Content
     &lt;div #elementMetaData('content')&gt;
       &lt;div #elementMetaData('contentmenu')&gt;
-        Content Menu
-       &lt;span #elementMetaData('menuentry')&gt;entry#1&lt;/span&gt;
-       &lt;span #elementMetaData('menuentry')&gt;entry#2&lt;/span&gt;
+        $msg.get('xe.themes.wizard.content.menu')
+       &lt;span #elementMetaData('menuentry')&gt;$msg.get('xe.themes.wizard.content.entry')#1&lt;/span&gt;
+       &lt;span #elementMetaData('menuentry')&gt;$msg.get('xe.themes.wizard.content.entry')#2&lt;/span&gt;
       &lt;/div&gt;
       &lt;div #elementMetaData('xwikicontent')&gt;
         &lt;div #elementMetaData('titlebox')&gt;
-          &lt;h2 #elementMetaData('title')&gt;Title&lt;/h2&gt;
+          &lt;h2 #elementMetaData('title')&gt;$msg.get('xe.themes.wizard.content.title')&lt;/h2&gt;
           #printColorThemeWizard('titlebox')
         &lt;/div&gt;
         &lt;div #elementMetaData('info')&gt;
-          &lt;div&gt;Informative Text&lt;/div&gt;
+          &lt;div&gt;$msg.get('xe.themes.wizard.content.informativeText')&lt;/div&gt;
           #printColorThemeWizard('info')
         &lt;/div&gt;
         &lt;div #elementMetaData('details')&gt;
-          &lt;div&gt;Details Text&lt;/div&gt;
+          &lt;div&gt;$msg.get('xe.themes.wizard.content.detailsText')&lt;/div&gt;
           #printColorThemeWizard('details')
         &lt;/div&gt;
         &lt;div class="clearfloats" &gt;&lt;/div&gt;
         &lt;div #elementMetaData('textlink')&gt;
           &lt;div&gt;
-            &lt;span #elementMetaData('text')&gt;Content Text&lt;/span&gt; |
-            &lt;span #elementMetaData('link')&gt;Content Link&lt;/span&gt;
+            &lt;span #elementMetaData('text')&gt;$msg.get('xe.themes.wizard.content.text')&lt;/span&gt; |
+            &lt;span #elementMetaData('link')&gt;$msg.get('xe.themes.wizard.content.link')&lt;/span&gt;
           &lt;/div&gt;
           #printColorThemeWizard('textlink')
         &lt;/div&gt;
         &lt;div #elementMetaData('highlight')&gt;
-          &lt;div&gt;Highlighted Text&lt;/div&gt;
+          &lt;div&gt;$msg.get('xe.themes.wizard.content.highlightedText')&lt;/div&gt;
           #printColorThemeWizard('highlight')
         &lt;/div&gt;
         &lt;div #elementMetaData('boxes')&gt;
-          &lt;div #elementMetaData('message')&gt;Message Box&lt;/div&gt;
+          &lt;div #elementMetaData('message')&gt;$msg.get('xe.themes.wizard.content.messageBox')&lt;/div&gt;
           &lt;table #elementMetaData('table')&gt;
-            &lt;thead&gt;&lt;tr&gt;&lt;th colspan="2" scope="col" #elementMetaData('th')&gt;Table&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;
-            &lt;tbody&gt;&lt;tr&gt;&lt;td #elementMetaData('td')&gt;data#1&lt;/td&gt;&lt;td #elementMetaData('td')&gt;data#2&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;
+            &lt;thead&gt;&lt;tr&gt;&lt;th colspan="2" scope="col" #elementMetaData('th')&gt;$msg.get('xe.themes.wizard.content.table')&lt;/th&gt;&lt;/tr&gt;&lt;/thead&gt;
+            &lt;tbody&gt;&lt;tr&gt;&lt;td #elementMetaData('td')&gt;$msg.get('xe.themes.wizard.content.table.data')#1&lt;/td&gt;&lt;td #elementMetaData('td')&gt;$msg.get('xe.themes.wizard.content.table.data')#2&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;
           &lt;/table&gt;
           #printColorThemeWizard('boxes')
         &lt;/div&gt;
         &lt;div class="clearfloats" &gt;&lt;/div&gt;
         &lt;div #elementMetaData('buttonbox')&gt;
-          &lt;div&gt;&lt;input #elementMetaData('button') type="button" value="Button" /&gt;&lt;/div&gt;
+          &lt;div&gt;&lt;input #elementMetaData('button') type="button" value="$msg.get('xe.themes.wizard.content.button')" /&gt;&lt;/div&gt;
           #printColorThemeWizard('buttonbox')
         &lt;/div&gt;
         &lt;div #elementMetaData('secondaryButtonbox')&gt;
-          &lt;div&gt;&lt;input #elementMetaData('secondaryButton') type="button" value="Secondary action button" /&gt;&lt;/div&gt;
+          &lt;div&gt;&lt;input #elementMetaData('secondaryButton') type="button" value="$msg.get('xe.themes.wizard.content.secondaryButton')" /&gt;&lt;/div&gt;
           #printColorThemeWizard('secondaryButtonbox')
         &lt;/div&gt;
         &lt;div class="clearfloats" &gt;&lt;/div&gt;
@@ -1530,10 +1530,10 @@
     ## Extra tabs - comments/attachments/history/information
     &lt;div  #elementMetaData('extratabs')&gt;
       &lt;div  #elementMetaData('tabshead')&gt;
-        &lt;span #elementMetaData('tabentryactive')&gt;tab &lt;span #elementMetaData('tabdetails')&gt;#1&lt;/span&gt;&lt;/span&gt;
-        &lt;span #elementMetaData('tabentry')&gt;tab &lt;span #elementMetaData('tabdetails')&gt;#2&lt;/span&gt;&lt;/span&gt;
+        &lt;span #elementMetaData('tabentryactive')&gt;$msg.get('xe.themes.wizard.tab') &lt;span #elementMetaData('tabdetails')&gt;#1&lt;/span&gt;&lt;/span&gt;
+        &lt;span #elementMetaData('tabentry')&gt;$msg.get('xe.themes.wizard.tab') &lt;span #elementMetaData('tabdetails')&gt;#2&lt;/span&gt;&lt;/span&gt;
       &lt;/div&gt;
-      &lt;div #elementMetaData('tabscontent')&gt;Text&lt;/div&gt;
+      &lt;div #elementMetaData('tabscontent')&gt;$msg.get('xe.themes.wizard.tab.text')&lt;/div&gt;
     &lt;/div&gt;
   &lt;/div&gt; ## main column
   &lt;div class="clearfloats" &gt;&lt;/div&gt;
Index: wiki/src/main/resources/ColorThemes/ColorThemeTemplate.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/ColorThemeTemplate.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/ColorThemeTemplate.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Template document for skin color themes</title>
+<title>$msg.get('xe.themes.template.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/DefaultColorTheme.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/DefaultColorTheme.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/DefaultColorTheme.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Default color theme</title>
+<title>$msg.get('xe.themes.color.default')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/InnerDark.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/InnerDark.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/InnerDark.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Inner Dark</title>
+<title>$msg.get('xe.themes.color.innerDark')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/Nature.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/Nature.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/Nature.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Nature</title>
+<title>$msg.get('xe.themes.color.nature')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/Nightfall.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/Nightfall.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/Nightfall.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Nightfall</title>
+<title>$msg.get('xe.themes.color.nightfall')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/Peach.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/Peach.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/Peach.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Peach</title>
+<title>$msg.get('xe.themes.color.peach')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/WebHome.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/WebHome.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/WebHome.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1251108485000</date>
 <contentUpdateDate>1251108485000</contentUpdateDate>
 <version>1.1</version>
-<title>Color Themes</title>
+<title>$msg.get('xe.themes.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
@@ -252,8 +252,7 @@
 <use>onDemand</use>
 </property>
 </object>
-<content>= Color Themes =
-{{velocity output="false"}}
+<content>{{velocity output="false"}}
 #if("$!request.xaction" == 'setTheme' &amp;&amp; "$!request.theme" != '' &amp;&amp; $hasAdmin)
   #set($preferencesDoc = $xwiki.getDocument('XWiki.XWikiPreferences'))
   #set($preferencesObj = $preferencesDoc.getObject('XWiki.XWikiPreferences'))
Index: wiki/src/main/resources/ColorThemes/WizardPropertyMapping.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/WizardPropertyMapping.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/WizardPropertyMapping.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1262108187000</date>
 <contentUpdateDate>1262108187000</contentUpdateDate>
 <version>1.1</version>
-<title>Color theme wizard property mapping</title>
+<title>$msg.get('xe.themes.wizard.mapping.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
Index: wiki/src/main/resources/ColorThemes/WizardWebColors.xml
===================================================================
--- wiki/src/main/resources/ColorThemes/WizardWebColors.xml	(revision 30737)
+++ wiki/src/main/resources/ColorThemes/WizardWebColors.xml	(working copy)
@@ -15,7 +15,7 @@
 <date>1262108187000</date>
 <contentUpdateDate>1262108187000</contentUpdateDate>
 <version>1.1</version>
-<title>Default color palette for the scriptless wizard</title>
+<title>$msg.get('xe.themes.wizard.webColors.title')</title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>