14814_dbal.diff

Administrator Admin, 2010-06-22 05:47

Download (1.78 KB)

View differences:

res/Templates/install.html (working copy)
14 14
<script type="text/javascript" src="../contrib/prototype/prototype.js"></script>
15 15
<script type="text/javascript" src="../sysext/install/Resources/Public/Javascript/install.js"></script>
16 16

  
17
<p>###LLDESCRIPTION###</p>
17 18
<form method="post" action="###ACTION###">
18 19
	<fieldset class="t3-install-form-label-width-7">
19 20
		<ol>
class.tx_dbal_installtool.php (working copy)
275 275
			'encryptionKey' => $instObj->createEncryptionKey(),
276 276
			'branch' => TYPO3_branch,
277 277
			'driver_options' => $driverOptionsSubPart,
278
			'continue' => 'Continue'
278
			'continue' => 'Continue',
279
			'llDescription' => 'If you have not already created a username and password to access the database, please do so now. This can be done using tools provided by your host.'
279 280
		);
280 281
		$subPartMarkers = array_merge($subPartMarkers, $driverMarkers);
281 282

  
......
464 465
				Host: <em>' . TYPO3_db_host . '</em>,
465 466
				Using Password: YES)
466 467
				<br />
467
				Go to Step 1 and enter a proper username/password!
468
				Go to Step 1 and enter a valid username and password!
468 469
			</p>
469 470
		';
470 471

  
......
539 540
				'step' => $instObj->step + 1,
540 541
				'action' => htmlspecialchars($instObj->action),
541 542
				'llOption2' => 'Select an EMPTY existing database:',
542
				'llRemark2' => 'All tables used by TYPO3 will be overwritten in step 3.',
543
				'llRemark2' => 'Any tables used by TYPO3 will be overwritten.',
543 544
				'continue' => 'Continue'
544 545
			);
545 546
				// Add step marker for main template