Bug 589154 - Edit should be a label, not a menuitem; r=dao a=dietrich

browser/base/content/browser.xul

@@ -478,9 +478,9 @@
                     command="Tools:PrivateBrowsing"
                     key="key_privatebrowsing"/>
           <menuseparator class="appmenu-menuseparator"/>
-          <hbox class="split-menuitem">
-            <menuitem id="appmenu-edit-menuitem"
-                      label="&editMenu.label;"
+          <hbox>
+            <menuitem id="appmenu-edit-label"
+                      label="&appMenuEdit.label;"
                       disabled="true"/>
             <toolbarbutton id="appmenu-cut"
                            class="appmenu-edit-button"

browser/locales/en-US/chrome/browser/browser.dtd

@@ -264,6 +264,7 @@
 <!ENTITY showAllHistoryCmd2.label "Show All History">
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
+<!ENTITY appMenuEdit.label "Edit">
 <!ENTITY appMenuCustomize.label "Customize">
 <!ENTITY appMenuToolbarLayout.label "Toolbar Layout…">
 <!ENTITY appMenuSidebars.label "Sidebars">

browser/themes/winstripe/browser/browser.css

@@ -262,7 +262,7 @@ statusbarpanel#statusbar-display {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
-#appmenu-edit-menuitem {
+#appmenu-edit-label {
   -moz-appearance: none;
   background: transparent;
   font-style: italic;