  
  <!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
  <!ENTITY hideOtherAppsCmdMac.commandkey "H">
+ 
+ <!ENTITY showAllAppsCmdMac.label        "Show All">
 diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
-index 5a9fa0f75b14..03db2b5469a5 100644
 --- a/caps/nsScriptSecurityManager.cpp
 +++ b/caps/nsScriptSecurityManager.cpp
-@@ -937,6 +937,7 @@ nsScriptSecurityManager::CheckLoadURIFlags(nsIURI *aSourceURI,
+@@ -932,16 +932,17 @@ nsScriptSecurityManager::CheckLoadURIFla
+     }
+ 
+     // Check for target URI pointing to a file
+     rv = NS_URIChainHasFlags(aTargetURI,
+                              nsIProtocolHandler::URI_IS_LOCAL_FILE,
                               &hasFlags);
      NS_ENSURE_SUCCESS(rv, rv);
      if (hasFlags) {

   }
 
   NS_ENSURE_TRUE(AfterElementStart(content, aOriginalElement, aStr), NS_ERROR_OUT_OF_MEMORY);
@@ -1034,75 +1062,72 @@ nsXMLContentSerializer::AppendElementEnd(Element* aElement,
 
   nsIContent* content = aElement;
 

                               bool *_retval)
 {
   NS_PRECONDITION(aError && aSourceText && aErrorText, "Check arguments!!!");
   nsresult rv = NS_OK;
 
   // The expat driver should report the error.  We're just cleaning up the mess.
   *_retval = true;
 
@@ -1358,26 +1360,32 @@ nsXMLContentSink::ReportError(const char
     return NS_OK;
   }
 
   // prepare to set <parsererror> as the document root
   rv = HandleProcessingInstruction(u"xml-stylesheet",
                                    u"href=\"chrome://global/locale/intl.css\" type=\"text/css\"");
   NS_ENSURE_SUCCESS(rv, rv);
 
