8 files changed, 899 insertions, 899 deletions
diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index a1f3411d..edc0ff3b 100644
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -1,111 +1,111 @@
-<div id="toc">
-
-<div class="topic">
-<div>Getting Started</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">Introduction</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">What is PRADO?</a></li>
-    <li><a href="?page=GettingStarted.Installation">Installation</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">New Features</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">Upgrading from v2.x and v1.x</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Tutorials</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">Creating First PRADO Application</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Sample: Hangman Game</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">Currency Converter</a></li>
-    <li><a href="?page=Tutorial.AddressBook">Address Book</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">AJAX Chat Client</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Fundamentals</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
-    <li><a href="?page=Fundamentals.Components">Components</a></li>
-    <li><a href="?page=Fundamentals.Controls">Controls</a></li>
-    <li><a href="?page=Fundamentals.Pages">Pages</a></li>
-    <li><a href="?page=Fundamentals.Modules">Modules</a></li>
-    <li><a href="?page=Fundamentals.Services">Services</a></li>
-    <li><a href="?page=Fundamentals.Applications">Applications</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Configurations</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">Overview</a></li>
-    <li><a href="?page=Configurations.Templates1">Templates: Part I</a></li>
-    <li><a href="?page=Configurations.Templates2">Templates: Part II</a></li>
-    <li><a href="?page=Configurations.Templates3">Templates: Part III</a></li>
-    <li><a href="?page=Configurations.AppConfig">Application Configurations</a></li>
-    <li><a href="?page=Configurations.PageConfig">Page Configurations</a></li>
-    <li><a href="?page=Configurations.UrlMapping">URL Mapping (Friendly URLs)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Control Reference</div>
-<ul>
-    <li><a href="?page=Controls.Standard">Standard Controls</a></li>
-    <li><a href="?page=Controls.Validation">Validation Controls</a></li>
-    <li><a href="?page=Controls.List">List Controls</a></li>
-    <li><a href="?page=Controls.Data">Data Controls</a></li>
-    <li><a href="?page=ActiveControls.Home">Active Controls (AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">Writing New Controls</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Service Reference</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">Page Service</a></li>
-    <li><a href="?page=Services.SoapService">SOAP Service</a></li>
-    <li><a href="?page=Services.RpcService">RPC Service</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Working with Databases</div>
-<ul>
-    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
-    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
-    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
-    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Advanced Topics</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Collections</a></li>
-    <li><a href="?page=Advanced.Auth">Authentication and Authorization</a></li>
-    <li><a href="?page=Advanced.Security">Security</a></li>
-    <li><a href="?page=Advanced.Assets">Assets</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
-    <li><a href="?page=Advanced.Themes">Themes and Skins</a></li>
-    <li><a href="?page=Advanced.State">Persistent State</a></li>
-    <li><a href="?page=Advanced.Logging">Logging</a></li>
-    <li><a href="?page=Advanced.Error">Error Handling and Reporting</a></li>
-    <li><a href="?page=Advanced.I18N">Internationalization</a></li>
-    <li><a href="?page=Advanced.Performance">Performance Tuning</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Client-side Scripting</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Introduction to Javascript</a></li>
-    <li><a href="?page=Advanced.Scripts1">Prototype Library Part I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Prototype Library Part II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>Getting Started</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">Introduction</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">What is PRADO?</a></li>
+    <li><a href="?page=GettingStarted.Installation">Installation</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">New Features</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">Upgrading from v2.x and v1.x</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Tutorials</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">Creating First PRADO Application</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Sample: Hangman Game</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">Currency Converter</a></li>
+    <li><a href="?page=Tutorial.AddressBook">Address Book</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">AJAX Chat Client</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Fundamentals</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
+    <li><a href="?page=Fundamentals.Components">Components</a></li>
+    <li><a href="?page=Fundamentals.Controls">Controls</a></li>
+    <li><a href="?page=Fundamentals.Pages">Pages</a></li>
+    <li><a href="?page=Fundamentals.Modules">Modules</a></li>
+    <li><a href="?page=Fundamentals.Services">Services</a></li>
+    <li><a href="?page=Fundamentals.Applications">Applications</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Configurations</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">Overview</a></li>
+    <li><a href="?page=Configurations.Templates1">Templates: Part I</a></li>
+    <li><a href="?page=Configurations.Templates2">Templates: Part II</a></li>
+    <li><a href="?page=Configurations.Templates3">Templates: Part III</a></li>
+    <li><a href="?page=Configurations.AppConfig">Application Configurations</a></li>
+    <li><a href="?page=Configurations.PageConfig">Page Configurations</a></li>
+    <li><a href="?page=Configurations.UrlMapping">URL Mapping (Friendly URLs)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Control Reference</div>
+<ul>
+    <li><a href="?page=Controls.Standard">Standard Controls</a></li>
+    <li><a href="?page=Controls.Validation">Validation Controls</a></li>
+    <li><a href="?page=Controls.List">List Controls</a></li>
+    <li><a href="?page=Controls.Data">Data Controls</a></li>
+    <li><a href="?page=ActiveControls.Home">Active Controls (AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">Writing New Controls</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Service Reference</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">Page Service</a></li>
+    <li><a href="?page=Services.SoapService">SOAP Service</a></li>
+    <li><a href="?page=Services.RpcService">RPC Service</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Working with Databases</div>
+<ul>
+    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
+    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
+    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
+    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Advanced Topics</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Collections</a></li>
+    <li><a href="?page=Advanced.Auth">Authentication and Authorization</a></li>
+    <li><a href="?page=Advanced.Security">Security</a></li>
+    <li><a href="?page=Advanced.Assets">Assets</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
+    <li><a href="?page=Advanced.Themes">Themes and Skins</a></li>
+    <li><a href="?page=Advanced.State">Persistent State</a></li>
+    <li><a href="?page=Advanced.Logging">Logging</a></li>
+    <li><a href="?page=Advanced.Error">Error Handling and Reporting</a></li>
+    <li><a href="?page=Advanced.I18N">Internationalization</a></li>
+    <li><a href="?page=Advanced.Performance">Performance Tuning</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Client-side Scripting</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Introduction to Javascript</a></li>
+    <li><a href="?page=Advanced.Scripts1">Prototype Library Part I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Prototype Library Part II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/es/TopicList.tpl b/demos/quickstart/protected/controls/es/TopicList.tpl
index 88143f8a..c2725733 100644
--- a/demos/quickstart/protected/controls/es/TopicList.tpl
+++ b/demos/quickstart/protected/controls/es/TopicList.tpl
@@ -1,111 +1,111 @@
-<div id="toc">
-
-<div class="topic">
-<div>Comenzar</div> 
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">Introducción</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">¿Que es PRADO?</a></li>
-    <li><a href="?page=GettingStarted.Installation">Instalación</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">Nuevas Funcionalidades</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">Actualizar desde la version v2.x y v1.x</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Tutoriales</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">Crear la primera aplicacion en PRADO</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Ejemplo: El ahorcado</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">Convertidor de Monedas</a></li>
-    <li><a href="?page=Tutorial.AddressBook">Libreta de direcciones</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">Cliente Chat en AJAX </a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Básicos</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">Arquitectura</a></li>
-    <li><a href="?page=Fundamentals.Components">Componentes</a></li>
-    <li><a href="?page=Fundamentals.Controls">Controles</a></li>
-    <li><a href="?page=Fundamentals.Pages">Páginas</a></li>
-    <li><a href="?page=Fundamentals.Modules">Mádulos</a></li>
-    <li><a href="?page=Fundamentals.Services">Servicios</a></li>
-    <li><a href="?page=Fundamentals.Applications">Aplicaciones</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Configuración</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">Perspectiva General</a></li>
-    <li><a href="?page=Configurations.Templates1">Plantillas: Parte I</a></li>
-    <li><a href="?page=Configurations.Templates2">Plantillas: Parte II</a></li>
-    <li><a href="?page=Configurations.Templates3">Plantillas: Parte III</a></li>
-    <li><a href="?page=Configurations.AppConfig">Configuraciones de Aplicación</a></li>
-    <li><a href="?page=Configurations.PageConfig">Configuraciones de Página</a></li>
-    <li><a href="?page=Configurations.UrlMapping">Mapeo URL (URLs amigables)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Referencia de controles</div>
-<ul>
-    <li><a href="?page=Controls.Standard">Controles Clásicos</a></li>
-    <li><a href="?page=Controls.Validation">Controles de Validación</a></li>
-    <li><a href="?page=Controls.List">Controles de Lista</a></li>
-    <li><a href="?page=Controls.Data">Controles de Datos</a></li>
-    <li><a href="?page=ActiveControls.Home">Controles Activos(AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">Escribir nuevos Controles</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Referencia de Servicios</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">Servicio Page</a></li>
-    <li><a href="?page=Services.SoapService">Servicio SOAP</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Trabajando con Bases de datos</div>
-<ul>
-    <li><a href="?page=Database.DAO">Objetos de acceso a datos (DAO)</a></li>
-    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
-    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
-    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Temas avanzados</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Colecciones</a></li>
-    <li><a href="?page=Advanced.Auth">Autenticación y Autorización</a></li>
-    <li><a href="?page=Advanced.Security">Seguridad</a></li>
-    <li><a href="?page=Advanced.Assets">Assets</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
-    <li><a href="?page=Advanced.Themes">Temas y Apariencias (Skins)</a></li>
-    <li><a href="?page=Advanced.State">Estado Persisntent</a></li>
-    <li><a href="?page=Advanced.Logging">Logging</a></li>
-    <li><a href="?page=Advanced.Error">Manipulación y Reportes de errores</a></li>
-
-    <li><a href="?page=Advanced.I18N">Internacionalización</a></li>
-    <li><a href="?page=Advanced.Performance">Puesta a punto y rendimiento(Performance Tuning)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Scripts del lado del cliente (Client-side Scripting)</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Introducción a Javascript</a></li>
-    <li><a href="?page=Advanced.Scripts1">Librería Prototipo Parte I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Librería Prototipo Parte II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Recetario de Javascript (Cookbook)</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>Comenzar</div> 
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">Introducción</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">¿Que es PRADO?</a></li>
+    <li><a href="?page=GettingStarted.Installation">Instalación</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">Nuevas Funcionalidades</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">Actualizar desde la version v2.x y v1.x</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Tutoriales</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">Crear la primera aplicacion en PRADO</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Ejemplo: El ahorcado</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">Convertidor de Monedas</a></li>
+    <li><a href="?page=Tutorial.AddressBook">Libreta de direcciones</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">Cliente Chat en AJAX </a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Básicos</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">Arquitectura</a></li>
+    <li><a href="?page=Fundamentals.Components">Componentes</a></li>
+    <li><a href="?page=Fundamentals.Controls">Controles</a></li>
+    <li><a href="?page=Fundamentals.Pages">Páginas</a></li>
+    <li><a href="?page=Fundamentals.Modules">Mádulos</a></li>
+    <li><a href="?page=Fundamentals.Services">Servicios</a></li>
+    <li><a href="?page=Fundamentals.Applications">Aplicaciones</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Configuración</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">Perspectiva General</a></li>
+    <li><a href="?page=Configurations.Templates1">Plantillas: Parte I</a></li>
+    <li><a href="?page=Configurations.Templates2">Plantillas: Parte II</a></li>
+    <li><a href="?page=Configurations.Templates3">Plantillas: Parte III</a></li>
+    <li><a href="?page=Configurations.AppConfig">Configuraciones de Aplicación</a></li>
+    <li><a href="?page=Configurations.PageConfig">Configuraciones de Página</a></li>
+    <li><a href="?page=Configurations.UrlMapping">Mapeo URL (URLs amigables)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Referencia de controles</div>
+<ul>
+    <li><a href="?page=Controls.Standard">Controles Clásicos</a></li>
+    <li><a href="?page=Controls.Validation">Controles de Validación</a></li>
+    <li><a href="?page=Controls.List">Controles de Lista</a></li>
+    <li><a href="?page=Controls.Data">Controles de Datos</a></li>
+    <li><a href="?page=ActiveControls.Home">Controles Activos(AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">Escribir nuevos Controles</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Referencia de Servicios</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">Servicio Page</a></li>
+    <li><a href="?page=Services.SoapService">Servicio SOAP</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Trabajando con Bases de datos</div>
+<ul>
+    <li><a href="?page=Database.DAO">Objetos de acceso a datos (DAO)</a></li>
+    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
+    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
+    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Temas avanzados</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Colecciones</a></li>
+    <li><a href="?page=Advanced.Auth">Autenticación y Autorización</a></li>
+    <li><a href="?page=Advanced.Security">Seguridad</a></li>
+    <li><a href="?page=Advanced.Assets">Assets</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
+    <li><a href="?page=Advanced.Themes">Temas y Apariencias (Skins)</a></li>
+    <li><a href="?page=Advanced.State">Estado Persisntent</a></li>
+    <li><a href="?page=Advanced.Logging">Logging</a></li>
+    <li><a href="?page=Advanced.Error">Manipulación y Reportes de errores</a></li>
+
+    <li><a href="?page=Advanced.I18N">Internacionalización</a></li>
+    <li><a href="?page=Advanced.Performance">Puesta a punto y rendimiento(Performance Tuning)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Scripts del lado del cliente (Client-side Scripting)</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Introducción a Javascript</a></li>
+    <li><a href="?page=Advanced.Scripts1">Librería Prototipo Parte I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Librería Prototipo Parte II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Recetario de Javascript (Cookbook)</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/fr/TopicList.tpl b/demos/quickstart/protected/controls/fr/TopicList.tpl
index cf2aa763..3020b24f 100644
--- a/demos/quickstart/protected/controls/fr/TopicList.tpl
+++ b/demos/quickstart/protected/controls/fr/TopicList.tpl
@@ -1,109 +1,109 @@
-<div id="toc">
-
-<div class="topic">
-<div>Démarrage rapide</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">Introduction</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">Qu'est-ce que PRADO ?</a></li>
-    <li><a href="?page=GettingStarted.Installation">Installation</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">Nouvelles fonctionnalités</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">Mise à jour de v2.x et v1.x</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Tutoriaux</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">Créer sa première application PRADO</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Exemple : Jeu du pendu</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">Convertisseur monétaire</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">Chat AJAX</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Fundamentaux</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
-    <li><a href="?page=Fundamentals.Components">Composants</a></li>
-    <li><a href="?page=Fundamentals.Controls">Contrôles</a></li>
-    <li><a href="?page=Fundamentals.Pages">Pages</a></li>
-    <li><a href="?page=Fundamentals.Modules">Modules</a></li>
-    <li><a href="?page=Fundamentals.Services">Services</a></li>
-    <li><a href="?page=Fundamentals.Applications">Applications</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Configurations</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">Vue d'ensemble</a></li>
-    <li><a href="?page=Configurations.Templates1">Templates : Partie I</a></li>
-    <li><a href="?page=Configurations.Templates2">Templates : Partie II</a></li>
-    <li><a href="?page=Configurations.Templates3">Templates : Partie III</a></li>
-    <li><a href="?page=Configurations.AppConfig">Configuration de l'application</a></li>
-    <li><a href="?page=Configurations.PageConfig">Configuration des pages</a></li>
-    <li><a href="?page=Configurations.UrlMapping">URL Mapping (Friendly URLs)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Réference des contrôles</div>
-<ul>
-    <li><a href="?page=Controls.Standard">Contrôles standards</a></li>
-    <li><a href="?page=Controls.Validation">Contrôles de validation</a></li>
-    <li><a href="?page=Controls.List">Contrôles de listes</a></li>
-    <li><a href="?page=Controls.Data">Contrôles de données</a></li>
-    <li><a href="?page=ActiveControls.Home">Active Controls (AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">Ecrire de nouveaux contrôles</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Réference des services</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">Page Service</a></li>
-    <li><a href="?page=Services.SoapService">SOAP Service</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Travailler avec les BDD</div>
-<ul>
-    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
-    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
-    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
-    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Thèmes avancés</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Collections</a></li>
-    <li><a href="?page=Advanced.Auth">Authentication et Authorisation</a></li>
-    <li><a href="?page=Advanced.Security">Securité</a></li>
-    <li><a href="?page=Advanced.Assets">Assets</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master et Content</a></li>
-    <li><a href="?page=Advanced.Themes">Thèmes et Skins</a></li>
-    <li><a href="?page=Advanced.State">Etat Persistent</a></li>
-    <li><a href="?page=Advanced.Logging">Logging</a></li>
-    <li><a href="?page=Advanced.Error">Gestion d'erreurs et rapports</a></li>
-    <li><a href="?page=Advanced.I18N">Internationalisation</a></li>
-    <li><a href="?page=Advanced.Performance">Amélioration des performances</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Script côté client</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Introduction au Javascript</a></li>
-    <li><a href="?page=Advanced.Scripts1">Librairie Prototype Partie I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Librairie Prototype Partie II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>Démarrage rapide</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">Introduction</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">Qu'est-ce que PRADO ?</a></li>
+    <li><a href="?page=GettingStarted.Installation">Installation</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">Nouvelles fonctionnalités</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">Mise à jour de v2.x et v1.x</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Tutoriaux</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">Créer sa première application PRADO</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Exemple : Jeu du pendu</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">Convertisseur monétaire</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">Chat AJAX</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Fundamentaux</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
+    <li><a href="?page=Fundamentals.Components">Composants</a></li>
+    <li><a href="?page=Fundamentals.Controls">Contrôles</a></li>
+    <li><a href="?page=Fundamentals.Pages">Pages</a></li>
+    <li><a href="?page=Fundamentals.Modules">Modules</a></li>
+    <li><a href="?page=Fundamentals.Services">Services</a></li>
+    <li><a href="?page=Fundamentals.Applications">Applications</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Configurations</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">Vue d'ensemble</a></li>
+    <li><a href="?page=Configurations.Templates1">Templates : Partie I</a></li>
+    <li><a href="?page=Configurations.Templates2">Templates : Partie II</a></li>
+    <li><a href="?page=Configurations.Templates3">Templates : Partie III</a></li>
+    <li><a href="?page=Configurations.AppConfig">Configuration de l'application</a></li>
+    <li><a href="?page=Configurations.PageConfig">Configuration des pages</a></li>
+    <li><a href="?page=Configurations.UrlMapping">URL Mapping (Friendly URLs)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Réference des contrôles</div>
+<ul>
+    <li><a href="?page=Controls.Standard">Contrôles standards</a></li>
+    <li><a href="?page=Controls.Validation">Contrôles de validation</a></li>
+    <li><a href="?page=Controls.List">Contrôles de listes</a></li>
+    <li><a href="?page=Controls.Data">Contrôles de données</a></li>
+    <li><a href="?page=ActiveControls.Home">Active Controls (AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">Ecrire de nouveaux contrôles</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Réference des services</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">Page Service</a></li>
+    <li><a href="?page=Services.SoapService">SOAP Service</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Travailler avec les BDD</div>
+<ul>
+    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
+    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
+    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
+    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Thèmes avancés</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Collections</a></li>
+    <li><a href="?page=Advanced.Auth">Authentication et Authorisation</a></li>
+    <li><a href="?page=Advanced.Security">Securité</a></li>
+    <li><a href="?page=Advanced.Assets">Assets</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master et Content</a></li>
+    <li><a href="?page=Advanced.Themes">Thèmes et Skins</a></li>
+    <li><a href="?page=Advanced.State">Etat Persistent</a></li>
+    <li><a href="?page=Advanced.Logging">Logging</a></li>
+    <li><a href="?page=Advanced.Error">Gestion d'erreurs et rapports</a></li>
+    <li><a href="?page=Advanced.I18N">Internationalisation</a></li>
+    <li><a href="?page=Advanced.Performance">Amélioration des performances</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Script côté client</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Introduction au Javascript</a></li>
+    <li><a href="?page=Advanced.Scripts1">Librairie Prototype Partie I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Librairie Prototype Partie II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/id/TopicList.tpl b/demos/quickstart/protected/controls/id/TopicList.tpl
index b9550221..75fa8614 100644
--- a/demos/quickstart/protected/controls/id/TopicList.tpl
+++ b/demos/quickstart/protected/controls/id/TopicList.tpl
@@ -1,110 +1,110 @@
-<div id="toc">
-
-<div class="topic">
-<div>Memulai</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">Pengenalan</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">Apa itu PRADO?</a></li>
-    <li><a href="?page=GettingStarted.Installation">Instalasi</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">Fitur Baru</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">Meningkatkan dari v2.x dan v1.x</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Tutorial</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">Membuat Aplikasi PRADO Pertama</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Contoh: Permainan Hangman</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">Pengubah Kurs</a></li>
-    <li><a href="?page=Tutorial.AddressBook">Buku Alamat</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">Klient Obrolan AJAX</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Fundamental</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">Arsitektur</a></li>
-    <li><a href="?page=Fundamentals.Components">Komponen</a></li>
-    <li><a href="?page=Fundamentals.Controls">Kontrol</a></li>
-    <li><a href="?page=Fundamentals.Pages">Halaman</a></li>
-    <li><a href="?page=Fundamentals.Modules">Modul</a></li>
-    <li><a href="?page=Fundamentals.Services">Layanan</a></li>
-    <li><a href="?page=Fundamentals.Applications">Aplikasi</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Konfigurasi</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">Tinjauan</a></li>
-    <li><a href="?page=Configurations.Templates1">Template: Bagian I</a></li>
-    <li><a href="?page=Configurations.Templates2">Template: Bagian II</a></li>
-    <li><a href="?page=Configurations.Templates3">Template: Bagian III</a></li>
-    <li><a href="?page=Configurations.AppConfig">Konfigurasi Aplikasi</a></li>
-    <li><a href="?page=Configurations.PageConfig">Konfigurasi Halaman</a></li>
-    <li><a href="?page=Configurations.UrlMapping">Pemetaan URL (URL bersahabat)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Referensi Kontrol</div>
-<ul>
-    <li><a href="?page=Controls.Standard">Kontrol Standar</a></li>
-    <li><a href="?page=Controls.Validation">Kontrol Validasi</a></li>
-    <li><a href="?page=Controls.List">Kontrol Daftar</a></li>
-    <li><a href="?page=Controls.Data">Kontrol Data</a></li>
-    <li><a href="?page=ActiveControls.Home">Kontrol Aktif (AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">Menulis Kontrol Baru</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Referensi Layanan</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">Layanan Halaman</a></li>
-    <li><a href="?page=Services.SoapService">Layanan SOAP</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Bekerja dengan Databases</div>
-<ul>
-    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
-    <li><a href="?page=Database.ActiveRecord">Rekaman Aktf</a></li>
-    <li><a href="?page=Database.Scaffold">Kerangka Rekaman Aktif</a></li>
-    <li><a href="?page=Database.SqlMap">Pemeta Data SqlMap</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Topik Lanjutan</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Koleksi</a></li>
-    <li><a href="?page=Advanced.Auth">Otentikasi dan Otorisasi</a></li>
-    <li><a href="?page=Advanced.Security">Keamanan</a></li>
-    <li><a href="?page=Advanced.Assets">Asset</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master dan Konten</a></li>
-    <li><a href="?page=Advanced.Themes">Tema dan Skin</a></li>
-    <li><a href="?page=Advanced.State">Kondisi Persisten</a></li>
-    <li><a href="?page=Advanced.Logging">Pencatatan</a></li>
-    <li><a href="?page=Advanced.Error">Penanganan Kesalahan dan Laporan</a></li>
-    <li><a href="?page=Advanced.I18N">Internasionalisasi</a></li>
-    <li><a href="?page=Advanced.Performance">Penyesuaian Performansi</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Penaskahan sisi-Klien</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Pengenalan Javascript</a></li>
-    <li><a href="?page=Advanced.Scripts1">Librari Prototipe Bagian I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Librari Prototipe Bagian II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Buku Lengkap Javascript</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>Memulai</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">Pengenalan</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">Apa itu PRADO?</a></li>
+    <li><a href="?page=GettingStarted.Installation">Instalasi</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">Fitur Baru</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">Meningkatkan dari v2.x dan v1.x</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Tutorial</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">Membuat Aplikasi PRADO Pertama</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Contoh: Permainan Hangman</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">Pengubah Kurs</a></li>
+    <li><a href="?page=Tutorial.AddressBook">Buku Alamat</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">Klient Obrolan AJAX</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Fundamental</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">Arsitektur</a></li>
+    <li><a href="?page=Fundamentals.Components">Komponen</a></li>
+    <li><a href="?page=Fundamentals.Controls">Kontrol</a></li>
+    <li><a href="?page=Fundamentals.Pages">Halaman</a></li>
+    <li><a href="?page=Fundamentals.Modules">Modul</a></li>
+    <li><a href="?page=Fundamentals.Services">Layanan</a></li>
+    <li><a href="?page=Fundamentals.Applications">Aplikasi</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Konfigurasi</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">Tinjauan</a></li>
+    <li><a href="?page=Configurations.Templates1">Template: Bagian I</a></li>
+    <li><a href="?page=Configurations.Templates2">Template: Bagian II</a></li>
+    <li><a href="?page=Configurations.Templates3">Template: Bagian III</a></li>
+    <li><a href="?page=Configurations.AppConfig">Konfigurasi Aplikasi</a></li>
+    <li><a href="?page=Configurations.PageConfig">Konfigurasi Halaman</a></li>
+    <li><a href="?page=Configurations.UrlMapping">Pemetaan URL (URL bersahabat)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Referensi Kontrol</div>
+<ul>
+    <li><a href="?page=Controls.Standard">Kontrol Standar</a></li>
+    <li><a href="?page=Controls.Validation">Kontrol Validasi</a></li>
+    <li><a href="?page=Controls.List">Kontrol Daftar</a></li>
+    <li><a href="?page=Controls.Data">Kontrol Data</a></li>
+    <li><a href="?page=ActiveControls.Home">Kontrol Aktif (AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">Menulis Kontrol Baru</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Referensi Layanan</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">Layanan Halaman</a></li>
+    <li><a href="?page=Services.SoapService">Layanan SOAP</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Bekerja dengan Databases</div>
+<ul>
+    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
+    <li><a href="?page=Database.ActiveRecord">Rekaman Aktf</a></li>
+    <li><a href="?page=Database.Scaffold">Kerangka Rekaman Aktif</a></li>
+    <li><a href="?page=Database.SqlMap">Pemeta Data SqlMap</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Topik Lanjutan</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Koleksi</a></li>
+    <li><a href="?page=Advanced.Auth">Otentikasi dan Otorisasi</a></li>
+    <li><a href="?page=Advanced.Security">Keamanan</a></li>
+    <li><a href="?page=Advanced.Assets">Asset</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master dan Konten</a></li>
+    <li><a href="?page=Advanced.Themes">Tema dan Skin</a></li>
+    <li><a href="?page=Advanced.State">Kondisi Persisten</a></li>
+    <li><a href="?page=Advanced.Logging">Pencatatan</a></li>
+    <li><a href="?page=Advanced.Error">Penanganan Kesalahan dan Laporan</a></li>
+    <li><a href="?page=Advanced.I18N">Internasionalisasi</a></li>
+    <li><a href="?page=Advanced.Performance">Penyesuaian Performansi</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Penaskahan sisi-Klien</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Pengenalan Javascript</a></li>
+    <li><a href="?page=Advanced.Scripts1">Librari Prototipe Bagian I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Librari Prototipe Bagian II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Buku Lengkap Javascript</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/ja/TopicList.tpl b/demos/quickstart/protected/controls/ja/TopicList.tpl
index 2c22641c..dbfc7eb4 100644
--- a/demos/quickstart/protected/controls/ja/TopicList.tpl
+++ b/demos/quickstart/protected/controls/ja/TopicList.tpl
@@ -1,110 +1,110 @@
-<div id="toc">
-
-<div class="topic">
-<div>ご利用の前に</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">はじめに</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">PRADO とは？</a></li>
-    <li><a href="?page=GettingStarted.Installation">インストール</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">新機能</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">v2.x v1.x からのバージョンアップ</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>チュートリアル</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">初めての PRADO アプリケーション</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Hangman ゲームサンプル</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">通貨コンバーター</a></li>
-    <li><a href="?page=Tutorial.AddressBook">アドレス帳</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">Ajax チャット</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>動作原理</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">アーキテクチャ</a></li>
-    <li><a href="?page=Fundamentals.Components">コンポーネント</a></li>
-    <li><a href="?page=Fundamentals.Controls">コントロール</a></li>
-    <li><a href="?page=Fundamentals.Pages">ページ</a></li>
-    <li><a href="?page=Fundamentals.Modules">モジュール</a></li>
-    <li><a href="?page=Fundamentals.Services">サービス</a></li>
-    <li><a href="?page=Fundamentals.Applications">アプリケーション</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>設定</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">概観</a></li>
-    <li><a href="?page=Configurations.Templates1">テンプレート: パート I</a></li>
-    <li><a href="?page=Configurations.Templates2">テンプレート: パート II</a></li>
-    <li><a href="?page=Configurations.Templates3">テンプレート: パート III</a></li>
-    <li><a href="?page=Configurations.AppConfig">アプリケーション設定</a></li>
-    <li><a href="?page=Configurations.PageConfig">ページ設定</a></li>
-    <li><a href="?page=Configurations.UrlMapping">URL マッピング (Friendly URLs)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>コントロールリファレンス</div>
-<ul>
-    <li><a href="?page=Controls.Standard">通常コントロール</a></li>
-    <li><a href="?page=Controls.Validation">バリデーションコントロール</a></li>
-    <li><a href="?page=Controls.List">リストコントロール</a></li>
-    <li><a href="?page=Controls.Data">データコントロール</a></li>
-    <li><a href="?page=ActiveControls.Home">アクティブコントロール (AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">独自のコントロールを作成する</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>サービスリファレンス</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">ページサービス</a></li>
-    <li><a href="?page=Services.SoapService">SOAP サービス</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>データベース連携</div>
-<ul>
-    <li><a href="?page=Database.DAO">データアクセスオブジェクト</a></li>
-    <li><a href="?page=Database.ActiveRecord">アクティブレコード</a></li>
-    <li><a href="?page=Database.Scaffold">アクティブレコードScaffold</a></li>
-    <li><a href="?page=Database.SqlMap">SqlMapデータマッパー</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>上級者向けトピック</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">コレクション</a></li>
-    <li><a href="?page=Advanced.Auth">認証と承認</a></li>
-    <li><a href="?page=Advanced.Security">セキュリティ</a></li>
-    <li><a href="?page=Advanced.Assets">アセット</a></li>
-    <li><a href="?page=Advanced.MasterContent">マスター/コンテンツ</a></li>
-    <li><a href="?page=Advanced.Themes">テーマとスキン</a></li>
-    <li><a href="?page=Advanced.State">状態の保存</a></li>
-    <li><a href="?page=Advanced.Logging">ロギング</a></li>
-    <li><a href="?page=Advanced.Error">エラーハンドリングとエラーレポート</a></li>
-    <li><a href="?page=Advanced.I18N">国際化対応</a></li>
-    <li><a href="?page=Advanced.Performance">パフォーマンスチューニング</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>クライアントサイドスクリプト</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Javascript 使用方法</a></li>
-    <li><a href="?page=Advanced.Scripts1">Prototype ライブラリ パート I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Prototype ライブラリ パート II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Javascript クックブック</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>ご利用の前に</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">はじめに</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">PRADO とは？</a></li>
+    <li><a href="?page=GettingStarted.Installation">インストール</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">新機能</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">v2.x v1.x からのバージョンアップ</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>チュートリアル</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">初めての PRADO アプリケーション</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Hangman ゲームサンプル</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">通貨コンバーター</a></li>
+    <li><a href="?page=Tutorial.AddressBook">アドレス帳</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">Ajax チャット</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>動作原理</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">アーキテクチャ</a></li>
+    <li><a href="?page=Fundamentals.Components">コンポーネント</a></li>
+    <li><a href="?page=Fundamentals.Controls">コントロール</a></li>
+    <li><a href="?page=Fundamentals.Pages">ページ</a></li>
+    <li><a href="?page=Fundamentals.Modules">モジュール</a></li>
+    <li><a href="?page=Fundamentals.Services">サービス</a></li>
+    <li><a href="?page=Fundamentals.Applications">アプリケーション</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>設定</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">概観</a></li>
+    <li><a href="?page=Configurations.Templates1">テンプレート: パート I</a></li>
+    <li><a href="?page=Configurations.Templates2">テンプレート: パート II</a></li>
+    <li><a href="?page=Configurations.Templates3">テンプレート: パート III</a></li>
+    <li><a href="?page=Configurations.AppConfig">アプリケーション設定</a></li>
+    <li><a href="?page=Configurations.PageConfig">ページ設定</a></li>
+    <li><a href="?page=Configurations.UrlMapping">URL マッピング (Friendly URLs)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>コントロールリファレンス</div>
+<ul>
+    <li><a href="?page=Controls.Standard">通常コントロール</a></li>
+    <li><a href="?page=Controls.Validation">バリデーションコントロール</a></li>
+    <li><a href="?page=Controls.List">リストコントロール</a></li>
+    <li><a href="?page=Controls.Data">データコントロール</a></li>
+    <li><a href="?page=ActiveControls.Home">アクティブコントロール (AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">独自のコントロールを作成する</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>サービスリファレンス</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">ページサービス</a></li>
+    <li><a href="?page=Services.SoapService">SOAP サービス</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>データベース連携</div>
+<ul>
+    <li><a href="?page=Database.DAO">データアクセスオブジェクト</a></li>
+    <li><a href="?page=Database.ActiveRecord">アクティブレコード</a></li>
+    <li><a href="?page=Database.Scaffold">アクティブレコードScaffold</a></li>
+    <li><a href="?page=Database.SqlMap">SqlMapデータマッパー</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>上級者向けトピック</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">コレクション</a></li>
+    <li><a href="?page=Advanced.Auth">認証と承認</a></li>
+    <li><a href="?page=Advanced.Security">セキュリティ</a></li>
+    <li><a href="?page=Advanced.Assets">アセット</a></li>
+    <li><a href="?page=Advanced.MasterContent">マスター/コンテンツ</a></li>
+    <li><a href="?page=Advanced.Themes">テーマとスキン</a></li>
+    <li><a href="?page=Advanced.State">状態の保存</a></li>
+    <li><a href="?page=Advanced.Logging">ロギング</a></li>
+    <li><a href="?page=Advanced.Error">エラーハンドリングとエラーレポート</a></li>
+    <li><a href="?page=Advanced.I18N">国際化対応</a></li>
+    <li><a href="?page=Advanced.Performance">パフォーマンスチューニング</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>クライアントサイドスクリプト</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Javascript 使用方法</a></li>
+    <li><a href="?page=Advanced.Scripts1">Prototype ライブラリ パート I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Prototype ライブラリ パート II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Javascript クックブック</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/pl/TopicList.tpl b/demos/quickstart/protected/controls/pl/TopicList.tpl
index e4cb586b..33d8a126 100644
--- a/demos/quickstart/protected/controls/pl/TopicList.tpl
+++ b/demos/quickstart/protected/controls/pl/TopicList.tpl
@@ -1,110 +1,110 @@
-<div id="toc">
-
-<div class="topic">
-<div>Rozpoczynamy</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">Wprowadzenie</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">Czym jest PRADO?</a></li>
-    <li><a href="?page=GettingStarted.Installation">Instalacja</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">Nowe możliwości</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">Aktualizacja z wersji 2.x oraz 1.x</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Tutoriale</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">Tworzenie pierwszej aplikacji PRADO</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Przykład: gra wisielec</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">Konwenter walut</a></li>
-    <li><a href="?page=Tutorial.AddressBook">Książka adresowa</a></li>    
-    <li><a href="?page=Tutorial.AjaxChat">AJAX-owy klient czat</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Postawy</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">Architektura</a></li>
-    <li><a href="?page=Fundamentals.Components">Komponenty</a></li>
-    <li><a href="?page=Fundamentals.Controls">Kontrolki</a></li>
-    <li><a href="?page=Fundamentals.Pages">Strony</a></li>
-    <li><a href="?page=Fundamentals.Modules">Moduły</a></li>
-    <li><a href="?page=Fundamentals.Services">Serwisy</a></li>
-    <li><a href="?page=Fundamentals.Applications">Applicacje</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Konfiguracja</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">Przegląd</a></li>
-    <li><a href="?page=Configurations.Templates1">Szablony: część I</a></li>
-    <li><a href="?page=Configurations.Templates2">Szablony: część II</a></li>
-    <li><a href="?page=Configurations.Templates3">Szablony: część III</a></li>
-    <li><a href="?page=Configurations.AppConfig">Konfiguracja aplikacji</a></li>
-    <li><a href="?page=Configurations.PageConfig">Konfiguracja strony</a></li>
-    <li><a href="?page=Configurations.UrlMapping">Mapowanie adresów URL (Przyjazne URL-e)</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Informacje o kontrolkach</div>
-<ul>
-    <li><a href="?page=Controls.Standard">Kontrolki standardowe</a></li>
-    <li><a href="?page=Controls.Validation">Kontrolki walidujące</a></li>
-    <li><a href="?page=Controls.List">Kontrolki listujące</a></li>
-    <li><a href="?page=Controls.Data">Kontrolki danych</a></li>
-    <li><a href="?page=ActiveControls.Home">Kontrolki aktywne (AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">Tworzenie nowych kontrolek</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Informacje o usługach</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">Usługa strony [Page Service]</a></li>
-    <li><a href="?page=Services.SoapService">Usługa SOAP [SOAP Service]</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Operacje na bazach dancyh</div>
-<ul>
-    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
-    <li><a href="?page=Database.ActiveRecord">Rekord aktywny (Active Record)</a></li>
-    <li><a href="?page=Database.Scaffold">Szkielet rekordu aktywnego (Scafold)</a></li>
-    <li><a href="?page=Database.SqlMap">Mapa danych SqlMap</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Zaawansowane tematy</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Kolekcje</a></li>
-    <li><a href="?page=Advanced.Auth">Autentykacja i autoryzacja</a></li>
-    <li><a href="?page=Advanced.Security">Bezpieczeńswo</a></li>
-    <li><a href="?page=Advanced.Assets">Assets</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
-    <li><a href="?page=Advanced.Themes">Tematy oraz skórki</a></li>
-    <li><a href="?page=Advanced.State">Stan ustalony [Persistent State]</a></li>
-    <li><a href="?page=Advanced.Logging">Wpisywanie do dziennika [logging]</a></li>
-    <li><a href="?page=Advanced.Error">Obsługa i raportowanie błędów</a></li>
-    <li><a href="?page=Advanced.I18N">Internationalizacja</a></li>
-    <li><a href="?page=Advanced.Performance">Zwiększanie wydajności</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>Skrypty po stronie klienta</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">Wprowadznie do Javascript</a></li>
-    <li><a href="?page=Advanced.Scripts1">Biblioteka Prototype część I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Biblioteka Prototype część II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Książka z przepisami Javascript</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>Rozpoczynamy</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">Wprowadzenie</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">Czym jest PRADO?</a></li>
+    <li><a href="?page=GettingStarted.Installation">Instalacja</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">Nowe możliwości</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">Aktualizacja z wersji 2.x oraz 1.x</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Tutoriale</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">Tworzenie pierwszej aplikacji PRADO</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Przykład: gra wisielec</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">Konwenter walut</a></li>
+    <li><a href="?page=Tutorial.AddressBook">Książka adresowa</a></li>    
+    <li><a href="?page=Tutorial.AjaxChat">AJAX-owy klient czat</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Postawy</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">Architektura</a></li>
+    <li><a href="?page=Fundamentals.Components">Komponenty</a></li>
+    <li><a href="?page=Fundamentals.Controls">Kontrolki</a></li>
+    <li><a href="?page=Fundamentals.Pages">Strony</a></li>
+    <li><a href="?page=Fundamentals.Modules">Moduły</a></li>
+    <li><a href="?page=Fundamentals.Services">Serwisy</a></li>
+    <li><a href="?page=Fundamentals.Applications">Applicacje</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Konfiguracja</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">Przegląd</a></li>
+    <li><a href="?page=Configurations.Templates1">Szablony: część I</a></li>
+    <li><a href="?page=Configurations.Templates2">Szablony: część II</a></li>
+    <li><a href="?page=Configurations.Templates3">Szablony: część III</a></li>
+    <li><a href="?page=Configurations.AppConfig">Konfiguracja aplikacji</a></li>
+    <li><a href="?page=Configurations.PageConfig">Konfiguracja strony</a></li>
+    <li><a href="?page=Configurations.UrlMapping">Mapowanie adresów URL (Przyjazne URL-e)</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Informacje o kontrolkach</div>
+<ul>
+    <li><a href="?page=Controls.Standard">Kontrolki standardowe</a></li>
+    <li><a href="?page=Controls.Validation">Kontrolki walidujące</a></li>
+    <li><a href="?page=Controls.List">Kontrolki listujące</a></li>
+    <li><a href="?page=Controls.Data">Kontrolki danych</a></li>
+    <li><a href="?page=ActiveControls.Home">Kontrolki aktywne (AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">Tworzenie nowych kontrolek</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Informacje o usługach</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">Usługa strony [Page Service]</a></li>
+    <li><a href="?page=Services.SoapService">Usługa SOAP [SOAP Service]</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Operacje na bazach dancyh</div>
+<ul>
+    <li><a href="?page=Database.DAO">Data Access Objects</a></li>
+    <li><a href="?page=Database.ActiveRecord">Rekord aktywny (Active Record)</a></li>
+    <li><a href="?page=Database.Scaffold">Szkielet rekordu aktywnego (Scafold)</a></li>
+    <li><a href="?page=Database.SqlMap">Mapa danych SqlMap</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Zaawansowane tematy</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Kolekcje</a></li>
+    <li><a href="?page=Advanced.Auth">Autentykacja i autoryzacja</a></li>
+    <li><a href="?page=Advanced.Security">Bezpieczeńswo</a></li>
+    <li><a href="?page=Advanced.Assets">Assets</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
+    <li><a href="?page=Advanced.Themes">Tematy oraz skórki</a></li>
+    <li><a href="?page=Advanced.State">Stan ustalony [Persistent State]</a></li>
+    <li><a href="?page=Advanced.Logging">Wpisywanie do dziennika [logging]</a></li>
+    <li><a href="?page=Advanced.Error">Obsługa i raportowanie błędów</a></li>
+    <li><a href="?page=Advanced.I18N">Internationalizacja</a></li>
+    <li><a href="?page=Advanced.Performance">Zwiększanie wydajności</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>Skrypty po stronie klienta</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">Wprowadznie do Javascript</a></li>
+    <li><a href="?page=Advanced.Scripts1">Biblioteka Prototype część I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Biblioteka Prototype część II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Książka z przepisami Javascript</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/controls/zh/TopicList.tpl b/demos/quickstart/protected/controls/zh/TopicList.tpl
index 5273f313..6a4c6e17 100644
--- a/demos/quickstart/protected/controls/zh/TopicList.tpl
+++ b/demos/quickstart/protected/controls/zh/TopicList.tpl
@@ -1,109 +1,109 @@
-<div id="toc">
-
-<div class="topic">
-<div>PRADO初步</div>
-<ul>
-    <li><a href="?page=GettingStarted.Introduction">概况</a></li>
-    <li><a href="?page=GettingStarted.AboutPrado">什么是PRADO？</a></li>
-    <li><a href="?page=GettingStarted.Installation">安装</a></li>
-    <li><a href="?page=GettingStarted.NewFeatures">版本新功能</a></li>
-    <li><a href="?page=GettingStarted.Upgrading">从v2.x和v1.x升级</a></li>
-    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
-    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>范例教程</div>
-<ul>
-    <li><a href="?page=GettingStarted.HelloWorld">创建第一个PRADO应用</a></li>
-    <li><a href="?page=Fundamentals.Hangman">Hangman游戏</a></li>
-    <li><a href="?page=Tutorial.CurrencyConverter">货币转换程序</a></li>
-    <li><a href="?page=Tutorial.AjaxChat">AJAX聊天程序</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>基础概念</div>
-<ul>
-    <li><a href="?page=Fundamentals.Architecture">框架结构</a></li>
-    <li><a href="?page=Fundamentals.Components">部件</a></li>
-    <li><a href="?page=Fundamentals.Controls">控件</a></li>
-    <li><a href="?page=Fundamentals.Pages">页面</a></li>
-    <li><a href="?page=Fundamentals.Modules">模块</a></li>
-    <li><a href="?page=Fundamentals.Services">服务</a></li>
-    <li><a href="?page=Fundamentals.Applications">应用</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>各种配置</div>
-<ul>
-    <li><a href="?page=Configurations.Overview">概况</a></li>
-    <li><a href="?page=Configurations.Templates1">模板（1）</a></li>
-    <li><a href="?page=Configurations.Templates2">模板（2）</a></li>
-    <li><a href="?page=Configurations.Templates3">模板（3）</a></li>
-    <li><a href="?page=Configurations.AppConfig">应用配置</a></li>
-    <li><a href="?page=Configurations.PageConfig">页面配置</a></li>
-    <li><a href="?page=Configurations.UrlMapping">URL映射</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>控件使用参考</div>
-<ul>
-    <li><a href="?page=Controls.Standard">基本控件</a></li>
-    <li><a href="?page=Controls.Validation">验证控件</a></li>
-    <li><a href="?page=Controls.List">列表控件</a></li>
-    <li><a href="?page=Controls.Data">数据控件</a></li>
-    <li><a href="?page=ActiveControls.Home">Active控件（AJAX)</a></li>
-    <li><a href="?page=Controls.NewControl">创建新控件</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>服务使用参考</div>
-<ul>
-    <li><a href="?page=Fundamentals.Services">页面服务</a></li>
-    <li><a href="?page=Services.SoapService">SOAP服务</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>使用数据库</div>
-<ul>
-    <li><a href="?page=Database.DAO">数据存取对象（DAO）</a></li>
-    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
-    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
-    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>高级教程</div>
-<ul>
-	<li><a href="?page=Advanced.Collections">Collections</a></li>
-    <li><a href="?page=Advanced.Auth">验证和授权</a></li>
-    <li><a href="?page=Advanced.Security">安全</a></li>
-    <li><a href="?page=Advanced.Assets">资源</a></li>
-    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
-    <li><a href="?page=Advanced.Themes">Themes and Skins</a></li>
-    <li><a href="?page=Advanced.State">Persistent State</a></li>
-    <li><a href="?page=Advanced.Logging">日志</a></li>
-    <li><a href="?page=Advanced.Error">错误处理</a></li>
-    <li><a href="?page=Advanced.I18N">多语言支持</a></li>
-    <li><a href="?page=Advanced.Performance">Performance Tuning</a></li>
-</ul>
-</div>
-
-<div class="topic">
-<div>客户端编程</div>
-<ul>
-    <li><a href="?page=Advanced.Scripts">JavaScript介绍</a></li>
-    <li><a href="?page=Advanced.Scripts1">Prototype Library Part I</a></li>
-    <li><a href="?page=Advanced.Scripts2">Prototype Library Part II</a></li>
-    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
-</ul>
-</div>
-
+<div id="toc">
+
+<div class="topic">
+<div>PRADO初步</div>
+<ul>
+    <li><a href="?page=GettingStarted.Introduction">概况</a></li>
+    <li><a href="?page=GettingStarted.AboutPrado">什么是PRADO？</a></li>
+    <li><a href="?page=GettingStarted.Installation">安装</a></li>
+    <li><a href="?page=GettingStarted.NewFeatures">版本新功能</a></li>
+    <li><a href="?page=GettingStarted.Upgrading">从v2.x和v1.x升级</a></li>
+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>
+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>范例教程</div>
+<ul>
+    <li><a href="?page=GettingStarted.HelloWorld">创建第一个PRADO应用</a></li>
+    <li><a href="?page=Fundamentals.Hangman">Hangman游戏</a></li>
+    <li><a href="?page=Tutorial.CurrencyConverter">货币转换程序</a></li>
+    <li><a href="?page=Tutorial.AjaxChat">AJAX聊天程序</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>基础概念</div>
+<ul>
+    <li><a href="?page=Fundamentals.Architecture">框架结构</a></li>
+    <li><a href="?page=Fundamentals.Components">部件</a></li>
+    <li><a href="?page=Fundamentals.Controls">控件</a></li>
+    <li><a href="?page=Fundamentals.Pages">页面</a></li>
+    <li><a href="?page=Fundamentals.Modules">模块</a></li>
+    <li><a href="?page=Fundamentals.Services">服务</a></li>
+    <li><a href="?page=Fundamentals.Applications">应用</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>各种配置</div>
+<ul>
+    <li><a href="?page=Configurations.Overview">概况</a></li>
+    <li><a href="?page=Configurations.Templates1">模板（1）</a></li>
+    <li><a href="?page=Configurations.Templates2">模板（2）</a></li>
+    <li><a href="?page=Configurations.Templates3">模板（3）</a></li>
+    <li><a href="?page=Configurations.AppConfig">应用配置</a></li>
+    <li><a href="?page=Configurations.PageConfig">页面配置</a></li>
+    <li><a href="?page=Configurations.UrlMapping">URL映射</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>控件使用参考</div>
+<ul>
+    <li><a href="?page=Controls.Standard">基本控件</a></li>
+    <li><a href="?page=Controls.Validation">验证控件</a></li>
+    <li><a href="?page=Controls.List">列表控件</a></li>
+    <li><a href="?page=Controls.Data">数据控件</a></li>
+    <li><a href="?page=ActiveControls.Home">Active控件（AJAX)</a></li>
+    <li><a href="?page=Controls.NewControl">创建新控件</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>服务使用参考</div>
+<ul>
+    <li><a href="?page=Fundamentals.Services">页面服务</a></li>
+    <li><a href="?page=Services.SoapService">SOAP服务</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>使用数据库</div>
+<ul>
+    <li><a href="?page=Database.DAO">数据存取对象（DAO）</a></li>
+    <li><a href="?page=Database.ActiveRecord">Active Record</a></li>
+    <li><a href="?page=Database.Scaffold">Active Record Scaffold</a></li>
+    <li><a href="?page=Database.SqlMap">SqlMap Data Mapper</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>高级教程</div>
+<ul>
+	<li><a href="?page=Advanced.Collections">Collections</a></li>
+    <li><a href="?page=Advanced.Auth">验证和授权</a></li>
+    <li><a href="?page=Advanced.Security">安全</a></li>
+    <li><a href="?page=Advanced.Assets">资源</a></li>
+    <li><a href="?page=Advanced.MasterContent">Master and Content</a></li>
+    <li><a href="?page=Advanced.Themes">Themes and Skins</a></li>
+    <li><a href="?page=Advanced.State">Persistent State</a></li>
+    <li><a href="?page=Advanced.Logging">日志</a></li>
+    <li><a href="?page=Advanced.Error">错误处理</a></li>
+    <li><a href="?page=Advanced.I18N">多语言支持</a></li>
+    <li><a href="?page=Advanced.Performance">Performance Tuning</a></li>
+</ul>
+</div>
+
+<div class="topic">
+<div>客户端编程</div>
+<ul>
+    <li><a href="?page=Advanced.Scripts">JavaScript介绍</a></li>
+    <li><a href="?page=Advanced.Scripts1">Prototype Library Part I</a></li>
+    <li><a href="?page=Advanced.Scripts2">Prototype Library Part II</a></li>
+    <li><a href="?page=Advanced.Scripts3">Javascript Cookbook</a></li>
+</ul>
+</div>
+
 </div>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/pages/GettingStarted/CommandLine.page b/demos/quickstart/protected/pages/GettingStarted/CommandLine.page
index 31509338..bc8f2f55 100644
--- a/demos/quickstart/protected/pages/GettingStarted/CommandLine.page
+++ b/demos/quickstart/protected/pages/GettingStarted/CommandLine.page
@@ -1,136 +1,136 @@
-<com:TContent ID="body" >
-<h1 id="501">Command Line Tool</h1>
-<p id="70046" class="block-content">The optional <tt>prado-cli.php</tt> PHP script file in the <tt>framework</tt>
-directory provides command line tools to perform various tedious takes in Prado.
-The <tt>prado-cli.php</tt> can be used to create Prado project skeletons, create
-initial test fixtures, and access to an interactive PHP shell.
-</p>
-<h2 id="502">Requirements</h2>
-<p id="70047" class="block-content">
-To use the command line tool, you need to use your command prompt, command console
-or terminal. In addition, PHP must be able to execute PHP scripts from
-the command line.
-</p>
-
-<h2 id="503">Usage</h2>
-<p id="70048" class="block-content">
-If you type <tt>php path/to/framework/prado-cli.php</tt>, you should see
-the following information. Alternatively, if you are not on Windows, 
-you may try to change the <tt>prado-cli.php</tt> into an executable
-and execute it as a script</p>
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70006">
-Command line tools for Prado 3.0.5.
-usage: php prado-cli.php action <parameter> [optional]
-example: php prado-cli.php -c mysite
-
-actions:
-  -c <directory>
-    Creates a Prado project skeleton for the given <directory>.
-
-  -t <directory>
-    Create test fixtures in the given <directory>.
-
-  shell [directory]
-    Runs a PHP interactive interpreter. Initializes the Prado
-    application in the given [directory].
-</com:TTextHighlighter>
-
-<p id="70049" class="block-content">The <b>&lt;parameter&gt;</b> are required parameters and <b>[optional]</b>
-are optional parameters. </p>
-
-<h2 id="504">Creating a new Prado project skeleton</h2>
-
-<p id="70050" class="block-content">To create a Prado project skeleton, do the following:</p>
-<ol>
-	<li>Change to the directory where you want to create the project skeleton.</li>
-	<li>Type, <tt>php ../prado/framework/prado-cli.php -c helloworld</tt>, where
-	<tt>helloworld</tt> is the directory name that you want to create the project skeleton files.</li>
-	<li>Type, <tt>php ../prado/framework/prado-cli.php <b>-t</b> helloworld</tt> to create
-	the test fixtures for the <tt>helloworld</tt> project.</li>
-</ol>
-
-<h2 id="505">Interactive Shell</h2>
-<p id="70051" class="block-content">
-The interactive shell allows you to evaluate PHP statements from the command line.
-The <tt>prado-cli.php</tt> script can be used to start the shell and load an existing
-Prado project. For example, let us load the blog demo project. Assume that your
-command line is in the <tt>prado</tt> distribution directory and you type.
-</p>
-<p id="70052" class="block-content">
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70007">
-$: php framework/prado-cli.php shell demos/blog
-</com:TTextHighlighter>
-The output should be
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70008">
-Command line tools for Prado 3.0.5.
-** Loaded Prado application in directory "demos\blog\protected".
-PHP-Shell - Version 0.3.1
-(c) 2006, Jan Kneschke <jan@kneschke.de>
-
->> use '?' to open the inline help
-
->>
-</com:TTextHighlighter>
-Then we will get an instance of the Prado blog application, and from
-that instance we want an instance of the <tt>'data'</tt> module. Notice that
-a <b>semicolon</b> at the end of the line <b>suppresses the output</b>.
-
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70009">
->> $app = Prado::getApplication();
-
->> $db = $app->getModule('data');
-</com:TTextHighlighter>
-Lastly, we want to use the data module to query for a post with <tt>ID=1</tt>. Notice that
-we <b>leave out the semicolon</b> to show the results.
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70010">
->> $db->queryPostByID(1)
-</com:TTextHighlighter>
-There should not be any errors and you should see the following. 
-<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70011">
-PostRecord#1
-(
-    [ID] => 1
-    [AuthorID] => 1
-    [AuthorName] => 'Prado User'
-    [CreateTime] => 1148819691
-    [ModifyTime] => 0
-    [Title] => 'Welcome to Prado Weblog'
-    [Content] => 'Congratulations! You have successfully installed Prado Blog --
- a PRADO-driven weblog system. A default administrator account has been created.
- Please login with <b>admin/prado</b> and update your password as soon as possible.'
-    [Status] => 0
-    [CommentCount] => 0
-)
-</com:TTextHighlighter>
-</p>
-
-<h2>Creating Active Record Classes</h2>
-<p>
-In the blog demo project, we need to create two <a href="?page=Database.ActiveRecord">Active Record</a> classes, <tt>UserRecord</tt> and <tt>PostRecord</tt>, to represent data records in the <tt>users</tt> and <tt>posts</tt> tables, respectively. Active Record classes must extend from the base class <tt>ActiveRecord</tt>, and must define property names that matches with the field names of the corresponding table.
-</p>
-
-<p>
-To better organize our directories, we create a new directory <tt>protected/database</tt> to hold the class files. We also modify our application configuration by inserting the following lines. It is equivalent to adding the directory <tt>protected/database</tt> to PHP include_path, which allows us to use the classes without explicitly including them.
-</p>
-
-<com:TTextHighlighter CssClass="source" Language="xml">
-<paths>
-  <using namespace="Application.database.*" />
-</paths>
-</com:TTextHighlighter>
-
-<p>
-At the prompt, enter the following two commands to create <tt>UserRecord</tt> and <tt>PostRecord</tt> classes:
-</p>
-
-<com:TTextHighlighter CssClass="source cli" Language="text">
->> generate users Application.database.UserRecord
-
->> generate posts Application.database.PostRecord
-</com:TTextHighlighter>
-
-<p>
-Here we used the <a href="?page=Fundamentals.Components">namespace format</a> again to specify the classes to be created. The path <tt>Application.database.UserRecord</tt> indicates that we want the <tt>UserRecord</tt> class file to be <tt>protected/database/UserRecord.php</tt>.
-</p>
-
-</com:TContent>
+<com:TContent ID="body" >
+<h1 id="501">Command Line Tool</h1>
+<p id="70046" class="block-content">The optional <tt>prado-cli.php</tt> PHP script file in the <tt>framework</tt>
+directory provides command line tools to perform various tedious takes in Prado.
+The <tt>prado-cli.php</tt> can be used to create Prado project skeletons, create
+initial test fixtures, and access to an interactive PHP shell.
+</p>
+<h2 id="502">Requirements</h2>
+<p id="70047" class="block-content">
+To use the command line tool, you need to use your command prompt, command console
+or terminal. In addition, PHP must be able to execute PHP scripts from
+the command line.
+</p>
+
+<h2 id="503">Usage</h2>
+<p id="70048" class="block-content">
+If you type <tt>php path/to/framework/prado-cli.php</tt>, you should see
+the following information. Alternatively, if you are not on Windows, 
+you may try to change the <tt>prado-cli.php</tt> into an executable
+and execute it as a script</p>
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70006">
+Command line tools for Prado 3.0.5.
+usage: php prado-cli.php action <parameter> [optional]
+example: php prado-cli.php -c mysite
+
+actions:
+  -c <directory>
+    Creates a Prado project skeleton for the given <directory>.
+
+  -t <directory>
+    Create test fixtures in the given <directory>.
+
+  shell [directory]
+    Runs a PHP interactive interpreter. Initializes the Prado
+    application in the given [directory].
+</com:TTextHighlighter>
+
+<p id="70049" class="block-content">The <b>&lt;parameter&gt;</b> are required parameters and <b>[optional]</b>
+are optional parameters. </p>
+
+<h2 id="504">Creating a new Prado project skeleton</h2>
+
+<p id="70050" class="block-content">To create a Prado project skeleton, do the following:</p>
+<ol>
+	<li>Change to the directory where you want to create the project skeleton.</li>
+	<li>Type, <tt>php ../prado/framework/prado-cli.php -c helloworld</tt>, where
+	<tt>helloworld</tt> is the directory name that you want to create the project skeleton files.</li>
+	<li>Type, <tt>php ../prado/framework/prado-cli.php <b>-t</b> helloworld</tt> to create
+	the test fixtures for the <tt>helloworld</tt> project.</li>
+</ol>
+
+<h2 id="505">Interactive Shell</h2>
+<p id="70051" class="block-content">
+The interactive shell allows you to evaluate PHP statements from the command line.
+The <tt>prado-cli.php</tt> script can be used to start the shell and load an existing
+Prado project. For example, let us load the blog demo project. Assume that your
+command line is in the <tt>prado</tt> distribution directory and you type.
+</p>
+<p id="70052" class="block-content">
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70007">
+$: php framework/prado-cli.php shell demos/blog
+</com:TTextHighlighter>
+The output should be
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70008">
+Command line tools for Prado 3.0.5.
+** Loaded Prado application in directory "demos\blog\protected".
+PHP-Shell - Version 0.3.1
+(c) 2006, Jan Kneschke <jan@kneschke.de>
+
+>> use '?' to open the inline help
+
+>>
+</com:TTextHighlighter>
+Then we will get an instance of the Prado blog application, and from
+that instance we want an instance of the <tt>'data'</tt> module. Notice that
+a <b>semicolon</b> at the end of the line <b>suppresses the output</b>.
+
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70009">
+>> $app = Prado::getApplication();
+
+>> $db = $app->getModule('data');
+</com:TTextHighlighter>
+Lastly, we want to use the data module to query for a post with <tt>ID=1</tt>. Notice that
+we <b>leave out the semicolon</b> to show the results.
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70010">
+>> $db->queryPostByID(1)
+</com:TTextHighlighter>
+There should not be any errors and you should see the following. 
+<com:TTextHighlighter Language="cli" CssClass="source block-content cli" id="code_70011">
+PostRecord#1
+(
+    [ID] => 1
+    [AuthorID] => 1
+    [AuthorName] => 'Prado User'
+    [CreateTime] => 1148819691
+    [ModifyTime] => 0
+    [Title] => 'Welcome to Prado Weblog'
+    [Content] => 'Congratulations! You have successfully installed Prado Blog --
+ a PRADO-driven weblog system. A default administrator account has been created.
+ Please login with <b>admin/prado</b> and update your password as soon as possible.'
+    [Status] => 0
+    [CommentCount] => 0
+)
+</com:TTextHighlighter>
+</p>
+
+<h2>Creating Active Record Classes</h2>
+<p>
+In the blog demo project, we need to create two <a href="?page=Database.ActiveRecord">Active Record</a> classes, <tt>UserRecord</tt> and <tt>PostRecord</tt>, to represent data records in the <tt>users</tt> and <tt>posts</tt> tables, respectively. Active Record classes must extend from the base class <tt>ActiveRecord</tt>, and must define property names that matches with the field names of the corresponding table.
+</p>
+
+<p>
+To better organize our directories, we create a new directory <tt>protected/database</tt> to hold the class files. We also modify our application configuration by inserting the following lines. It is equivalent to adding the directory <tt>protected/database</tt> to PHP include_path, which allows us to use the classes without explicitly including them.
+</p>
+
+<com:TTextHighlighter CssClass="source" Language="xml">
+<paths>
+  <using namespace="Application.database.*" />
+</paths>
+</com:TTextHighlighter>
+
+<p>
+At the prompt, enter the following two commands to create <tt>UserRecord</tt> and <tt>PostRecord</tt> classes:
+</p>
+
+<com:TTextHighlighter CssClass="source cli" Language="text">
+>> generate users Application.database.UserRecord
+
+>> generate posts Application.database.PostRecord
+</com:TTextHighlighter>
+
+<p>
+Here we used the <a href="?page=Fundamentals.Components">namespace format</a> again to specify the classes to be created. The path <tt>Application.database.UserRecord</tt> indicates that we want the <tt>UserRecord</tt> class file to be <tt>protected/database/UserRecord.php</tt>.
+</p>
+
+</com:TContent>