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

editor/ui/composer/content/editor.js

@@ -1751,6 +1751,8 @@ function InitObjectPropertiesMenuitem(id)
     switch (name)
     {
       case "img":
+        // Check if img is enclosed in link
+        //  (use "href" to not be fooled by named anchor)
         if (editorShell.GetElementOrParentByTagName("href", element))
           objStr = GetString("ImageAndLink");
         else

editor/ui/composer/locale/en-US/editor.properties

@@ -81,11 +81,11 @@ OpenCircle=Open circle
 SolidSquare=Solid square
 NumberStyle=Number Style
 Automatic=Automatic
-Style_1=1,2,3...
-Style_I=I,II,III...
-Style_i=i,ii,iii...
-Style_A=A,B,C...
-Style_a=a,b,c...
+Style_1=1, 2, 3...
+Style_I=I, II, III...
+Style_i=i, ii, iii...
+Style_A=A, B, C...
+Style_a=a, b, c...
 Pixels=pixels
 Percent=percent
 PercentOfCell=% of cell
@@ -116,6 +116,7 @@ NestedTable=Nested Table
 HLine=Horizontal Line
 Link=Link
 Image=Image
+ImageAndLink=Image and Link
 NamedAnchor=Named Anchor
 List=List
 ListItem=List Item