Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js	(copie de travail)
@@ -82,7 +82,7 @@
 	 * LOCALIZATION                                    *
 	 ***************************************************/
 	localize: function (label) {
-		return HTMLArea.I18N.dialogs[label] || HTMLArea.I18N.tooltips[label] || HTMLArea.I18N.msg[label] || label;
+		return HTMLArea.I18N.dialogs[label] || HTMLArea.I18N.tooltips[label] || HTMLArea.I18N.msg[label] || '';
 	},
 	/***************************************************
 	 * INITIALIZATION                                  *
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js	(copie de travail)
@@ -178,6 +178,7 @@
 					tooltip		: this.localize(buttonId + '-Tooltip'),
 					iconCls		: 'htmlarea-action-' + button[3],
 					contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+					helpText	: this.localize(buttonId + '-helpText'),
 					action		: 'onButtonPress',
 					hotKey		: ((this.buttonsConfiguration[button[2]] && this.buttonsConfiguration[button[2]].hotKey) ? this.buttonsConfiguration[button[2]].hotKey : (button[1] ? button[1] : null))
 				};
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/locallang.xml	(copie de travail)
@@ -8,21 +8,33 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="Indent-Tooltip">Increase indent</label>
+			<label index="Indent-helpText">Increases text indentation</label>
 			<label index="Outdent-Tooltip">Reduce indent</label>
+			<label index="Outdent-helpText">Reduces text indentation</label>
 			<label index="Blockquote-Tooltip">Large quotation</label>
+			<label index="Blockquote-helpText">Makes a large quotation block</label>
 			<label index="FormatBlock-Tooltip">Type of block</label>
 			<label index="InsertParagraphBefore-Tooltip">Insert a paragraph before the current block</label>
+			<label index="InsertParagraphBefore-contextMenuTitle">Insert paragraph before</label>
+			<label index="InsertParagraphBefore-helpText">Inserts a paragraph before the current block</label>
 			<label index="InsertParagraphAfter-Tooltip">Insert a paragraph after the current block</label>
-			<label index="InsertParagraphBefore-contextMenuTitle">Insert paragraph before</label>
 			<label index="InsertParagraphAfter-contextMenuTitle">Insert paragraph after</label>
+			<label index="InsertParagraphAfter-helpText">Inserts a paragraph after the current block</label>
 			<label index="JustifyLeft-Tooltip">Justify left</label>
+			<label index="JustifyLeft-helpText">Aligns the text to the left</label>
 			<label index="JustifyCenter-Tooltip">Center</label>
+			<label index="JustifyCenter-helpText">Centers the text</label>
 			<label index="JustifyRight-Tooltip">Justify right</label>
+			<label index="JustifyRight-helpText">Aligns the text to the right</label>
 			<label index="JustifyFull-Tooltip">Justify left and right</label>
+			<label index="JustifyFull-helpText">Aligns the text both to the left and the right</label>
 			<label index="Left-Tooltip">Left</label>
 			<label index="InsertOrderedList-Tooltip">Ordered List</label>
+			<label index="InsertOrderedList-helpText">Makes an ordered list from the curent selection</label>
 			<label index="InsertUnorderedList-Tooltip">Bulleted List</label>
+			<label index="InsertUnorderedList-helpText">Makes an bulleted list from the curent selection</label>
 			<label index="InsertHorizontalRule-Tooltip">Horizontal Rule</label>
+			<label index="InsertHorizontalRule-helpText">Inserts an horizontal rule</label>
 			<label index="No block">No block format</label>
 			<label index="Remove block">Remove block format</label>
 			<label index="Technische Universitat Ilmenau">Technische Universität Ilmenau</label>
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/context-menu.js	(copie de travail)
@@ -125,9 +125,9 @@
 								itemId: itemId,
 								cls: 'button',
 								overCls: 'hover',
-								text: (button.contextMenuTitle || button.tooltip.title),
+								text: (button.contextMenuTitle ? button.contextMenuTitle : button.tooltip.title),
 								iconCls: button.iconCls,
-								helpText: this.localize(itemId + '-helpText') || this.localize(itemId + '-tooltip'),
+								helpText: (button.helpText ? button.helpText : this.localize(itemId + '-tooltip')),
 								hidden: true
 							});
 							firstInGroup = false;
@@ -201,7 +201,8 @@
 			} else if (xtype === 'menuitem') {
 				var button = this.getButton(menuItem.getItemId());
 				if (button) {
-					menuItem.setText(button.tooltip.title);
+					menuItem.setText(button.contextMenuTitle ? button.contextMenuTitle : button.tooltip.title);
+					menuItem.helpText = button.helpText ? button.helpText : menuItem.helpText;
 					menuItem.setVisible(!button.disabled);
 					lastIsButton = lastIsButton || !button.disabled;
 				} else {
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/ContextMenu/locallang.xml	(copie de travail)
@@ -6,6 +6,39 @@
 	</meta>
 	<data type="array">
 		<languageKey index="default" type="array">
+			<label index="Remove the">Remove the</label>
+			<label index="Remove this node from the document">Removes this node from the document</label>
+			<label index="TO-toggle-borders-tooltip">Toggle borders</label>
+			<label index="TO-cell-prop-tooltip">Shows the Table Cell Properties dialogue</label>
+			<label index="TO-cell-insert-before-tooltip">Inserts a new cell before the current one</label>
+			<label index="TO-cell-insert-after-tooltip">Inserts a new cell after the current one</label>
+			<label index="TO-cell-delete-tooltip">Deletes the current cell</label>
+			<label index="TO-cell-split-tooltip">Splits the current cell</label>
+			<label index="TO-cell-merge-tooltip">Merges the selected cells</label>
+			<label index="TO-row-prop-tooltip">Shows the Table Row Properties dialogue</label>
+			<label index="TO-row-insert-above-tooltip">Inserts a new row before the current one</label>
+			<label index="TO-row-insert-under-tooltip">Inserts a new row after the current one</label>
+			<label index="TO-row-delete-tooltip">Deletes the current row</label>
+			<label index="TO-row-split-tooltip">Splits the current row</label>
+			<label index="TO-table-prop-tooltip">Shows the Table Properties dialogue</label>
+			<label index="TO-table-restyle-tooltip">Re-applies the odd-even styles on the table</label>
+			<label index="TO-col-prop-tooltip">Shows the Column Cells Properties dialogue</label>
+			<label index="TO-col-insert-before-tooltip">Inserts a new column before the current one</label>
+			<label index="TO-col-insert-after-tooltip">Inserts a new column after the current one</label>
+			<label index="TO-col-delete-tooltip">Deletes the current column</label>
+			<label index="TO-col-split-tooltip">Splits the current column</label>
+			<!--Following labels unused in TYPO3 4.5+ -->
+			<label index="Element">Element</label>
+			<label index="Please confirm remove">Please confirm that you want to remove this element:</label>
+			<label index="Remove this node from the document">Removes this node from the document</label>
+			<label index="How did you get here? (Please report!)">How did you get here? (Please report!)</label>
+			<label index="Show the image properties dialog">Show the image properties dialog</label>
+			<label index="Modify URL">Modify URL</label>
+			<label index="Current URL is">Current URL is</label>
+			<label index="Opens this link in a new window">Opens this link in a new window</label>
+			<label index="Please confirm unlink">Please confirm that you want to unlink this element.</label>
+			<label index="Link points to:">Link points to:</label>
+			<label index="Unlink the current element">Unlink the current element</label>
 			<label index="Cut">Cut</label>
 			<label index="Copy">Copy</label>
 			<label index="Paste">Paste</label>
@@ -32,6 +65,11 @@
 			<label index="TO-col-insert-after-title">Insert C_olumn After</label>
 			<label index="TO-col-delete-title">De_lete Column</label>
 			<label index="TO-col-split-title">Split Column</label>
+			<label index="Create a link">Create a link</label>
+			<label index="Insert paragraph before">Insert paragraph before</label>
+			<label index="Insert a paragraph before the current node">Insert a paragraph before the current node</label>
+			<label index="Insert paragraph after">Insert paragraph after</label>
+			<label index="Insert a paragraph after the current node">Insert a paragraph after the current node</label>
 			<label index="JustifyLeft-title">Justify Left</label>
 			<label index="JustifyCenter-title">Justify Center</label>
 			<label index="JustifyRight-title">Justify Right</label>
@@ -41,42 +79,6 @@
 			<label index="JustifyRight-tooltip">Aligns text to the right</label>
 			<label index="JustifyFull-tooltip">Aligns text both to the left and the right</label>
 			<label index="Make link">Make lin_k</label>
-			<label index="Remove the">Remove the</label>
-			<label index="Element">Element</label>
-			<label index="Please confirm remove">Please confirm that you want to remove this element:</label>
-			<label index="Remove this node from the document">Removes this node from the document</label>
-			<label index="How did you get here? (Please report!)">How did you get here? (Please report!)</label>
-			<label index="Show the image properties dialog">Show the image properties dialog</label>
-			<label index="Modify URL">Modify URL</label>
-			<label index="Current URL is">Current URL is</label>
-			<label index="Opens this link in a new window">Opens this link in a new window</label>
-			<label index="Please confirm unlink">Please confirm that you want to unlink this element.</label>
-			<label index="Link points to:">Link points to:</label>
-			<label index="Unlink the current element">Unlink the current element</label>
-			<label index="TO-toggle-borders-tooltip">Toggle borders</label>
-			<label index="TO-cell-prop-tooltip">Shows the Table Cell Properties dialogue</label>
-			<label index="TO-cell-insert-before-tooltip">Inserts a new cell before the current one</label>
-			<label index="TO-cell-insert-after-tooltip">Inserts a new cell after the current one</label>
-			<label index="TO-cell-delete-tooltip">Deletes the current cell</label>
-			<label index="TO-cell-split-tooltip">Splits the current cell</label>
-			<label index="TO-cell-merge-tooltip">Merges the selected cells</label>
-			<label index="TO-row-prop-tooltip">Shows the Table Row Properties dialogue</label>
-			<label index="TO-row-insert-above-tooltip">Inserts a new row before the current one</label>
-			<label index="TO-row-insert-under-tooltip">Inserts a new row after the current one</label>
-			<label index="TO-row-delete-tooltip">Deletes the current row</label>
-			<label index="TO-row-split-tooltip">Splits the current row</label>
-			<label index="TO-table-prop-tooltip">Shows the Table Properties dialogue</label>
-			<label index="TO-table-restyle-tooltip">Re-applies the odd-even styles on the table</label>
-			<label index="TO-col-prop-tooltip">Shows the Column Cells Properties dialogue</label>
-			<label index="TO-col-insert-before-tooltip">Inserts a new column before the current one</label>
-			<label index="TO-col-insert-after-tooltip">Inserts a new column after the current one</label>
-			<label index="TO-col-delete-tooltip">Deletes the current column</label>
-			<label index="TO-col-split-tooltip">Splits the current column</label>
-			<label index="Create a link">Create a link</label>
-			<label index="Insert paragraph before">Insert paragraph before</label>
-			<label index="Insert a paragraph before the current node">Insert a paragraph before the current node</label>
-			<label index="Insert paragraph after">Insert paragraph after</label>
-			<label index="Insert a paragraph after the current node">Insert a paragraph after the current node</label>
 		</languageKey>
 	</data>
 	<orig_hash type="array">
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js	(copie de travail)
@@ -75,6 +75,8 @@
 			var buttonConfiguration = {
 				id		: buttonId,
 				tooltip		: this.localize(buttonId + '-Tooltip'),
+				contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+				helpText	: this.localize(buttonId + '-helpText'),
 				iconCls		: 'htmlarea-action-' + button[5],
 				action		: 'onButtonPress',
 				context		: button[1],
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/locallang.xml	(copie de travail)
@@ -8,9 +8,13 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="Indent-Tooltip">Increase indent</label>
+			<label index="Indent-helpText">Increases text indentation</label>
 			<label index="Outdent-Tooltip">Reduce indent</label>
+			<label index="Outdent-helpText">Reduces text indentation</label>
 			<label index="DefinitionList-Tooltip">Definition list</label>
+			<label index="DefinitionList-helpText">Makes a definition list from the current selection</label>
 			<label index="DefinitionItem-Tooltip">Toggle term and definition</label>
+			<label index="DefinitionItem-helpText">Toggles term and definition elements</label>
 			<label index="No block">No block format</label>
 			<label index="Remove block">Remove block format</label>
 			<label index="Technische Universitat Ilmenau">Technische Universität Ilmenau</label>
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js	(copie de travail)
@@ -106,6 +106,8 @@
 			var buttonConfiguration = {
 				id		: buttonId,
 				tooltip		: this.localize(buttonId + "-Tooltip"),
+				contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
+				helpText	: this.localize(buttonId + '-helpText'),
 				action		: "onButtonPress",
 				context		: button[1],
 				hide		: false,
Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml	(r�vision 9754)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/locallang.xml	(copie de travail)
@@ -15,15 +15,19 @@
 			<label index="Bold-Tooltip">Bold</label>
 			<label index="Citation-Tooltip">Citation</label>
 			<label index="Code-Tooltip">Computer code fragment</label>
+			<label index="Code-contextMenuTitle">Code fragment</label>
 			<label index="Definition-Tooltip">Definition</label>
 			<label index="DeletedText-Tooltip">Deleted text</label>
 			<label index="Emphasis-Tooltip">Emphasis</label>
 			<label index="Keyboard-Tooltip">Text to be entered by the user</label>
+			<label index="Keyboard-contextMenuTitle">Text to enter</label>
 			<label index="InsertedText-Tooltip">Inserted text</label>
 			<label index="Italic-Tooltip">Italic</label>
 			<label index="MonoSpaced-Tooltip">Monospaced text</label>
 			<label index="Quotation-Tooltip">Short inline quotation</label>
+			<label index="Quotation-contextMenuTitle">Short quotation</label>
 			<label index="Sample-Tooltip">Sample program output or script</label>
+			<label index="Sample-contextMenuTitle">Sample output</label>
 			<label index="Small-Tooltip">Small text</label>
 			<label index="Span-Tooltip">Style container</label>
 			<label index="StrikeThrough-Tooltip">Strike-through text</label>
@@ -32,6 +36,7 @@
 			<label index="Superscript-Tooltip">Superscript</label>
 			<label index="Underline-Tooltip">Underline</label>
 			<label index="Variable-Tooltip">Variable or program argument</label>
+			<label index="Variable-contextMenuTitle">Variable</label>
 			<label index="Technische Universitat Ilmenau">Technische Universität Ilmenau</label>
 		</languageKey>
 	</data>
