diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index fea1b6d12..8063ab9af 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -29,7 +29,7 @@ abstract class InstallControllerHttp
 	/**
 	 * @var array List of installer steps
 	 */
-	protected static $steps = array('welcome', 'system', 'database', 'configure', 'process');
+	protected static $steps = array('welcome', 'license', 'system', 'database', 'configure', 'process');
 
 	protected static $instances = array();
 
diff --git a/install-dev/controllers/http/system.php b/install-dev/controllers/http/system.php
index bebad9fca..38dc09762 100644
--- a/install-dev/controllers/http/system.php
+++ b/install-dev/controllers/http/system.php
@@ -71,7 +71,6 @@ class InstallControllerHttpSystem extends InstallControllerHttp
 	{
 		if (!isset($this->tests['required']))
 			$this->tests['required'] = $this->model_system->checkRequiredTests();
-
 		if (!isset($this->tests['optional']))
 			$this->tests['optional'] = $this->model_system->checkOptionalTests();
 
@@ -80,16 +79,18 @@ class InstallControllerHttpSystem extends InstallControllerHttp
 			'required' => array(
 				array(
 					'title' => $this->l('PHP parameters:'),
+					'success' => 1,
 					'checks' => array(
-						'phpversion' => $this->l('Is PHP 5.1.2 or later installed ?'),
-						'upload' => $this->l('Can upload files ?'),
-						'system' => $this->l('Can create new files and folders ?'),
-						'gd' => $this->l('Is GD Library installed ?'),
-						'mysql_support' => $this->l('Is MySQL support is on ?'),
+						'phpversion' => $this->l('PHP 5.1.2 or later is not enabled'),
+						'upload' => $this->l('Cannot upload files'),
+						'system' => $this->l('Cannot create new files and folders'),
+						'gd' => $this->l('GD Library is not installed'),
+						'mysql_support' => $this->l('MySQL support is not activated'),
 					)
 				),
 				array(
 					'title' => $this->l('Recursive write permissions on files and folders:'),
+					'success' => 1,
 					'checks' => array(
 						'config_dir' => '~/config/',
 						'cache_dir' => '~/cache/',
@@ -110,19 +111,25 @@ class InstallControllerHttpSystem extends InstallControllerHttp
 			'optional' => array(
 				array(
 					'title' => $this->l('PHP parameters:'),
+					'success' => $this->tests['optional']['success'],
 					'checks' => array(
-						'fopen' => $this->l('Can open external URLs ?'),
-						'register_globals' => $this->l('Is PHP register global option off (recommended) ?'),
-						'gz' => $this->l('Is GZIP compression activated (recommended) ?'),
-						'mcrypt' => $this->l('Is Mcrypt extension available (recommended) ?'),
-						'magicquotes' => $this->l('Is PHP magic quotes option deactivated (recommended) ?'),
-						'dom' => $this->l('Is Dom extension loaded ?'),
-						'pdo_mysql' => $this->l('Is PDO MySQL extension loaded ?'),
+						'fopen' => $this->l('Cannot open external URLs'),
+						'register_globals' => $this->l('PHP register global option is on'),
+						'gz' => $this->l('GZIP compression is not activated'),
+						'mcrypt' => $this->l('Mcrypt extension is not enabled'),
+						'magicquotes' => $this->l('PHP magic quotes option is enabled'),
+						'dom' => $this->l('Dom extension is not loaded'),
+						'pdo_mysql' => $this->l('PDO MySQL extension is not loaded'),
 					)
 				),
 			),
 		);
 
+		foreach ($this->tests_render['required'] as &$category)
+			foreach ($category['checks'] as $id => $check)
+				if ($this->tests['required']['checks'][$id] != 'ok')
+					$category['success'] = 0;
+		
 		// If required tests failed, disable next button
 		if (!$this->tests['required']['success'])
 			$this->next_button = false;
diff --git a/install-dev/controllers/http/welcome.php b/install-dev/controllers/http/welcome.php
index dba71d9b4..0fae26c09 100644
--- a/install-dev/controllers/http/welcome.php
+++ b/install-dev/controllers/http/welcome.php
@@ -25,31 +25,20 @@
 */
 
 /**
- * Step 1 : display agrement form
+ * Step 1 : display language form
  */
 class InstallControllerHttpWelcome extends InstallControllerHttp
 {
-	/**
-	 * Process welcome form
-	 *
-	 * @see InstallAbstractModel::process()
-	 */
 	public function processNextStep()
 	{
-		$this->session->licence_agrement = Tools::getValue('licence_agrement');
-		$this->session->configuration_agrement = Tools::getValue('configuration_agrement');
+
 	}
 
-	/**
-	 * Licence agrement must be checked to validate this step
-	 *
-	 * @see InstallAbstractModel::validate()
-	 */
 	public function validate()
 	{
-		return $this->session->licence_agrement;
+		return true;
 	}
-
+	
 	/**
 	 * Change language
 	 */
diff --git a/install-dev/langs/en/install.php b/install-dev/langs/en/install.php
index e3af62e82..ee296298a 100644
--- a/install-dev/langs/en/install.php
+++ b/install-dev/langs/en/install.php
@@ -9,10 +9,11 @@ return array(
 		'support' => 'http://support.prestashop.com/en/',
 	),
 	'translations' => array(
-		'menu_welcome' => 'Welcome!',
+		'menu_welcome' => 'Choose your language',
+		'menu_license' => 'License agreements',
 		'menu_system' => 'System Compatibility',
 		'menu_database' => 'System Configuration',
-		'menu_configure' => 'Shop Configuration',
-		'menu_process' => 'Installation process',
+		'menu_configure' => 'Store information',
+		'menu_process' => 'Store installation',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index 080c09701..abdba8686 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -5,11 +5,12 @@ return array(
 		'support' => 'http://support.prestashop.com/fr/',
 	),
 	'translations' => array(
-		'menu_welcome' => 'Bienvenue !',
+		'menu_welcome' => 'Choix de la langue',
+		'menu_license' => 'Acceptation des licences',
 		'menu_system' => 'Compatibilité système',
 		'menu_database' => 'Configuration système',
-		'menu_configure' => 'Configuration de la boutique',
-		'menu_process' => 'Installation',
+		'menu_configure' => 'Informations de la boutique',
+		'menu_process' => 'Installation de la boutique',
 		'Choose the installer language:' => 'Choisissez votre langue pour l\'installation',
 		'Field required' => 'Champ requis',
 		'Invalid shop name' => 'Nom de la boutique non valide',
diff --git a/install-dev/models/system.php b/install-dev/models/system.php
index 29fd664e6..665cb3f2f 100644
--- a/install-dev/models/system.php
+++ b/install-dev/models/system.php
@@ -39,6 +39,7 @@ class InstallModelSystem extends InstallAbstractModel
 	public function checkTests($list, $type)
 	{
 		$tests = ConfigurationTest::check($list);
+
 		$success = true;
 		foreach ($tests as $result)
 			$success &= ($result == 'ok') ? true : false;
diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js
index 69b8fd351..b9a987c49 100644
--- a/install-dev/theme/js/welcome.js
+++ b/install-dev/theme/js/welcome.js
@@ -7,24 +7,4 @@ $(document).ready(function()
         form.attr('action', form.attr('action')+'#licenses-agreement');
         form.submit();
 	});
-	
-	// Desactivate next button if licence checkbox is not checked
-	if (!$('#set_license').prop('checked'))
-	{
-		$('#btNext').addClass('disabled').attr('disabled', true);
-	}
-	
-	// Activate / desactivate next button when licence checkbox is clicked
-	$('#set_license').click(function()
-	{
-		if ($(this).prop('checked'))
-			$('#btNext').removeClass('disabled').attr('disabled', false);
-		else
-			$('#btNext').addClass('disabled').attr('disabled', true);
-	});
-	
-	if ($('#set_license').prop('checked'))
-		$('#btNext').removeClass('disabled').attr('disabled', false);
-	else
-		$('#btNext').addClass('disabled').attr('disabled', true);
 });
\ No newline at end of file
diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css
index decf3011a..578819661 100644
--- a/install-dev/theme/view.css
+++ b/install-dev/theme/view.css
@@ -477,7 +477,8 @@ ul#optional {
 }
 	ul#required li.ok, 
 	ul#optional li.ok{
-		background:#f8f8f8 url(img/pict_ok.png) no-repeat 99% 10px
+		display:none
+		/*background:#f8f8f8 url(img/pict_ok.png) no-repeat 99% 10px*/
 }
 	ul#required li.fail,
 	ul#optional li.fail {
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index 93d4a8dfa..595690ee5 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -8,7 +8,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 <!-- Configuration form -->
 <div id="infosShopBlock">
-	<h2><?php echo $this->l('Shop settings and merchant account information') ?></h2>
+	<h2><?php echo $this->l('Information about your Store') ?></h2>
 
 	<!-- Shop name -->
 	<div class="field clearfix">
@@ -31,7 +31,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 				<option value="0"><?php echo $this->l('Other activity...') ?></option>
 			</select>
 		</div>
-		<p class="userInfos aligned"><?php echo $this->l('This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.') ?></p>
+		<p class="userInfos aligned"><?php echo $this->l('Help us learn more about your store so we can offer you optimal guidance and the best features for your business!') ?></p>
 	</div>
 
 	<!-- Install type (with fixtures or not) -->
@@ -86,7 +86,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<div class="contentinput">
 			<p id="alignedLogo"><img id="uploadedImage" src="../img/logo.jpg?t=<?php echo time() ?>" alt="Logo" /></p>
 		</div>
-		<p class="userInfos aligned"><?php echo $this->l('Recommended dimensions:') ?><br />209px x 52px</p>
+		<p class="userInfos aligned"><?php echo $this->l('Optional - You can add you logo at a later time.') ?></p>
 
 		<div id="inputFileLogo" class="contentinput" style="top:-20px;position:relative">
 			<input type="file" name="fileToUpload" id="fileToUpload"/>
@@ -121,6 +121,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 			<input type="text" class="text required" id="infosEmail" name="admin_email" value="<?php echo htmlspecialchars($this->session->admin_email) ?>" />
 			<sup class="required">*</sup>
 		</div>
+		<p class="userInfos aligned"><?php echo $this->l('This email address will be your username to access your store\'s back office.') ?></p>
 		<?php echo $this->displayError('admin_email') ?>
 	</div>
 
diff --git a/install-dev/theme/views/database.phtml b/install-dev/theme/views/database.phtml
index 67c6435e7..798fc0bda 100644
--- a/install-dev/theme/views/database.phtml
+++ b/install-dev/theme/views/database.phtml
@@ -4,14 +4,16 @@
 <div id="dbPart">
 	<h2><?php echo $this->l('Configure your database by filling out the following fields:') ?></h2>
 	<p>
-		<?php echo $this->l('You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.') ?>
+		<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
+		<br />
+		<?php echo $this->l('Please complete the fields below in order for PrestaShop to connect to your database. ') ?>
 	</p>
 
 	<div id="formCheckSQL">
 		<p class="first" style="margin-top: 15px;">
 			<label for="dbServer"><?php echo $this->l('Database server address:') ?> </label>
 			<input size="25" class="text" type="text" id="dbServer" name="dbServer" value="<?php echo htmlspecialchars($this->database_server) ?>" />
-			<span class="userInfos aligned"><?php echo $this->l('If you want to use a different port, add :XX after your server address where XX is your port number.') ?></span>
+			<span class="userInfos aligned"><?php echo $this->l('The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".') ?></span>
 		</p>
 		<p>
 			<label for="dbName"><?php echo $this->l('Database name:') ?> </label>
@@ -43,7 +45,7 @@
 			</p>
 		<?php endif; ?>
 		<p class="aligned last">
-			<input id="btTestDB" class="button" type="button" value="<?php echo $this->l('Verify now!') ?>"/>
+			<input id="btTestDB" class="button" type="button" value="<?php echo $this->l('Test your database connection now!') ?>"/>
 		</p>
 
 		<?php if ($this->errors): ?>
@@ -55,6 +57,7 @@
 </div>
 
 <!-- Email configuration -->
+<!--
 <div id="mailPart">
 	<h2><?php echo $this->l('E-mail delivery set-up') ?></h2>
 
@@ -102,5 +105,5 @@
 	</p>
 	<p id="mailResultCheck" style="display: none;"></p>
 </div>
-
+-->
 <?php $this->displayTemplate('footer') ?>
\ No newline at end of file
diff --git a/install-dev/theme/views/header.phtml b/install-dev/theme/views/header.phtml
index f0506fb3b..1e424f40b 100644
--- a/install-dev/theme/views/header.phtml
+++ b/install-dev/theme/views/header.phtml
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head>
-	<title><?php echo $this->l('PrestaShop Wizard Installer') ?></title>
+	<title><?php echo $this->l('PrestaShop Installation Assistant') ?></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
 	<meta http-equiv="Pragma" content="no-cache" />
@@ -76,7 +76,7 @@
 <div id="sheets" class="sheet shown">
 	<div id="sheet_<?php echo $this->step ?>" class="sheet shown clearfix">
 	<div class="contentTitle">
-		<h1><?php echo $this->l('Installation wizard') ?></h1>
+		<h1><?php echo $this->l('Installation Assistant') ?></h1>
 
 		<ul id="stepList_1" class="stepList clearfix">
 			<?php foreach ($this->getSteps() as $step): ?>
diff --git a/install-dev/theme/views/system.phtml b/install-dev/theme/views/system.phtml
index 2c8679930..5e1e85ff9 100644
--- a/install-dev/theme/views/system.phtml
+++ b/install-dev/theme/views/system.phtml
@@ -1,24 +1,19 @@
 <?php $this->displayTemplate('header') ?>
 
-<h2><?php echo $this->l('Required set-up. Please verify the following checklist items are true.') ?></h2>
+<h2><?php echo $this->l('We are currently checking PrestaShop compatibility with your system environment') ?></h2>
 
 <p><?php echo $this->l('If you have any questions, please visit our <a href="%1$s" target="_blank">documentation</a> and <a href="%2$s" target="_blank">community forum</a>.', $this->getDocumentationLink(), $this->getForumLink()); ?></p>
 
+<?php if ($this->tests['required']['success']): ?>
+	<h3 class="okBlock"><?php echo $this->l('PrestaShop compatibility with your system environment has been verified!') ?></h3>
+<?php else: ?>
+	<h3 class="errorBlock"><?php echo $this->l('Oops! Please correct the item(s) below, and then click “Refresh information” to test the compatibility of your new system.') ?></h3>
+<?php endif; ?>
 <!-- Display tests results -->
 <?php foreach ($this->tests_render as $type => $categories): ?>
-	<?php if ($type == 'required'): ?>
-		<?php if ($this->tests['required']['success']): ?>
-			<h3 class="okBlock"><?php echo $this->l('Your configuration is valid, click next to continue!') ?></h3>
-		<?php else: ?>
-			<h3 class="errorBlock"><?php echo $this->l('Your configuration is invalid. Please fix the issues below:') ?></h3>
-		<?php endif; ?>
-	<?php else: ?>
-		<h3><?php echo $this->l('Optional set-up') ?></h3>
-	<?php endif; ?>
-
 	<ul id="<?php echo $type ?>">
 	<?php foreach ($categories as $category): ?>
-		<li class="title"><?php echo $category['title'] ?></li>
+		<li class="title <?php if ($category['success'] == 1): ?>ok<?php endif;?>"><?php echo $category['title'] ?></li>
 		<?php $i = 0; foreach ($category['checks'] as $id => $lang): ?>
 			<li class="required <?php if ($i == 0): ?>first<?php endif;?> <?php echo $this->tests[$type]['checks'][$id] ?>">
 				<?php echo $lang ?>
diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml
index cb5563181..6742117cc 100644
--- a/install-dev/theme/views/welcome.phtml
+++ b/install-dev/theme/views/welcome.phtml
@@ -14,12 +14,12 @@
 <?php endif; ?>
 
 <h2><?php echo $this->l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?></h2>
-<p><?php echo $this->l('The installation process should take only few minutes!') ?></p>
+<p><?php echo $this->l('The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.') ?></p>
 <p><?php echo $this->l('If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?></p>
 
 <!-- List of languages -->
 <?php if (count($this->language->getIsoList()) > 1): ?>
-	<h2><?php echo $this->l('Choose the installer language:') ?></h2>
+	<h2><?php echo $this->l('Continue the installation in:') ?></h2>
 	<ul id="langList" style="line-height: 20px;">
 	<?php foreach ($this->language->getIsoList() as $iso): ?>
 		<li>
@@ -37,75 +37,6 @@
 	</ul>
 <?php endif; ?>
 
-<!-- Did you know -->
-<h3 class="no-margin"><?php echo $this->l('Did you know?'); ?></h3>
-<p><?php echo $this->l('PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.', 56); ?> </p>
-
-<!-- License agreement -->
-<h2 id="licenses-agreement"><?php echo $this->l('License Agreements') ?></h2>
-<p><strong><?php echo $this->l('PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.') ?></strong></p>
-<div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
-	<h3>Core: Open Software License ("OSL") v. 3.0</h3>
-	<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
-	<h4>Licensed under the Open Software License version 3.0</h4>
-	<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
-	<ol style="list-style-type: lower-alpha; margin-left: 20px">
-		<li>to reproduce the Original Work in copies, either alone or as part of a collective work</li>
-		<li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work</li>
-		<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License</li>
-		<li>to perform the Original Work publicly</li>
-		<li>to display the Original Work publicly</li>
-	</ol>
-	<p><strong>2. Grant of Patent License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p>
-	<p><strong>3. Grant of Source Code License.</strong> The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p>
-	<p><strong>4. Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p>
-	<p><strong>5. External Deployment.</strong> The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p>
-	<p><strong>6. Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p>
-	<p><strong>7. Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p>
-	<p><strong>8. Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p>
-	<p><strong>9. Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p>
-	<p><strong>10. Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p>
-	<p><strong>11. Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p>
-	<p><strong>12. Attorneys Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p>
-	<p><strong>13. Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
-	<p><strong>14. Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
-	<p><strong>15. Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
-	<p><strong>16. Modification of This License.</strong> This License is Copyright &copy; 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under Open Software License ("OSL") v. 3.0" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
-
-	<h3>Modules and Themes: Academic Free License ("AFL") v. 3.0</h3>
-	<p>This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
-	<h4>Licensed under the Academic Free License version 3.0</h4>
-	<p><strong>1. Grant of Copyright License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
-	<ol style="list-style-type: lower-alpha; margin-left: 20px">
-		<li>to reproduce the Original Work in copies, either alone or as part of a collective work;</li>
-		<li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;</li>
-		<li>to distribute or communicate copies of the Original Work and Derivative Works to the public, <span style="text-decoration: underline">under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License</span>;</li>
-		<li>to perform the Original Work publicly; and</li>
-		<li>to display the Original Work publicly.</li>
-	</ol>
-	<p><strong>2. Grant of Patent License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p>
-	<p><strong>3. Grant of Source Code License.</strong> The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p>
-	<p><strong>4. Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p>
-	<p><strong>5. External Deployment.</strong> The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p>
-	<p><strong>6. Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p>
-	<p><strong>7. Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p>
-	<p><strong>8. Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p>
-	<p><strong>9. Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p>
-	<p><strong>10. Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p>
-	<p><strong>11. Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p>
-	<p><strong>12. Attorneys' Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p>
-	<p><strong>13. Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
-	<p><strong>14. Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
-	<p><strong>15. Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
-	<p><strong>16. Modification of This License.</strong> This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under &lt;insert your license name here&gt;" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
-</div>
-
-<div>
-	<input type="checkbox" id="set_license" class="required" name="licence_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->licence_agrement): ?>checked="checked"<?php endif; ?> />
-	<div style="float:left;width:600px;margin-left:8px"><label for="set_license"><strong><?php echo $this->l('I agree to the above terms and conditions.') ?></strong></label></div>
-	<br />
-	<input type="checkbox" id="configuration_agrement" name="configuration_agrement" value="1" style="vertical-align: middle;float:left" <?php if ($this->session->configuration_agrement): ?>checked="checked"<?php endif; ?> />
-	<div style="float:left;width:600px;margin-left:8px"><label for="configuration_agrement"><strong><?php echo $this->l('I agree to participate in improving the solution by sending anonymous information about my configuration.') ?></strong></label></div>
-</div>
+<p><?php echo $this->l('The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!', 55); ?> </p>
 
 <?php $this->displayTemplate('footer') ?>
\ No newline at end of file