Index: src/wp-includes/js/thickbox/thickbox.js
===================================================================
--- src/wp-includes/js/thickbox/thickbox.js	(revision 29654)
+++ src/wp-includes/js/thickbox/thickbox.js	(working copy)
@@ -130,7 +130,22 @@
 
 			TB_WIDTH = imageWidth + 30;
 			TB_HEIGHT = imageHeight + 60;
-			jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='"+thickboxL10n.close+"'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><div class='tb-close-icon'></div></a></div>");
+			jQuery("#TB_window").append(
+				"<a href='' id='TB_ImageOff'>"
+					+ "<span class='screen-reader-text'>" + thickboxL10n.close + "</span>"
+					+ "<img id='TB_Image' src='" + url + "' width='" + imageWidth + "' height='" + imageHeight + "' alt='" + caption + "'/>"
+				+ "</a>"
+				+ "<div id='TB_caption'>"
+					+ caption
+					+ "<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div>"
+				+ "</div>"
+				+ "<div id='TB_closeWindow'>"
+					+ "<a href='#' id='TB_closeWindowButton'>"
+						+ "<span class='screen-reader-text'>" + thickboxL10n.close + "</span>"
+						+ "<div class='tb-close-icon'></div>"
+					+ "</a>"
+				+ "</div>"
+			);
 
 			jQuery("#TB_closeWindowButton").click(tb_remove);
 
@@ -195,18 +210,49 @@
 					urlNoQuery = url.split('TB_');
 					jQuery("#TB_iframeContent").remove();
 					if(params['modal'] != "true"){//iframe no modal
-						jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><div class='tb-close-icon'></div></a></div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
+						jQuery("#TB_window").append(
+							"<div id='TB_title'>"
+								+ "<div id='TB_ajaxWindowTitle'>" + caption + "</div>"
+								+ "<div id='TB_closeAjaxWindow'>"
+									+ "<a href='#' id='TB_closeWindowButton'>"
+										+ "<span class='screen-reader-text'>" + thickboxL10n.close + "</span>"
+										+ "<div class='tb-close-icon'></div>"
+									+ "</a>"
+								+ "</div>"
+							+ "</div>"
+							+ "<iframe frameborder='0' hspace='0' src='" + urlNoQuery[0] + "' id='TB_iframeContent'"
+								+ "name='TB_iframeContent" + Math.round( Math.random() * 1000 ) + "' onload='tb_showIframe()'"
+								+ "style='width:" + ( ajaxContentW + 29 ) + "px;height:" + ( ajaxContentH + 17 ) + "px;'>"
+								+ thickboxL10n.noiframes
+							+ "</iframe>"
+						);
 					}else{//iframe modal
-					jQuery("#TB_overlay").unbind();
-						jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
+						jQuery("#TB_overlay").unbind();
+						jQuery("#TB_window").append(
+							"<iframe frameborder='0' hspace='0' src='" + urlNoQuery[0] + "' id='TB_iframeContent'"
+								+ "name='TB_iframeContent" + Math.round( Math.random() * 1000 ) + "' onload='tb_showIframe()'"
+								+ "style='width:" + ( ajaxContentW + 29 ) + "px;height:" + ( ajaxContentH + 17 ) + "px;'>"
+								+ thickboxL10n.noiframes
+							+ "</iframe>"
+						);
 					}
 			}else{// not an iframe, ajax
 					if(jQuery("#TB_window").css("visibility") != "visible"){
 						if(params['modal'] != "true"){//ajax no modal
-						jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><div class='tb-close-icon'></div></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
+							jQuery("#TB_window").append(
+								"<div id='TB_title'>"
+									+ "<div id='TB_ajaxWindowTitle'>" + caption + "</div>"
+									+ "<div id='TB_closeAjaxWindow'>"
+										+ "<a href='#' id='TB_closeWindowButton'>"
+											+ "<div class='tb-close-icon'></div>"
+										+ "</a>"
+									+ "</div>"
+								+ "</div>"
+								+ "<div id='TB_ajaxContent' style='width:" + ajaxContentW + "px;height:" + ajaxContentH + "px'></div>"
+							);
 						}else{//ajax modal
-						jQuery("#TB_overlay").unbind();
-						jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
+							jQuery("#TB_overlay").unbind();
+							jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:" + ajaxContentW + "px;height:" + ajaxContentH + "px;'></div>");
 						}
 					}else{//this means the window is already up, we are just loading new content via ajax
 						jQuery("#TB_ajaxContent")[0].style.width = ajaxContentW +"px";