Index: typo3/index.php
===================================================================
--- typo3/index.php	(Revision 105)
+++ typo3/index.php	(Revision 110)
@@ -97,7 +97,6 @@
 
 		// Internal, static:
 	var $redirectToURL;			// Set to the redirect URL of the form (may be redirect_url or "alt_main.php")
-	var $L_vars;				// Set to the labels used for the login screen.
 
 		// Internal, dynamic:
 	var $content;				// Content accumulation
@@ -137,9 +136,6 @@
 			$this->loginSecurityLevel = $TYPO3_CONF_VARS['BE']['loginSecurityLevel'];
 		}
 
-			// Getting login labels:
-		$this->L_vars = explode('|',$TYPO3_CONF_VARS['BE']['loginLabels']);
-
 			// Setting the redirect URL to "alt_main.php" if no alternative input is given:
 		$this->redirectToURL = $this->redirect_url ? $this->redirect_url : 'alt_main.php';
 
@@ -188,9 +184,6 @@
 			// Initialize interface selectors:
 		$this->makeInterfaceSelectorBox();
 
-			// Replace an optional marker in the "Administration Login" label
-		$this->L_vars[6] = str_replace("###SITENAME###",$TYPO3_CONF_VARS['SYS']['sitename'],$this->L_vars[6]);
-
 			// Creating form based on whether there is a login or not:
 		if (!$BE_USER->user['uid'])	{
 
[... -- snip here because both changes (language-menu and labels) were mixed in one part]
 			// There must be no white-spaces outside of the tags (needed for buggy IE)
 		$content.=				'<!--
 								Login form:
 							--><table cellspacing="0" cellpadding="0" border="0" id="logintable">
 									<tr>
-										<td colspan="2"><h2>'.htmlspecialchars($this->L_vars[6]).'</h2></td>
+										<td colspan="2"><h2>'.htmlspecialchars(sprintf($LANG->sL('LLL:EXT:lang/locallang_core.php:loginscreen.headline'), $TYPO3_CONF_VARS['SYS']['sitename'])).'</h2></td>
 									</tr>'.($this->commandLI ? '
 									<tr class="c-wrong">
-										<td colspan="2"><p class="c-wrong">'.htmlspecialchars($this->L_vars[9]).'</p></td>
+										<td colspan="2"><p class="c-wrong">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:loginscreen.noteLoginUnsuccessful')).'</p></td>
 									</tr>' : '').'
 									<tr class="c-username">
-										<td><p class="c-username">'.htmlspecialchars($this->L_vars[0]).':</p></td>
+										<td><p class="c-username">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:labels.username')).':</p></td>
 										<td><input type="text" name="username" value="'.htmlspecialchars($this->u).'" class="c-username" /></td>
 									</tr>
 									<tr class="c-password">
-										<td><p class="c-password">'.htmlspecialchars($this->L_vars[1]).':</p></td>
+										<td><p class="c-password">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:labels.password')).':</p></td>
 										<td><input type="password" name="p_field" value="'.htmlspecialchars($this->p).'" class="c-password" /></td>
 									</tr>'.($this->interfaceSelector && !$this->loginRefresh ? '
 									<tr class="c-interfaceselector">
-										<td><p class="c-interfaceselector">'.htmlspecialchars($this->L_vars[2]).':</p></td>
+										<td><p class="c-interfaceselector">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:labels.interface')).':</p></td>
 										<td>'.$this->interfaceSelector.'</td>
 									</tr>' : '' ).'
 									<tr class="c-submit">
 										<td></td>
-										<td><input type="submit" name="commandLI" value="'.htmlspecialchars($this->L_vars[3]).'" class="c-submit" /></td>
+										<td><input type="submit" name="commandLI" value="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.login')).'" class="c-submit" /></td>
 									</tr>
 									<tr class="c-info">
-										<td colspan="2"><p class="c-info">'.htmlspecialchars($this->L_vars[7]).'</p></td>
+										<td colspan="2"><p class="c-info">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:loginscreen.noteCookies')).'</p></td>
 									</tr>
 								</table>';
 
@@ -333,7 +337,7 @@
 	 * @return	string		HTML output
 	 */
 	function makeLogoutForm()	{
-		global $BE_USER;
+		global $BE_USER, $TYPO3_CONF_VARS, $LANG;
 
 
 		$content.='
@@ -344,23 +348,23 @@
 							<table cellspacing="0" cellpadding="0" border="0" id="logintable">
 									<tr>
 										<td></td>
-										<td><h2>'.htmlspecialchars($this->L_vars[6]).'</h2></td>
+										<td><h2>'.htmlspecialchars(sprintf($LANG->sL('LLL:EXT:lang/locallang_core.php:loginscreen.headline'), $TYPO3_CONF_VARS['SYS']['sitename'])).'</h2></td>
 									</tr>
 									<tr class="c-username">
-										<td><p class="c-username">'.htmlspecialchars($this->L_vars[0]).':</p></td>
+										<td><p class="c-username">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.username')).':</p></td>
 										<td><p class="c-username-current">'.htmlspecialchars($BE_USER->user['username']).'</p></td>
 									</tr>'.($this->interfaceSelector_jump ? '
 									<tr class="c-interfaceselector">
-										<td><p class="c-interfaceselector">'.htmlspecialchars($this->L_vars[2]).':</p></td>
+										<td><p class="c-interfaceselector">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:labels.interface')).':</p></td>
 										<td>'.$this->interfaceSelector_jump.'</td>
 									</tr>' : '' ).'
 									<tr class="c-submit">
 										<td><input type="hidden" name="p_field" value="" /></td>
-										<td><input type="submit" name="commandLO" value="'.htmlspecialchars($this->L_vars[4]).'" class="c-submit" /></td>
+										<td><input type="submit" name="commandLO" value="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:buttons.logout')).'" class="c-submit" /></td>
 									</tr>
 									<tr class="c-info">
 										<td></td>
-										<td><p class="c-info">'.htmlspecialchars($this->L_vars[7]).'</p></td>
+										<td><p class="c-info">'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.php:loginscreen.noteCookies')).'</p></td>
 									</tr>
 								</table>';
 
@@ -491,7 +495,7 @@
 	 * @return	void
 	 */
 	function makeInterfaceSelectorBox()	{
-		global $TYPO3_CONF_VARS;
+		global $TYPO3_CONF_VARS,$LANG;
 
 			// Reset variables:
 		$this->interfaceSelector = '';
@@ -504,10 +508,8 @@
 			if (count($parts)>1)	{	// Only if more than one interface is defined will we show the selector:
 
 					// Initialize:
-				$tempLabels=explode(',',$this->L_vars[5]);
-				$labels=array();
-				$labels['backend']=$tempLabels[0];
-				$labels['frontend']=$tempLabels[1];
+				$labels['backend']=$LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.interfaces.backend');
+				$labels['frontend']=$LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.interfaces.frontend');
 
 				$jumpScript=array();
 				$jumpScript['backend']='alt_main.php';
@@ -545,6 +547,7 @@
 	 * @return	string		Text/Image (HTML) for copyright notice.
 	 */
 	function makeCopyrightNotice()	{
+		global $LANG;
 
 			// Get values from TYPO3_CONF_VARS:
 		$loginCopyrightWarrantyProvider = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyProvider']));
@@ -552,21 +555,20 @@
 
 			// Make warranty note:
 		if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10)	{
-			$warrantyNote='Warranty is supplied by '.htmlspecialchars($loginCopyrightWarrantyProvider).'; <a href="'.htmlspecialchars($loginCopyrightWarrantyURL).'" target="_blank">click for details.</a>';
+			$warrantyNote=sprintf($LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.warrantyProvidedBy'), htmlspecialchars($loginCopyrightWarrantyProvider)).'; <a href="'.htmlspecialchars($loginCopyrightWarrantyURL).'" target="_blank">'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.clickfordetails').'</a>.';
 		} else {
-			$warrantyNote='TYPO3 comes with ABSOLUTELY NO WARRANTY; <a href="http://typo3.com/1316.0.html" target="_blank">click for details.</a>';
+			$warrantyNote=$LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.warranty').'; <a href="http://typo3.com/1316.0.html" target="_blank">'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.clickfordetails').'</a>.';
 		}
 
-			// Compile full copyright notice:
+			// Compile full copyright notice:		
 		$copyrightNotice = '<a href="http://typo3.com/" target="_blank">'.
 					'<img src="gfx/loginlogo_transp.gif" width="75" height="19" alt="TYPO3 logo" align="left" />'.
-					'TYPO3 CMS'.($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ver. '.htmlspecialchars($GLOBALS['TYPO_VERSION']):'').
-					'</a>. '.
-					'Copyright &copy; '.TYPO3_copyright_year.' Kasper Sk&#229;rh&#248;j. Extensions are copyright of their respective owners. '.
-					'Go to <a href="http://typo3.com/" target="_blank">http://typo3.com/</a> for details. '.
+					'TYPO3 CMS'.($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ver. '.htmlspecialchars($GLOBALS['TYPO_VERSION']):'').'</a>. Copyright &copy; '.TYPO3_copyright_year.' Kasper Sk&#229;rh&#248;j. '.
+					sprintf($LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.copyrightExtensions'), '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>').' '.
 					$warrantyNote.' '.
-					'This is free software, and you are welcome to redistribute it under certain conditions; <a href="http://typo3.com/1316.0.html" target="_blank">click for details</a>. '.
-					'Obstructing the appearance of this notice is prohibited by law.';
+					$LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.freeSoftware').'; '.
+					'<a href="http://typo3.com/1316.0.html" target="_blank">'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.clickfordetails').'</a>. '.
+					$LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.obstructingNotice').'.';
 
 			// Return notice:
 		return $copyrightNotice;
@@ -626,6 +628,7 @@
 	 * @credits			Idea by Jan-Hendrik Heuing
 	 */
 	function makeLoginNews()	{
+		global $LANG;
 
 			// Reset output variable:
 		$newsContent= '';
@@ -655,7 +658,7 @@
 						Login screen news:
 					-->
 					<div id="loginNews">
-					<h2>'.htmlspecialchars($this->L_vars[8]).'</h2>
+					<h2>'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_core.xml:loginscreen.newsHeadline')).':</h2>
 					<table border="0" cellpadding="0" cellspacing="0">
 						'.$newsContent.'
 					</table>
Index: typo3/sysext/lang/locallang_core.xml
===================================================================
--- typo3/sysext/lang/locallang_core.xml	(Revision 105)
+++ typo3/sysext/lang/locallang_core.xml	(Revision 110)
@@ -87,6 +87,10 @@
 			<label index="labels.setAllCheckboxes">Select All Checkboxes</label>
 			<label index="labels.changeInOrig">Changed in original translation</label>
 			<label index="labels.expandAll">Expand all</label>
+			<label index="labels.username">Username</label>
+			<label index="labels.password">Password</label>
+			<label index="labels.interface">Interface</label>
+			<label index="labels.clickfordetails">click for details</label>
 			<label index="ver.online">ONLINE</label>
 			<label index="ver.mgm">Version Management</label>
 			<label index="ver.selVer">Select version:</label>
@@ -150,7 +154,8 @@
 			<label index="rm.edit">Edit</label>
 			<label index="rm.export">Export</label>
 			<label index="rm.delete">Delete</label>
-			<label index="buttons.logout">Logout</label>
+			<label index="buttons.login">Log In</label>
+			<label index="buttons.logout">Log Out</label>
 			<label index="buttons.exit">Exit</label>
 			<label index="buttons.selMenu_modules">MODULES</label>
 			<label index="buttons.clear">Clear</label>
@@ -184,6 +189,21 @@
 			<label index="cm.copyFolder_into">Copy folder into</label>
 			<label index="cm.moveFolder_into">Move folder into</label>
 			<label index="cm.createNewRelation">Create new relation</label>
+			<label index="loginscreen.headline">Administration Login on %s</label>
+			<label index="loginscreen.noteCookies">(Note: Cookies and JavaScript must be enabled!)</label>
+			<label index="loginscreen.noteLoginUnsuccessful">Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
+			<label index="loginscreen.interfaces.backend">Backend</label>
+			<label index="loginscreen.interfaces.frontend">Frontend</label>
+			<label index="loginscreen.copyrightExtensions">Extensions are copyright of their respective owners. Go to %s for details.</label>
+			<label index="loginscreen.warranty">TYPO3 comes with ABSOLUTELY NO WARRANTY</label>
+			<label index="loginscreen.warrantyProvidedBy">Warranty is supplied by %s</label>
+			<label index="loginscreen.freeSoftware">This is free software, and you are welcome to redistribute it under certain conditions</label>
+			<label index="loginscreen.obstructingNotice">Obstructing the appearance of this notice is prohibited by law</label>
+			<label index="loginscreen.newsHeadline">Important Messages</label>
 		</languageKey>
 	</data>
-</T3locallang>
+	<orig_hash type="array">
+	</orig_hash>
+	<orig_text type="array">
+	</orig_text>
+</T3locallang>
\ Kein Zeilenvorschub am Ende der Datei