diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp index eca9443f7a2..0b0462f0155 100644 --- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp +++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp @@ -889,7 +889,7 @@ nsresult nsOperaCookieMigrator::AddCookie(nsICookieManager2* aManager) { // This is where we use the information gathered in all the other - // states to add a cookie to the Firebird Cookie Manager. + // states to add a cookie to the Firebird/Firefox Cookie Manager. nsXPIDLCString domain; SynthesizeDomain(getter_Copies(domain)); diff --git a/mozilla/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp index b382f1c7c49..89534f7c257 100644 --- a/mozilla/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp +++ b/mozilla/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp @@ -439,7 +439,7 @@ nsSeamonkeyProfileMigrator::SetDownloadManager(void* aTransform, nsIPrefBranch* // 1 - show individual progress dialogs // 2 - show nothing // - // Firebird has only a download manager window, but it can behave like a progress dialog, thus: + // Firefox has only a download manager window, but it can behave like a progress dialog, thus: // 0 || 1 -> show downloads window when a download starts // 2 -> don't show anything when a download starts // 1 -> close the downloads window as if it were a progress window when downloads complete. diff --git a/mozilla/browser/installer/unix/config.it b/mozilla/browser/installer/unix/config.it index e334e294716..070379abd6e 100644 --- a/mozilla/browser/installer/unix/config.it +++ b/mozilla/browser/installer/unix/config.it @@ -281,7 +281,7 @@ Title=@WININT_TITLE@ Sub Title=@WININT_SUBTITLE@ Message0=@WININT_MESSAGE0@ -; Only a maximum of 4 "Windows Integration-Item"s are allowded. Each Item +; Only a maximum of 4 "Windows Integration-Item"s are allowed. Each Item ; shows up as a checkbox in the Windows Integration dialog. [Windows Integration-Item0] CheckBoxState=TRUE diff --git a/mozilla/build/unix/print-depth-path.sh b/mozilla/build/unix/print-depth-path.sh index a468263b6d8..4d22d55b0dc 100755 --- a/mozilla/build/unix/print-depth-path.sh +++ b/mozilla/build/unix/print-depth-path.sh @@ -41,9 +41,9 @@ # This script will print the depth path for a mozilla directory based # on the info in Makefile # -# Its a hack. Its brute force. Its horrible. -# It dont use Artificial Intelligence. It dont use Virtual Reality. -# Its not perl. Its not python. But it works. +# It's a hack. It's brute force. It's horrible. +# It don't use Artificial Intelligence. It don't use Virtual Reality. +# It's not perl. It's not python. But it works. # # Usage: print-depth-path.sh # diff --git a/mozilla/calendar/resources/content/calendar.js b/mozilla/calendar/resources/content/calendar.js index ef6990c9815..46af563569b 100644 --- a/mozilla/calendar/resources/content/calendar.js +++ b/mozilla/calendar/resources/content/calendar.js @@ -72,7 +72,7 @@ var gCalendar = null; //the next line needs XX-DATE-XY but last X instead of Y var gDateMade = "2002052213-cal" -// turn on debuging +// turn on debugging var gDebugCalendar = false; // single global instance of CalendarWindow diff --git a/mozilla/calendar/resources/content/calendarEvent.js b/mozilla/calendar/resources/content/calendarEvent.js index 214f1a3021f..5d74fc0244d 100644 --- a/mozilla/calendar/resources/content/calendarEvent.js +++ b/mozilla/calendar/resources/content/calendarEvent.js @@ -129,7 +129,7 @@ CalendarEventDataSource.InitService = function calEvent_InitService( root ) return new CalendarEventDataSource( null, root.getUserPath() ); } -// turn on/off debuging +// turn on/off debugging CalendarEventDataSource.gDebug = true; // Singleton CalendarEventDataSource variable. diff --git a/mozilla/calendar/resources/content/calendarMail.js b/mozilla/calendar/resources/content/calendarMail.js index 2297dd5a9c4..84321e2eef0 100644 --- a/mozilla/calendar/resources/content/calendarMail.js +++ b/mozilla/calendar/resources/content/calendarMail.js @@ -126,7 +126,7 @@ function noMail() function noAccount() { - // this could call the account wizard I guess thats a later feature + // this could call the account wizard, I guess that's a later feature mdebug("You don't have a mail account"); } diff --git a/mozilla/camino/src/bookmarks/BookmarkManager.mm b/mozilla/camino/src/bookmarks/BookmarkManager.mm index ce3e3fcdfac..904f6393af4 100644 --- a/mozilla/camino/src/bookmarks/BookmarkManager.mm +++ b/mozilla/camino/src/bookmarks/BookmarkManager.mm @@ -275,7 +275,7 @@ static BookmarkManager* gBookmarkManager = nil; [root release]; // Turn off the posting of update notifications while reading in bookmarks. - // All interested parties haven't been init'd yet, and/or will recieve the + // All interested parties haven't been init'd yet, and/or will receive the // managerStartedNotification when setup is actually complete. [BookmarkItem setSuppressAllUpdateNotifications:YES]; BOOL bookmarksReadOK = [self readBookmarks]; @@ -1393,7 +1393,7 @@ static BookmarkManager* gBookmarkManager = nil; if ([tokenScanner isAtEnd]) { // we scanned up to the but didn't find a " character ending the HREF. This is probably // because we're scanning a bookmarklet that contains an embedded so we're in the - // middle of the string. Just bail and dont import this bookmark. The parser should be able + // middle of the string. Just bail and don't import this bookmark. The parser should be able // to recover on its own once it gets to the next " - +
To see more detailed information about the message's security, click the key or lock icon, or follow the instructions in - Message Security - Received + Message Security - Received Message.
[Return to beginning of
@@ -396,7 +396,7 @@
[Return to beginning of
section] This section describes the Message Security window that you can open for any
diff --git a/mozilla/extensions/irc/js/tests/DP.js b/mozilla/extensions/irc/js/tests/DP.js
index 60ae96ae0fd..bfe5843fbba 100644
--- a/mozilla/extensions/irc/js/tests/DP.js
+++ b/mozilla/extensions/irc/js/tests/DP.js
@@ -170,7 +170,7 @@ function DPM_getPhraseDirected(seedWord, dir)
else
word= this.wordPivots[word].previousList.getRandomLink().link;
- if (word != "") // if it isnt blank
+ if (word != "") // if it isn't blank
{
dpprint ("DPM_getPhraseDirected: got word '" + word + "'");
diff --git a/mozilla/extensions/irc/js/tests/mingus.js b/mozilla/extensions/irc/js/tests/mingus.js
index a4b9402549d..6929bc21afd 100644
--- a/mozilla/extensions/irc/js/tests/mingus.js
+++ b/mozilla/extensions/irc/js/tests/mingus.js
@@ -144,7 +144,7 @@ function initMingus ()
bot.personality.dp.getPhraseContaining (escape(subject.toLowerCase()));
if (!answer)
- answer = "I dont know anything about " + e.matchresult[1];
+ answer = "I don't know anything about " + e.matchresult[1];
if (answer.charCodeAt (0) != 1)
e.replyTo.say (e.user.properNick + ", " + answer);
diff --git a/mozilla/extensions/irc/js/tests/test_matchobject.js b/mozilla/extensions/irc/js/tests/test_matchobject.js
index 93b1a956b0a..c44380a3669 100644
--- a/mozilla/extensions/irc/js/tests/test_matchobject.js
+++ b/mozilla/extensions/irc/js/tests/test_matchobject.js
@@ -16,9 +16,9 @@ function test_matchObject()
/* false, single pattern matches, negated */
f &= !matchObject (obj1, p1, true);
- /* false, single pattern doesnt match*/
+ /* false, single pattern doesn't match */
f &= !matchObject (obj1, p3);
- /* true, single pattern doesnt match, negated */
+ /* true, single pattern doesn't match, negated */
f &= matchObject (obj1, p3, true);
/* true, p1 matches */
diff --git a/mozilla/extensions/python/xpcom/file.py b/mozilla/extensions/python/xpcom/file.py
index d128e56a21d..06aee843640 100644
--- a/mozilla/extensions/python/xpcom/file.py
+++ b/mozilla/extensions/python/xpcom/file.py
@@ -54,7 +54,7 @@ Known Limitations:
setup a message queue.
Known Bugs:
- * Only read ("r") mode is supported. Although write ("w") mode doesnt make
+ * Only read ("r") mode is supported. Although write ("w") mode doesn't make
sense for HTTP type URLs, it potentially does for file:// etc type ones.
* No concept of text mode vs binary mode. It appears Mozilla takes care of
this internally (ie, all "text/???" mime types are text, rest are binary)
diff --git a/mozilla/extensions/python/xpcom/server/policy.py b/mozilla/extensions/python/xpcom/server/policy.py
index 90bc4e0346c..98b2c38b597 100644
--- a/mozilla/extensions/python/xpcom/server/policy.py
+++ b/mozilla/extensions/python/xpcom/server/policy.py
@@ -159,7 +159,7 @@ class DefaultPolicy:
if iid in self._nominated_interfaces_:
# We return the underlying object re-wrapped
# in a new gateway - which is desirable, as one gateway should only support
- # one interface (this wont affect the users of this policy - we can have as many
+ # one interface (this won't affect the users of this policy - we can have as many
# gateways as we like pointing to the same Python objects - the users never
# see what object the call came in from.
# NOTE: We could have simply returned the instance and let the framework
@@ -172,12 +172,12 @@ class DefaultPolicy:
return GetClassInfoForObject(self._obj_)
# See if the instance has a QI
- # use lower-case "_query_interface_" as win32com does, and it doesnt really matter.
+ # use lower-case "_query_interface_" as win32com does, and it doesn't really matter.
delegate = getattr(self._obj_, "_query_interface_", None)
if delegate is not None:
- # The COM object itself doesnt get passed to the child
+ # The COM object itself doesn't get passed to the child
# (again, as win32com doesnt). It is rarely needed
- # (in win32com, we dont even pass it to the policy, although we have identified
+ # (in win32com, we don't even pass it to the policy, although we have identified
# one place where we should - for marshalling - so I figured I may as well pass it
# to the policy layer here, but no all the way down to the object.
return delegate(iid)
@@ -191,7 +191,7 @@ class DefaultPolicy:
if attr is not None and hasattr(self._obj_, attr):
return xpcom.server.WrapObject(SupportsPrimitive(iid, self._obj_, attr, cvt), iid, bWrapClient = 0)
# Out of clever things to try!
- return None # We dont support this IID.
+ return None # We don't support this IID.
def _MakeInterfaceParam_(self, interface, iid, method_index, mi, param_index):
# Wrap a "raw" interface object in a nice object. The result of this
diff --git a/mozilla/extensions/python/xpcom/src/PyGBase.cpp b/mozilla/extensions/python/xpcom/src/PyGBase.cpp
index c645d1b82b0..6f3b0d5c544 100644
--- a/mozilla/extensions/python/xpcom/src/PyGBase.cpp
+++ b/mozilla/extensions/python/xpcom/src/PyGBase.cpp
@@ -144,7 +144,7 @@ PyG_Base::PyG_Base(PyObject *instance, const nsIID &iid)
Py_XDECREF(real_repr);
}
#endif // DEBUG_LIFETIMES
- Py_XINCREF(instance); // instance should never be NULL - but whats an X between friends!
+ Py_XINCREF(instance); // instance should never be NULL - but what's an X between friends!
PyXPCOM_DLLAddRef();
@@ -166,7 +166,7 @@ PyG_Base::~PyG_Base()
if (m_pBaseObject)
m_pBaseObject->Release();
if (m_pWeakRef) {
- // Need to ensure some other thread isnt doing a QueryReferent on
+ // Need to ensure some other thread isn't doing a QueryReferent on
// our weak reference at the same time
CEnterLeaveXPCOMFramework _celf;
PyXPCOM_GatewayWeakReference *p = (PyXPCOM_GatewayWeakReference *)(nsISupports *)m_pWeakRef;
@@ -246,7 +246,7 @@ done:
// object in one of the xpcom.client.Interface objects, allowing
// natural usage of the interface from Python clients.
// Note that piid will usually be NULL - this is because the runtime
-// reflection interfaces dont provide this information to me.
+// reflection interfaces don't provide this information to me.
// In this case, the Python code may choose to lookup the complete
// interface info to obtain the IID.
// It is expected (but should not be assumed) that the method info
@@ -310,7 +310,7 @@ done:
// return our obISupports. If NULL, we are really hosed and nothing we can do.
return obISupports;
}
- // Dont need to return this - we have a better result.
+ // Don't need to return this - we have a better result.
Py_XDECREF(obISupports);
return result;
}
@@ -570,7 +570,7 @@ nsresult PyG_Base::InvokeNativeViaPolicyInternal(
ppResult = &temp;
nsresult nr = do_dispatch(m_pPyObject, ppResult, szMethodName, szFormat, va);
- // If temp is NULL, they provided a buffer, and we dont touch it.
+ // If temp is NULL, they provided a buffer, and we don't touch it.
// If not NULL, *ppResult = temp, and _we_ do own it.
Py_XDECREF(temp);
return nr;
diff --git a/mozilla/extensions/python/xpcom/src/PyGStub.cpp b/mozilla/extensions/python/xpcom/src/PyGStub.cpp
index ae36b1aa597..0cfda731f51 100644
--- a/mozilla/extensions/python/xpcom/src/PyGStub.cpp
+++ b/mozilla/extensions/python/xpcom/src/PyGStub.cpp
@@ -67,8 +67,8 @@ PyXPCOM_XPTStub::GetInterfaceInfo(nsIInterfaceInfo** info)
if (info==nsnull)
return NS_ERROR_NULL_POINTER;
// Simply get the XPCOM runtime to provide this
- // (but there must be some reason why they dont get it themselves!?
- // Maybe because they dont know the IID?
+ // (but there must be some reason why they don't get it themselves!?)
+ // Maybe because they don't know the IID?
nsCOMPtr Your encoder's class name should be listed as the value of the
diff --git a/mozilla/modules/edtplug/classes/netscape/plugin/composer/Plugin.java b/mozilla/modules/edtplug/classes/netscape/plugin/composer/Plugin.java
index 35f5c148b76..251c1d4d0f8 100644
--- a/mozilla/modules/edtplug/classes/netscape/plugin/composer/Plugin.java
+++ b/mozilla/modules/edtplug/classes/netscape/plugin/composer/Plugin.java
@@ -73,9 +73,9 @@ import java.util.ResourceBundle;
* framework:
* // the purpose of the rest of the code is to get succesfully
+ // the purpose of the rest of the code is to get successfully
Message Security - Received
+
Message Security - Received
Message
+heading will wrap automatically.
diff --git a/mozilla/layout/html/tests/table/marvin/tables_td_nowrap.html b/mozilla/layout/html/tests/table/marvin/tables_td_nowrap.html
index cc492667b57..097e8de2015 100644
--- a/mozilla/layout/html/tests/table/marvin/tables_td_nowrap.html
+++ b/mozilla/layout/html/tests/table/marvin/tables_td_nowrap.html
@@ -46,7 +46,7 @@
The TD cell (The EggPlant Exchange) should not wrap when window is resized. However, the cell below the
-heading will wrap atuomatically.
+heading will wrap automatically.
The subsequent ones may be combined to generate multiple results. NOTE: This
-hasn't been fixed as yet. So it wont work for now. But if it did...
+hasn't been fixed as yet. So it won't work for now. But if it did...
You can try something fancy like- http://foo:4321/multi&close&both
The Eggplant Exchange
diff --git a/mozilla/lib/mac/UserInterface/CCaption.h b/mozilla/lib/mac/UserInterface/CCaption.h
index 24172ae6620..2a90ae319ab 100644
--- a/mozilla/lib/mac/UserInterface/CCaption.h
+++ b/mozilla/lib/mac/UserInterface/CCaption.h
@@ -83,7 +83,7 @@ class CListenerCaption : public CCaption, public LListener
{
public:
enum { class_ID = 'CCap' }; // class id
- enum { default_menu_item = 1 }; // initial defualt menu item
+ enum { default_menu_item = 1 }; // initial default menu item
CListenerCaption( LStream *inStream );
virtual ~CListenerCaption();
diff --git a/mozilla/lib/mac/UserInterface/CMouseDispatcher.cp b/mozilla/lib/mac/UserInterface/CMouseDispatcher.cp
index efa4fc61316..9edc45bd79c 100644
--- a/mozilla/lib/mac/UserInterface/CMouseDispatcher.cp
+++ b/mozilla/lib/mac/UserInterface/CMouseDispatcher.cp
@@ -64,7 +64,7 @@ void CMouseDispatcher::ExecuteSelf(
Assert_(inMessage == msg_Event);
const EventRecord* theEvent = (const EventRecord*)ioParam;
- // High level events dont have the mouse position in the where field
+ // High level events don't have the mouse position in the where field
// of the event record.
if (theEvent->what == kHighLevelEvent)
return;
diff --git a/mozilla/lib/mac/UserInterface/CPatternButton.cp b/mozilla/lib/mac/UserInterface/CPatternButton.cp
index d58b67dabf0..594895f4169 100644
--- a/mozilla/lib/mac/UserInterface/CPatternButton.cp
+++ b/mozilla/lib/mac/UserInterface/CPatternButton.cp
@@ -214,7 +214,7 @@ void CPatternButton::CalcOrientationPoint(Point& outPoint)
// the downward scale from 32 to 16 bit coordinate spaces
// in converting from SPoint32 to plain old Point
// is ok because we are guaranteed to be in bounds since we
- // wont be drawing if we cant FocusExposed().
+ // won't be drawing if we can't FocusExposed().
SPoint32 theFrameLocation;
switch (mOrientation)
diff --git a/mozilla/lib/mac/UserInterface/CPatternButtonPopupText.cp b/mozilla/lib/mac/UserInterface/CPatternButtonPopupText.cp
index 8343ad9c5a2..35435f9fdee 100644
--- a/mozilla/lib/mac/UserInterface/CPatternButtonPopupText.cp
+++ b/mozilla/lib/mac/UserInterface/CPatternButtonPopupText.cp
@@ -138,7 +138,7 @@ CPatternButtonPopupText::DrawButtonContent(void)
{
// draw round rect frame
UGraphicGizmos::BevelTintRoundRect(mCachedButtonFrame, 8, 8, UGAAppearance::sGASevenGrayLevels, false);
- // draw seperator between text and arrow
+ // draw saperator between text and arrow
UGraphicGizmos::BevelTintLine(mCachedButtonFrame.right - gsPopup_ArrowButtonWidth,
mCachedButtonFrame.top + 1,
mCachedButtonFrame.right - gsPopup_ArrowButtonWidth,
diff --git a/mozilla/lib/mac/UserInterface/CSharedPatternWorld.cp b/mozilla/lib/mac/UserInterface/CSharedPatternWorld.cp
index 5cd8a126057..b0a2e5f5cde 100644
--- a/mozilla/lib/mac/UserInterface/CSharedPatternWorld.cp
+++ b/mozilla/lib/mac/UserInterface/CSharedPatternWorld.cp
@@ -96,7 +96,7 @@ void CSharedPatternWorld::CalcRelativePoint(
// the downward scale from 32 to 16 bit coordinate spaces
// in converting from SPoint32 to plain old Point
// is ok because we are guaranteed to be in bounds since we
- // wont be drawing if we cant FocusExposed().
+ // won't be drawing if we can't FocusExposed().
switch (inOrientation)
{
diff --git a/mozilla/lib/mac/UserInterface/LCustomizeMenu.cp b/mozilla/lib/mac/UserInterface/LCustomizeMenu.cp
index 2ddf6579688..f97a755e268 100644
--- a/mozilla/lib/mac/UserInterface/LCustomizeMenu.cp
+++ b/mozilla/lib/mac/UserInterface/LCustomizeMenu.cp
@@ -151,7 +151,7 @@ void LCustomizeMenu::Draw(MenuHandle menu, MenuDefUPP* /* root */, Rect *rect, P
//
// DrawItemSeparator
//
-void LCustomizeMenu::DrawItemSeperator(Rect& itemrect )
+void LCustomizeMenu::DrawItemSeparator(Rect& itemrect )
{
::PenPat(&qd.gray);
::MoveTo(itemrect.left, itemrect.top + 8);
@@ -284,8 +284,8 @@ void LCustomizeMenu::DrawItem(MenuHandle menu, int item, Rect& itemrect )
::GetMenuItemText(menu, item, itemtext);
if(itemtext[1] == '-')
{
- // Draw Seperator
- DrawItemSeperator(itemrect );
+ // Draw Separator
+ DrawItemSeparator(itemrect);
}
else
{
diff --git a/mozilla/lib/mac/UserInterface/LCustomizeMenu.h b/mozilla/lib/mac/UserInterface/LCustomizeMenu.h
index 6266877e97a..0f4911752ff 100644
--- a/mozilla/lib/mac/UserInterface/LCustomizeMenu.h
+++ b/mozilla/lib/mac/UserInterface/LCustomizeMenu.h
@@ -51,7 +51,7 @@ protected:
virtual short MeasureItem (MenuHandle menu, int item);
// Function called by DrawItem()
- virtual void DrawItemSeperator (Rect& itemrect);
+ virtual void DrawItemSeparator (Rect& itemrect);
virtual void DrawItemText (Rect& itemrect, Str255 itemtext );
virtual void DrawItemIcon (Rect& itemrect, short iconindex);
virtual void DrawItemCommand (Rect& itemrect, short cmd);
diff --git a/mozilla/lib/mac/UserInterface/UGAAppearance.cp b/mozilla/lib/mac/UserInterface/UGAAppearance.cp
index 89b4c500c1d..a051757f6e1 100644
--- a/mozilla/lib/mac/UserInterface/UGAAppearance.cp
+++ b/mozilla/lib/mac/UserInterface/UGAAppearance.cp
@@ -403,7 +403,7 @@ void UGAAppearance::DrawGAPopupDimmedBevelTint(
// draw round rect frame
UGraphicGizmos::BevelTintRoundRect(frame, 8, 8, sGAFiveGrayLevels, false);
- // draw seperator between text and arrow
+ // draw separator between text and arrow
UGraphicGizmos::BevelTintLine(frame.right - gsPopup_ArrowButtonWidth,
frame.top + 1,
frame.right - gsPopup_ArrowButtonWidth,
diff --git a/mozilla/lib/mac/UserInterface/UGraphicGizmos.cp b/mozilla/lib/mac/UserInterface/UGraphicGizmos.cp
index b0cdcafb3f6..8e597376b20 100644
--- a/mozilla/lib/mac/UserInterface/UGraphicGizmos.cp
+++ b/mozilla/lib/mac/UserInterface/UGraphicGizmos.cp
@@ -1590,5 +1590,5 @@ void CIconFamily::CalcBestSize(const Rect& inContainer)
mIconRect.bottom = 12;
}
else
- Assert_(false); // you really wont be able to draw in bounds
+ Assert_(false); // you really won't be able to draw in bounds
}
diff --git a/mozilla/mail/extensions/offline/install.js b/mozilla/mail/extensions/offline/install.js
index b5322c417ab..0a585c4db8a 100644
--- a/mozilla/mail/extensions/offline/install.js
+++ b/mozilla/mail/extensions/offline/install.js
@@ -31,7 +31,7 @@ if(err == SUCCESS) {
}
err = performInstall();
if(err == SUCCESS || err == 999) {
- alert(APP_DISPLAY_NAME+" "+APP_VERSION+" has been succesfully installed.\n"+APP_SUCCESS_MESSAGE);
+ alert(APP_DISPLAY_NAME+" "+APP_VERSION+" has been successfully installed.\n"+APP_SUCCESS_MESSAGE);
} else {
alert("Install failed. Error code:" + err);
cancelInstall(err);
diff --git a/mozilla/mail/installer/windows/config.it b/mozilla/mail/installer/windows/config.it
index ed34f8866ca..3624c3e39e0 100644
--- a/mozilla/mail/installer/windows/config.it
+++ b/mozilla/mail/installer/windows/config.it
@@ -290,7 +290,7 @@ Title={Integration_Title}
Sub Title={Integration_SubTitle}
Message0={Integration_Message0}
-; Only a maximum of 3 "Windows Integration-Item"s are allowded. Each Item
+; Only a maximum of 3 "Windows Integration-Item"s are allowed. Each Item
; shows up as a checkbox in the Windows Integration dialog.
[Windows Integration-Item0]
CheckBoxState=FALSE
diff --git a/mozilla/mailnews/addrbook/src/nsVCard.cpp b/mozilla/mailnews/addrbook/src/nsVCard.cpp
index f396d82fad6..7616621a4df 100644
--- a/mozilla/mailnews/addrbook/src/nsVCard.cpp
+++ b/mozilla/mailnews/addrbook/src/nsVCard.cpp
@@ -1194,7 +1194,7 @@ static int yylex() {
}
}
else {
- /* unknow token */
+ /* unknown token */
return 0;
}
break;
diff --git a/mozilla/mailnews/base/build/win32.order b/mozilla/mailnews/base/build/win32.order
index e60d1f66660..2bc0af7b14f 100644
--- a/mozilla/mailnews/base/build/win32.order
+++ b/mozilla/mailnews/base/build/win32.order
@@ -277,7 +277,7 @@
?GetSortType@nsMsgDBView@@UAGIPAH@Z ; 2
?CreateLiterals@nsMsgFolderDataSource@@IAEIPAVnsIRDFService@@@Z ; 2
?AdjustRowCount@nsMsgDBView@@IAEIHH@Z ; 2
-?SetSupressMsgDisplay@nsMsgDBView@@UAGIH@Z ; 2
+?SetSuppressMsgDisplay@nsMsgDBView@@UAGIH@Z ; 2
?SetOpenFolder@nsMsgWindow@@UAGIPAVnsIMsgFolder@@@Z ; 2
?OnItemBoolPropertyChanged@nsMsgFolderDataSource@@UAGIPAVnsISupports@@PAVnsIAtom@@HH@Z ; 2
?createRootResources@nsMsgAccountManagerDataSource@@IAEIPAVnsIRDFResource@@PAVnsISupportsArray@@@Z ; 2
diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp
index d5db3454533..8f1e059a4cc 100644
--- a/mozilla/mailnews/base/src/nsMessenger.cpp
+++ b/mozilla/mailnews/base/src/nsMessenger.cpp
@@ -1751,7 +1751,7 @@ nsMessenger::SendUnsentMessages(nsIMsgIdentity *aIdentity, nsIMsgWindow *aMsgWin
if (NS_SUCCEEDED(rv) && pMsgSendLater)
{
#ifdef DEBUG
- printf("We succesfully obtained a nsIMsgSendLater interface....\n");
+ printf("We successfully obtained a nsIMsgSendLater interface....\n");
#endif
SendLaterListener *sendLaterListener = new SendLaterListener(this);
diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.h b/mozilla/mailnews/base/src/nsMsgAccountManager.h
index 88d3330586d..2d24bdc48ca 100644
--- a/mozilla/mailnews/base/src/nsMsgAccountManager.h
+++ b/mozilla/mailnews/base/src/nsMsgAccountManager.h
@@ -129,7 +129,7 @@ private:
nsresult removeKeyedAccount(const char *key);
- // sets the pref for the defualt server
+ // sets the pref for the default server
nsresult setDefaultAccountPref(nsIMsgAccount *aDefaultAccount);
// fires notifications to the appropriate root folders
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
index 396d46af791..91b1116b033 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
@@ -257,7 +257,7 @@ nsresult nsMsgFolderCache::OpenMDB(const char *dbName, PRBool exists)
{
ret = thumb->DoMore(m_mdbEnv, &outTotal, &outCurrent, &outDone, &outBroken);
if (ret != 0)
- {// mork isn't really doing NS erorrs yet.
+ {// mork isn't really doing NS errors yet.
outDone = PR_TRUE;
break;
}
diff --git a/mozilla/mailnews/build/win32.order b/mozilla/mailnews/build/win32.order
index e60d1f66660..2bc0af7b14f 100644
--- a/mozilla/mailnews/build/win32.order
+++ b/mozilla/mailnews/build/win32.order
@@ -277,7 +277,7 @@
?GetSortType@nsMsgDBView@@UAGIPAH@Z ; 2
?CreateLiterals@nsMsgFolderDataSource@@IAEIPAVnsIRDFService@@@Z ; 2
?AdjustRowCount@nsMsgDBView@@IAEIHH@Z ; 2
-?SetSupressMsgDisplay@nsMsgDBView@@UAGIH@Z ; 2
+?SetSuppressMsgDisplay@nsMsgDBView@@UAGIH@Z ; 2
?SetOpenFolder@nsMsgWindow@@UAGIPAVnsIMsgFolder@@@Z ; 2
?OnItemBoolPropertyChanged@nsMsgFolderDataSource@@UAGIPAVnsISupports@@PAVnsIAtom@@HH@Z ; 2
?createRootResources@nsMsgAccountManagerDataSource@@IAEIPAVnsIRDFResource@@PAVnsISupportsArray@@@Z ; 2
diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp
index 88495ceeda7..f6f87251920 100644
--- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp
@@ -1277,11 +1277,11 @@ NS_IMETHODIMP nsMsgCompose::CloseWindow(PRBool recycleIt)
/**
* In order to really free the memory, we need to call the JS garbage collector for our window.
- * If we don't call GC, the nsIMsgCompose object hold by JS will not be released despite we set
- * the JS global that hold it to null. Each time we reopen a recycled window, we allocate a new
- * nsIMsgCompose that we really need to be releazed when we recycle the window. In fact despite
- * we call GC here atfer the release wont occurs right away. But if we don't call it, the release
- * will apppend only when we phisically close the window which will append only on quit.
+ * If we don't call GC, the nsIMsgCompose object held by JS will not be released despite we set
+ * the JS global that held it to null. Each time we reopen a recycled window, we allocate a new
+ * nsIMsgCompose that we really need to be released when we recycle the window. In fact despite
+ * we call GC here, the release won't occur right away. But if we don't call it, the release
+ * will happen only when we physically close the window which will happen only on quit.
*/
nsCOMPtr
* netscape.plugin.composer.imageEncoder.factory - a single classname of a Factory class.
- * netscape.plugin.composer.imageEncoder.classes - a colon-seperated list of the classnames of the plugins in
+ * netscape.plugin.composer.imageEncoder.classes - a colon-separated list of the classnames of the plugins in
* this archive.
*
*
* netscape.plugin.composer.factory - a single classname of a Factory class.
- * netscape.plugin.composer.classes - a colon-seperated list of the classnames of
+ * netscape.plugin.composer.classes - a colon-separated list of the classnames of
* the plugins in this archive.
- * netscape.plugin.composer.eventHandlers - a colon-seperated list of the classnames
+ * netscape.plugin.composer.eventHandlers - a colon-separated list of the classnames
* of the plugins in this archive to execute when an event happens. See Document
* for a list of the standard events.
*
diff --git a/mozilla/modules/edtplug/classes/netscape/plugin/composer/mapedit/InfoDialog.java b/mozilla/modules/edtplug/classes/netscape/plugin/composer/mapedit/InfoDialog.java
index a3a8ba64f68..8ef2d675d57 100644
--- a/mozilla/modules/edtplug/classes/netscape/plugin/composer/mapedit/InfoDialog.java
+++ b/mozilla/modules/edtplug/classes/netscape/plugin/composer/mapedit/InfoDialog.java
@@ -135,7 +135,7 @@ class MultiLineLabel extends Canvas {
}
}
- // Here are four versions of the cosntrutor.
+ // Here are four versions of the constructor.
// Break the label up into separate lines, and save the other info.
public MultiLineLabel(String label, int margin_width, int margin_height,
int alignment) {
diff --git a/mozilla/modules/edtplug/classes/netscape/test/plugin/composer/ReleaseNotes.html b/mozilla/modules/edtplug/classes/netscape/test/plugin/composer/ReleaseNotes.html
index 16649006267..5cf65c21612 100644
--- a/mozilla/modules/edtplug/classes/netscape/test/plugin/composer/ReleaseNotes.html
+++ b/mozilla/modules/edtplug/classes/netscape/test/plugin/composer/ReleaseNotes.html
@@ -144,7 +144,7 @@ to include this fix.
*
diff --git a/mozilla/modules/libjar/nsZipArchive.cpp b/mozilla/modules/libjar/nsZipArchive.cpp
index f6834649465..66e6fdc8609 100644
--- a/mozilla/modules/libjar/nsZipArchive.cpp
+++ b/mozilla/modules/libjar/nsZipArchive.cpp
@@ -553,7 +553,7 @@ PRInt32 nsZipArchive::CloseArchive()
PL_FinishArenaPool(&mArena);
// CAUTION:
- // We dont need to delete each of the nsZipItem as the memory for
+ // We don't need to delete each of the nsZipItem as the memory for
// the zip item and the filename it holds are both allocated from the Arena.
// Hence, destroying the Arena is like destroying all the memory
// for all the nsZipItem in one shot. But if the ~nsZipItem is doing
diff --git a/mozilla/modules/libjar/nsZlibAllocator.h b/mozilla/modules/libjar/nsZlibAllocator.h
index 9b3b530e806..5dcc938f26d 100644
--- a/mozilla/modules/libjar/nsZlibAllocator.h
+++ b/mozilla/modules/libjar/nsZlibAllocator.h
@@ -74,7 +74,7 @@ class nsZlibAllocator {
PRBool claimed = Claim(i);
// ASSERT that we claimed the bucked. If we cannot, then the bucket is in use.
- // We dont attempt to free this ptr.
+ // We don't attempt to free this ptr.
// This will most likely cause a leak of this memory.
PR_ASSERT(claimed);
diff --git a/mozilla/modules/libnls/headers/decimfmt.h b/mozilla/modules/libnls/headers/decimfmt.h
index b7ad558c8e5..ae782f7191f 100644
--- a/mozilla/modules/libnls/headers/decimfmt.h
+++ b/mozilla/modules/libnls/headers/decimfmt.h
@@ -124,7 +124,7 @@ class DigitList;
*
* . Symbol Meaning
* . 0 a digit, showing up a zero if it is zero
- * . # a digit, supressed if zero
+ * . # a digit, suppressed if zero
* . . placeholder for decimal separator
* . , placeholder for grouping separator
* . ; separates postive from negative formats
diff --git a/mozilla/modules/libnls/headers/ptypes.h b/mozilla/modules/libnls/headers/ptypes.h
index 8aba09a9748..36c9e4260f3 100644
--- a/mozilla/modules/libnls/headers/ptypes.h
+++ b/mozilla/modules/libnls/headers/ptypes.h
@@ -339,7 +339,7 @@ public:
static const char* getDefaultDataDirectory();
/* complete a relative path to a full pathname, and convert to platform-specific syntax. */
- /* The character seperating directories for the relative path is '|'. */
+ /* The character separating directories for the relative path is '|'. */
static void pathnameInContext( char* fullname, t_int32 maxsize, char* relpath );
/* Return the default locale ID string by querying ths system, or
@@ -347,7 +347,7 @@ public:
static const char* getDefaultLocaleID();
/**
- * Retrun true if this platform is big-endian, that is, if the number
+ * Return true if this platform is big-endian, that is, if the number
* 0x1234 is stored 0x12, 0x34 in memory. Return false if this platform
* is little-endian, and is, if 0x1234 is stored 0x34, 0x12 in memory.
*/
diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js
index 323afdfd21a..6966e52ab04 100644
--- a/mozilla/modules/libpref/src/init/all.js
+++ b/mozilla/modules/libpref/src/init/all.js
@@ -201,7 +201,7 @@ pref("print.show_print_progress", true);
// xxxbsmedberg: more toolkit prefs
// When this is set to false each window has its own PrintSettings
-// and a chnage in one window does not affect the others
+// and a change in one window does not affect the others
pref("print.use_global_printsettings", true);
// Use the native dialog or the XP dialog?
diff --git a/mozilla/modules/libtest/src/nsTestEventsApi.cpp b/mozilla/modules/libtest/src/nsTestEventsApi.cpp
index 0a4b81ffa7f..29519bc91f8 100644
--- a/mozilla/modules/libtest/src/nsTestEventsApi.cpp
+++ b/mozilla/modules/libtest/src/nsTestEventsApi.cpp
@@ -17,7 +17,7 @@ private:
nsrefcnt mRefCnt;
public:
-// Constructor and Destuctor
+// Constructor and Destructor
nsTestEventsApi();
~nsTestEventsApi();
diff --git a/mozilla/modules/libtest/src/nsTestQueryApi.cpp b/mozilla/modules/libtest/src/nsTestQueryApi.cpp
index 0754ea9877d..5d340d9ab52 100644
--- a/mozilla/modules/libtest/src/nsTestQueryApi.cpp
+++ b/mozilla/modules/libtest/src/nsTestQueryApi.cpp
@@ -17,7 +17,7 @@ private:
nsrefcnt mRefCnt;
public:
-// Constructor and Destuctor
+// Constructor and Destructor
nsTestQueryApi();
~nsTestQueryApi();
diff --git a/mozilla/modules/oji/tests/FAQ b/mozilla/modules/oji/tests/FAQ
index 597544d54c4..51676a0c105 100644
--- a/mozilla/modules/oji/tests/FAQ
+++ b/mozilla/modules/oji/tests/FAQ
@@ -134,7 +134,7 @@ NOTE: These API tests are build using Gnu Compiler gcc.
13) On executing autorun.pl, browser always invokes "Profile Window". Is there
- any way to supress this box.
+ any way to suppress this box.
In autorun.pl, search of ADDITIONAL_PARAMETERS. It is set to "-P default"
Change it to reflect your Profile name (-P myProfile)
diff --git a/mozilla/modules/oji/tests/script/OJIAPITestsDescr.html b/mozilla/modules/oji/tests/script/OJIAPITestsDescr.html
index 2c27f8a7d31..b57ddf7ccab 100755
--- a/mozilla/modules/oji/tests/script/OJIAPITestsDescr.html
+++ b/mozilla/modules/oji/tests/script/OJIAPITestsDescr.html
@@ -728,7 +728,7 @@ OJI API Tests Descriptions
JNIEnv_GetObjectClass_2 jclass GetObjectClass(jobject obj) (NULL) GetObjectClass(NULL) return correct value JNIEnv_IsInstanceOf_1 jboolean IsInstanceOf(jobject obj, jclass clazz) (obj1, clazz1)) IsInstanceOf(some obj, its class) return correct value
-JNIEnv_IsInstanceOf_2 jboolean IsInstanceOf(jobject obj, jclass clazz) (obj1, clazz2)) IsInstanceOf(some obj, its superclass) return correct value
+JNIEnv_IsInstanceOf_3 jboolean IsInstanceOf(jobject obj, jclass clazz) (obj1, clazz3)) IsInstanceOf(some obj, isnt superclass or class) return correct value JNIEnv_IsInstanceOf_3 jboolean IsInstanceOf(jobject obj, jclass clazz) (obj1, clazz3)) IsInstanceOf(some obj, isn't superclass or class) return correct value JNIEnv_IsInstanceOf_4 jboolean IsInstanceOf(jobject obj, jclass clazz) (NULL, clazz1)) IsInstanceOf(NULL, class) return correct value JNIEnv_IsInstanceOf_5 jboolean IsInstanceOf(jobject obj, jclass clazz) (NULL, NULL)) IsInstanceOf(NULL, NULL) return correct value
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_1.cpp b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_1.cpp
index 3925168fba2..242720a95cc 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_1.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_1.cpp
@@ -46,9 +46,9 @@ JNI_OJIAPITest(JNIEnv_GetMethodID_1)
if(MethodID == NULL){
- return TestResult::PASS("GetMethodID with class == NULL return 0, its correct");
+ return TestResult::PASS("GetMethodID with class == NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetMethodID with class == NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetMethodID with class == NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_2.cpp b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_2.cpp
index a8fd433c22d..1d6f03b9fed 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_2.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_2.cpp
@@ -44,9 +44,9 @@ JNI_OJIAPITest(JNIEnv_GetMethodID_2)
IMPLEMENT_GetMethodID_METHOD("Test1", "Print_string", NULL);
if(MethodID == NULL){
- return TestResult::PASS("GetMethodID with sig==NULL return 0, its correct");
+ return TestResult::PASS("GetMethodID with sig==NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetMethodID with sig==NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetMethodID with sig==NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_3.cpp b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_3.cpp
index 85f3da76bf2..fa2c66bb123 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_3.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_3.cpp
@@ -46,8 +46,8 @@ JNI_OJIAPITest(JNIEnv_GetMethodID_3)
if(MethodID == NULL){
- return TestResult::PASS("GetMethodID for name = NULL return 0, its correct");
+ return TestResult::PASS("GetMethodID for name = NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetMethodID for name = NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetMethodID for name = NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_4.cpp b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_4.cpp
index 0226219886b..acaac241315 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_4.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_4.cpp
@@ -45,9 +45,9 @@ JNI_OJIAPITest(JNIEnv_GetMethodID_4)
//env->CallVoidMethod(obj, MethodID, NULL);
if(MethodID == NULL){
- return TestResult::PASS("GetMethodID with incorrect sig return 0, its correct");
+ return TestResult::PASS("GetMethodID with incorrect sig return 0, it's correct");
}else{
- return TestResult::FAIL("GetMethodID with incorrect sig doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetMethodID with incorrect sig doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_5.cpp b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_5.cpp
index 9eae71c08d1..c9caba81996 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_5.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingInstanceMethods/GetMethodID_5.cpp
@@ -53,8 +53,8 @@ JNI_OJIAPITest(JNIEnv_GetMethodID_5)
if(MethodID == NULL && env->ExceptionOccurred()) {
env->ExceptionDescribe(); //exception should be thrown){
- return TestResult::PASS("GetMethodID for not existing name return 0, its correct");
+ return TestResult::PASS("GetMethodID for not existing name return 0, it's correct");
}else{
- return TestResult::FAIL("GetMethodID for not existing name doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetMethodID for not existing name doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_1.cpp b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_1.cpp
index fce432c922c..89b26d5eae6 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_1.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_1.cpp
@@ -46,9 +46,9 @@ JNI_OJIAPITest(JNIEnv_GetStaticMethodID_1)
if(MethodID == NULL){
- return TestResult::PASS("GetStaticMethodID with class == NULL return 0, its correct");
+ return TestResult::PASS("GetStaticMethodID with class == NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetStaticMethodID with class == NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetStaticMethodID with class == NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_2.cpp b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_2.cpp
index 313e7d245c4..8f5df8ea10b 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_2.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_2.cpp
@@ -44,9 +44,9 @@ JNI_OJIAPITest(JNIEnv_GetStaticMethodID_2)
IMPLEMENT_GetStaticMethodID_METHOD("Test1", "Print_string_static", NULL);
if(MethodID == NULL){
- return TestResult::PASS("GetStaticMethodID with sig==NULL return 0, its correct");
+ return TestResult::PASS("GetStaticMethodID with sig==NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetStaticMethodID with sig==NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetStaticMethodID with sig==NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_3.cpp b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_3.cpp
index 049a0c7dd9f..4f776bfba4a 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_3.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_3.cpp
@@ -46,8 +46,8 @@ JNI_OJIAPITest(JNIEnv_GetStaticMethodID_3)
if(MethodID == NULL){
- return TestResult::PASS("GetStaticMethodID for name = NULL return 0, its correct");
+ return TestResult::PASS("GetStaticMethodID for name = NULL return 0, it's correct");
}else{
- return TestResult::FAIL("GetStaticMethodID for name = NULL doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetStaticMethodID for name = NULL doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_4.cpp b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_4.cpp
index a5dae8419dd..ca2fa20a476 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_4.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_4.cpp
@@ -45,9 +45,9 @@ JNI_OJIAPITest(JNIEnv_GetStaticMethodID_4)
//env->CallVoidMethod(clazz, MethodID, NULL);
if(MethodID == NULL){
- return TestResult::PASS("GetStaticMethodID with incorrect sig return 0, its correct");
+ return TestResult::PASS("GetStaticMethodID with incorrect sig return 0, it's correct");
}else{
- return TestResult::FAIL("GetStaticMethodID with incorrect sig doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetStaticMethodID with incorrect sig doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_5.cpp b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_5.cpp
index eb12f3cd894..0c39d7e045f 100755
--- a/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_5.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/CallingStaticMethods/GetStaticMethodID_5.cpp
@@ -45,8 +45,8 @@ JNI_OJIAPITest(JNIEnv_GetStaticMethodID_5)
//env->CallVoidMethod(clazz, MethodID, 10);
if(MethodID == NULL){
- return TestResult::PASS("GetStaticMethodID for not existing name return 0, its correct");
+ return TestResult::PASS("GetStaticMethodID for not existing name return 0, it's correct");
}else{
- return TestResult::FAIL("GetStaticMethodID for not existing name doesnt return 0, its incorrect");
+ return TestResult::FAIL("GetStaticMethodID for not existing name doesn't return 0, it's incorrect");
}
}
diff --git a/mozilla/modules/oji/tests/src/JNI/ClassOperation/FindClass_1.cpp b/mozilla/modules/oji/tests/src/JNI/ClassOperation/FindClass_1.cpp
index da4ccb775b8..34136ce70b3 100755
--- a/mozilla/modules/oji/tests/src/JNI/ClassOperation/FindClass_1.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/ClassOperation/FindClass_1.cpp
@@ -44,7 +44,7 @@ JNI_OJIAPITest(JNIEnv_FindClass_1)
jclass clazz = env->FindClass(NULL);
if(clazz!=NULL){
- return TestResult::FAIL("FindClass(NULL) doesnt return NULL - incorrect");
+ return TestResult::FAIL("FindClass(NULL) doesn't return NULL - incorrect");
}
return TestResult::PASS("FindClass(NULL) return NULL - correct");
diff --git a/mozilla/modules/oji/tests/src/JNI/ObjectOperations/IsInstanceOf_3.cpp b/mozilla/modules/oji/tests/src/JNI/ObjectOperations/IsInstanceOf_3.cpp
index b93fd0cdcf8..c65e5141a8c 100755
--- a/mozilla/modules/oji/tests/src/JNI/ObjectOperations/IsInstanceOf_3.cpp
+++ b/mozilla/modules/oji/tests/src/JNI/ObjectOperations/IsInstanceOf_3.cpp
@@ -49,9 +49,9 @@ JNI_OJIAPITest(JNIEnv_IsInstanceOf_3)
if(env->IsInstanceOf(obj1, clazz3)){
- return TestResult::FAIL("IsInstanceOf(some obj, isnt superclass or class) return incorrect value");
+ return TestResult::FAIL("IsInstanceOf(some obj, isn't superclass or class) return incorrect value");
}else{
- return TestResult::PASS("IsInstanceOf(some obj, isnt superclass or class) return correct value");
+ return TestResult::PASS("IsInstanceOf(some obj, isn't superclass or class) return correct value");
}
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index 189b82d1e4b..6cc49a1a16a 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -1059,7 +1059,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
// and free it at line #2096, so it couldn't be a const ptr to string literal
char *val = (char*) values[i];
if (val && *val) {
- // we cannot just *val=0, it wont be free properly in such case
+ // we cannot just *val=0, it won't be free properly in such case
val[0] = '0';
val[1] = 0;
}
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 289155df86a..818cb076cc0 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -4914,9 +4914,9 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
delete pfd;
if (pluginTag) {
- // If plugin changed, delete cachedPluginTag and dont use cache
+ // If plugin changed, delete cachedPluginTag and don't use cache
if (LL_NE(fileModTime, pluginTag->mLastModifiedTime)) {
- // Plugins has changed. Dont use cached plugin info.
+ // Plugins has changed. Don't use cached plugin info.
delete pluginTag;
pluginTag = nsnull;
diff --git a/mozilla/modules/plugin/samples/4x-scriptable/doc.html b/mozilla/modules/plugin/samples/4x-scriptable/doc.html
index 820d8e37fc7..77d6e54968e 100644
--- a/mozilla/modules/plugin/samples/4x-scriptable/doc.html
+++ b/mozilla/modules/plugin/samples/4x-scriptable/doc.html
@@ -135,7 +135,7 @@ public nsISecurityCheckedComponent
JNIEnv_IsSameObject_1 jboolean IsSameObject(jobject obj1, jobject obj2) (obj1, obj2) ) IsSameObject(obj, obj) return correct value
{
return NS_OK;
}
-
// through the Mozilla Security Manager
static const char gAllAccess[] = "AllAccess";
NS_IMETHODIMP nsScriptablePeer::CanCreateWrapper(const nsIID *
diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp
index 43989a4b9b8..b7c6e4169a1 100644
--- a/mozilla/modules/plugin/samples/backward/badapter.cpp
+++ b/mozilla/modules/plugin/samples/backward/badapter.cpp
@@ -855,7 +855,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
// NPP_NewStream:
// Notifies an instance of a new data stream and returns an error value.
//
-// Create a stream peer and stream. If succesful, save
+// Create a stream peer and stream. If successful, save
// the stream peer in NPStream's pdata.
//+++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mozilla/modules/plugin/samples/default/os2/npshell.cpp b/mozilla/modules/plugin/samples/default/os2/npshell.cpp
index 9bc0ebbb7cd..dc3dbebbc4c 100644
--- a/mozilla/modules/plugin/samples/default/os2/npshell.cpp
+++ b/mozilla/modules/plugin/samples/default/os2/npshell.cpp
@@ -251,7 +251,7 @@ NPP_WriteReady(NPP pInstance, NPStream *stream)
CPlugin * pPlugin = (CPlugin *)pInstance->pdata;
assert(pPlugin != NULL);
- return -1L; // dont accept any bytes in NPP_Write()
+ return -1L; // don't accept any bytes in NPP_Write()
}
//------------------------------------------------------------------------------------
diff --git a/mozilla/modules/plugin/samples/default/unix/npunix.c b/mozilla/modules/plugin/samples/default/unix/npunix.c
index f3045e5183b..452f8ec5f89 100644
--- a/mozilla/modules/plugin/samples/default/unix/npunix.c
+++ b/mozilla/modules/plugin/samples/default/unix/npunix.c
@@ -405,7 +405,7 @@ NP_GetValue(void* future, NPPVariable variable, void *value)
*
* PARAMETERS
* nsTable - The netscape function table. If developers just use these
- * wrappers, they dont need to worry about all these function
+ * wrappers, they don't need to worry about all these function
* tables.
* RETURN
* pluginFuncs
diff --git a/mozilla/modules/plugin/samples/default/windows/npshell.cpp b/mozilla/modules/plugin/samples/default/windows/npshell.cpp
index 1f57eef586f..b7d2683d4a1 100644
--- a/mozilla/modules/plugin/samples/default/windows/npshell.cpp
+++ b/mozilla/modules/plugin/samples/default/windows/npshell.cpp
@@ -255,7 +255,7 @@ NPP_WriteReady(NPP pInstance, NPStream *stream)
// We don't want any data, kill the stream
NPN_DestroyStream(pInstance, stream, NPRES_DONE);
- return -1L; // dont accept any bytes in NPP_Write()
+ return -1L; // don't accept any bytes in NPP_Write()
}
//------------------------------------------------------------------------------------
diff --git a/mozilla/modules/plugin/samples/testevents/README.txt b/mozilla/modules/plugin/samples/testevents/README.txt
index 57bb00478f6..27f9efb56fe 100644
--- a/mozilla/modules/plugin/samples/testevents/README.txt
+++ b/mozilla/modules/plugin/samples/testevents/README.txt
@@ -30,7 +30,7 @@ with focus.
PROBLEMS:
* Plugins on Windows don't have event messages.
-* Plugins on Windows dont have key-pressed messages (only keyup and down)
+* Plugins on Windows don't have key-pressed messages (only keyup and down)
* Focus interaction is not correct (probably need a focus event)
diff --git a/mozilla/modules/plugin/samples/testevents/npevents.cpp b/mozilla/modules/plugin/samples/testevents/npevents.cpp
index 5d88adfce4c..95d032c2cb3 100644
--- a/mozilla/modules/plugin/samples/testevents/npevents.cpp
+++ b/mozilla/modules/plugin/samples/testevents/npevents.cpp
@@ -853,7 +853,7 @@ LRESULT CALLBACK EventsPluginInstance::WndProcChild(HWND hWnd, UINT Msg, WPARAM
EventsPluginInstance* inst = (EventsPluginInstance*) GetProp(hWnd, gInstanceLookupString);
NS_ABORT_IF_FALSE(inst, "Could not get the inst from the Window!!");
switch (Msg) {
- // NOTE: We DONT pass on DBLCLK messages, as both Scintilla and
+ // NOTE: We DON'T pass on DBLCLK messages, as both Scintilla and
// Mozilla have their own special logic, and they step on each other.
// (causing our child to see a double-click as a triple-click)
case WM_KEYDOWN:
diff --git a/mozilla/modules/plugin/samples/unixprinting/npunix.c b/mozilla/modules/plugin/samples/unixprinting/npunix.c
index f3045e5183b..452f8ec5f89 100644
--- a/mozilla/modules/plugin/samples/unixprinting/npunix.c
+++ b/mozilla/modules/plugin/samples/unixprinting/npunix.c
@@ -405,7 +405,7 @@ NP_GetValue(void* future, NPPVariable variable, void *value)
*
* PARAMETERS
* nsTable - The netscape function table. If developers just use these
- * wrappers, they dont need to worry about all these function
+ * wrappers, they don't need to worry about all these function
* tables.
* RETURN
* pluginFuncs
diff --git a/mozilla/modules/progress/src/makefile.win b/mozilla/modules/progress/src/makefile.win
index 6bce83dd3ab..d108f4a053f 100644
--- a/mozilla/modules/progress/src/makefile.win
+++ b/mozilla/modules/progress/src/makefile.win
@@ -96,7 +96,7 @@ LINCS=\
include <$(DEPTH)\config\rules.mak>
-# XXX this should not be required, but mantomake doesnt grok J?I yet
+# XXX this should not be required, but mantomake doesn't grok J?I yet
# also, -I..\public should be -I$(PUBLIC)\progress
LINCS=$(LINCS) \
-I$(DEPTH)/cmd/winfe \
diff --git a/mozilla/modules/rdf/include/rdf.h b/mozilla/modules/rdf/include/rdf.h
index 47ad6eb47b5..f5677dc33b9 100644
--- a/mozilla/modules/rdf/include/rdf.h
+++ b/mozilla/modules/rdf/include/rdf.h
@@ -186,7 +186,7 @@ PR_PUBLIC_API(RDF_Error) RDF_Shutdown(void);
#include "vocab.h"
-/* the stuff in vocab.h will supercede whats below. I am leaving this here
+/* the stuff in vocab.h will supercede what's below. I am leaving this here
only for the very near future */
diff --git a/mozilla/modules/rdf/src/query.c b/mozilla/modules/rdf/src/query.c
index 86ae39d783a..942efbb395b 100644
--- a/mozilla/modules/rdf/src/query.c
+++ b/mozilla/modules/rdf/src/query.c
@@ -336,7 +336,7 @@ RDF_Literal noUnknownAs(RDF_Query q, RDF_LiteralList orderedLiterals, RDF_Variab
return NULL;
}
-/* Returns true if the conjuncts were ordered succesfully.
+/* Returns true if the conjuncts were ordered successfully.
*/
PRBool orderConjuncts(RDF_Query q) {
uint16 numOrdered = 0;
@@ -390,7 +390,7 @@ PRBool orderConjuncts(RDF_Query q) {
} else break;
}
}
- if (numOrdered == q->numLiterals) { /* ordered all succesfully so replace literals */
+ if (numOrdered == q->numLiterals) { /* ordered all successfully so replace literals */
RDF_LiteralList old = q->literals;
q->literals = orderedLiterals;
destroyLiteralList(old, false);
diff --git a/mozilla/modules/softupdt/src/os2updt.c b/mozilla/modules/softupdt/src/os2updt.c
index 6285ba2c7b0..a9874022922 100644
--- a/mozilla/modules/softupdt/src/os2updt.c
+++ b/mozilla/modules/softupdt/src/os2updt.c
@@ -1323,7 +1323,7 @@ PSZ CsysUpdate(
pszScan );
} /* End if path not already there*/
- /* Else path exists..dont add */
+ /* Else path exists..don't add */
break;
}
diff --git a/mozilla/msgsdk/C/protocol/IMAP4/src/imap4.c b/mozilla/msgsdk/C/protocol/IMAP4/src/imap4.c
index 296cc5b67a8..370e9403c03 100644
--- a/mozilla/msgsdk/C/protocol/IMAP4/src/imap4.c
+++ b/mozilla/msgsdk/C/protocol/IMAP4/src/imap4.c
@@ -1294,7 +1294,7 @@ int imap4_unsubscribe(imap4Client_t* in_pimap4, const char* in_mailbox, char** o
/**
* This function is called to get the server to (possibly) checkpoint
-* its state, if that is necesary. Note: This does not imply that you
+* its state, if that is necessary. Note: This does not imply that you
* will get new EXISTS messages. If you want that type of stuff, use
* NOOP. Note: This may not instantaneous. For more info on this and the
* differences from NOOP, see RFC 1730.
diff --git a/mozilla/msgsdk/java/highlevel/examples/testsendMessage.java b/mozilla/msgsdk/java/highlevel/examples/testsendMessage.java
index 00aabd6c25a..a18e143c03d 100644
--- a/mozilla/msgsdk/java/highlevel/examples/testsendMessage.java
+++ b/mozilla/msgsdk/java/highlevel/examples/testsendMessage.java
@@ -115,12 +115,12 @@ public class testsendMessage
try
{
- // >>>> Build and retrun a Multi-pArt MIME Message <<<<
+ // >>>> Build and return a Multi-Part MIME Message <<<<
// Get an inputStream to user entered text
bins = new ByteArrayInputStream (textMsg.getBytes());
- // Create a new Multi-part MIMEMessage with the above text and the file passed
+ // Create a new Multi-Part MIMEMessage with the above text and the file passed
mmsg = new MIMEMessage(bins, fullfilename, encoding);
// set the user entered headers on the message
diff --git a/mozilla/msgsdk/java/protocol/examples/example1/SendMsgClnt.java b/mozilla/msgsdk/java/protocol/examples/example1/SendMsgClnt.java
index 2e37fc91af6..df3e41ac311 100644
--- a/mozilla/msgsdk/java/protocol/examples/example1/SendMsgClnt.java
+++ b/mozilla/msgsdk/java/protocol/examples/example1/SendMsgClnt.java
@@ -568,7 +568,7 @@ public class SendMsgClnt extends Frame
try
{
- // >>>> Build and retrun a text MIME Message <<<<
+ // >>>> Build and return a text MIME Message <<<<
// Get an inputStream to user entered text
bins = new ByteArrayInputStream ((textArea.getText()).getBytes());
@@ -621,7 +621,7 @@ public class SendMsgClnt extends Frame
try
{
- // >>>> Build and retrun a Multi-pArt MIME Message <<<<
+ // >>>> Build and return a Multi-Part MIME Message <<<<
// Get an inputStream to user entered text
bins = new ByteArrayInputStream ((textArea.getText()).getBytes());
diff --git a/mozilla/msgsdk/java/protocol/examples/example2/MIMEEncodeTest.java b/mozilla/msgsdk/java/protocol/examples/example2/MIMEEncodeTest.java
index fd32960ca68..7c7e2f3f632 100644
--- a/mozilla/msgsdk/java/protocol/examples/example2/MIMEEncodeTest.java
+++ b/mozilla/msgsdk/java/protocol/examples/example2/MIMEEncodeTest.java
@@ -94,7 +94,7 @@ public class MIMEEncodeTest
try
{
- // >>>> Build and retrun a Multi-Part MIME Message <<<<
+ // >>>> Build and return a Multi-Part MIME Message <<<<
// Get an inputStream to user entered text
bins = new ByteArrayInputStream (textMsg.getBytes());
diff --git a/mozilla/netwerk/base/public/nsIURL.idl b/mozilla/netwerk/base/public/nsIURL.idl
index 8c735b9d1eb..47006fc5864 100644
--- a/mozilla/netwerk/base/public/nsIURL.idl
+++ b/mozilla/netwerk/base/public/nsIURL.idl
@@ -108,7 +108,7 @@ interface nsIURL : nsIURI
* empty string. If the trailing slash is omitted, then the
* Directory is /foo/ and the file is bar (i.e. this is a
* syntactic, not a semantic breakdown of the Path).
- * And hence dont rely on this for something to be a definitely
+ * And hence don't rely on this for something to be a definitely
* be a file. But you can get just the leading directory portion
* for sure.
*
@@ -122,7 +122,7 @@ interface nsIURL : nsIURI
* e.g. http://foo/bar/, then the Directory attribute accesses
* the complete /foo/bar/ portion, and the FileName is the
* empty string. Note that this is purely based on searching
- * for the last trailing slash. And hence dont rely on this to
+ * for the last trailing slash. And hence don't rely on this to
* be a definite file.
*
* Some characters may be escaped.
diff --git a/mozilla/netwerk/base/src/nsDirectoryIndexStream.h b/mozilla/netwerk/base/src/nsDirectoryIndexStream.h
index 370b0bacd31..b5b21311060 100644
--- a/mozilla/netwerk/base/src/nsDirectoryIndexStream.h
+++ b/mozilla/netwerk/base/src/nsDirectoryIndexStream.h
@@ -55,7 +55,7 @@ protected:
nsVoidArray mArray;
// XXX - we could make these statics, and share them. But we're only going to have one
- // of directoryindexstream at once, so theres no point
+ // of directoryindexstream at once, so there's no point
nsXPIDLCString mFSCharset;
nsCOMPtr
diff --git a/mozilla/netwerk/testserver/docs/urlmap b/mozilla/netwerk/testserver/docs/urlmap
index 60295e5f541..50e563dc0e6 100644
--- a/mozilla/netwerk/testserver/docs/urlmap
+++ b/mozilla/netwerk/testserver/docs/urlmap
@@ -54,7 +54,7 @@ START /complex
INCLUDE generic.res
Content-Type: multipart/mixed; boundary=TheWallFromPinkFloyd
CRLF
-Preamble to multipart messages. Only clients that dont handle
+Preamble to multipart messages. Only clients that don't handle
multipart would see this!
CRLF
--TheWallFromPinkFloyd