Index: t3lib/class.t3lib_tsfebeuserauth.php
===================================================================
RCS file: /cvsroot/typo3/TYPO3core/t3lib/class.t3lib_tsfebeuserauth.php,v
retrieving revision 1.22
diff -u -r1.22 class.t3lib_tsfebeuserauth.php
--- t3lib/class.t3lib_tsfebeuserauth.php	19 Jun 2005 22:48:48 -0000	1.22
+++ t3lib/class.t3lib_tsfebeuserauth.php	21 Sep 2005 10:42:07 -0000
@@ -870,9 +870,10 @@
 	 * IF the global variable $LOCAL_LANG is NOT an array (yet) then this function loads the global $LOCAL_LANG array with the content of "sysext/lang/locallang_tsfe.php" so that the values therein can be used for labels in the Admin Panel
 	 *
 	 * @param	string		Key for a label in the $LOCAL_LANG array of "sysext/lang/locallang_tsfe.php"
+	 * @param	boolean		If set, the string won't be converted to utf-8 entities, but left in the current users charSet
 	 * @return	string		The value for the $key
 	 */
-	function extGetLL($key)	{
+	function extGetLL($key,$noConvert=0)	{
 		global $LOCAL_LANG;
 		if (!is_array($LOCAL_LANG))	{
 			$GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_tsfe.php');
@@ -882,11 +883,13 @@
 
 		$labelStr = htmlspecialchars($GLOBALS['LANG']->getLL($key));	// Label string in the default backend output charset.
 
-			// Convert to utf-8, then to entities:
-		if ($GLOBALS['LANG']->charSet!='utf-8')	{
-			$labelStr = $GLOBALS['LANG']->csConvObj->utf8_encode($labelStr,$GLOBALS['LANG']->charSet);
+		if (!$noConvert)	{
+				// Convert to utf-8, then to entities:
+			if ($GLOBALS['LANG']->charSet!='utf-8')	{
+				$labelStr = $GLOBALS['LANG']->csConvObj->utf8_encode($labelStr,$GLOBALS['LANG']->charSet);
+			}
+			$labelStr = $GLOBALS['LANG']->csConvObj->utf8_to_entities($labelStr);
 		}
-		$labelStr = $GLOBALS['LANG']->csConvObj->utf8_to_entities($labelStr);
 
 			// Return the result:
 		return $labelStr;
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
RCS file: /cvsroot/typo3/TYPO3core/typo3/sysext/cms/tslib/class.tslib_content.php,v
retrieving revision 1.78
diff -u -r1.78 class.tslib_content.php
--- typo3/sysext/cms/tslib/class.tslib_content.php	14 Jul 2005 12:41:45 -0000	1.78
+++ typo3/sysext/cms/tslib/class.tslib_content.php	21 Sep 2005 10:42:08 -0000
@@ -6613,7 +6662,7 @@
 						if ($dataArr[$hideField])	{
 							$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/button_unhide.gif" width="11" height="10" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_unhide').'" align="top" alt="" title="" />',$formName,'unhide');
 						} else {
-							$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/button_hide.gif" width="11" height="10" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_hide').'" align="top" alt="" title="" />',$formName,'hide','',$BE_USER->extGetLL('p_hideConfirm'));
+							$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/button_hide.gif" width="11" height="10" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_hide').'" align="top" alt="" title="" />',$formName,'hide','',$BE_USER->extGetLL('p_hideConfirm', 1));
 						}
 					}
 					if (isset($allow['new']))	{
@@ -6623,7 +6672,7 @@
 							$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/new_record.gif" width="16" height="12" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_newRecordAfter').'" align="top" alt="" title="" />',$formName,'new',$currentRecord);
 						}
 					}
-					if (isset($allow['delete']))		{$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/delete_record.gif" width="12" height="12" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_delete').'" align="top" alt="" title="" />',$formName,'delete','',$BE_USER->extGetLL('p_deleteConfirm'));	}
+					if (isset($allow['delete']))		{$panel.=$this->editPanelLinkWrap('<img src="t3lib/gfx/delete_record.gif" width="12" height="12" vspace="1" hspace="2" border="0" title="'.$BE_USER->extGetLL('p_delete').'" align="top" alt="" title="" />',$formName,'delete','',$BE_USER->extGetLL('p_deleteConfirm', 1));	}
 
 						//	Final
 					$labelTxt = $this->stdWrap($conf['label'],$conf['label.']);
@@ -6754,7 +6803,7 @@
 			}
 		} else {
 			if ($confirm)	{
-				$cf1="if (confirm(unescape('".t3lib_div::rawurlencodeJS($confirm)."'))){";
+				$cf1="if (confirm(".$GLOBALS['LANG']->JScharCode($confirm).")){";
 				$cf2='}';
 			} else {
 				$cf1=$cf2='';