Use 'Images and Link' for properties menuitem when image is also a link, b=127541, r=brade, sr=kin, a=asa

git-svn-id: svn://10.0.0.236/trunk@116533 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/editor/ui/composer/content/editor.js

@@ -1751,7 +1751,10 @@ function InitObjectPropertiesMenuitem(id)
     switch (name)
     {
       case "img":
-        objStr = GetString("Image");
+        if (editorShell.GetElementOrParentByTagName("href", element))
+          objStr = GetString("ImageAndLink");
+        else
+          objStr = GetString("Image");
         break;
       case "hr":
         objStr = GetString("HLine");