--- text_html_old.py	2007-04-18 15:34:02.000000000 +0200
+++ text_html.py	2007-04-17 23:06:26.000000000 +0200
@@ -684,14 +684,14 @@
 
         # check whether attachment exists, possibly point to upload form
         if not exists:
-            linktext = _('Create new drawing "%(filename)s (opens in new window)"')
-            return wikiutil.link_tag(
+            linktext = _('Create new drawing %(filename)s')
+            return (wikiutil.link_tag(
                 self.request,
                 ('%s?action=AttachFile&rename=%s%s' %
                  (wikiutil.quoteWikinameURL(pagename),
                   wikiutil.url_quote_plus(fname),
                   drawing and ('&drawing=%s' % wikiutil.url_quote(drawing)) or '')),
-                linktext % {'filename': self.text(fname)})
+                linktext % {'filename': self.text(fname)}) +  '<span class="screenreader_info"> %s</span>' % _('(opens in new window)'))
 
         mappath = AttachFile.getFilename(self.request, pagename, drawing + u'.map')
         edit_link = ('%s?action=AttachFile&rename=%s&drawing=%s' % (
@@ -715,24 +715,25 @@
                 # add alt and title tags to areas
                 map = re.sub('href\s*=\s*"((?!%TWIKIDRAW%).+?)"', r'href="\1" alt="\1" title="\1"', map)
                 # add in edit links plus alt and title attributes
-                alt = title =  _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}
+                alt = title =  _('Edit drawing %(filename)s %(hint)s') % {'filename': self.text(fname),
+                                                                          'hint': _('(opens in new window)') }
                 map = map.replace('%TWIKIDRAW%"', '%s" alt="%s" title="%s"' % (edit_link, alt, title))
                 # unxml, because 4.01 concrete will not validate />
                 map = map.replace('/>', '>')
-                alt = title = _('Clickable drawing: %(filename)s') % {'filename': self.text(fname)}
+                alt = _('Clickable drawing: %(filename)s') % {'filename': self.text(fname)}
                 return (map + self.image(
                     alt=alt,
-                    title=title,
+                    title="",
                     src=AttachFile.getAttachUrl(pagename, filename, self.request, addts=1),
                     usemap='#'+mapid, css="drawing"))
         else:
-            alt = title =  _('Edit drawing %(filename)s (opens in new window)') % {'filename': self.text(fname)}
-            return wikiutil.link_tag(self.request,
+            alt = title =  _('Edit drawing %(filename)s') % {'filename': self.text(fname)}
+            return (wikiutil.link_tag(self.request,
                                      edit_link,
                                      self.image(alt=alt,
                                                 title=title,
                                                 src=AttachFile.getAttachUrl(pagename, filename, self.request, addts=1), css="drawing"),
-                                     title=title)
+                                     title=title) + '<span class="screenreader_info"> %s</span>' % _('(opens in new window)'))
 
 
     # Text ##############################################################