diff --git a/mozilla/content/base/public/nsIStyleRuleProcessor.h b/mozilla/content/base/public/nsIStyleRuleProcessor.h
index aca01834244..32494874c8b 100644
--- a/mozilla/content/base/public/nsIStyleRuleProcessor.h
+++ b/mozilla/content/base/public/nsIStyleRuleProcessor.h
@@ -165,7 +165,7 @@ struct AttributeRuleProcessorData : public RuleProcessorData {
 #define NS_ISTYLE_RULE_PROCESSOR_IID     \
 {0x015575fe, 0x7b6c, 0x11d3, {0xba, 0x05, 0x00, 0x10, 0x83, 0x02, 0x3c, 0x2b}}
 
-/* The style rule processor interface is a mechanism to seperate the matching
+/* The style rule processor interface is a mechanism to separate the matching
  * of style rules from style sheet instances.
  * Simple style sheets can and will act as their own processor. 
  * Sheets where rule ordering interlaces between multiple sheets, will need to 
diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 90bcdeac067..be8fec8ad41 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -711,7 +711,7 @@ nsPlainTextSerializer::DoOpenContainer(const nsIParserNode* aNode, PRInt32 aTag)
     // We must make sure that the content of two table cells get a
     // space between them.
 
-    // To make the seperation between cells most obvious and
+    // To make the separation between cells most obvious and
     // importable, we use a TAB.
     if (GetLastBool(mHasWrittenCellsForRow)) {
       // Bypass |Write| so that the TAB isn't compressed away.
diff --git a/mozilla/docshell/base/nsDefaultURIFixup.cpp b/mozilla/docshell/base/nsDefaultURIFixup.cpp
index 672475e87d1..95899bc98c2 100644
--- a/mozilla/docshell/base/nsDefaultURIFixup.cpp
+++ b/mozilla/docshell/base/nsDefaultURIFixup.cpp
@@ -494,7 +494,7 @@ PRBool nsDefaultURIFixup::PossiblyHostPortUrl(const nsAString &aUrl)
     //   <hostname>:<port>/
     //
     // Where <hostname> is a string of alphanumeric characters and dashes
-    // seperated by dots.
+    // separated by dots.
     // and <port> is a 5 or less digits. This actually breaks the rfc2396
     // definition of a scheme which allows dots in schemes.
     //
diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 26cfd119efe..2f86954d794 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3816,7 +3816,7 @@ nsDocShell::SetupRefreshURIFromHeader(nsIURI * aBaseURI,
     //  Refresh immediately using URI as the destination.
     // 
     // Currently, anything immediately following the URI, if
-    // seperated by any char in the set "'\"\t\r\n " will be
+    // separated by any char in the set "'\"\t\r\n " will be
     // ignored. So "10; url=go.html ; foo=bar" will work,
     // and so will "10; url='go.html'; foo=bar". However,
     // "10; url=go.html; foo=bar" will result in the uri
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
index 3509dff587f..7397c5f700d 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -1338,7 +1338,7 @@ nsHTMLEditRules::WillInsertText(PRInt32          aAction,
     PRInt32 pos = 0;
     NS_NAMED_LITERAL_STRING(newlineStr, LFSTR);
         
-    // for efficiency, break out the pre case seperately.  This is because
+    // for efficiency, break out the pre case separately.  This is because
     // its a lot cheaper to search the input string for only newlines than
     // it is to search for both tabs and newlines.
     if (isPRE || bPlaintext)
@@ -5881,7 +5881,7 @@ nsHTMLEditRules::MakeTransitionList(nsCOMArray<nsIDOMNode>& inArrayOfNodes,
     transNode->GetParentNode(getter_AddRefs(curElementParent));
     if (curElementParent != prevElementParent)
     {
-      // different parents, or seperated by <br>: transition point
+      // different parents, or separated by <br>: transition point
       inTransitionArray.InsertElementAt((void*)PR_TRUE,i);  
     }
     else
@@ -6763,7 +6763,7 @@ nsHTMLEditRules::JoinNodesSmart( nsIDOMNode *aNodeLeft,
   res = mHTMLEditor->GetLengthOfDOMNode(aNodeLeft, *((PRUint32*)aOutMergeOffset));
   if (NS_FAILED(res)) return res;
 
-  // seperate join rules for differing blocks
+  // separate join rules for differing blocks
   if (nsHTMLEditUtils::IsParagraph(aNodeLeft))
   {
     // for para's, merge deep & add a <br> after merging
@@ -7361,7 +7361,7 @@ nsHTMLEditRules::RemoveEmptyNodes()
         if (NS_FAILED(res)) return res;
         if (bIsEmptyNode)
         {
-          if (bIsMailCite)  // mailcites go on a seperate list from other empty nodes
+          if (bIsMailCite)  // mailcites go on a separate list from other empty nodes
           {
             arrayOfEmptyCites.AppendObject(node);
           }
@@ -7393,7 +7393,7 @@ nsHTMLEditRules::RemoveEmptyNodes()
   }
   
   // now delete the empty mailcites
-  // this is a seperate step because we want to pull out any br's and preserve them.
+  // this is a separate step because we want to pull out any br's and preserve them.
   nodeCount = arrayOfEmptyCites.Count();
   for (j = 0; j < nodeCount; j++)
   {
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index 401fa756a78..492c6b3d791 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -5754,7 +5754,7 @@ nsHTMLEditor::SetCSSBackgroundColor(const nsAString& aColor)
           }
         }
         // first check the start parent of the range to see if it needs to 
-        // be seperately handled (it does if it's a text node, due to how the
+        // be separately handled (it does if it's a text node, due to how the
         // subtree iterator works - it will not have reported it).
         if (IsTextNode(startNode) && IsEditable(startNode))
         {
@@ -5798,7 +5798,7 @@ nsHTMLEditor::SetCSSBackgroundColor(const nsAString& aColor)
         arrayOfNodes.Clear();
         
         // last check the end parent of the range to see if it needs to 
-        // be seperately handled (it does if it's a text node, due to how the
+        // be separately handled (it does if it's a text node, due to how the
         // subtree iterator works - it will not have reported it).
         if (IsTextNode(endNode) && IsEditable(endNode))
         {
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
index 130ba02fd9a..cf11ce89a12 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
@@ -207,7 +207,7 @@ NS_IMETHODIMP nsHTMLEditor::SetInlineProperty(nsIAtom *aProperty,
           }
         }
         // first check the start parent of the range to see if it needs to 
-        // be seperately handled (it does if it's a text node, due to how the
+        // be separately handled (it does if it's a text node, due to how the
         // subtree iterator works - it will not have reported it).
         if (IsTextNode(startNode) && IsEditable(startNode))
         {
@@ -232,7 +232,7 @@ NS_IMETHODIMP nsHTMLEditor::SetInlineProperty(nsIAtom *aProperty,
         arrayOfNodes.Clear();
         
         // last check the end parent of the range to see if it needs to 
-        // be seperately handled (it does if it's a text node, due to how the
+        // be separately handled (it does if it's a text node, due to how the
         // subtree iterator works - it will not have reported it).
         if (IsTextNode(endNode) && IsEditable(endNode))
         {
@@ -1518,7 +1518,7 @@ nsHTMLEditor::RelativeFontChange( PRInt32 aSizeChange)
         arrayOfNodes.Clear();
       }
       // now check the start and end parents of the range to see if they need to 
-      // be seperately handled (they do if they are text nodes, due to how the
+      // be separately handled (they do if they are text nodes, due to how the
       // subtree iterator works - it will not have reported them).
       if (IsTextNode(startNode) && IsEditable(startNode))
       {
diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
index 5c449fa6688..9d0db34d622 100644
--- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp
+++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
@@ -630,7 +630,7 @@ nsTextEditRules::WillInsertText(PRInt32          aAction,
     nsCOMPtr<nsIDOMNode> unused;
     PRInt32 pos = 0;
         
-    // for efficiency, break out the pre case seperately.  This is because
+    // for efficiency, break out the pre case separately.  This is because
     // its a lot cheaper to search the input string for only newlines than
     // it is to search for both tabs and newlines.
     if (isPRE)
diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
index e28c8a80492..d7124195e4f 100644
--- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
+++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
@@ -230,7 +230,7 @@ nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrin
                 printSettings->SetPrintFrameType(nsIPrintSettings::kFramesAsIs);
             if (printData.mPrintSelectedFrame)
                 printSettings->SetPrintFrameType(nsIPrintSettings::kSelectedFrame);
-            if (printData.mPrintFramesSeperatly)
+            if (printData.mPrintFramesSeparately)
                 printSettings->SetPrintFrameType(nsIPrintSettings::kEachFrameSep);
 
             printSettings->SetShrinkToFit(printData.mShrinkToFit);
diff --git a/mozilla/embedding/qa/jstests/accessibility/xul/xulmenubar.xul b/mozilla/embedding/qa/jstests/accessibility/xul/xulmenubar.xul
index f5692787c08..5005bbb9fa4 100644
--- a/mozilla/embedding/qa/jstests/accessibility/xul/xulmenubar.xul
+++ b/mozilla/embedding/qa/jstests/accessibility/xul/xulmenubar.xul
@@ -114,7 +114,7 @@
       <!-- There are five elements associated with creating a menu bar and its menus.
       menubar - The container for the row of menus.
       menu - Despite the name, this is actually only the title of the menu on the menubar.
-      This element can be placed on a menubar or can be placed seperately.
+      This element can be placed on a menubar or can be placed separately.
       menupopup - The popup box that appears when you click on the menu title. This box 
       contains the list of menu commands.
       menuitem - An individual command on the menu. This would be placed on a menupopup.
diff --git a/mozilla/extensions/irc/ChangeLog b/mozilla/extensions/irc/ChangeLog
index 8fac0da8cd2..04e2df9479d 100644
--- a/mozilla/extensions/irc/ChangeLog
+++ b/mozilla/extensions/irc/ChangeLog
@@ -29,7 +29,7 @@ bug 41564 to get charsets working.
   are now all valid commands.
 * add prefs for when to make noise; new msg, msg in existing query view, and/or
   /stalk matches.
-* allow for space seperated list of sounds to play, like "beep beep", or
+* allow for space separated list of sounds to play, like "beep beep", or
   "file:/foo.wav"
 * fix bogus "connection refused" error when disconnecting.
 * add editable topic in header area.
@@ -291,7 +291,7 @@ commands.js:
 
 handlers.js:
 - don't call setOutputStyle() onLoad (it's been deleted.)
-- we can now call setClientOutput() and initStatic() onLoad, because the output window is a seperate .html file.  This means the the xul onLoad will not be called until the .html file is loaded, and so we can be sure that the content model for the output window will be stable.
+- we can now call setClientOutput() and initStatic() onLoad, because the output window is a separate .html file.  This means the the xul onLoad will not be called until the .html file is loaded, and so we can be sure that the content model for the output window will be stable.
 - global change from 'quotes like this' to ``quotes like this''.
 - set client.debugMode variable when debug messages are on.  This flag is used to determine how we display irc message codes.
 - remove onToggleToolbarIcons() because we don't have a toolbar anymore.
diff --git a/mozilla/extensions/irc/xul/content/readprefs.js b/mozilla/extensions/irc/xul/content/readprefs.js
index 2e26353c530..b94dc3f927b 100644
--- a/mozilla/extensions/irc/xul/content/readprefs.js
+++ b/mozilla/extensions/irc/xul/content/readprefs.js
@@ -32,9 +32,9 @@
  *   +- bugURL   (String) url to use for "bug 12345" links.  Use %s to place
  *                        the bug number.
  *   +- initialURLs (String) irc:// urls to connect to on startup, semicolon
- *   |                       seperated
+ *   |                       separated
  *   +- initialScripts (String) urls for scripts to run at startup,
- *   |                          semicolon seperated
+ *   |                          semicolon separated
  *   +- newTabLimit (Number) max number of tabs to have open before disabling
  *   |                       automatic tab creation for private messages.
  *   |                       use 0 for unlimited new tabs, or 1 to disable
@@ -50,7 +50,7 @@
  *   +- nickCompleteStr (String) String to use when tab-completing nicknames
  *   |                           at the beginning of sentences
  *   +- stalkWords (String) List of words to add to the stalk victims list
- *   |                      semicolon seperated (see the /stalk command)
+ *   |                      semicolon separated (see the /stalk command)
  *   +- deleteOnPart (Boolean) Delete channel window automatically after a /part
  *   |
  *   |  The following beep prefs can be set to the text "beep" to use the
diff --git a/mozilla/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html b/mozilla/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
index ccd46099de3..889cdf4efb2 100644
--- a/mozilla/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
+++ b/mozilla/extensions/webservices/docs/Soap_Scripts_in_Mozilla.html
@@ -1053,7 +1053,7 @@ Schema    files   into the schema collection.<br>
   or decoder, which     then may lookup additional encoders or decoders by 
  a string key as required.     &nbsp;For either the 1.1 or 1.2 version of 
 the default SOAP encoding, the    default encoder and decoder use the schema 
-type's namespaceURI and name,   seperated by "#" to look up additional decoders 
+type's namespaceURI and name,   separated by "#" to look up additional decoders 
 for specific schema types.   &nbsp;Additional encoders and decoders registered 
   within the default encodings   will automatically be invoked as an object 
   identified as the corresponding   type is processed. &nbsp;Other encodings 
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPException.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPException.cpp
index c078bd69eef..62268458bb4 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPException.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPException.cpp
@@ -159,9 +159,9 @@ nsSOAPException::GetData(nsISupports * *aData)
   return NS_OK;
 }
 
-static NS_NAMED_LITERAL_STRING(kErrorSeperator1, ": ");
-static NS_NAMED_LITERAL_STRING(kErrorSeperator2, ", called by ");
-static NS_NAMED_LITERAL_STRING(kErrorSeperator3, ", caused by ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator1, ": ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator2, ", called by ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator3, ", caused by ");
 
 /* string toString (); */
 NS_IMETHODIMP 
@@ -170,13 +170,13 @@ nsSOAPException::ToString(char **_retval)
   NS_ENSURE_ARG_POINTER(_retval);
   nsAutoString s;
   s.Append(mName);
-  s.Append(kErrorSeperator1);
+  s.Append(kErrorSeparator1);
   s.Append(mMessage);
   if (mFrame) {
     char* str = nsnull;
     mFrame->ToString(&str);
     if (str) {
-      s.Append(kErrorSeperator2);
+      s.Append(kErrorSeparator2);
       nsAutoString i;
       CopyASCIItoUCS2(nsDependentCString(str),i);
       nsMemory::Free(str);
@@ -190,7 +190,7 @@ nsSOAPException::ToString(char **_retval)
       nsAutoString i;
       CopyASCIItoUCS2(nsDependentCString(str),i);
       nsMemory::Free(str);
-      s.Append(kErrorSeperator3);
+      s.Append(kErrorSeparator3);
       s.Append(i);
     }
   }
diff --git a/mozilla/extensions/xmlextras/docs/Soap_Scripts_in_Mozilla.html b/mozilla/extensions/xmlextras/docs/Soap_Scripts_in_Mozilla.html
index ccd46099de3..889cdf4efb2 100644
--- a/mozilla/extensions/xmlextras/docs/Soap_Scripts_in_Mozilla.html
+++ b/mozilla/extensions/xmlextras/docs/Soap_Scripts_in_Mozilla.html
@@ -1053,7 +1053,7 @@ Schema    files   into the schema collection.<br>
   or decoder, which     then may lookup additional encoders or decoders by 
  a string key as required.     &nbsp;For either the 1.1 or 1.2 version of 
 the default SOAP encoding, the    default encoder and decoder use the schema 
-type's namespaceURI and name,   seperated by "#" to look up additional decoders 
+type's namespaceURI and name,   separated by "#" to look up additional decoders 
 for specific schema types.   &nbsp;Additional encoders and decoders registered 
   within the default encodings   will automatically be invoked as an object 
   identified as the corresponding   type is processed. &nbsp;Other encodings 
diff --git a/mozilla/extensions/xmlextras/soap/src/nsSOAPException.cpp b/mozilla/extensions/xmlextras/soap/src/nsSOAPException.cpp
index c078bd69eef..62268458bb4 100644
--- a/mozilla/extensions/xmlextras/soap/src/nsSOAPException.cpp
+++ b/mozilla/extensions/xmlextras/soap/src/nsSOAPException.cpp
@@ -159,9 +159,9 @@ nsSOAPException::GetData(nsISupports * *aData)
   return NS_OK;
 }
 
-static NS_NAMED_LITERAL_STRING(kErrorSeperator1, ": ");
-static NS_NAMED_LITERAL_STRING(kErrorSeperator2, ", called by ");
-static NS_NAMED_LITERAL_STRING(kErrorSeperator3, ", caused by ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator1, ": ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator2, ", called by ");
+static NS_NAMED_LITERAL_STRING(kErrorSeparator3, ", caused by ");
 
 /* string toString (); */
 NS_IMETHODIMP 
@@ -170,13 +170,13 @@ nsSOAPException::ToString(char **_retval)
   NS_ENSURE_ARG_POINTER(_retval);
   nsAutoString s;
   s.Append(mName);
-  s.Append(kErrorSeperator1);
+  s.Append(kErrorSeparator1);
   s.Append(mMessage);
   if (mFrame) {
     char* str = nsnull;
     mFrame->ToString(&str);
     if (str) {
-      s.Append(kErrorSeperator2);
+      s.Append(kErrorSeparator2);
       nsAutoString i;
       CopyASCIItoUCS2(nsDependentCString(str),i);
       nsMemory::Free(str);
@@ -190,7 +190,7 @@ nsSOAPException::ToString(char **_retval)
       nsAutoString i;
       CopyASCIItoUCS2(nsDependentCString(str),i);
       nsMemory::Free(str);
-      s.Append(kErrorSeperator3);
+      s.Append(kErrorSeparator3);
       s.Append(i);
     }
   }
diff --git a/mozilla/gfx/public/nsPDECommon.h b/mozilla/gfx/public/nsPDECommon.h
index d5ba4906b8d..7b4dafbc496 100644
--- a/mozilla/gfx/public/nsPDECommon.h
+++ b/mozilla/gfx/public/nsPDECommon.h
@@ -50,7 +50,7 @@ typedef struct {
   Boolean mPrintSelection;
   Boolean mPrintFrameAsIs;
   Boolean mPrintSelectedFrame;
-  Boolean mPrintFramesSeperatly;
+  Boolean mPrintFramesSeparately;
   Boolean mShrinkToFit;
 } nsPrintExtensions;
 
@@ -67,4 +67,4 @@ typedef struct {
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mozilla/gfx/src/mac/nsImageMac.cpp b/mozilla/gfx/src/mac/nsImageMac.cpp
index 977e26a6137..7edfa11e4e9 100644
--- a/mozilla/gfx/src/mac/nsImageMac.cpp
+++ b/mozilla/gfx/src/mac/nsImageMac.cpp
@@ -1031,7 +1031,7 @@ nsImageMac::ConvertToIcon(  const nsRect& aSrcRegion,
     'XXX#' resources (icm#, ics#, ICN# or ich#) contain a 1 bit icon of the 
     indicated
     size, followed immediate by a 1 bit mask of the same size. 
-    That's how it works, you can't have the mask seperately.
+    That's how it works, you can't have the mask separately.
     This mask is used for all icons of that size in a suite or family.
     
     So if you want to use a 256 colour 32x32 icon you will typically call
diff --git a/mozilla/gfx/src/mac/nsPDECommon.h b/mozilla/gfx/src/mac/nsPDECommon.h
index d5ba4906b8d..7b4dafbc496 100644
--- a/mozilla/gfx/src/mac/nsPDECommon.h
+++ b/mozilla/gfx/src/mac/nsPDECommon.h
@@ -50,7 +50,7 @@ typedef struct {
   Boolean mPrintSelection;
   Boolean mPrintFrameAsIs;
   Boolean mPrintSelectedFrame;
-  Boolean mPrintFramesSeperatly;
+  Boolean mPrintFramesSeparately;
   Boolean mShrinkToFit;
 } nsPrintExtensions;
 
@@ -67,4 +67,4 @@ typedef struct {
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/mozilla/gfx/src/mac/printerplugin/Headers/PrintDialogPDE.h b/mozilla/gfx/src/mac/printerplugin/Headers/PrintDialogPDE.h
index f96c7ac463c..cf75850487a 100644
--- a/mozilla/gfx/src/mac/printerplugin/Headers/PrintDialogPDE.h
+++ b/mozilla/gfx/src/mac/printerplugin/Headers/PrintDialogPDE.h
@@ -46,7 +46,7 @@ enum {
 ePrintSelectionControlID = 4000,
 ePrintFrameAsIsControlID,
 ePrintSelectedFrameControlID,
-ePrintFramesSeperatlyControlID,
+ePrintFramesSeparatelyControlID,
 eShrinkToFiControlID,
 eRadioGroupControlID,
 };
diff --git a/mozilla/gfx/src/mac/printerplugin/Resources/English.lproj/PrintDialogPDE.r b/mozilla/gfx/src/mac/printerplugin/Resources/English.lproj/PrintDialogPDE.r
index 3052c0a0f70..88e07d36c85 100644
--- a/mozilla/gfx/src/mac/printerplugin/Resources/English.lproj/PrintDialogPDE.r
+++ b/mozilla/gfx/src/mac/printerplugin/Resources/English.lproj/PrintDialogPDE.r
@@ -76,7 +76,7 @@ resource 'CNTL' (ePrintSelectedFrameControlID, "Print Selected Frame", purgeable
 };
 
 
-resource 'CNTL' (ePrintFramesSeperatlyControlID, "Print Frames Seperately", purgeable) {
+resource 'CNTL' (ePrintFramesSeparatelyControlID, "Print Frames Separately", purgeable) {
 {170, 72, 185, 250},					
  0, 							
  invisible,						
diff --git a/mozilla/gfx/src/mac/printerplugin/Source/PrintDialogPDE.c b/mozilla/gfx/src/mac/printerplugin/Source/PrintDialogPDE.c
index 3a8e1831cb8..afc22a0447e 100644
--- a/mozilla/gfx/src/mac/printerplugin/Source/PrintDialogPDE.c
+++ b/mozilla/gfx/src/mac/printerplugin/Source/PrintDialogPDE.c
@@ -99,7 +99,7 @@ typedef struct{
   ControlRef  thePrintSelectionOnly;
   ControlRef  thePrintFrameAsIs;
   ControlRef  thePrintSelectedFrame;
-  ControlRef  thePrintFramesSeperatly;
+  ControlRef  thePrintFramesSeparately;
   ControlRef  theShrinkToFit;
   ControlRef  theRadioGroup;
 } PrintDialogPDEOnlyContext, *PrintDialogPDEOnlyContextPtr;
@@ -470,7 +470,7 @@ MozPDEInitialize( PMPDEContext    aContext,
     theContext->thePrintSelectionOnly = GetNewControl(ePrintSelectionControlID, theWindow);
     theContext->thePrintFrameAsIs = GetNewControl(ePrintFrameAsIsControlID, theWindow);
     theContext->thePrintSelectedFrame = GetNewControl(ePrintSelectedFrameControlID, theWindow);
-    theContext->thePrintFramesSeperatly = GetNewControl(ePrintFramesSeperatlyControlID, theWindow);
+    theContext->thePrintFramesSeparately = GetNewControl(ePrintFramesSeparatelyControlID, theWindow);
     theContext->theShrinkToFit = GetNewControl(eShrinkToFiControlID, theWindow);
     theContext->theRadioGroup = GetNewControl(eRadioGroupControlID, theWindow);
 
@@ -479,7 +479,7 @@ MozPDEInitialize( PMPDEContext    aContext,
     EmbedControl(theContext->theShrinkToFit, aParentUserPane);
     EmbedControl(theContext->thePrintFrameAsIs, theContext->theRadioGroup);
     EmbedControl(theContext->thePrintSelectedFrame, theContext->theRadioGroup);
-    EmbedControl(theContext->thePrintFramesSeperatly, theContext->theRadioGroup);
+    EmbedControl(theContext->thePrintFramesSeparately, theContext->theRadioGroup);
     EmbedControl(theContext->theRadioGroup, aParentUserPane);    
 
     // set controls as visible
@@ -487,14 +487,14 @@ MozPDEInitialize( PMPDEContext    aContext,
     SetControlVisibility(theContext->thePrintSelectionOnly, true, false);
     SetControlVisibility(theContext->thePrintFrameAsIs, true, false);
     SetControlVisibility(theContext->thePrintSelectedFrame, true, false);
-    SetControlVisibility(theContext->thePrintFramesSeperatly, true, false);
+    SetControlVisibility(theContext->thePrintFramesSeparately, true, false);
     SetControlVisibility(theContext->theShrinkToFit, true, false);
 
     // Set default value
     SetControlValue(theContext->thePrintSelectionOnly, 0);
     SetControlValue(theContext->thePrintFrameAsIs, 0);
     SetControlValue(theContext->thePrintSelectedFrame, 0);
-    SetControlValue(theContext->thePrintFramesSeperatly, 0);
+    SetControlValue(theContext->thePrintFramesSeparately, 0);
     SetControlValue(theContext->theShrinkToFit, 0);
 
     // Set flags
@@ -613,7 +613,7 @@ MozPDESync(PMPDEContext aContext,PMPrintSession  aPrintSession,Boolean aSyncDire
       printSettings.mPrintSelection = false;
       printSettings.mPrintFrameAsIs = false;
       printSettings.mPrintSelectedFrame = false;
-      printSettings.mPrintFramesSeperatly = false;
+      printSettings.mPrintFramesSeparately = false;
       printSettings.mShrinkToFit = false;
                
       switch (aSyncDirection){
@@ -647,17 +647,17 @@ MozPDESync(PMPDEContext aContext,PMPrintSession  aPrintSession,Boolean aSyncDire
                 SetControlValue(theContext->thePrintSelectedFrame, 0);
               }
             
-              // control to print all frames seperately
-              EnableControl((ControlHandle)theContext->thePrintFramesSeperatly);
-              theControlValue = (printSettings.mPrintFramesSeperatly) ? 1 : 0;
-              SetControlValue(theContext->thePrintFramesSeperatly, theControlValue);
+              // control to print all frames separately
+              EnableControl((ControlHandle)theContext->thePrintFramesSeparately);
+              theControlValue = (printSettings.mPrintFramesSeparately) ? 1 : 0;
+              SetControlValue(theContext->thePrintFramesSeparately, theControlValue);
             } else {
               DisableControl((ControlHandle)theContext->thePrintFrameAsIs);
               SetControlValue(theContext->thePrintFrameAsIs, 0);
               DisableControl((ControlHandle)theContext->thePrintSelectedFrame);
               SetControlValue(theContext->thePrintSelectedFrame, 0);
-              DisableControl((ControlHandle)theContext->thePrintFramesSeperatly);
-              SetControlValue(theContext->thePrintFramesSeperatly, 0);
+              DisableControl((ControlHandle)theContext->thePrintFramesSeparately);
+              SetControlValue(theContext->thePrintFramesSeparately, 0);
             }
           
             // shrink to fit
@@ -673,8 +673,8 @@ MozPDESync(PMPDEContext aContext,PMPrintSession  aPrintSession,Boolean aSyncDire
            printSettings.mPrintFrameAsIs = theControlValue != 0;
            theControlValue = GetControlValue(theContext->thePrintSelectedFrame);
            printSettings.mPrintSelectedFrame = theControlValue != 0;
-           theControlValue = GetControlValue(theContext->thePrintFramesSeperatly);
-           printSettings.mPrintFramesSeperatly = theControlValue != 0;
+           theControlValue = GetControlValue(theContext->thePrintFramesSeparately);
+           printSettings.mPrintFramesSeparately = theControlValue != 0;
            theControlValue = GetControlValue(theContext->theShrinkToFit);
            printSettings.mShrinkToFit = theControlValue != 0;
          
diff --git a/mozilla/gfx/src/nsTransform2D.cpp b/mozilla/gfx/src/nsTransform2D.cpp
index 323bca6c11e..88c37d32843 100644
--- a/mozilla/gfx/src/nsTransform2D.cpp
+++ b/mozilla/gfx/src/nsTransform2D.cpp
@@ -435,7 +435,7 @@ void nsTransform2D :: TransformCoord(nscoord *ptX, nscoord *ptY)
     case MG_2DSCALE | MG_2DTRANSLATION:
       // You can not use a translation that is not rounded to calculate a 
       // final destination and get consistent results.  The translation is rounded 
-      // seperatly only for the final coordinate location.  Its ok 
+      // separately only for the final coordinate location.  Its ok 
       // to keep the tranlation in floating for the matrix.. just don't use it
       // pre-rounded for coordinate locations.  Its not valid to translate 1.333 pixels for example
       // on output since .33 pixel is not a valid output unit and can cause inconsistencies. (dcone)
diff --git a/mozilla/gfx/src/windows/blank_glyph.ccmap b/mozilla/gfx/src/windows/blank_glyph.ccmap
index 7b5407956b3..c58e43bb86a 100755
--- a/mozilla/gfx/src/windows/blank_glyph.ccmap
+++ b/mozilla/gfx/src/windows/blank_glyph.ccmap
@@ -76,7 +76,7 @@
    0XFEFF : BYTE ORDER MARK^L
    0XFFA0 : HALFWIDTH HANGUL FILLER
    0XFFF9 : INTERLINEAR ANNOTATION ANCHOR
-   0XFFFA : INTERLINEAR ANNOTATION SEPERATOR
+   0XFFFA : INTERLINEAR ANNOTATION SEPARATOR
    0XFFFB : INTERLINEAR ANNOTATION TERMINATOR
    0X2000 : EN QUAD
    0X2001 : EM QUAD
diff --git a/mozilla/gfx/src/xprint/xprintutil.c b/mozilla/gfx/src/xprint/xprintutil.c
index 85f8321a9b2..2080e60048e 100644
--- a/mozilla/gfx/src/xprint/xprintutil.c
+++ b/mozilla/gfx/src/xprint/xprintutil.c
@@ -47,7 +47,7 @@
 #define strtok_r(s1, s2, x) PL_strtok_r((s1), (s2), (x))
 #endif /* USE_MOZILLA_TYPES */
 
-/* List of tokens which can be used to seperate entries in the 
+/* List of tokens which can be used to separate entries in the 
  * $XPSERVERLIST env var */
 static const char XPServerListSeparators[] = " \t\v\n\r\f";
 
@@ -664,7 +664,7 @@ Bool XpuParseMediumSourceSize( const char *value,
   while(*s);
   *d = '\0';
     
-  /* seperate medium name from string */
+  /* separate medium name from string */
   d = (char *)search_next_space(name);
   if( !d )
   {
diff --git a/mozilla/htmlparser/src/COtherElements.h b/mozilla/htmlparser/src/COtherElements.h
index 07dfaa03026..64f057472a4 100644
--- a/mozilla/htmlparser/src/COtherElements.h
+++ b/mozilla/htmlparser/src/COtherElements.h
@@ -117,7 +117,7 @@ inline PRBool ListContainsTag(eHTMLTags* aTagList,eHTMLTags aTag) {
 class CElement {
 public:
 
-    //break this struct out seperately so that lame compilers don't gack.
+    //break this struct out separately so that lame compilers don't gack.
   struct CFlags {
     PRUint32  mOmitEndTag:1;
     PRUint32  mIsContainer:1;
diff --git a/mozilla/htmlparser/src/nsDTDUtils.h b/mozilla/htmlparser/src/nsDTDUtils.h
index e9c9825cfa2..2fb0ffe7e6d 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/htmlparser/src/nsDTDUtils.h
@@ -369,7 +369,7 @@ public:
   PRInt32         mResidualStyleCount;
   PRInt32         mContextTopIndex;
 
-    //break this struct out seperately so that lame compilers don't gack.
+    //break this struct out separately so that lame compilers don't gack.
     //By using these bits instead of bools, we have a bit-o-memory.
   struct CFlags {
     PRUint8  mHadBody:1;
diff --git a/mozilla/htmlparser/tests/html/quote002.html b/mozilla/htmlparser/tests/html/quote002.html
index 2873a8c8fe8..182be7f5045 100644
--- a/mozilla/htmlparser/tests/html/quote002.html
+++ b/mozilla/htmlparser/tests/html/quote002.html
@@ -9,7 +9,7 @@
   <br> tag A is used so you can check the string by moving mouse on the link.
   <br> use view source or text editor to compare with browser display.
   <br>10 <a href= "abcd""xyz" > 2 quoted string stick together</a>
-  <br>20 <a href= "abcd" "xyz" > 2 quoted string seperated by space</a>
+  <br>20 <a href= "abcd" "xyz" > 2 quoted string separated by space</a>
   <br>30 <a href= "abcd"efg"xyz" > Navigator doesn't support nested quote.</a>
   <br>40 <a href= "abcd&quot;xyz" > quoted string can have escaped quote.</a>
   <br>50 <a href= abcd&quot;xyz > unquoted string can have escaped quote.</a>
@@ -30,4 +30,4 @@
   <br>In the following test line, quote is the last char in the html file.
   <br> Navigator 4.0 displace the line as text.
   <br> XENA60 appends a closing quote and display it as link with empty href="".
-  <br>150 <a href= "
\ No newline at end of file
+  <br>150 <a href= "
diff --git a/mozilla/layout/doc/Layout_Overview.html b/mozilla/layout/doc/Layout_Overview.html
index 220ccb72462..f8616981e4e 100644
--- a/mozilla/layout/doc/Layout_Overview.html
+++ b/mozilla/layout/doc/Layout_Overview.html
@@ -40,7 +40,7 @@ speech-synthesizer. To date the only real use of this multiple presentation
 ability is seen in printing, where multiple presentations are managed, all
 connected to the same content model. (note: it is unclear if this is really
 a benefit - it may have been better to use a copy of the content model for
-each presentation, and to remove the complexity of managing seperate presentations
+each presentation, and to remove the complexity of managing separate presentations
 - analysis is needed here). The idea of supporting a non-visual presentation
 is interesting. Layout's support for aural presentations is undeveloped,
 though conceptually, it is possible and supported by the architecture.<br>
diff --git a/mozilla/layout/doc/debugtable.html b/mozilla/layout/doc/debugtable.html
index b952379bc0c..282b086dea5 100644
--- a/mozilla/layout/doc/debugtable.html
+++ b/mozilla/layout/doc/debugtable.html
@@ -35,7 +35,7 @@ The available options are:
 <li><code>disable-resize-opt</code>
 </ul>
 <p>
-These options can be combined with a comma seperated list	
+These options can be combined with a comma separated list 
 Messages generated by the <code>reflow</code> switch:
 <ul>
 <li><code> Block(div)(1)@00BE5AC4: reflowing dirty lines computedWidth=9000 computedHeight=1500</code>
diff --git a/mozilla/layout/doc/obsolete/line-layout.html b/mozilla/layout/doc/obsolete/line-layout.html
index e1405dc8ddd..a2ad3afb951 100644
--- a/mozilla/layout/doc/obsolete/line-layout.html
+++ b/mozilla/layout/doc/obsolete/line-layout.html
@@ -85,7 +85,7 @@ as well as both storing and interrogating "word" state.
 To support the white-space property, the line layout logic keeps track
 of the presence of white-space in the line as it told to reflow each inline
 frame. This allows for the compression of leading whitespace and the compression
-of adjacent whitespace that is in seperate inline elements.
+of adjacent whitespace that is in separate inline elements.
 <p>As a post-processing step, the TrimTrailingWhiteSpace logic is used
 to remove those pesky pices of white-space that end up being placed at
 the end of a line, that shouldn't really be seen.
diff --git a/mozilla/layout/doc/obsolete/nav4-html.html b/mozilla/layout/doc/obsolete/nav4-html.html
index b3a4cf0b075..ed87987b19e 100644
--- a/mozilla/layout/doc/obsolete/nav4-html.html
+++ b/mozilla/layout/doc/obsolete/nav4-html.html
@@ -19,7 +19,7 @@ for the attributes and how the tag is treated by magellan.
 Parsing</H2>
 HTML is tokenized by an HTML scanner. The scanner is fed unicode data to
 parse. Stream converters are used to translate from various encodings to
-unicode. The scanner seperates the input stream into tokens which consist
+unicode. The scanner separates the input stream into tokens which consist
 of:
 <UL>
 <LI>
@@ -433,7 +433,7 @@ a conditional soft line break is done and the alignment is popped.
 >= 0 ]
 <BR><B>HEIGHT</B>=value-or-pct [ % of win.height minus margins; clamped:
 >= 0 ]
-<BR><B>CELLPADDING</B>=int [clamped: >= 0; seperate pads take precedence
+<BR><B>CELLPADDING</B>=int [clamped: >= 0; separate pads take precedence
 ]
 <BR><B>TOPPADDING</B>= int [clamped: >= 0 ]
 <BR><B>BOTTOMPADDING</B>= int [clamped: >= 0 ]
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 6d2ce2bad3c..ea676373a57 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -2427,7 +2427,7 @@ NS_IMETHODIMP
 nsComboboxControlFrame::GetAdditionalChildListName(PRInt32   aIndex,
                                          nsIAtom** aListName) const
 {
-   // Maintain a seperate child list for the dropdown list (i.e. popup listbox)
+   // Maintain a separate child list for the dropdown list (i.e. popup listbox)
    // This is necessary because we don't want the listbox to be included in the layout
    // of the combox's children because it would take up space, when it is suppose to
    // be floating above the display.
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index c71fe0f6788..fdf7b5fc0ed 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -131,7 +131,7 @@ ShowDebugFlags()
   for (; bdf < end; bdf++) {
     printf("  %s\n", bdf->name);
   }
-  printf("Note: GECKO_BLOCK_DEBUG_FLAGS is a comma seperated list of flag\n");
+  printf("Note: GECKO_BLOCK_DEBUG_FLAGS is a comma separated list of flag\n");
   printf("names (no whitespace)\n");
 }
 
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index c8464c41587..9fc1106ff5d 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -3155,7 +3155,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
     mCachedAttrParamValues[mNumCachedAttrs-1] = ToNewUTF8String(data);
   }
 
-  // add our PARAM and null seperator
+  // add our PARAM and null separator
   mCachedAttrParamNames [mNumCachedAttrs] = ToNewUTF8String(NS_LITERAL_STRING("PARAM"));
   mCachedAttrParamValues[mNumCachedAttrs] = nsnull;
 
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index c71fe0f6788..fdf7b5fc0ed 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -131,7 +131,7 @@ ShowDebugFlags()
   for (; bdf < end; bdf++) {
     printf("  %s\n", bdf->name);
   }
-  printf("Note: GECKO_BLOCK_DEBUG_FLAGS is a comma seperated list of flag\n");
+  printf("Note: GECKO_BLOCK_DEBUG_FLAGS is a comma separated list of flag\n");
   printf("names (no whitespace)\n");
 }
 
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index c8464c41587..9fc1106ff5d 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -3155,7 +3155,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
     mCachedAttrParamValues[mNumCachedAttrs-1] = ToNewUTF8String(data);
   }
 
-  // add our PARAM and null seperator
+  // add our PARAM and null separator
   mCachedAttrParamNames [mNumCachedAttrs] = ToNewUTF8String(NS_LITERAL_STRING("PARAM"));
   mCachedAttrParamValues[mNumCachedAttrs] = nsnull;
 
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index 6d2ce2bad3c..ea676373a57 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -2427,7 +2427,7 @@ NS_IMETHODIMP
 nsComboboxControlFrame::GetAdditionalChildListName(PRInt32   aIndex,
                                          nsIAtom** aListName) const
 {
-   // Maintain a seperate child list for the dropdown list (i.e. popup listbox)
+   // Maintain a separate child list for the dropdown list (i.e. popup listbox)
    // This is necessary because we don't want the listbox to be included in the layout
    // of the combox's children because it would take up space, when it is suppose to
    // be floating above the display.
diff --git a/mozilla/layout/style/nsIStyleRuleProcessor.h b/mozilla/layout/style/nsIStyleRuleProcessor.h
index aca01834244..32494874c8b 100644
--- a/mozilla/layout/style/nsIStyleRuleProcessor.h
+++ b/mozilla/layout/style/nsIStyleRuleProcessor.h
@@ -165,7 +165,7 @@ struct AttributeRuleProcessorData : public RuleProcessorData {
 #define NS_ISTYLE_RULE_PROCESSOR_IID     \
 {0x015575fe, 0x7b6c, 0x11d3, {0xba, 0x05, 0x00, 0x10, 0x83, 0x02, 0x3c, 0x2b}}
 
-/* The style rule processor interface is a mechanism to seperate the matching
+/* The style rule processor interface is a mechanism to separate the matching
  * of style rules from style sheet instances.
  * Simple style sheets can and will act as their own processor. 
  * Sheets where rule ordering interlaces between multiple sheets, will need to 
diff --git a/mozilla/mailnews/addrbook/resources/content/abCommon.js b/mozilla/mailnews/addrbook/resources/content/abCommon.js
index 2b4ef1598c2..e44cb56eed3 100644
--- a/mozilla/mailnews/addrbook/resources/content/abCommon.js
+++ b/mozilla/mailnews/addrbook/resources/content/abCommon.js
@@ -518,7 +518,7 @@ function GetSelectedAddresses()
   return GetAddressesForCards(selectedCards);
 }
 
-// Generate a comma seperate list of addresses from a given
+// Generate a comma separated list of addresses from a given
 // set of cards.
 function GetAddressesForCards(cards)
 {
diff --git a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp
index 1acd39f5f82..eae6b73e301 100644
--- a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp
@@ -1348,7 +1348,7 @@ NS_IMETHODIMP nsAddressBook::ExportAddressBook(nsIAbDirectory *aDirectory)
     if (extension.Equals(CSV_FILE_EXTENSION))
       rv = ExportDirectoryToDelimitedText(aDirectory, CSV_DELIM, CSV_DELIM_LEN, localFile);
     else if (extension.Equals(TAB_FILE_EXTENSION) || extension.Equals(TXT_FILE_EXTENSION)) {
-      // .tab and .txt are both tab seperated
+      // .tab and .txt are both tab separated
       rv = ExportDirectoryToDelimitedText(aDirectory, TAB_DELIM, TAB_DELIM_LEN, localFile);
     }
     else {
@@ -1500,7 +1500,7 @@ nsAddressBook::ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const
             }
           }
 
-          // write out the linebreak that seperates the cards
+          // write out the linebreak that separates the cards
           rv = outputStream->Write(MSG_LINEBREAK, MSG_LINEBREAK_LEN, &writeCount);
           NS_ENSURE_SUCCESS(rv,rv);
           if (MSG_LINEBREAK_LEN != writeCount)
@@ -1618,7 +1618,7 @@ nsAddressBook::ExportDirectoryToLDIF(nsIAbDirectory *aDirectory, nsILocalFile *a
             }
           }
         
-          // write out the linebreak that seperates the cards
+          // write out the linebreak that separates the cards
           rv = outputStream->Write(LDIF_LINEBREAK, LDIF_LINEBREAK_LEN, &writeCount);
           NS_ENSURE_SUCCESS(rv,rv);
           if (LDIF_LINEBREAK_LEN != writeCount)
diff --git a/mozilla/mailnews/base/search/public/nsIMsgFilter.idl b/mozilla/mailnews/base/search/public/nsIMsgFilter.idl
index e3c004e4bac..dabdd074686 100644
--- a/mozilla/mailnews/base/search/public/nsIMsgFilter.idl
+++ b/mozilla/mailnews/base/search/public/nsIMsgFilter.idl
@@ -100,7 +100,7 @@ interface nsIMsgFilter : nsISupports {
 
     attribute nsIMsgSearchScopeTerm scope;
 
-    // marking noscript because "headers" is actually a null-seperated
+    // marking noscript because "headers" is actually a null-separated
     // list of headers, which is not scriptable
     [noscript] void MatchHdr(in nsIMsgDBHdr msgHdr, in nsIMsgFolder folder,
                   in nsIMsgDatabase db,
diff --git a/mozilla/mailnews/base/search/public/nsIMsgFilterList.idl b/mozilla/mailnews/base/search/public/nsIMsgFilterList.idl
index 70a50e366b9..028d3584ff2 100644
--- a/mozilla/mailnews/base/search/public/nsIMsgFilterList.idl
+++ b/mozilla/mailnews/base/search/public/nsIMsgFilterList.idl
@@ -100,7 +100,7 @@ interface nsIMsgFilterList : nsISupports {
     void saveToDefaultFile();
     
 
-    // marking noscript because headers is a null-seperated list
+    // marking noscript because headers is a null-separated list
     // of strings, which is not scriptable
     [noscript]
     void applyFiltersToHdr(in nsMsgFilterTypeType filterType,
diff --git a/mozilla/mailnews/base/search/public/nsIMsgSearchTerm.idl b/mozilla/mailnews/base/search/public/nsIMsgSearchTerm.idl
index 70d43ae5cc3..d41982683de 100644
--- a/mozilla/mailnews/base/search/public/nsIMsgSearchTerm.idl
+++ b/mozilla/mailnews/base/search/public/nsIMsgSearchTerm.idl
@@ -75,7 +75,7 @@ interface nsIMsgSearchTerm : nsISupports {
                       in nsIMsgDBHdr msg,
                       in nsIMsgDatabase db);
 
-    // marking noscript because headers is a null-seperated list of strings,
+    // marking noscript because headers is a null-separated list of strings,
     // which is not scriptable
     [noscript]
     boolean matchArbitraryHeader(in nsIMsgSearchScopeTerm scopeTerm,
diff --git a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp
index a8f419584d7..af95d380bff 100644
--- a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp
+++ b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp
@@ -83,7 +83,7 @@ nsSmtpDelegateFactory::CreateDelegate(nsIRDFResource *aOuter,
   
   rv = url->SetSpec(nsDependentCString(uri));
 
-  // seperate out username, hostname
+  // separate out username, hostname
   nsCAutoString hostname;
   nsCAutoString userpass;
 
diff --git a/mozilla/mailnews/import/public/nsIImportAddressBooks.idl b/mozilla/mailnews/import/public/nsIImportAddressBooks.idl
index 78d3279bc5e..aec84eeb990 100644
--- a/mozilla/mailnews/import/public/nsIImportAddressBooks.idl
+++ b/mozilla/mailnews/import/public/nsIImportAddressBooks.idl
@@ -55,7 +55,7 @@
   1) The first UI
   panel will allow selection of the address book and will indicate to the user
   if the address book will be imported into an existing address book or new address
-  books.  (This could be 2 seperate xul UI's?).
+  books.  (This could be 2 separate xul UI's?).
   2) The second panel will show field mapping if it is required - if it is required then
   there will be one panel per address book for formats that support multiple
   address books.  If it is not required then there will be no second panel.
diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.cpp b/mozilla/mailnews/local/src/nsPop3Protocol.cpp
index 764bf31f5ff..6b34ed92271 100644
--- a/mozilla/mailnews/local/src/nsPop3Protocol.cpp
+++ b/mozilla/mailnews/local/src/nsPop3Protocol.cpp
@@ -2664,7 +2664,7 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn
         switch(m_pop3ConData->next_state)
         {
         case POP3_READ_PASSWORD:
-            /* This is a seperate state so that we're waiting for the
+            /* This is a separate state so that we're waiting for the
                user to type in a password while we don't actually have
                a connection to the pop server open; this saves us from
                having to worry about the server timing out on us while
diff --git a/mozilla/mailnews/mime/public/nsIMsgHeaderParser.idl b/mozilla/mailnews/mime/public/nsIMsgHeaderParser.idl
index 7aba63f18ca..037ef1b5c3c 100644
--- a/mozilla/mailnews/mime/public/nsIMsgHeaderParser.idl
+++ b/mozilla/mailnews/mime/public/nsIMsgHeaderParser.idl
@@ -76,7 +76,7 @@ interface nsIMsgHeaderParser : nsISupports {
                              out string addresses, out PRUint32 numAddresses);
 
   /* Given a string which contains a list of Header addresses, returns a
-     comma-seperated list of just the `mailbox' portions.
+     comma-separated list of just the `mailbox' portions.
 
      The caller may pass nsnull for charset and it will be interpreted as "us-ascii".
 
@@ -86,7 +86,7 @@ interface nsIMsgHeaderParser : nsISupports {
 
 
   /* Given a string which contains a list of Header addresses, returns a
-     comma-seperated list of just the `user name' portions.  If any of
+     comma-separated list of just the `user name' portions.  If any of
      the addresses doesn't have a name, then the mailbox is used instead.
 
      The caller may pass nsnull for charset and it will be interpreted as "us-ascii".
diff --git a/mozilla/mailnews/mime/src/mimehdrs.cpp b/mozilla/mailnews/mime/src/mimehdrs.cpp
index d640f21a4a1..9c78f129ea1 100644
--- a/mozilla/mailnews/mime/src/mimehdrs.cpp
+++ b/mozilla/mailnews/mime/src/mimehdrs.cpp
@@ -441,7 +441,7 @@ MimeHeaders_get (MimeHeaders *hdrs, const char *header_name,
 
 			/* Since we are tacking more data onto the end of the header
 			   field, we must make it be a well-formed continuation line,
-			   by seperating the old and new data with CR-LF-TAB.
+                          by separating the old and new data with CR-LF-TAB.
 			 */
 			*s++ = ',';				/* #### only do this for addr headers? */
 			*s++ = MSG_LINEBREAK[0];
diff --git a/mozilla/mailnews/mime/src/nsMimeAddress.cpp b/mozilla/mailnews/mime/src/nsMimeAddress.cpp
index 5b26ea6efeb..63a0a782998 100644
--- a/mozilla/mailnews/mime/src/nsMimeAddress.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeAddress.cpp
@@ -63,7 +63,7 @@ ParseRFC822Addresses (const char *line,
 }
 
 /* Given a string which contains a list of RFC822 addresses, returns a
-   comma-seperated list of just the `mailbox' portions.
+   comma-separated list of just the `mailbox' portions.
  */
 char *
 ExtractRFC822AddressMailboxes (const char *line)
@@ -80,7 +80,7 @@ ExtractRFC822AddressMailboxes (const char *line)
 
 
 /* Given a string which contains a list of RFC822 addresses, returns a
-   comma-seperated list of just the `user name' portions.  If any of
+   comma-separated list of just the `user name' portions.  If any of
    the addresses doesn't have a name, then the mailbox is used instead.
 
    The names are *unquoted* and therefore cannot be re-parsed in any way.
diff --git a/mozilla/mailnews/mime/src/nsMimeAddress.h b/mozilla/mailnews/mime/src/nsMimeAddress.h
index eede4cea32b..08e965551fb 100644
--- a/mozilla/mailnews/mime/src/nsMimeAddress.h
+++ b/mozilla/mailnews/mime/src/nsMimeAddress.h
@@ -55,7 +55,7 @@ char *
 ExtractRFC822AddressMailboxes (const char *line);
 
 /* Given a string which contains a list of RFC822 addresses, returns a
-   comma-seperated list of just the `user name' portions.  If any of
+   comma-separated list of just the `user name' portions.  If any of
    the addresses doesn't have a name, then the mailbox is used instead.
 
    The names are *unquoted* and therefore cannot be re-parsed in any way.
diff --git a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
index 621599fabc1..a13c8185cac 100644
--- a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
+++ b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp
@@ -975,7 +975,7 @@ msg_quote_phrase_or_addr(char *address, PRInt32 length, PRBool addr_p)
                  || *in == '<' || *in == '>' || *in == '@' || *in == ',') 
             /* If the name contains control chars or Header specials, it needs to
              * be enclosed in quotes.  Double-quotes and backslashes will be dealt
-             * with seperately.
+             * with separately.
              *
              * The ":" character is explicitly not in this list, though Header says
              * it should be quoted, because that has been seen to break VMS
@@ -1186,7 +1186,7 @@ msg_unquote_phrase_or_addr(const char *line, PRBool preserveIntegrity, char **li
 /* msg_extract_Header_address_mailboxes
  *
  * Given a string which contains a list of Header addresses, returns a
- * comma-seperated list of just the `mailbox' portions.
+ * comma-separated list of just the `mailbox' portions.
  */
 static char *
 msg_extract_Header_address_mailboxes(const char *line)
@@ -1236,7 +1236,7 @@ msg_extract_Header_address_mailboxes(const char *line)
 /* msg_extract_Header_address_names
  *
  * Given a string which contains a list of Header addresses, returns a
- * comma-seperated list of just the `user name' portions.  If any of
+ * comma-separated list of just the `user name' portions.  If any of
  * the addresses doesn't have a name, then the mailbox is used instead.
  *
  * The names are *unquoted* and therefore cannot be re-parsed in any way.
diff --git a/mozilla/mailnews/movemail/README b/mozilla/mailnews/movemail/README
index cf21b57d1e6..fecc6327309 100644
--- a/mozilla/mailnews/movemail/README
+++ b/mozilla/mailnews/movemail/README
@@ -24,7 +24,7 @@ of the product)
 
 It's actually probably simpler than your description - we've done a fairly good job at keeping
 the idea of POP (as a protocol for retrieving remote mail) and Local Mail (as a way of storing
-mail messages locally) as seperate entities, though there is still work to be done to seperate
+mail messages locally) as separate entities, though there is still work to be done to separate
 the two. Both implementations reside in mozilla/mailnews/local though.
 
 the movemail implementation could leverage the Local Mail work, performing the same function as
diff --git a/mozilla/mailnews/news/public/nsINntpService.idl b/mozilla/mailnews/news/public/nsINntpService.idl
index 116483fe266..7aff077face 100644
--- a/mozilla/mailnews/news/public/nsINntpService.idl
+++ b/mozilla/mailnews/news/public/nsINntpService.idl
@@ -52,11 +52,11 @@ interface nsICacheSession;
 [scriptable, uuid(4C9F90E0-E19B-11d2-806E-006008128C4E)]
 interface nsINntpService : nsISupports {
   
-  /* newsgroupsList is a comma seperated list of newsgroups, which may be
+  /* newsgroupsList is a comma separated list of newsgroups, which may be
    * in news://host/group or group form
    * "news://host/group1,news://host/group2" or "group1,group2"
    *
-   * newsgroupsHeaderVal is a comma seperated list of groups in the group form
+   * newsgroupsHeaderVal is a comma separated list of groups in the group form
    * "group1,group2"
    *
    * newshostHeaderVal is a single hostname.
diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
index 231ceb51cb3..fcf96d9c11b 100644
--- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
@@ -1403,7 +1403,7 @@ nsNNTPProtocol::ParseURL(nsIURI * aURL, char ** aGroup, char ** aMessageID,
 
     /* At this point, the search data is attached to `message_id' (if there
 	 is one) or `group' (if there is one) or `host_and_port' (otherwise.)
-	 Seperate the search data from what it is clinging to, being careful
+        Separate the search data from what it is clinging to, being careful
 	 to interpret the "?" only if it comes after the "@" in an ID, since
 	 the syntax of message IDs is tricky.  (There may be a ? in the
 	 random-characters part of the ID (before @), but not in the host part
diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp
index bd5f60bf67e..fcf894a668f 100644
--- a/mozilla/mailnews/news/src/nsNntpService.cpp
+++ b/mozilla/mailnews/news/src/nsNntpService.cpp
@@ -749,7 +749,7 @@ nsNntpService::SetUpNntpUrlForPosting(nsINntpUrl *nntpUrl, const char *newsgroup
 
   nsCAutoString host;
 
-  // newsgroupsNames can be a comma seperated list of these:
+  // newsgroupsNames can be a comma separated list of these:
   // news://host/group
   // news://group
   // host/group
@@ -862,7 +862,7 @@ nsNntpService::GenerateNewsHeaderValsForPosting(const char *newsgroupsList, char
   NS_ENSURE_ARG_POINTER(newshostHeaderVal);
   NS_ENSURE_ARG_POINTER(*newsgroupsList);
 
-  // newsgroupsList can be a comma seperated list of these:
+  // newsgroupsList can be a comma separated list of these:
   // news://host/group
   // news://group
   // host/group
diff --git a/mozilla/modules/libpr0n/src/imgLoader.cpp b/mozilla/modules/libpr0n/src/imgLoader.cpp
index b6d387aa1f4..9b547182b21 100644
--- a/mozilla/modules/libpr0n/src/imgLoader.cpp
+++ b/mozilla/modules/libpr0n/src/imgLoader.cpp
@@ -635,7 +635,7 @@ imgLoader::CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup *aLoadGro
 {
   LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::CreateNewProxyForRequest", "imgRequest", aRequest);
 
-  /* XXX If we move decoding onto seperate threads, we should save off the
+  /* XXX If we move decoding onto separate threads, we should save off the
      calling thread here and pass it off to |proxyRequest| so that it call
      proxy calls to |aObserver|.
    */
diff --git a/mozilla/modules/libpref/src/unix/unix.js b/mozilla/modules/libpref/src/unix/unix.js
index 12f1276712f..4a03e2e6455 100644
--- a/mozilla/modules/libpref/src/unix/unix.js
+++ b/mozilla/modules/libpref/src/unix/unix.js
@@ -107,7 +107,7 @@ pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
 pref("applications.tmp_dir", "/tmp");
 // On Solaris/IRIX, this should be "lp"
 pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
-pref("print.printer_list", ""); // list of printers, seperated by spaces
+pref("print.printer_list", ""); // list of printers, separated by spaces
 pref("print.print_reversed", false);
 pref("print.print_color", true);
 pref("print.print_landscape", false);
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index 978b7bddc90..39c8a0e8cde 100644
--- a/mozilla/modules/plugin/base/public/npapi.h
+++ b/mozilla/modules/plugin/base/public/npapi.h
@@ -38,7 +38,7 @@
 
 
 /*
- *  npapi.h $Revision: 3.28 $
+ *  npapi.h $Revision: 3.29 $
  *  Netscape client plug-in API spec
  */
 
@@ -125,7 +125,7 @@
 
 /* The OS/2 version of Netscape uses RC_DATA to define the
    mime types, file extentions, etc that are required.
-   Use a vertical bar to seperate types, end types with \0.
+   Use a vertical bar to separate types, end types with \0.
    FileVersion and ProductVersion are 32bit ints, all other
    entries are strings the MUST be terminated wwith a \0.
 
diff --git a/mozilla/modules/plugin/base/public/nsPluginLogging.h b/mozilla/modules/plugin/base/public/nsPluginLogging.h
index b2c907c22f2..cb4215387e2 100644
--- a/mozilla/modules/plugin/base/public/nsPluginLogging.h
+++ b/mozilla/modules/plugin/base/public/nsPluginLogging.h
@@ -69,7 +69,7 @@
 #define PLUGIN_LOG_NOISY  7
 #define PLUGIN_LOG_MAX    9
 
-// 2. You can combine logs and levels by seperating them with a comma:
+// 2. You can combine logs and levels by separating them with a comma:
 //    My favorite Win32 Example: SET NSPR_LOG_MODULES=Plugin:5,PluginNPP:5,PluginNPN:5
 
 // 3. Instead of output going to the console, you can log to a file. Additionally, set the
diff --git a/mozilla/modules/plugin/base/public/nsplugindefs.h b/mozilla/modules/plugin/base/public/nsplugindefs.h
index 15e0973a844..534da8236d6 100644
--- a/mozilla/modules/plugin/base/public/nsplugindefs.h
+++ b/mozilla/modules/plugin/base/public/nsplugindefs.h
@@ -68,7 +68,7 @@
 
 /* The OS/2 version of Netscape uses RC_DATA to define the
    mime types, file extentions, etc that are required.
-   Use a vertical bar to seperate types, end types with \0.
+   Use a vertical bar to separate types, end types with \0.
    FileVersion and ProductVersion are 32bit ints, all other
    entries are strings the MUST be terminated wwith a \0.
 
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index 627f1e1aaa5..af0ae9eb23a 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -737,7 +737,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
     // nsPluginTagType_Object or Applet may also have PARAM tags
     // Note: The arrays handed back by GetParameters() are
     // crafted specially to be directly behind the arrays from GetAtributes()
-    // with a null entry as a seperator. This is for 4.x backwards compatibility!
+    // with a null entry as a separator. This is for 4.x backwards compatibility!
     // see bug 111008 for details
     if (tagtype != nsPluginTagType_Embed) {
       PRUint16 pcount = 0;
diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h
index 07dfaa03026..64f057472a4 100644
--- a/mozilla/parser/htmlparser/src/COtherElements.h
+++ b/mozilla/parser/htmlparser/src/COtherElements.h
@@ -117,7 +117,7 @@ inline PRBool ListContainsTag(eHTMLTags* aTagList,eHTMLTags aTag) {
 class CElement {
 public:
 
-    //break this struct out seperately so that lame compilers don't gack.
+    //break this struct out separately so that lame compilers don't gack.
   struct CFlags {
     PRUint32  mOmitEndTag:1;
     PRUint32  mIsContainer:1;
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.h b/mozilla/parser/htmlparser/src/nsDTDUtils.h
index e9c9825cfa2..2fb0ffe7e6d 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.h
@@ -369,7 +369,7 @@ public:
   PRInt32         mResidualStyleCount;
   PRInt32         mContextTopIndex;
 
-    //break this struct out seperately so that lame compilers don't gack.
+    //break this struct out separately so that lame compilers don't gack.
     //By using these bits instead of bools, we have a bit-o-memory.
   struct CFlags {
     PRUint8  mHadBody:1;
diff --git a/mozilla/parser/htmlparser/tests/html/quote002.html b/mozilla/parser/htmlparser/tests/html/quote002.html
index 2873a8c8fe8..182be7f5045 100644
--- a/mozilla/parser/htmlparser/tests/html/quote002.html
+++ b/mozilla/parser/htmlparser/tests/html/quote002.html
@@ -9,7 +9,7 @@
   <br> tag A is used so you can check the string by moving mouse on the link.
   <br> use view source or text editor to compare with browser display.
   <br>10 <a href= "abcd""xyz" > 2 quoted string stick together</a>
-  <br>20 <a href= "abcd" "xyz" > 2 quoted string seperated by space</a>
+  <br>20 <a href= "abcd" "xyz" > 2 quoted string separated by space</a>
   <br>30 <a href= "abcd"efg"xyz" > Navigator doesn't support nested quote.</a>
   <br>40 <a href= "abcd&quot;xyz" > quoted string can have escaped quote.</a>
   <br>50 <a href= abcd&quot;xyz > unquoted string can have escaped quote.</a>
@@ -30,4 +30,4 @@
   <br>In the following test line, quote is the last char in the html file.
   <br> Navigator 4.0 displace the line as text.
   <br> XENA60 appends a closing quote and display it as link with empty href="".
-  <br>150 <a href= "
\ No newline at end of file
+  <br>150 <a href= "
diff --git a/mozilla/profile/pref-migrator/public/nsIPrefMigration.idl b/mozilla/profile/pref-migrator/public/nsIPrefMigration.idl
index 1ccaf0e3dbe..8e58f8b3d4f 100644
--- a/mozilla/profile/pref-migrator/public/nsIPrefMigration.idl
+++ b/mozilla/profile/pref-migrator/public/nsIPrefMigration.idl
@@ -73,7 +73,7 @@ interface nsIPrefMigration: nsISupports
   void GetError();	
 
   /**
-   * this should be in a seperate interface
+   * this should be in a separate interface
    **/
 
   void WindowCloseCallback();  
diff --git a/mozilla/webshell/tests/viewer/resources/find.html b/mozilla/webshell/tests/viewer/resources/find.html
index b7184948d20..dc4227ae730 100644
--- a/mozilla/webshell/tests/viewer/resources/find.html
+++ b/mozilla/webshell/tests/viewer/resources/find.html
@@ -7,7 +7,7 @@
 
 <body bgcolor="#C0C0C0">
 <style type="text/css">
-/* This style sheet should be in a seperate file */
+/* This style sheet should be in a separate file */
 
 FIELDSET {
     background-color: rgb(192, 192, 192);
diff --git a/mozilla/webshell/tests/viewer/resources/image_props.html b/mozilla/webshell/tests/viewer/resources/image_props.html
index 872c5468bf0..fe8912e17ac 100644
--- a/mozilla/webshell/tests/viewer/resources/image_props.html
+++ b/mozilla/webshell/tests/viewer/resources/image_props.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <style type="text/css">
-  /* This style sheet should be in a seperate file */
+  /* This style sheet should be in a separate file */
 
   FIELDSET {
       background-color: rgb(192, 192, 192);
@@ -55,4 +55,4 @@
 </FIELDSET>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/mozilla/webshell/tests/viewer/resources/printsetup.html b/mozilla/webshell/tests/viewer/resources/printsetup.html
index a1271d5a091..3d4a01ae3c4 100644
--- a/mozilla/webshell/tests/viewer/resources/printsetup.html
+++ b/mozilla/webshell/tests/viewer/resources/printsetup.html
@@ -7,7 +7,7 @@
 
 <body bgcolor="#C0C0C0" style="overflow: hidden;">
 <style type="text/css">
-/* This style sheet should be in a seperate file */
+/* This style sheet should be in a separate file */
 
 FIELDSET {
     background-color: rgb(192, 192, 192);
diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h
index 5489d5d206b..bc78e28b101 100644
--- a/mozilla/widget/public/nsIWidget.h
+++ b/mozilla/widget/public/nsIWidget.h
@@ -143,7 +143,7 @@ enum nsBorderStyle
   eBorderStyle_menu     = 1 << 4,
 
   // enables the minimize button so the user can minimize the window.
-  //   turned off for tranient windows since they can not be minimized seperate from their parent
+  //   turned off for tranient windows since they can not be minimized separate from their parent
   eBorderStyle_minimize = 1 << 5,
 
   // enables the maxmize button so the user can maximize the window
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index c694c9c8f3a..3052eab5432 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -2070,7 +2070,7 @@ NS_IMETHODIMP nsChildView::SetTitle(const nsString& title)
 
 NS_IMETHODIMP nsChildView::GetAttention()
 {
-  // Since the Mac doesn't consider each window a seperate process this call functions
+  // Since the Mac doesn't consider each window a separate process this call functions
   // slightly different than on other platforms.  We first check to see if we're the
   // foreground process and, if so, ignore the call.  We also check to see if a notification
   // is already pending and, if so, remove it since we only have one notification per process.
diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp
index a6265275832..278ae5b8fef 100644
--- a/mozilla/widget/src/gtk/nsWindow.cpp
+++ b/mozilla/widget/src/gtk/nsWindow.cpp
@@ -2255,7 +2255,7 @@ void * nsWindow::GetNativeData(PRUint32 aDataType)
       }
 
       // we have to flush the X queue here so that any plugins that
-      // might be running on seperate X connections will be able to use
+      // might be running on separate X connections will be able to use
       // this window in case it was just created
       XSync(GDK_DISPLAY(), False);
       return (void *)GDK_WINDOW_XWINDOW(mSuperWin->bin_window);
diff --git a/mozilla/widget/src/gtk2/nsScrollbar.h b/mozilla/widget/src/gtk2/nsScrollbar.h
index 72d58f26693..7a93c308fb6 100644
--- a/mozilla/widget/src/gtk2/nsScrollbar.h
+++ b/mozilla/widget/src/gtk2/nsScrollbar.h
@@ -132,7 +132,7 @@ private:
     GtkOrientation  mOrientation;
     GtkAdjustment  *mAdjustment;
 
-    // We track these seperately because sometimes their values might
+    // We track these separately because sometimes their values might
     // be different than the values stored in the adjustment.
     PRUint32 mMaxRange;
     PRUint32 mThumbSize;
diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp
index 12a1c2b33b2..5958d9ea113 100644
--- a/mozilla/widget/src/gtk2/nsWindow.cpp
+++ b/mozilla/widget/src/gtk2/nsWindow.cpp
@@ -2529,7 +2529,7 @@ nsWindow::SetupPluginPort(void)
         return nsnull;
 
     // we have to flush the X queue here so that any plugins that
-    // might be running on seperate X connections will be able to use
+    // might be running on separate X connections will be able to use
     // this window in case it was just created
     XWindowAttributes xattrs;
     XGetWindowAttributes(GDK_DISPLAY (),
diff --git a/mozilla/widget/src/mac/nsWindow.cpp b/mozilla/widget/src/mac/nsWindow.cpp
index b0fab8db364..5441b2a6e54 100644
--- a/mozilla/widget/src/mac/nsWindow.cpp
+++ b/mozilla/widget/src/mac/nsWindow.cpp
@@ -2501,7 +2501,7 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& title)
 
 NS_IMETHODIMP nsWindow::GetAttention()
 {
-	// Since the Mac doesn't consider each window a seperate process this call functions
+        // Since the Mac doesn't consider each window a separate process this call functions
 	// slightly different than on other platforms.  We first check to see if we're the
 	// foreground process and, if so, ignore the call.  We also check to see if a notification
 	// is already pending and, if so, remove it since we only have one notification per process.
diff --git a/mozilla/widget/src/xlib/nsAppShell.cpp b/mozilla/widget/src/xlib/nsAppShell.cpp
index 2c850455968..1f119f9a949 100644
--- a/mozilla/widget/src/xlib/nsAppShell.cpp
+++ b/mozilla/widget/src/xlib/nsAppShell.cpp
@@ -434,7 +434,7 @@ NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
                                 (XtPointer)mEventQueue);
 
 /* This hack would not be neccesary if we would have a hashtable function
- * which returns success/failure in a seperate var ...
+ * which returns success/failure in a separate var ...
  */
 #define NEVER_BE_ZERO_MAGIC (54321) 
       tag += NEVER_BE_ZERO_MAGIC; /* be sure that |tag| is _never_ 0 */
diff --git a/mozilla/xpcom/base/nsTraceRefcnt.h b/mozilla/xpcom/base/nsTraceRefcnt.h
index 544bc5e8a2a..35c3e4148c5 100644
--- a/mozilla/xpcom/base/nsTraceRefcnt.h
+++ b/mozilla/xpcom/base/nsTraceRefcnt.h
@@ -57,7 +57,7 @@ class nsISupports;
 
 #if (defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING))
 // Make refcnt logging part of the build. This doesn't mean that
-// actual logging will occur (that requires a seperate enable; see
+// actual logging will occur (that requires a separate enable; see
 // nsTraceRefcnt.h for more information).
 #define NS_BUILD_REFCNT_LOGGING 1
 #endif
diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.h b/mozilla/xpcom/base/nsTraceRefcntImpl.h
index 544bc5e8a2a..35c3e4148c5 100644
--- a/mozilla/xpcom/base/nsTraceRefcntImpl.h
+++ b/mozilla/xpcom/base/nsTraceRefcntImpl.h
@@ -57,7 +57,7 @@ class nsISupports;
 
 #if (defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING))
 // Make refcnt logging part of the build. This doesn't mean that
-// actual logging will occur (that requires a seperate enable; see
+// actual logging will occur (that requires a separate enable; see
 // nsTraceRefcnt.h for more information).
 #define NS_BUILD_REFCNT_LOGGING 1
 #endif
diff --git a/mozilla/xpcom/doc/MemoryTools.html b/mozilla/xpcom/doc/MemoryTools.html
index 41e5f4c6a80..c3a70be3631 100644
--- a/mozilla/xpcom/doc/MemoryTools.html
+++ b/mozilla/xpcom/doc/MemoryTools.html
@@ -131,7 +131,7 @@ that your platform support leaky. Currently only linux supports leaky.</blockquo
                     <blockquote>Instead of slowing to a useless, instead
 you can slow to a meer crawl by using this option. When enabled, the xpcom
 logging software will look for the XPCOM_MEM_LOG_CLASSES environment variable
-(for platforms that support getenv). The variable contains a comma seperated
+(for platforms that support getenv). The variable contains a comma separated
 list of names which will be used to compare against the type's of the objects
 being logged. For example: 
                       <blockquote>env XPCOM_MEM_LOG_CLASSES=nsWebShell XPCOM_MEM_REFCNT_LOG=1 
diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in
index b1948b70bab..86947756a01 100644
--- a/mozilla/xpcom/sample/Makefile.in
+++ b/mozilla/xpcom/sample/Makefile.in
@@ -62,7 +62,7 @@ include $(topsrcdir)/config/config.mk
 
 EXTRA_COMPONENTS = nsSample.js
 
-# seperate libraries linked in.
+# separate libraries linked in.
 EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)embedstring.$(LIB_SUFFIX) \
diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index 3fb46854fb8..8424db909f1 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -437,7 +437,7 @@ nsSplashScreenWin::Hide() {
         //  http://bugzilla.mozilla.org/show_bug.cgi?id=65974
         //  http://bugzilla.mozilla.org/show_bug.cgi?id=29172
         //  http://bugzilla.mozilla.org/show_bug.cgi?id=45805
-        // As the splash-screen is in a seperate thread, Windows considers
+        // As the splash-screen is in a separate thread, Windows considers
         // this the "foreground" thread.  When our main windows on the main
         // thread are activated, they are treated like windows from a different
         // application, so Windows 2000 and 98 both leave the window in the background.
diff --git a/mozilla/xpfe/components/filepicker/res/content/filepicker.js b/mozilla/xpfe/components/filepicker/res/content/filepicker.js
index d827c8a0bd4..de5434a94cf 100644
--- a/mozilla/xpfe/components/filepicker/res/content/filepicker.js
+++ b/mozilla/xpfe/components/filepicker/res/content/filepicker.js
@@ -747,7 +747,7 @@ function toggleShowHidden(event) {
 
 // from the current directory and whatever was entered
 // in the entry field, try to make a new path. This
-// uses "/" as the directory seperator, "~" as a shortcut
+// uses "/" as the directory separator, "~" as a shortcut
 // for the home directory (but only when seen at the start
 // of a path), and ".." to denote the parent directory.
 // returns an array of the files listed,
diff --git a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp
index cf666a83f6f..ede34472f56 100644
--- a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp
+++ b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp
@@ -744,7 +744,7 @@ NS_IMETHODIMP nsWindowsHooks::IsOptionEnabled(const char* option, PRBool *_retva
   *                   passed to the executable in the (appname) Quick Launch registry key
   *
   * Description:
-  *     This function seperates out the arguments from the optinline string
+  *     This function separates out the arguments from the optinline string
   *     Returning a pointer into the first arguments buffer.
   *     This function is used only locally, and is meant to reduce code size and readability.
   *
diff --git a/mozilla/xpinstall/packager/build/scripts/makeall.pl b/mozilla/xpinstall/packager/build/scripts/makeall.pl
index be3ac5bab71..e2cfb3f4db5 100644
--- a/mozilla/xpinstall/packager/build/scripts/makeall.pl
+++ b/mozilla/xpinstall/packager/build/scripts/makeall.pl
@@ -49,7 +49,7 @@ $inDefaultVersion     = $ARGV[0];
 # $ARGV[0] has the form maj.min.release.bld where maj, min, release
 #   and bld are numerics representing version information.
 # Other variables need to use parts of the version info also so we'll
-#   split out the dot seperated values into the array @versionParts
+#   split out the dot separated values into the array @versionParts
 #   such that:
 #
 #   $versionParts[0] = maj
diff --git a/mozilla/xpinstall/packager/os2/makeall.pl b/mozilla/xpinstall/packager/os2/makeall.pl
index 4bc6eaf1464..af6cdaba1d9 100644
--- a/mozilla/xpinstall/packager/os2/makeall.pl
+++ b/mozilla/xpinstall/packager/os2/makeall.pl
@@ -47,7 +47,7 @@ $inDefaultVersion     = $ARGV[0];
 # $ARGV[0] has the form maj.min.release.bld where maj, min, release
 #   and bld are numerics representing version information.
 # Other variables need to use parts of the version info also so we'll
-#   split out the dot seperated values into the array @versionParts
+#   split out the dot separated values into the array @versionParts
 #   such that:
 #
 #   $versionParts[0] = maj
diff --git a/mozilla/xpinstall/packager/win_gre/makeall.pl b/mozilla/xpinstall/packager/win_gre/makeall.pl
index b410dbe6f72..77ce98d26a2 100644
--- a/mozilla/xpinstall/packager/win_gre/makeall.pl
+++ b/mozilla/xpinstall/packager/win_gre/makeall.pl
@@ -60,7 +60,7 @@ print "  Raw version id   : $inDefaultProductVersion\n";
 # $inDefaultGreVersion has the form maj.min.release.bld where maj, min, release
 #   and bld are numerics representing version information.
 # Other variables need to use parts of the version info also so we'll
-#   split out the dot seperated values into the array @versionParts
+#   split out the dot separated values into the array @versionParts
 #   such that:
 #
 #   $versionParts[0] = maj
diff --git a/mozilla/xpinstall/packager/win_mfcembed/makeall.pl b/mozilla/xpinstall/packager/win_mfcembed/makeall.pl
index 44265663acb..de5373dde35 100644
--- a/mozilla/xpinstall/packager/win_mfcembed/makeall.pl
+++ b/mozilla/xpinstall/packager/win_mfcembed/makeall.pl
@@ -60,7 +60,7 @@ print "  Raw version id   : $inDefaultProductVersion\n";
 # $inDefaultProductVersion has the form maj.min.release.bld where maj, min, release
 #   and bld are numerics representing version information.
 # Other variables need to use parts of the version info also so we'll
-#   split out the dot seperated values into the array @versionParts
+#   split out the dot separated values into the array @versionParts
 #   such that:
 #
 #   $versionParts[0] = maj
diff --git a/mozilla/xpinstall/packager/windows/makeall.pl b/mozilla/xpinstall/packager/windows/makeall.pl
index 9706fa586c7..aa588a3370c 100644
--- a/mozilla/xpinstall/packager/windows/makeall.pl
+++ b/mozilla/xpinstall/packager/windows/makeall.pl
@@ -69,7 +69,7 @@ print "  Raw version id   : $inDefaultProductVersion\n";
 # $inDefaultProductVersion has the form maj.min.release.bld where maj, min, release
 #   and bld are numerics representing version information.
 # Other variables need to use parts of the version info also so we'll
-#   split out the dot seperated values into the array @versionParts
+#   split out the dot separated values into the array @versionParts
 #   such that:
 #
 #   $versionParts[0] = maj