diff --git a/mozilla/build/package/Makefile.in b/mozilla/build/package/Makefile.in index 6b31fd97274..ebd474d262f 100644 --- a/mozilla/build/package/Makefile.in +++ b/mozilla/build/package/Makefile.in @@ -14,7 +14,7 @@ # The Original Code is Mozilla packaging code. # # The Initial Developer of the Original Code is -# Benjamin Smedberg _. +# Benjamin Smedberg . # Portions created by the Initial Developer are Copyright (C) 2003 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/calendar/base/public/calIDecoratedView.idl b/mozilla/calendar/base/public/calIDecoratedView.idl index 02d4c52eeab..144e75c1466 100644 --- a/mozilla/calendar/base/public/calIDecoratedView.idl +++ b/mozilla/calendar/base/public/calIDecoratedView.idl @@ -15,13 +15,12 @@ * The Original Code is Calendar views. * * The Initial Developer of the Original Code is - * Joey Minta - * Dan Mosedale - * + * Joey Minta * Portions created by the Initial Developer are Copyright (C) 2005 * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Dan Mosedale * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/mozilla/calendar/resources/skin/classic/selectAddresses.css b/mozilla/calendar/resources/skin/classic/selectAddresses.css index 9d48cbc4a98..348432f2010 100644 --- a/mozilla/calendar/resources/skin/classic/selectAddresses.css +++ b/mozilla/calendar/resources/skin/classic/selectAddresses.css @@ -1,4 +1,38 @@ -/** INSERT OPEN OEONE LICENSE */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is OEone Calendar code. + * + * The Initial Developer of the Original Code is + * OEone Corporation. + * Portions created by the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ /*-------------------------------------------------------------------- * Select Addresses Dialog diff --git a/mozilla/calendar/resources/skin/modern/selectAddresses.css b/mozilla/calendar/resources/skin/modern/selectAddresses.css index 9d48cbc4a98..348432f2010 100644 --- a/mozilla/calendar/resources/skin/modern/selectAddresses.css +++ b/mozilla/calendar/resources/skin/modern/selectAddresses.css @@ -1,4 +1,38 @@ -/** INSERT OPEN OEONE LICENSE */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is OEone Calendar code. + * + * The Initial Developer of the Original Code is + * OEone Corporation. + * Portions created by the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ /*-------------------------------------------------------------------- * Select Addresses Dialog diff --git a/mozilla/camino/src/browser/BrowserTabView.h b/mozilla/camino/src/browser/BrowserTabView.h index e45fcee9e81..4ec2be26c15 100644 --- a/mozilla/camino/src/browser/BrowserTabView.h +++ b/mozilla/camino/src/browser/BrowserTabView.h @@ -16,11 +16,12 @@ * The Original Code is the Mozilla browser. * * The Initial Developer of the Original Code is - * Matt Judy. Portions of code @2002 nibfile.com. + * Matt Judy. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Portions of code @2002 nibfile.com. * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp index ba4a90be899..44c9db028b5 100644 --- a/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp +++ b/mozilla/content/xml/document/src/nsLoadSaveContentSink.cpp @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Netscape Communiactions Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/content/xml/document/src/nsLoadSaveContentSink.h b/mozilla/content/xml/document/src/nsLoadSaveContentSink.h index 14f6fdbe44d..7d7b553c7b4 100644 --- a/mozilla/content/xml/document/src/nsLoadSaveContentSink.h +++ b/mozilla/content/xml/document/src/nsLoadSaveContentSink.h @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Netscape Communiactions Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/content/xml/document/src/nsXMLFragmentContentSink.cpp b/mozilla/content/xml/document/src/nsXMLFragmentContentSink.cpp index 880a29c6616..a3d1c6ce551 100644 --- a/mozilla/content/xml/document/src/nsXMLFragmentContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLFragmentContentSink.cpp @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Steve Swanson steve.swanson@mackichan.com. + * Steve Swanson * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/dom/public/idl/ls/Makefile.in b/mozilla/dom/public/idl/ls/Makefile.in index 2f94a1dcef0..edc9be3dda2 100644 --- a/mozilla/dom/public/idl/ls/Makefile.in +++ b/mozilla/dom/public/idl/ls/Makefile.in @@ -14,8 +14,7 @@ # The Original Code is mozilla.org code. # # The Initial Developer of the Original Code is -# Netsscape Communications Corporation. -# +# Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 2002 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/dom/public/idl/xpath/nsIDOMNSXPathExpression.idl b/mozilla/dom/public/idl/xpath/nsIDOMNSXPathExpression.idl index ff7aed58ef1..d6288c44919 100644 --- a/mozilla/dom/public/idl/xpath/nsIDOMNSXPathExpression.idl +++ b/mozilla/dom/public/idl/xpath/nsIDOMNSXPathExpression.idl @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Novell, inc. + * Novell, Inc. * Portions created by the Initial Developer are Copyright (C) 2005 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp index 09b0b50a2ea..9a9b67adada 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp @@ -16,7 +16,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Netscape Communications Coporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2003 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/embedding/qa/Makefile.in b/mozilla/embedding/qa/Makefile.in index 8ea9f199ecd..d5e70eb116d 100644 --- a/mozilla/embedding/qa/Makefile.in +++ b/mozilla/embedding/qa/Makefile.in @@ -14,7 +14,7 @@ # The Original Code is Mozilla QA Tests. # # The Initial Developer of the Original Code is -# +# Josh Soref. # Portions created by the Initial Developer are Copyright (C) 2004 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp index 45beff0c421..df152fec92e 100644 --- a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp +++ b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp @@ -16,7 +16,7 @@ * The Original Code is mozilla.org Code. * * The Initial Developer of the Original Code is - * Aaron Leventhal. Portionsk created by Aaron Leventhal are Copyright (C) 2001 Aaron Leventhal. All Rights Reserved. + * Aaron Leventhal. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in index 6d06ffb7a89..8f70219fd24 100755 --- a/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in +++ b/mozilla/extensions/cck/browser/resources/content/cckwizard/srcfiles/cckService.js.in @@ -16,7 +16,7 @@ * The Original Code is the Client Customization Kit (CCK). * * The Initial Developer of the Original Code is - * Giorgio Maonem + * Giorgio Maone * Portions created by the Initial Developer are Copyright (C) 2005 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/intl/uconv/src/wincharset.properties b/mozilla/intl/uconv/src/wincharset.properties index 02392ffebd4..6765e6b2f6f 100644 --- a/mozilla/intl/uconv/src/wincharset.properties +++ b/mozilla/intl/uconv/src/wincharset.properties @@ -14,7 +14,7 @@ # The Original Code is mozilla.org code. # # The Initial Developer of the Original Code is -# Netscape Communications Corportation. +# Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1999 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp index 5fb8e1a061f..b3e09fe4170 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp @@ -17,7 +17,7 @@ * The Original Code is CharToByteX11Johab.java. * * The Initial Developer of the Original Code is - * Deogtae Kim (98/05/03) and Based on: Hanterm source code adapted by Jungshik Shin . + * Deogtae Kim (98/05/03) * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * @@ -39,6 +39,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ + #include "nsUnicodeToX11Johab.h" #include "nsUCvKODll.h" diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.cpp index 27e65088f91..e20dd16d008 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.cpp @@ -15,7 +15,7 @@ * The Original Code is Mozilla Communicator client code. * * The Initial Developer of the Original Code is - * Roland Mainz . All Rights Reserved. + * Roland Mainz . * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.h index f1035b7e819..9d402fb7810 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToAdobeEuro.h @@ -15,7 +15,7 @@ * The Original Code is Mozilla Communicator client code. * * The Initial Developer of the Original Code is - * The Initial Developer of the Original Code is Roland Mainz . All Rights Reserved. + * Roland Mainz . * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTIS620.h b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTIS620.h index 9a2247b24e5..66708880a60 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTIS620.h +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTIS620.h @@ -15,7 +15,7 @@ * The Original Code is Mozilla communicator client code. * * The Initial Developer of the Original Code is - * Netscape Communication Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1999 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/js2/tests/cpp/DikDik_Shell.cpp b/mozilla/js2/tests/cpp/DikDik_Shell.cpp index e5b2f71ca2b..d24a2460688 100644 --- a/mozilla/js2/tests/cpp/DikDik_Shell.cpp +++ b/mozilla/js2/tests/cpp/DikDik_Shell.cpp @@ -14,7 +14,8 @@ * * The Original Code is The JavaScript 2 Protoype. * - * The Initial Developer of the Original Code is Netscape Communicatins Corp. + * The Initial Developer of the Original Code is + * Netscape Communications Corp. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/layout/base/nsChangeHint.h b/mozilla/layout/base/nsChangeHint.h index c8cdebfc935..1676cf16148 100644 --- a/mozilla/layout/base/nsChangeHint.h +++ b/mozilla/layout/base/nsChangeHint.h @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Netscape Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/mailnews/addrbook/public/nsIAbDirFactory.idl b/mozilla/mailnews/addrbook/public/nsIAbDirFactory.idl index 7169defd91c..037d80d8bae 100644 --- a/mozilla/mailnews/addrbook/public/nsIAbDirFactory.idl +++ b/mozilla/mailnews/addrbook/public/nsIAbDirFactory.idl @@ -15,11 +15,12 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Paul Sandoz Sun Microsystems, Inc. + * Sun Microsystems, Inc. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Paul Sandoz * Csaba Borbola * Seth Spitzer * diff --git a/mozilla/mailnews/base/src/nsSoundDatasource.cpp b/mozilla/mailnews/base/src/nsSoundDatasource.cpp index 0c1a7e3acc9..a1cfdfbaa5c 100644 --- a/mozilla/mailnews/base/src/nsSoundDatasource.cpp +++ b/mozilla/mailnews/base/src/nsSoundDatasource.cpp @@ -15,11 +15,12 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Seth Spitzer Netscape Communications Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Seth Spitzer * * Alternatively, the contents of this file may be used under the terms of * either of the GNU General Public License Version 2 or later (the "GPL"), diff --git a/mozilla/mailnews/local/public/nsINewsBlogFeedDownloader.idl b/mozilla/mailnews/local/public/nsINewsBlogFeedDownloader.idl index ec530988a8d..592e19cb4f9 100755 --- a/mozilla/mailnews/local/public/nsINewsBlogFeedDownloader.idl +++ b/mozilla/mailnews/local/public/nsINewsBlogFeedDownloader.idl @@ -14,7 +14,7 @@ * The Original Code is mozilla mailnews. * * The Initial Developer of the Original Code is - * David Bienvenu. + * David Bienvenu . * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/tools/dreftool/Makefile.in b/mozilla/tools/dreftool/Makefile.in index 745932099e7..69f4fd0b8b3 100644 --- a/mozilla/tools/dreftool/Makefile.in +++ b/mozilla/tools/dreftool/Makefile.in @@ -14,7 +14,7 @@ # The Original Code is Dreftool. # # The Initial Developer of the Original Code is -# Portions created by the Initial Developer are Copyright (C) 2003 the Initial Developer. All Rights Reserved. +# Rick Gessner. # Portions created by the Initial Developer are Copyright (C) 2001 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/uriloader/exthandler/beos/nsOSHelperAppService.h b/mozilla/uriloader/exthandler/beos/nsOSHelperAppService.h index 3384893fe3b..b871abc66d4 100644 --- a/mozilla/uriloader/exthandler/beos/nsOSHelperAppService.h +++ b/mozilla/uriloader/exthandler/beos/nsOSHelperAppService.h @@ -14,7 +14,7 @@ * The Original Code is nsOSHelperAppService.h. * * The Initial Developer of the Original Code is - * PaulAshford. + * Paul Ashford. * Portions created by the Initial Developer are Copyright (C) 2002 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/xremoteclient/PhRemoteClient.h b/mozilla/widget/src/xremoteclient/PhRemoteClient.h index bd58b78bfbc..d0f830e9026 100644 --- a/mozilla/widget/src/xremoteclient/PhRemoteClient.h +++ b/mozilla/widget/src/xremoteclient/PhRemoteClient.h @@ -14,7 +14,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Christopher Blizzard. Portions created Christopher Blizzard are Copyright (C) Christopher Blizzard. All Rights Reserved. + * Christopher Blizzard. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/xremoteclient/XRemoteClient.cpp b/mozilla/widget/src/xremoteclient/XRemoteClient.cpp index 9334fe09e12..90bc477301b 100644 --- a/mozilla/widget/src/xremoteclient/XRemoteClient.cpp +++ b/mozilla/widget/src/xremoteclient/XRemoteClient.cpp @@ -18,8 +18,8 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Christopher Blizzard and Jamie Zawinski. Portions created Christopher Blizzard are Copyright (C) 2000 Christopher Blizzard. - * Portions created by the Initial Developer are Copyright (C) 1994 + * Christopher Blizzard and Jamie Zawinski. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 * the Initial Developer. All Rights Reserved. * * Contributor(s): diff --git a/mozilla/widget/src/xremoteclient/XRemoteClient.h b/mozilla/widget/src/xremoteclient/XRemoteClient.h index 2def6414f8d..9b41f0accc7 100644 --- a/mozilla/widget/src/xremoteclient/XRemoteClient.h +++ b/mozilla/widget/src/xremoteclient/XRemoteClient.h @@ -14,7 +14,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Christopher Blizzard. Portions created Christopher Blizzard are Copyright (C) Christopher Blizzard. All Rights Reserved. + * Christopher Blizzard. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp index 2f52d141b80..511f6ac0307 100644 --- a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp +++ b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * Netscape Communicationsm Corporation. + * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. * diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-keynav.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-keynav.js index d99b2124091..f4889f49291 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/pref-keynav.js +++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-keynav.js @@ -14,8 +14,8 @@ * * The Original Code is Mozilla.org Code. * - * The Initial Developer of the Original Code is Aaron Leventhal - * Netscape Communications Corporation. + * The Initial Developer of the Original Code is + * Aaron Leventhal. * Portions created by the Initial Developer are Copyright (C) 2003 * the Initial Developer. All Rights Reserved. *