Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php	(revision 9924)
+++ t3lib/class.t3lib_tceforms.php	(working copy)
@@ -1404,13 +1404,17 @@
 				if (!($c % $cols)) {
 					$item .= '<tr>';
 				}
-				$cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']));
+				$renderInverted = !empty($config['renderInverted']) ? TRUE : FALSE;
+				$cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']), $renderInverted);
 				$cBName = $PA['itemFormElName'] . '_' . $c;
 				$cBID = $PA['itemFormElID'] . '_' . $c;
 				$item .= '<td nowrap="nowrap">' .
-						 '<input type="checkbox"' . $this->insertDefStyle('check') . ' value="1" name="' . $cBName . '"' . $cBP . $disabled . ' id="' . $cBID . '" />' .
-						 $this->wrapLabels('<label for="' . $cBID . '">' . htmlspecialchars($p[0]) . '</label>&nbsp;') .
-						 '</td>';
+					'<input type="checkbox"' . $this->insertDefStyle('check') .
+						' value="1" name="' . $cBName . '"' . $cBP .
+						$disabled . ' id="' . $cBID . '" ' .
+					' />' .
+					$this->wrapLabels('<label for="' . $cBID . '">' . htmlspecialchars($p[0]) . '</label>&nbsp;') .
+					'</td>';
 				if (($c % $cols) + 1 == $cols) {
 					$item .= '</tr>';
 				}
@@ -1428,12 +1432,16 @@
 		} else {
 			for ($c = 0; $c < count($selItems); $c++) {
 				$p = $selItems[$c];
-				$cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']));
+				$renderInverted = !empty($config['renderInverted']) ? TRUE : FALSE;
+				$cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']), $renderInverted);
 				$cBName = $PA['itemFormElName'] . '_' . $c;
 				$cBID = $PA['itemFormElID'] . '_' . $c;
 				$item .= ($c > 0 ? '<br />' : '') .
-						 '<input type="checkbox"' . $this->insertDefStyle('check') . ' value="1" name="' . $cBName . '"' . $cBP . $PA['onFocus'] . $disabled . ' id="' . $cBID . '" />' .
-						 $this->wrapLabels('<label for="' . $cBID . '">' . htmlspecialchars($p[0]) . '</label>');
+					'<input type="checkbox"' . $this->insertDefStyle('check') .
+						' value="1" name="' . $cBName . '"' . $cBP .
+						$PA['onFocus'] . $disabled . ' id="' . $cBID . '" ' .
+					' />' .
+					$this->wrapLabels('<label for="' . $cBID . '">' . htmlspecialchars($p[0]) . '</label>');
 			}
 		}
 		if (!$disabled) {
@@ -4274,12 +4279,26 @@
 	 * @param	string		Additional JavaScript for the onclick handler.
 	 * @return	string		The onclick attribute + possibly the checked-option set.
 	 */
-	function checkBoxParams($itemName, $thisValue, $c, $iCount, $addFunc = '') {
-		$onClick = $this->elName($itemName) . '.value=this.checked?(' . $this->elName($itemName) . '.value|' . pow(2, $c) . '):(' . $this->elName($itemName) . '.value&' . (pow(2, $iCount) - 1 - pow(2, $c)) . ');' .
-				   $addFunc;
-		$str = ' onclick="' . htmlspecialchars($onClick) . '"' .
-			   (($thisValue & pow(2, $c)) ? ' checked="checked"' : '');
-		return $str;
+	protected function checkBoxParams($itemName, $thisValue, $c, $iCount, $addFunc = '', $renderInverted = FALSE) {
+		$toggleOn  = $this->elName($itemName) . '.value&' . (pow(2, $iCount) - 1 - pow(2, $c));
+		$toggleOff = $this->elName($itemName) . '.value|' . pow(2, $c);
+		$isChecked = ($thisValue & pow(2, $checkboxNumber));
+
+		if ($renderInverted) {
+			$isChecked = !$isChecked;
+
+			$tmp       = $toggleOn;
+			$toggleOn  = $toggleOff;
+			$toggleOff = $tmp;
+		}
+
+		$toggle = $this->elName($itemName) . '.value=this.checked?' .
+			'(' . $toggleOff . '):(' . $toggleOn . ');';
+
+		$onclick = ' onclick="' . htmlspecialchars($toggle . $addFunc) . '" ';
+		$checked = $isChecked ? ' checked="checked" ' : '';
+
+		return $onclick . $checked;
 	}
 
 	/**
Index: t3lib/stddb/tbl_pages.php
===================================================================
--- t3lib/stddb/tbl_pages.php	(revision 9924)
+++ t3lib/stddb/tbl_pages.php	(working copy)
@@ -55,12 +55,12 @@
 						'--div--',
 					),
 					array(
-						'LLL:EXT:lang/locallang_tca.php:doktype.I.1',
+						'LLL:EXT:lang/locallang_tca.xml:doktype.I.1',
 						(string) t3lib_pageSelect::DOKTYPE_SYSFOLDER,
 						'i/sysf.gif',
 					),
 					array(
-						'LLL:EXT:lang/locallang_tca.php:doktype.I.2',
+						'LLL:EXT:lang/locallang_tca.xml:doktype.I.2',
 						(string) t3lib_pageSelect::DOKTYPE_RECYCLER,
 						'i/recycler.gif',
 					),
@@ -147,7 +147,7 @@
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.editlock_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -157,10 +157,11 @@
 			'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.hidden',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'default' => '1',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.hidden_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.show',
 					),
 				),
 			),
@@ -199,7 +200,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						'0',
 					),
 					array(
@@ -225,7 +226,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						0,
 					),
 					array(
@@ -273,7 +274,7 @@
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.extendToSubpages_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -294,9 +295,10 @@
 			'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.nav_hide',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.nav_hide_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -352,7 +354,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:lang/locallang_core.xml:labels.automatic',
 						'0',
 					),
 					array(
@@ -458,9 +460,10 @@
 			'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_cache',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_cache_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -470,9 +473,10 @@
 			'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_search',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_search_checkbox_1_formlabel',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -626,7 +630,7 @@
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_tca.xml:pages.is_siteroot_checkbox_1_formlabel'
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled'
 					),
 				),
 			),
@@ -695,7 +699,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:cms/locallang_tca.xml:pages.fe_login_mode.enable',
 						0,
 					),
 					array(
Index: typo3/sysext/lang/locallang_tca.xml
===================================================================
--- typo3/sysext/lang/locallang_tca.xml	(revision 9924)
+++ typo3/sysext/lang/locallang_tca.xml	(working copy)
@@ -89,7 +89,7 @@
 			<label index="sys_workspace.stagechg_notification">Stage change notification by email:</label>
 			<label index="pages">Page</label>
 			<label index="doktype.I.0">Standard</label>
-			<label index="doktype.I.1">SysFolder</label>
+			<label index="doktype.I.1">Folder</label>
 			<label index="doktype.I.2">Recycler</label>
 			<label index="title">Pagetitle:</label>
 			<label index="php_tree_stop">Stop page tree:</label>
Index: typo3/sysext/lang/locallang_core.xml
===================================================================
--- typo3/sysext/lang/locallang_core.xml	(revision 9924)
+++ typo3/sysext/lang/locallang_core.xml	(working copy)
@@ -64,6 +64,9 @@
 			<label index="labels.depth_infi">Infinite</label>
 			<label index="labels.allow">Allow</label>
 			<label index="labels.deny">Deny</label>
+			<label index="labels.automatic">Auto</label>
+			<label index="labels.enabled">Enabled</label>
+			<label index="labels.show">Show</label>
 			<label index="labels.generalTab">General</label>
 			<label index="labels.refresh">Reload the tree from server</label>
 			<label index="labels.temporaryDBmount">Cancel temporary DB mount</label>
@@ -80,8 +83,8 @@
 			<label index="labels.rootLevel">root level</label>
 			<label index="labels.addnew">Add new</label>
 			<label index="labels.toggleall">Toggle all</label>
-			<label index="labels.selected">Selected</label>
-			<label index="labels.items">Items</label>
+			<label index="labels.selected">Selected Items</label>
+			<label index="labels.items">Available Items</label>
 			<label index="labels.remove_selected">Remove selected items</label>
 			<label index="labels.move_to_top">Move selected items to top</label>
 			<label index="labels.move_up">Move selected items upwards</label>
Index: typo3/sysext/css_styled_content/flexform_ds.xml
===================================================================
--- typo3/sysext/css_styled_content/flexform_ds.xml	(revision 9924)
+++ typo3/sysext/css_styled_content/flexform_ds.xml	(working copy)
@@ -35,6 +35,12 @@
 							<label>LLL:EXT:css_styled_content/locallang_db.xml:tt_content.tx_cssstyledcontent_acctables_tfoot</label>
 							<config>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</acctables_tfoot>
@@ -69,6 +75,13 @@
 							<label>LLL:EXT:css_styled_content/locallang_db.xml:tt_content.tx_cssstyledcontent_acctables_nostyles</label>
 							<config>
 								<type>check</type>
+								<renderInverted>1</renderInverted>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</acctables_nostyles>
Index: typo3/sysext/css_styled_content/locallang_db.xml
===================================================================
--- typo3/sysext/css_styled_content/locallang_db.xml	(revision 9924)
+++ typo3/sysext/css_styled_content/locallang_db.xml	(working copy)
@@ -7,26 +7,26 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="tt_content.tx_cssstyledcontent_acctables">Accessibility</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_caption">Table caption (&lt;caption&gt;)</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_summary">Table summary (&quot;summary&quot; attribute in &lt;table&gt; tags)</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_tfoot">Use table-footer (&lt;tfoot&gt; around last table row)</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.0">no header</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.1">top</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.2">left</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos">Table Header position</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_nostyles">No CSS styles for this table</label>
-			<label index="tt_content.tx_cssstyledcontent_acctables_tableclass">CSS class for the table.</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing">Table parsing</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote">Text delimiter</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_none">none</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_single">'</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_double">"</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter">Field delimiter</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_pipe">|</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_semicolon">;</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_colon">:</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_comma">,</label>
-			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_tab">&lt;tabulator&gt;</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_caption">Table Caption</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_summary">Table Summary</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_tfoot">Use Table Footer (wrap last row with &lt;tfoot&gt; tags)</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.0">No header</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.1">Top</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos.I.2">Left</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_headerpos">Table Header Position</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_nostyles">Use CSS Styles</label>
+			<label index="tt_content.tx_cssstyledcontent_acctables_tableclass">Additional CSS Class</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing">CSV parsing</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote">Text Delimiter</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_none">None</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_single">' (Single quotes)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_quote_double">" (Double quotes)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter">Field Delimiter</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_pipe">| (Pipe)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_semicolon">; (Semicolon)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_colon">: (Colon)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_comma">, (Comma)</label>
+			<label index="tt_content.tx_cssstyledcontent_tableparsing_delimiter_tab">&#x21E5; (Tab)</label>
 			<label index="tt_content.tx_cssstyledcontent_section_frame.I.9">No Frame</label>
 			<label index="tt_content.tx_cssstyledcontent_section_frame.I.0">Default Frame</label>
 		</languageKey>
Index: typo3/sysext/cms/flexform_media.xml
===================================================================
--- typo3/sysext/cms/flexform_media.xml	(revision 9924)
+++ typo3/sysext/cms/flexform_media.xml	(working copy)
@@ -42,6 +42,12 @@
 							<config>
 								<type>check</type>
 								<default>1</default>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</mmforcePlayer>
Index: typo3/sysext/cms/locallang_ttc.xml
===================================================================
--- typo3/sysext/cms/locallang_ttc.xml	(revision 9924)
+++ typo3/sysext/cms/locallang_ttc.xml	(working copy)
@@ -38,14 +38,14 @@
 			<label index="colPos.I.0">Left</label>
 			<label index="colPos.I.2">Right</label>
 			<label index="colPos.I.3">Border</label>
-			<label index="date">Date:</label>
+			<label index="date">Date</label>
 			<label index="date_formlabel">Date</label>
 			<label index="header">Header:</label>
-			<label index="header_formlabel">Main headline</label>
-			<label index="header.ALT.shortcut_formlabel">Name (invisible)</label>
-			<label index="header.ALT.script_formlabel">Name (invisible)</label>
-			<label index="header.ALT.div_formlabel">Name (invisible)</label>
-			<label index="header.ALT.html_formlabel">Name (invisible)</label>
+			<label index="header_formlabel">Header</label>
+			<label index="header.ALT.shortcut_formlabel">Name (not visible in frontend)</label>
+			<label index="header.ALT.script_formlabel">Name (not visible in frontend)</label>
+			<label index="header.ALT.div_formlabel">Name (not visible in frontend)</label>
+			<label index="header.ALT.html_formlabel">Name (not visible in frontend)</label>
 			<label index="header_position">Align:</label>
 			<label index="header_position_formlabel">Alignment</label>
 			<label index="header_position.I.1">Center</label>
@@ -106,7 +106,7 @@
 			<label index="imageheight">Height (pixels):</label>
 			<label index="imageheight_formlabel">Height (px)</label>
 			<label index="imageorient">Position:</label>
-			<label index="imageorient_formlabel">Position and alignment</label>
+			<label index="imageorient_formlabel">Position and Alignment</label>
 			<label index="imageorient.I.0">Above, center</label>
 			<label index="imageorient.I.1">Above, right</label>
 			<label index="imageorient.I.2">Above, left</label>
@@ -119,19 +119,16 @@
 			<label index="imageorient.I.9">Beside text, right</label>
 			<label index="imageorient.I.10">Beside text, left</label>
 			<label index="imageborder">Border:</label>
-			<label index="imageborder.I.0">Activate</label>
 			<label index="imageborder_formlabel">Border</label>
 			<label index="image_noRows">No rows:</label>
-			<label index="image_noRows.I.0">Deactivate</label>
-			<label index="image_noRows_formlabel">Horizontal rows</label>
+			<label index="image_noRows_formlabel">Display as Rows</label>
 			<label index="image_link">Link:</label>
-			<label index="image_link_formlabel">Links (separate with commas)</label>
+			<label index="image_link_formlabel">Links (Separate with Commas, One Link per Image)</label>
 			<label index="image_zoom">Click-enlarge:</label>
-			<label index="image_zoom_formlabel">On click</label>
-			<label index="image_zoom.I.0">Enlarge</label>
+			<label index="image_zoom_formlabel">Enlarge on Click</label>
 			<label index="image_effects">Effects:</label>
-			<label index="image_effects_formlabel">Effects</label>
-			<label index="image_effects.I.0">(None)</label>
+			<label index="image_effects_formlabel">Effect</label>
+			<label index="image_effects.I.0">None</label>
 			<label index="image_effects.I.1">Rotate 90 CW</label>
 			<label index="image_effects.I.2">Rotate -90 CCW</label>
 			<label index="image_effects.I.3">Rotate 180</label>
@@ -153,45 +150,46 @@
 			<label index="image_frames.I.7">Frame 7</label>
 			<label index="image_frames.I.8">Frame 8</label>
 			<label index="image_compression">Image quality/processing:</label>
-			<label index="image_compression_formlabel">Quality and type</label>
-			<label index="image_compression.I.1">None (ignores all other options!)</label>
+			<label index="image_compression_formlabel">Quality and Type</label>
+			<label index="image_compression.I.1">None (ignores all other options)</label>
 			<label index="image_compression.I.15">JPG/Very High</label>
 			<label index="image_compression.I.16">JPG/High</label>
 			<label index="image_compression.I.17">JPG/Medium</label>
 			<label index="image_compression.I.18">JPG/Low</label>
 			<label index="image_compression.I.19">JPG/Very Low</label>
 			<label index="imagecols">Columns:</label>
-			<label index="imagecols_formlabel">Number of columns</label>
+			<label index="imagecols_formlabel">Number of Columns</label>
 			<label index="imagecaption_position">Align:</label>
-			<label index="imagecaption_position_formlabel">Caption alignment</label>
+			<label index="imagecaption_position_formlabel">Caption Alignment</label>
 			<label index="imagecaption_position.I.1">Center</label>
 			<label index="imagecaption_position.I.2">Right</label>
 			<label index="imagecaption_position.I.3">Left</label>
 			<label index="image_altText">Alternative Text:</label>
-			<label index="altText_formlabel">Alternative texts (separate with breaks)</label>
+			<label index="altText_formlabel">Alternative Labels (One per Line)</label>
 			<label index="image_titleText">Title Text:</label>
-			<label index="titleText_formlabel">Titles (separate with breaks)</label>
+			<label index="titleText_formlabel">Titles (One per Line)</label>
 			<label index="image_longdescURL">Long Description URL:</label>
-			<label index="longdescURL_formlabel">URLs for a longer description (separate with breaks)</label>
-			<label index="cols">Table Columns:</label>
+			<label index="longdescURL_formlabel">Long Description URLs (One per Line)</label>
+			<label index="cols">Columns</label>
 			<label index="cols.I.0">Auto</label>
+			<label index="recursive.I.0">0 levels (only selected page)</label>
 			<label index="recursive.I.1">1 level</label>
 			<label index="recursive.I.2">2 levels</label>
 			<label index="recursive.I.3">3 levels</label>
 			<label index="recursive.I.4">4 levels</label>
 			<label index="recursive.I.5">Infinite</label>
-			<label index="menu_type">Menu type:</label>
-			<label index="menu_type_formlabel">Menu type</label>
-			<label index="menu_type.I.0">Menu of these pages</label>
-			<label index="menu_type.I.1">Menu of subpages to these pages</label>
-			<label index="menu_type.I.2">Menu of subpages to these pages (with abstract)</label>
-			<label index="menu_type.I.3">Menu of subpages to these pages + sections</label>
+			<label index="menu_type">Menu Type</label>
+			<label index="menu_type_formlabel">Menu Type</label>
+			<label index="menu_type.I.0">Menu of selected pages</label>
+			<label index="menu_type.I.1">Menu of subpages of selected pages</label>
+			<label index="menu_type.I.2">Menu of subpages of selected pages including abstracts</label>
+			<label index="menu_type.I.3">Menu of subpages of selected pages including sections</label>
 			<label index="menu_type.I.4">Sitemap</label>
-			<label index="menu_type.I.5">Section index (pagecontent w/Index checked)</label>
+			<label index="menu_type.I.5">Section index (page content marked for section menus)</label>
 			<label index="menu_type.I.6">Recently updated pages</label>
 			<label index="menu_type.I.7">Related pages (based on keywords)</label>
 			<label index="list_type">Plugin:</label>
-			<label index="list_type_formlabel">Selected plugin</label>
+			<label index="list_type_formlabel">Selected Plugin</label>
 			<label index="table_bgColor">Backgr. Color:</label>
 			<label index="table_bgColor_formlabel">Background color</label>
 			<label index="table_bgColor.I.1">Color 1</label>
@@ -208,21 +206,20 @@
 			<label index="table_cellspacing_formlabel">Cellspacing (px)</label>
 			<label index="table_cellpadding">Cellpadding:</label>
 			<label index="table_cellpadding_formlabel">Cellpadding (px)</label>
-			<label index="media">Files:</label>
-			<label index="media.ALT.uploads_formlabel">Or select files manually</label>
+			<label index="media">Files</label>
+			<label index="media.ALT.uploads_formlabel">Select Files</label>
 			<label index="multimedia">File:</label>
 			<label index="multimedia_formlabel">Selected media file</label>
 			<label index="filelink_size">Show filesize:</label>
-			<label index="filelink_size.I.0">Activate</label>
-			<label index="filelink_size_formlabel">Filesize information</label>
+			<label index="filelink_size_formlabel">Display Filesize Information</label>
 			<label index="records">Items:</label>
 			<label index="records_formlabel">Records</label>
 			<label index="spaceBefore">Before:</label>
-			<label index="spaceBefore_formlabel">Top margin</label>
+			<label index="spaceBefore_formlabel">Top Margin</label>
 			<label index="spaceAfter">After:</label>
-			<label index="spaceAfter_formlabel">Bottom margin</label>
+			<label index="spaceAfter_formlabel">Bottom Margin</label>
 			<label index="section_frame">Frame:</label>
-			<label index="section_frame_formlabel">Indentations and frames</label>
+			<label index="section_frame_formlabel">Indentation and Frames</label>
 			<label index="section_frame.I.1">Invisible</label>
 			<label index="section_frame.I.2">Ruler before</label>
 			<label index="section_frame.I.3">Ruler after</label>
@@ -239,55 +236,52 @@
 			<label index="splash_layout.I.4">__Graphical:__</label>
 			<label index="splash_layout.I.5">Postit 1</label>
 			<label index="sectionIndex">Index:</label>
-			<label index="sectionIndex_formlabel">In section menus</label>
-			<label index="sectionIndex.I.0">Visible</label>
+			<label index="sectionIndex_formlabel">Show in Section Menus</label>
 			<label index="linkToTop">To top:</label>
-			<label index="linkToTop_formlabel">Link to top of page</label>
-			<label index="linkToTop.I.0">Activate</label>
+			<label index="linkToTop_formlabel">Append with Link to Top of Page</label>
 			<label index="rte_enabled">Disable Rich Text Editor:</label>
-			<label index="rte_enabled_formlabel">Rich Text Editor for this text</label>
-			<label index="rte_enabled.I.0">Disable</label>			
-			<label index="pi_flexform">Plugin Options:</label>
+			<label index="rte_enabled_formlabel">Rich Text Editor</label>
+			<label index="pi_flexform">Plugin Options</label>
 			<label index="ALT.imgOptions">Image Options</label>
 			<label index="ALT.imgLinks">Image Links</label>
 			<label index="ALT.imgDimensions">Image Dimensions</label>
-			<label index="select_key_formlabel">Code for this plugin</label>
+			<label index="select_key_formlabel">Plugin Mode</label>
 			<label index="select_key.ALT.uploads">Read from path:</label>
-			<label index="select_key.ALT.uploads_formlabel">Read from this path</label>
+			<label index="select_key.ALT.uploads_formlabel">Path</label>
 			<label index="select_key.ALT.script_formlabel">PHP Code</label>
 			<label index="imagecaption.ALT.uploads">Descriptions:</label>
-			<label index="imagecaption.ALT.uploads_formlabel">File descriptions (separate with breaks)</label>
+			<label index="imagecaption.ALT.uploads_formlabel">File Descriptions (One per Line)</label>
 			<label index="imagecaption.ALT.script">Comments:</label>
 			<label index="bodytext.ALT.mailform">Configuration:</label>
-			<label index="bodytext.ALT.mailform_formlabel">Form</label>
-			<label index="pages.ALT.mailform">Jump to page:</label>
+			<label index="bodytext.ALT.mailform_formlabel">Form Structure</label>
+			<label index="pages.ALT.mailform">Target Page</label>
 			<label index="pages.ALT.searchform">Target page</label>
 			<label index="pages.ALT.loginform">Selected pages: Target (1st), FE user container (2nd)</label>
 			<label index="pages.ALT.search">Send to page:</label>
 			<label index="pages.ALT.login">Send to page:</label>
 			<label index="pages.ALT.menu_formlabel">Selected pages</label>
-			<label index="pages.ALT.list_formlabel">Starting point for this plugin</label>
+			<label index="pages.ALT.list_formlabel">Record Storage Page</label>
 			<label index="pages.ALT.script_formlabel">Starting point for this script</label>
 			<label index="subheader.ALT.mailform">Recipient-email:</label>
-			<label index="subheader.ALT.mailform_formlabel">Recipient email</label>
+			<label index="subheader.ALT.mailform_formlabel">Recipient Email</label>
 			<label index="bodytext.ALT.html">HTML:</label>
 			<label index="tabs.text">Text</label>
 			<label index="tabs.media">Media</label>
 			<label index="tabs.plugin">Plugin</label>
 			<label index="media.options">Media Options</label>
-			<label index="media.url">relative Path of Media File or URL</label>
+			<label index="media.url">Path or URL</label>
 			<label index="media.browseUrlTitle">Select File or URL</label>
 			<label index="media.width">Media Width</label>
 			<label index="media.height">Media Height</label>
-			<label index="media.forcePlayer">Use Player (only for Shockwave Flash)</label>
+			<label index="media.forcePlayer">Use Player (Flash Only)</label>
 			<label index="media.type">Media Type</label>
 			<label index="media.type.video">Video</label>
 			<label index="media.type.audio">Audio</label>
 			<label index="media.renderType">Render Type</label>
 			<label index="media.renderType.auto">Auto</label>
-			<label index="media.renderType.swf">Shockwave Flash Browser Plugin</label>
+			<label index="media.renderType.swf">Flash Browser Plugin</label>
 			<label index="media.renderType.qt">QuickTime Browser Plugin</label>
-			<label index="media.renderType.embed">HTML Embed Element</label>
+			<label index="media.renderType.embed">Native HTML Embed Element</label>
 			<label index="media.additionalOptions">Additional Parameters</label>
 			<label index="media.params">Media Parameter</label>
 			<label index="media.params.option">Option</label>
@@ -308,43 +302,44 @@
 			<label index="media.params.customEntryLabel">Enter flashvars, params or attributes</label>
 			<label index="media.noFile">ERROR: Missing URL or File!</label>
 			<label index="sys_language_uid_formlabel">Language</label>
-			<label index="subheader_formlabel">Secondary headline</label>
-			<label index="hidden_formlabel">Content element</label>
-			<label index="hidden.I.0">Disable</label>
-			<label index="starttime_formlabel">Release date</label>
-			<label index="endtime_formlabel">Expiration date</label>
-			<label index="fe_group_formlabel">Usergroups and general login response</label>
-			<label index="layout_formlabel">Frontend variants</label>
+			<label index="subheader_formlabel">Subheader</label>
+			<label index="hidden_formlabel">Content Element</label>
+			<label index="starttime_formlabel">Publish Date</label>
+			<label index="endtime_formlabel">Expiration Date</label>
+			<label index="fe_group_formlabel">Usergroup Access Rights</label>
+			<label index="layout_formlabel">Layout</label>
 			<label index="bodytext_formlabel">Text</label>
-			<label index="bodytext.ALT.bulletlist_formlabel">Bulletlist</label>
-			<label index="bodytext.ALT.table_formlabel">Table</label>
-			<label index="bodytext.ALT.media_formlabel">Alternative content</label>
+			<label index="bodytext.ALT.bulletlist_formlabel">Bullet List</label>
+			<label index="bodytext.ALT.table_formlabel">Table Structure</label>
+			<label index="bodytext.ALT.media_formlabel">Alternative Content</label>
 			<label index="bodytext.ALT.multimedia_formlabel">Parameters</label>
 			<label index="bodytext.ALT.textbox_formlabel">Text</label>
 			<label index="bodytext.ALT.script_formlabel">Parameters to pass to the script</label>
-			<label index="bodytext.ALT.html_formlabel">HTML code</label>
-			<label index="image_formlabel">Image files</label>
+			<label index="bodytext.ALT.html_formlabel">HTML Code</label>
+			<label index="image_formlabel">Images</label>
 			<label index="image.ALT.textbox_formlabel">Image files</label>
-			<label index="imagecaption_formlabel">Captions (separate with breaks)</label>
+			<label index="imagecaption_formlabel">Captions (One per Line)</label>
 			<label index="imagecaption.ALT.script_formlabel">Comments</label>
 			<label index="palette.general">Content Element</label>
 			<label index="palette.headers">Headlines</label>
-			<label index="palette.header">Headline</label>
-			<label index="palette.visibility">General visibility</label>
-			<label index="palette.access">Access times and rights</label>
-			<label index="palette.frames">General layout</label>
+			<label index="palette.header">Header</label>
+			<label index="palette.visibility">Visibility</label>
+			<label index="palette.access">Publish Dates and Access Rights</label>
+			<label index="palette.frames">Content Element Layout</label>
 			<label index="palette.textlayout">Text layout</label>
-			<label index="palette.imagefiles">Image files and captions</label>
-			<label index="palette.imagelinks">Click response for images</label>
-			<label index="palette.image_accessibility">Accessibility texts</label>
-			<label index="palette.image_settings">Image Settings</label>
-			<label index="palette.imageblock">Image block settings</label>
-			<label index="palette.mailform">Target and recipient</label>
-			<label index="palette.searchform">Search results</label>
+			<label index="palette.imagefiles">Images and Captions</label>
+			<label index="palette.imagelinks">Behavior</label>
+			<label index="palette.image_accessibility">Accessibility</label>
+			<label index="palette.image_settings">Image Adjustments</label>
+			<label index="palette.imageblock">Image Alignment</label>
+			<label index="palette.mailform">Target and Recipient</label>
+			<label index="palette.searchform">Search Results</label>
 			<label index="palette.loginform">Redirect target and FE user container</label>
 			<label index="palette.multimediafiles">Media files and parameters</label>
 			<label index="palette.textbox">Render text into images</label>
-			<label index="palette.menu">Menus and sitemaps</label>
+			<label index="palette.menu">Menu and Sitemap</label>
+			<label index="palette.uploads_layout">Filelinks Layout</label>
+			<label index="palette.table_layout">Table Layout</label>
 			<label index="tabs.access">Access</label>
 			<label index="tabs.appearance">Appearance</label>
 			<label index="tabs.behaviour">Behaviour</label>
Index: typo3/sysext/cms/tbl_tt_content.php
===================================================================
--- typo3/sysext/cms/tbl_tt_content.php	(revision 9924)
+++ typo3/sysext/cms/tbl_tt_content.php	(working copy)
@@ -171,9 +171,10 @@
 			'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:hidden.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -273,7 +274,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						'0',
 					),
 					array(
@@ -349,7 +350,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						'',
 					),
 					array(
@@ -397,7 +398,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						'0',
 					),
 					array(
@@ -798,7 +799,7 @@
 				'type' => 'check',
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:imageborder.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -808,9 +809,10 @@
 			'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -844,7 +846,7 @@
 				'type' => 'check',
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:image_zoom.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -1089,7 +1091,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
 						'',
 					),
 					array(
@@ -1208,7 +1210,7 @@
 				'type' => 'select',
 				'items' => array(
 					array(
-						'',
+						'LLL:EXT:cms/locallang_ttc.xml:recursive.I.0',
 						'0',
 					),
 					array(
@@ -1435,7 +1437,7 @@
 				'type' => 'check',
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:filelink_size.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -1575,7 +1577,7 @@
 				'default' => 1,
 				'items' => array (
 					'1'	=> array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:sectionIndex.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -1587,7 +1589,7 @@
 				'type' => 'check',
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:linkToTop.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 		),
@@ -1597,10 +1599,11 @@
 			'label' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled',
 			'config' => array(
 				'type' => 'check',
+				'renderInverted' => TRUE,
 				'showIfRTE' => 1,
 				'items' => array(
 					'1' => array(
-						'0' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled.I.0',
+						'0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
 					),
 				),
 			),
@@ -1742,7 +1745,7 @@
 					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
 				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
 					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;Table layout;tablelayout,
+					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.table_layout;tablelayout,
 					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
 				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
 		),
@@ -1768,7 +1771,7 @@
 					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
 				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
 					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-					--palette--;Filelinks layout;uploadslayout,
+					--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.uploads_layout;uploadslayout,
 				--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
 		),
 		'multimedia' =>	array(
@@ -2024,7 +2027,7 @@
 			'canNotCollapse' => 1,
 		),
 		'mailform' => array(
-			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.forms, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader.ALT.mailform_formlabel',
+			'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader.ALT.mailform_formlabel',
 			'canNotCollapse' => 1,
 		),
 		'searchform' => array(
Index: typo3/sysext/cms/locallang_tca.xml
===================================================================
--- typo3/sysext/cms/locallang_tca.xml	(revision 9924)
+++ typo3/sysext/cms/locallang_tca.xml	(working copy)
@@ -10,71 +10,68 @@
 			<label index="mod_tx_cms_webinfo_lang">Localization overview</label>
 			<label index="pages.palettes.standard">Page</label>
 			<label index="pages.palettes.title">Title</label>
-			<label index="pages.palettes.visibility">General visibility</label>
-			<label index="pages.palettes.access">Access times and rights</label>
+			<label index="pages.palettes.visibility">Visibility</label>
+			<label index="pages.palettes.access">Publish Dates and Access Rights</label>
 			<label index="pages.palettes.abstract">Abstract</label>
-			<label index="pages.palettes.metatags">Meta tags</label>
+			<label index="pages.palettes.metatags">Meta Tags</label>
 			<label index="pages.palettes.editorial">Editorial</label>
 			<label index="pages.palettes.abstract">Abstract</label>
-			<label index="pages.palettes.layout">Layout</label>
-			<label index="pages.palettes.module">Marked as container for</label>
-			<label index="pages.palettes.replace">Replace content</label>
-			<label index="pages.palettes.links">Links to this page</label>
+			<label index="pages.palettes.layout">Page Layout</label>
+			<label index="pages.palettes.module">Use as Container</label>
+			<label index="pages.palettes.replace">Replace Content</label>
+			<label index="pages.palettes.links">Links to this Page</label>
 			<label index="pages.palettes.caching">Caching</label>
 			<label index="pages.palettes.language">Language</label>
 			<label index="pages.palettes.miscellaneous">Miscellaneous</label>
 			<label index="pages.palettes.media">Files</label>
-			<label index="pages.palettes.storage">General record storage</label>
-			<label index="pages.palettes.config">Special configuration</label>
+			<label index="pages.palettes.storage">General Record Storage Page</label>
+			<label index="pages.palettes.config">TypoScript Configuration</label>
 			<label index="pages.doktype_formlabel">Type</label>
 			<label index="pages.doktype.I.0">Advanced</label>
 			<label index="pages.doktype.I.2">Shortcut</label>
 			<label index="pages.doktype.I.3">Not in menu</label>
 			<label index="pages.doktype.I.4">Backend User Section</label>
 			<label index="pages.doktype.I.5">Mount Point</label>
-			<label index="pages.doktype.I.7">Visual menu separator</label>
-			<label index="pages.doktype.I.8">Link to external URL</label>
+			<label index="pages.doktype.I.7">Menu Separator</label>
+			<label index="pages.doktype.I.8">Link to External URL</label>
 			<label index="pages.doktype.div.page">Page</label>
 			<label index="pages.doktype.div.link">Link</label>
 			<label index="pages.doktype.div.special">Special</label>
-			<label index="pages.title_formlabel">Main title</label>
-			<label index="pages.starttime_formlabel">Release time</label>
-			<label index="pages.endtime_formlabel">Expiration time</label>
-			<label index="pages.fe_group_formlabel">Usergroups and general login response</label>
+			<label index="pages.title_formlabel">Page Title</label>
+			<label index="pages.starttime_formlabel">Publish Date</label>
+			<label index="pages.endtime_formlabel">Expiration Date</label>
+			<label index="pages.fe_group_formlabel">Usergroup Access Rights</label>
 			<label index="pages.hidden">Hide page:</label>
 			<label index="pages.hidden_formlabel">Page</label>
-			<label index="pages.hidden_checkbox_1_formlabel">Disable</label>
-			<label index="pages.layout_formlabel">Frontend variants</label>
+			<label index="pages.layout_formlabel">Frontend Layout</label>
 			<label index="pages.layout.I.1">Layout 1</label>
 			<label index="pages.layout.I.2">Layout 2</label>
 			<label index="pages.layout.I.3">Layout 3</label>
 			<label index="pages.url_scheme">Enforce Protocol:</label>
-			<label index="pages.url_scheme_formlabel">Enforce Protocol</label>
+			<label index="pages.url_scheme_formlabel">Use Protocol</label>
 			<label index="pages.url_scheme.http">http://</label>
 			<label index="pages.url_scheme.https">https://</label>
 			<label index="pages.extendToSubpages">Include subpages:</label>
-			<label index="pages.extendToSubpages_formlabel">Inherit time and rights settings</label>
-			<label index="pages.extendToSubpages_checkbox_1_formlabel">on subpages</label>
+			<label index="pages.extendToSubpages_formlabel">Include Subpages</label>
 			<label index="pages.nav_title">Navigation title:</label>
-			<label index="pages.nav_title_formlabel">Alternative navigation title</label>
+			<label index="pages.nav_title_formlabel">Alternative Navigation Title</label>
 			<label index="pages.nav_hide">Hide in menu:</label>
-			<label index="pages.nav_hide_formlabel">In menus</label>
-			<label index="pages.nav_hide_checkbox_1_formlabel">hide</label>
+			<label index="pages.nav_hide_formlabel">Show in Menus</label>
 			<label index="pages.subtitle">Subtitle:</label>
 			<label index="pages.subtitle_formlabel">Subtitle</label>
 			<label index="pages.target">Target:</label>
-			<label index="pages.target_formlabel">Open with these target settings</label>
+			<label index="pages.target_formlabel">Link Target</label>
 			<label index="pages.alias">Alias:</label>
-			<label index="pages.alias_formlabel">Use this alias in simulated paths</label>
+			<label index="pages.alias_formlabel">URL Alias</label>
 			<label index="pages.url">URL:</label>
 			<label index="pages.url_formlabel">URL</label>
 			<label index="pages.urltype_formlabel">Protocol</label>
 			<label index="pages.lastUpdated">Last updated:</label>
-			<label index="pages.lastUpdated_formlabel">Latest update</label>
+			<label index="pages.lastUpdated_formlabel">Last Update</label>
 			<label index="pages.newUntil">'New' until:</label>
-			<label index="pages.newUntil_formlabel">Mark as 'New' until</label>
+			<label index="pages.newUntil_formlabel">Mark as 'New' Until</label>
 			<label index="pages.cache_timeout">Cache expires:</label>
-			<label index="pages.cache_timeout_formlabel">Cache lifetime</label>
+			<label index="pages.cache_timeout_formlabel">Cache Lifetime</label>
 			<label index="pages.cache_timeout.I.1">1 min</label>
 			<label index="pages.cache_timeout.I.2">5 min</label>
 			<label index="pages.cache_timeout.I.3">15 min</label>
@@ -85,8 +82,7 @@
 			<label index="pages.cache_timeout.I.8">2 days</label>
 			<label index="pages.cache_timeout.I.9">7 days</label>
 			<label index="pages.cache_timeout.I.10">1 month</label>
-			<label index="pages.editlock_formlabel">Editable for</label>
-			<label index="pages.editlock_checkbox_1_formlabel">Admins only</label>
+			<label index="pages.editlock_formlabel">Editable for Admins only</label>
 			<label index="pages.tabs.metadata">Metadata</label>
 			<label index="pages.tabs.files">Resources</label>
 			<label index="pages.tabs.resources">Resources</label>
@@ -100,38 +96,35 @@
 			<label index="pages.tabs.behaviour">Behaviour</label>
 			<label index="pages.no_cache">No cache:</label>
 			<label index="pages.no_cache_formlabel">Cache</label>
-			<label index="pages.no_cache_checkbox_1_formlabel">Disable</label>
 			<label index="pages.no_search">No search:</label>
-			<label index="pages.no_search_formlabel">Indexed search</label>
-			<label index="pages.no_search_checkbox_1_formlabel">Disable</label>
+			<label index="pages.no_search_formlabel">Include in Search</label>
 			<label index="pages.shortcut_mode">Shortcut mode:</label>
-			<label index="pages.shortcut_mode_formlabel">Shortcut mode</label>
+			<label index="pages.shortcut_mode_formlabel">Shortcut Mode</label>
 			<label index="pages.shortcut_mode.I.0">Selected page</label>
-			<label index="pages.shortcut_mode.I.1">First subpage</label>
-			<label index="pages.shortcut_mode.I.2">Random subpage</label>
-			<label index="pages.shortcut_mode.I.3">Parent page</label>
-			<label index="pages.shortcut_formlabel">Selected shortcut target</label>
+			<label index="pages.shortcut_mode.I.1">First subpage of current page</label>
+			<label index="pages.shortcut_mode.I.2">Random subpage of current page</label>
+			<label index="pages.shortcut_mode.I.3">Parent page of current page</label>
+			<label index="pages.shortcut_formlabel">Shortcut Target</label>
 			<label index="pages.content_from_pid">Show content from this page instead:</label>
-			<label index="pages.content_from_pid_formlabel">With content of the selected page</label>
+			<label index="pages.content_from_pid_formlabel">Show Content from Page</label>
 			<label index="pages.mount_pid">Mount Point (advanced):</label>
 			<label index="pages.mount_pid_formlabel">Mounted page</label>
 			<label index="pages.mount_pid_ol">Substitute Mount Point (this page) with Mounted page:</label>
-			<label index="pages.mount_pid_ol.I.0">This page</label>
-			<label index="pages.mount_pid_ol.I.1">Mounted page</label>
-			<label index="pages.mount_pid_ol_formlabel">Show content of</label>
+			<label index="pages.mount_pid_ol_formlabel">Show Content from</label>
+			<label index="pages.mount_pid_ol.I.0">This Page</label>
+			<label index="pages.mount_pid_ol.I.1">Mounted Page</label>
 			<label index="pages.abstract">Abstract:</label>
-			<label index="pages.abstract_formlabel">Used internally for teasers and menus</label>
-			<label index="pages.keywords_formlabel">Keywords (SEO)</label>
-			<label index="pages.description_formlabel">Description (SEO)</label>
-			<label index="pages.author_formlabel">Author name</label>
-			<label index="pages.author_email_formlabel">Author email</label>
+			<label index="pages.abstract_formlabel">Abstract</label>
+			<label index="pages.keywords_formlabel">Keywords</label>
+			<label index="pages.description_formlabel">Description</label>
+			<label index="pages.author_formlabel">Author Name</label>
+			<label index="pages.author_email_formlabel">Author Email</label>
 			<label index="pages.media">Files:</label>
-			<label index="pages.media_formlabel">Currently attached to this page</label>
+			<label index="pages.media_formlabel">Media</label>
 			<label index="pages.is_siteroot">Is root of website:</label>
-			<label index="pages.is_siteroot_formlabel">Set this page</label>
-			<label index="pages.is_siteroot_checkbox_1_formlabel">As site root</label>
+			<label index="pages.is_siteroot_formlabel">Use as Root Page</label>
 			<label index="pages.module">Contains plugin:</label>
-			<label index="pages.module_formlabel">Selected plugin</label>
+			<label index="pages.module_formlabel">Contains Plugin</label>
 			<label index="pages.module.I.1">Shop</label>
 			<label index="pages.module.I.2">Board</label>
 			<label index="pages.module.I.3">News</label>
@@ -144,16 +137,16 @@
 			<label index="pages.l18n_cfg.I.2">Hide page if no translation for current language exists</label>
 			<label index="pages.l18n_cfg.I.2a">Show page even if no translation exists</label>
 			<label index="pages.fe_login_mode">Login Mode:</label>
-			<label index="pages.fe_login_mode_formlabel">Login behaviour</label>
+			<label index="pages.fe_login_mode_formlabel">Login Behaviour</label>
 			<label index="pages.fe_login_mode.disable">Disable</label>
-			<label index="pages.fe_login_mode.disableAll">Disable user login completely</label>
-			<label index="pages.fe_login_mode.disableGroups">Allow logins, but not usergroups</label>
-			<label index="pages.fe_login_mode.enable">Enable</label>
-			<label index="pages.fe_login_mode.enableAgain">Enable logins again</label>
-			<label index="pages.storage_pid_formlabel">On selected page</label>
-			<label index="pages.TSconfig_formlabel">TSconfig</label>
+			<label index="pages.fe_login_mode.enable">Enable login</label>
+			<label index="pages.fe_login_mode.disableAll">Disable login</label>
+			<label index="pages.fe_login_mode.disableGroups">Enable user login, Disable usergroup login</label>
+			<label index="pages.fe_login_mode.enableAgain">Re-Enable login</label>
+			<label index="pages.storage_pid_formlabel">Page</label>
+			<label index="pages.TSconfig_formlabel">Page TSConfig</label>
 			<label index="pages.be_layout_formlabel">Backend Layout</label>
- 			<label index="pages.be_layout_next_level_formlabel">Backend Layout (on next level)</label>
+ 			<label index="pages.be_layout_next_level_formlabel">Backend Layout (On Next Level)</label>
 			<label index="tt_content">Pagecontent</label>
 			<label index="fe_users">Website user</label>
 			<label index="fe_users.username">Username:</label>
Index: typo3/sysext/felogin/locallang_db.xml
===================================================================
--- typo3/sysext/felogin/locallang_db.xml	(revision 9924)
+++ typo3/sysext/felogin/locallang_db.xml	(working copy)
@@ -7,29 +7,29 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="tt_content.CType_pi1">Website User Login</label>
-			<label index="felogin_redirectPid">Redirect at Login to Page (felogin):</label>
-			<label index="tt_content.pi_flexform.general_header">General Header:</label>
-			<label index="tt_content.pi_flexform.general_message">General Message:</label>
-			<label index="tt_content.pi_flexform.redirect_header">Redirect Header:</label>
-			<label index="tt_content.pi_flexform.redirect_message">Redirect Message:</label>
-			<label index="tt_content.pi_flexform.welcome_header">Welcome Header:</label>
-			<label index="tt_content.pi_flexform.welcome_message">Welcome Message:</label>
-			<label index="tt_content.pi_flexform.success_header">Login Success Header:</label>
-			<label index="tt_content.pi_flexform.success_message">Login Success Message:</label>
-			<label index="tt_content.pi_flexform.error_header">Login Error Header:</label>
-			<label index="tt_content.pi_flexform.error_message">Login Error Message:</label>
-			<label index="tt_content.pi_flexform.status_header">Status Display Header:</label>
-			<label index="tt_content.pi_flexform.status_message">Status Display Message:</label>
-			<label index="tt_content.pi_flexform.logout_header">Logout Header:</label>
-			<label index="tt_content.pi_flexform.logout_message">Logout Message:</label>
-			<label index="tt_content.pi_flexform.forgot_header">Forgot Password Header:</label>
-			<label index="tt_content.pi_flexform.forgot_message">Forgot Password Message:</label>
+			<label index="felogin_redirectPid">Redirect at Login to Page (felogin)</label>
+			<label index="tt_content.pi_flexform.general_header">General Header</label>
+			<label index="tt_content.pi_flexform.general_message">General Message</label>
+			<label index="tt_content.pi_flexform.redirect_header">Redirect Header</label>
+			<label index="tt_content.pi_flexform.redirect_message">Redirect Message</label>
+			<label index="tt_content.pi_flexform.welcome_header">Welcome Header</label>
+			<label index="tt_content.pi_flexform.welcome_message">Welcome Message</label>
+			<label index="tt_content.pi_flexform.success_header">Login Success Header</label>
+			<label index="tt_content.pi_flexform.success_message">Login Success Message</label>
+			<label index="tt_content.pi_flexform.error_header">Login Error Header</label>
+			<label index="tt_content.pi_flexform.error_message">Login Error Message</label>
+			<label index="tt_content.pi_flexform.status_header">Status Display Header</label>
+			<label index="tt_content.pi_flexform.status_message">Status Display Message</label>
+			<label index="tt_content.pi_flexform.logout_header">Logout Header</label>
+			<label index="tt_content.pi_flexform.logout_message">Logout Message</label>
+			<label index="tt_content.pi_flexform.forgot_header">Forgot Password Header</label>
+			<label index="tt_content.pi_flexform.forgot_message">Forgot Password Message</label>
 			<label index="tt_content.pi_flexform.sheet_general">General</label>
-			<label index="tt_content.pi_flexform.sheet_redirect">Redirect Options</label>
+			<label index="tt_content.pi_flexform.sheet_redirect">Redirects</label>
 			<label index="tt_content.pi_flexform.sheet_messages">Messages</label>
-			<label index="tt_content.pi_flexform.show_forgot_password">Show &quot;Forgot password?&quot; link:</label>
-			<label index="tt_content.pi_flexform.show_permalogin">Show &quot;Stay logged in&quot; checkbox (if switched on for the installation):</label>
-			<label index="tt_content.pi_flexform.show_logoutFormAfterLogin">Show logout form after successful login:</label>
+			<label index="tt_content.pi_flexform.show_forgot_password">Display Password Recovery Link</label>
+			<label index="tt_content.pi_flexform.show_permalogin">Display Remember Login Option</label>
+			<label index="tt_content.pi_flexform.show_logoutFormAfterLogin">Display Logout Form After Successful Login</label>
 			<label index="tt_content.pi_flexform.groupSelectmode">FE group select mode:</label>
 			<label index="tt_content.pi_flexform.groupSelectmode_showAll">Show all</label>
 			<label index="tt_content.pi_flexform.groupSelectmode_showSelected">Show selected</label>
@@ -40,21 +40,22 @@
 			<label index="tt_content.pi_flexform.field_manualOrder">Using fieldlists below:</label>
 			<label index="tt_content.pi_flexform.field_orderList">User Fields/list:</label>
 			<label index="tt_content.pi_flexform.field_orderDetails">User Fields/details:</label>
-			<label index="tt_content.pi_flexform.redirectMode">Redirect Mode (you have to choose the options, without defined Mode there is no redirect):</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.0">defined by Usergroup Record</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.1">defined by User Record</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.2">after Login (TS or Flexform)</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.3">after Logout (TS or Flexform)</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.4">after Login Error (TS or Flexform)</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.5">defined by GET/POST-Vars</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.6">defined by Referrer</label>
-			<label index="tt_content.pi_flexform.redirectMode.I.7">defined by Domain entries</label>
-			<label index="tt_content.pi_flexform.redirectFirstMethod">Use the first mode found:</label>
-			<label index="tt_content.pi_flexform.redirectDisable">Disable redirect:</label>
-			<label index="tt_content.pi_flexform.redirectPageLogin">After successful login redirect to page:</label>
-			<label index="tt_content.pi_flexform.redirectPageLoginError">After login with error redirect to page:</label>
-			<label index="tt_content.pi_flexform.redirectPageLogout">After logout redirect to page:</label>
-			<label index="tt_content.pi_flexform.template_file">Template file:</label>
+			<label index="tt_content.pi_flexform.redirectMode">Redirect Mode</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.0">Defined by Usergroup Record</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.1">Defined by User Record</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.2">After Login (TS or Flexform)</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.3">After Logout (TS or Flexform)</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.4">After Login Error (TS or Flexform)</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.5">Defined by GET/POST Parameters</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.6">Defined by Referrer</label>
+			<label index="tt_content.pi_flexform.redirectMode.I.7">Defined by Domain Entries</label>
+			<label index="tt_content.pi_flexform.redirectFirstMethod">Use First Supported Mode from Selection</label>
+			<label index="tt_content.pi_flexform.redirectDisable">Enable Redirect</label>
+			<label index="tt_content.pi_flexform.redirectPageLogin">After Successful Login Redirect to Page</label>
+			<label index="tt_content.pi_flexform.redirectPageLoginError">After Failed Login Redirect to Page</label>
+			<label index="tt_content.pi_flexform.redirectPageLogout">After Logout Redirect to Page</label>
+			<label index="tt_content.pi_flexform.template_file">Template File</label>
+			<label index="tt_content.pi_flexform.user_storage">User Storage Page</label>
 		</languageKey>
 	</data>
 </T3locallang>
Index: typo3/sysext/felogin/flexform.xml
===================================================================
--- typo3/sysext/felogin/flexform.xml	(revision 9924)
+++ typo3/sysext/felogin/flexform.xml	(working copy)
@@ -15,6 +15,12 @@
 							<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.show_forgot_password</label>
 							<config>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</showForgotPassword>
@@ -24,6 +30,12 @@
 							<config>
 								<default>1</default>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</showPermaLogin>
@@ -33,13 +45,19 @@
 							<config>
 								<default></default>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</showLogoutFormAfterLogin>
 					<pages>
 						<TCEforms>
 							<exclude>1</exclude>
-							<label>LLL:EXT:lang/locallang_general.php:LGL.startingpoint</label>
+							<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.user_storage</label>
 							<config>
 								<type>group</type>
 								<internal_type>db</internal_type>
@@ -59,27 +77,27 @@
 								<type>select</type>
 								<items type="array">
 									<numIndex index="0" type="array">
-										<numIndex index="0"></numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.0</numIndex>
 										<numIndex index="1"></numIndex>
 									</numIndex>
 									<numIndex index="1" type="array">
-										<numIndex index="0">LLL:EXT:cms/locallang_ttc.php:recursive.I.1</numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.1</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
 									<numIndex index="2" type="array">
-										<numIndex index="0">LLL:EXT:cms/locallang_ttc.php:recursive.I.2</numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.2</numIndex>
 										<numIndex index="1">2</numIndex>
 									</numIndex>
 									<numIndex index="3" type="array">
-										<numIndex index="0">LLL:EXT:cms/locallang_ttc.php:recursive.I.3</numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.3</numIndex>
 										<numIndex index="1">3</numIndex>
 									</numIndex>
 									<numIndex index="4" type="array">
-										<numIndex index="0">LLL:EXT:cms/locallang_ttc.php:recursive.I.4</numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.4</numIndex>
 										<numIndex index="1">4</numIndex>
 									</numIndex>
 									<numIndex index="5" type="array">
-										<numIndex index="0">LLL:EXT:cms/locallang_ttc.php:recursive.I.5</numIndex>
+										<numIndex index="0">LLL:EXT:cms/locallang_ttc.xml:recursive.I.5</numIndex>
 										<numIndex index="1">250</numIndex>
 									</numIndex>
 								</items>
@@ -165,6 +183,12 @@
 							<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectFirstMethod</label>
 							<config>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</redirectFirstMethod>
@@ -209,12 +233,18 @@
 								<show_thumbs>1</show_thumbs>
 							</config>
 						</TCEforms>
-					</redirectPageLogout>	
+					</redirectPageLogout>
 					<redirectDisable>
 						<TCEforms>
 							<label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectDisable</label>
 							<config>
 								<type>check</type>
+								<items type="array">
+									<numIndex index="1" type="array">
+										<numIndex index="0">LLL:EXT:lang/locallang_core.xml:labels.enabled</numIndex>
+										<numIndex index="1">1</numIndex>
+									</numIndex>
+								</items>
 							</config>
 						</TCEforms>
 					</redirectDisable>