INTEGRATION: CWS mh1990 (1.2.522); FILE MERGED

2005/04/22 12:00:35 mh 1.2.522.1: #121798#, update notice

2 files changed, 12 insertions, 40 deletions

diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index bdf6baee3d5a..52781fe55d94 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -6,8 +6,8 @@
 
 
 
-extern const char copyright_text_1[] = "Copyright � 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved.";
+extern const char copyright_text_1[] = "Copyright � 2005 Sun Microsystems, Inc., All rights reserved.";
 extern const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-extern const char copyright_text_21[] = "Copyright � 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, �tats-Unis. Tous droits r�serv�s.";
+extern const char copyright_text_21[] = "Copyright � 2005 Sun Microsystems, Tous droits r�serv�s.";
 extern const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index bebf06e477bd..48698ac03f24 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -6,45 +6,17 @@
 
 
 
-extern const char copyright_text_1[] = "Copyright � 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved.";
+extern const char copyright_text_1[] = "Copyright � 2005 Sun Microsystems, Inc., All rights reserved.";
 extern const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-extern const char copyright_text_3[] = "This document and the product to which it pertains are distributed under licenses restricting their use, copying, distribution, and decompilation. No part of the product or of this document may be reproduced in any form by any means without prior written authorization of Sun and its licensors, if any.";
-extern const char copyright_text_4[] = "Third-party software, including font technology, is copyrighted and licensed from Sun suppliers.";
-extern const char copyright_text_5[] = "This product is based in part on the work of the Independent JPEG Group, The FreeType Project and the Catharon Typography Project.";
-extern const char copyright_text_6[] = "Portions Copyright 2000 SuSE, Inc. Word for Word Copyright � 1996 Inso Corp. International CorrectSpell spelling correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved.";
-extern const char copyright_text_7[] = "Source code for portions of this product are available under the Mozilla Public License at the following sites: http://www.mozilla.org/, http://www.jclark.com/, and http://www.gingerall.com.";
-extern const char copyright_text_8[] = "Sun, Sun Microsystems, the Sun logo, Java, Solaris, StarOffice, the Butterfly logo, the Solaris logo, and the StarOffice logo are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.";
-extern const char copyright_text_9[] = "UNIX is a registered trademark in the U.S. and in other countries, exclusively licensed through X/Open Company, Ltd. Screen Beans and Screen Beans clipart characters are registered trademarks of A Bit Better Corporation. International CorrectSpell is a trademark of Lernout & Hauspie Speech Products N.V.";
-extern const char copyright_text_10[] = "International CorrectSpell Swedish, Russian, Norwegian, English, Dutch, and Danish correction systems Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_11[] = "International CorrectSpell Spanish and French correction systems Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from word list supplied by Librairie Larousse. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_12[] = "International CorrectSpell Australian English correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Based upon The Macquarie Dictionary, Second Revised Edition Copyright � Macquarie University NSW. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_13[] = "International CorrectSpell Catalan correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from Catalan word list Copyright � 1992 Universitat de Barcelona. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_14[] = "International CorrectSpell Czech correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from word list supplied by Jan Hajic. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_15[] = "International CorrectSpell Finnish correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from word list supplied by University of Helsinki Institute for Finnish Language and Dr. Kolbjorn Heggstad. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_16[] = "International CorrectSpell German correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from word list supplied by Langenscheidt K.G. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_17[] = "International CorrectSpell Italian correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Adapted from word list supplied by Zanichelli S.p.A. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_18[] = "International CorrectSpell Portuguese correction system Copyright � 1995 by Lernout & Hauspie Speech Products N.V. All rights reserved. Portions adapted from the Dicionario Academico da Lingua Portuguesa Copyright � 1992 by Porto Editora. Reproduction or disassembly of embodied algorithms or database prohibited.";
-extern const char copyright_text_19[] = "Federal Acquisitions: Commercial Software - Government Users Subject to Standard License Terms and Conditions.";
-extern const char copyright_text_20[] = "DOCUMENTATION IS PROVIDED \"AS IS\" AND ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.";
-extern const char copyright_text_21[] = "Copyright � 2002 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, �tats-Unis. Tous droits r�serv�s.";
+extern const char copyright_text_3[] = "U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  Use is subject to license terms.";
+extern const char copyright_text_4[] = "This distribution may include materials developed by third parties.Sun, Sun Microsystems, the Sun logo, Java, Solaris and StarOffice are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.";
+extern const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
+extern const char copyright_text_21[] = "Copyright � 2005 Sun Microsystems, Tous droits r�serv�s.";
 extern const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propri�t� intellectuels relatants � la technologie incorpor�e dans ce produit. En particulier, et sans la limitation, ces droits de propri�t� intellectuels peuvent inclure un ou plus des brevets am�ricains �num�r�s � http://www.sun.com/patents et un ou les brevets plus suppl�mentaires ou les applications de brevet en attente dans les �tats - Unis et les autres pays.";
 extern const char copyright_text_23[] = "Ce produit ou document est prot�g� par un copyright et distribu� avec des licences qui en restreignent l'utilisation, la copie, la distribution, et la d�compilation. Aucune partie de ce produit ou document ne peut �tre reproduite sous aucune forme, par quelque moyen que ce soit, sans l'autorisation pr�alable et �crite de Sun et de ses bailleurs de licence, s'il y ena.";
-extern const char copyright_text_24[] = "Le logiciel d�tenu par des tiers, et qui comprend la technologie relative aux polices de caract�res, est prot�g� par un copyright et licenci� par des fournisseurs de Sun.";
-extern const char copyright_text_25[] = "Ce produit repose en partie sur le travail de l'Independent JPEG Group, de The FreeType Project et de Catharon Typography Project.";
-extern const char copyright_text_26[] = "Portions Copyright 2000 SuSE, Inc. Word for Word Copyright � 1996 Inso Corp. Syst�me de correction orthographique International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s.";
-extern const char copyright_text_27[] = "Le code source de certaines parties de ce produit est disponible sous licence publique Mozilla sur les sites suivants�: http://www.mozilla.org/, http://www.jclark.com/ et http://www.gingerall.com.";
-extern const char copyright_text_28[] = "Sun, Sun Microsystems, le logo Sun, Java, Solaris, StarOffice, le logo Butterfly, le logo Solaris et le logo StarOffice sont des marques de fabrique ou des marques d�pos�es de Sun Microsystems, Inc. aux �tats-Unis et dans d'autres pays.";
-extern const char copyright_text_29[] = "UNIX est une marque d�pos�e aux �tats-Unis et dans d'autres pays et licenci�e exclusivement par X/Open Company, Ltd.";
-extern const char copyright_text_30[] = "Les Screen Beans et les objets graphiques pr�dessin�s Screen Beans sont des marques d�pos�es de A Bit Better Corporation. International CorrectSpell est une marque d�pos�e de Lernout & Hauspie Speech Products N.V.";
-extern const char copyright_text_31[] = "Syst�mes de correction orthographique su�dois, russe, norv�gien, anglais, n�erlandais et danois International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_32[] = "Syst�mes de correction orthographique espagnol et fran�ais International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots fournie par la Librairie Larousse. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_33[] = "Syst�me de correction orthographique anglais australien International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. �labor� � partir de The Macquarie Dictionary, deuxi�me �dition mise � jour. Copyright � Macquarie University NSW. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_34[] = "Syst�me de correction orthographique catalan International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots catalans Copyright � 1992 Universitat de Barcelona. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_35[] = "Syst�me de correction orthographique tch�que International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots fournie par Jan Hajic. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_36[] = "Syst�me de correction orthographique finlandais International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots fournie par le University of Helsinki Institute pour la langue finlandaise et par le Dr�Kolbjorn Heggstad. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_37[] = "Syst�me de correction orthographique allemand International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots fournie par Langenscheidt K.G. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_38[] = "Syst�me de correction orthographique italien International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Adapt� � partir de la liste de mots fournie par Zanichelli S.p.A. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_39[] = "Syst�me de correction orthographique portugais International CorrectSpell Copyright � 1995 de Lernout & Hauspie Speech Products N.V. Tous droits r�serv�s. Certaines parties ont �t� adapt�es � partir du Dicionario Academico da Lingua Portuguesa Copyright � 1992 de Porto Editora. Il est interdit de reproduire ou de d�sassembler les algorithmes ou les bases de donn�es incorpor�s.";
-extern const char copyright_text_40[] = "Acquisitions f�d�rales�: logiciel commercial�; les utilisateurs gouvernementaux sont soumis aux conditions g�n�rales standard de la licence.";
-extern const char copyright_text_41[] = "LA DOCUMENTATION est fournie ��TELLE QUELLE�� et TOUTES LES CONDITIONS, REPR�SENTATIONS ET GARANTIES EXPRESSES OU TACITES, Y COMPRIS TOUTE GARANTIE TACITE CONCERNANT LA QUALIT� MARCHANDE, L'APTITUDE � UN USAGE PARTICULIER OU LA NON-VIOLATION DE DROITS DE TIERS SERONT REJET�ES, EXCEPT� DANS LE CAS O� L'EXCLUSION OU LA LIMITATION DE TELLES GARANTIES NE SERAIT PAS AUTORIS�E PAR LA L�GISLATION EN VIGUEUR.";
+extern const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";
+extern const char copyright_text_25[] = "Cette distribution peut comprendre des composants développés par des tierces parties.";
+extern const char copyright_text_26[] = "Sun, Sun Microsystems, le logo Sun, Java, Solaris et StarOffice sont des marques de fabrique ou des marques déposées de Sun Microsystems, Inc. aux Etats-Unis et dans d'autres pay";
+extern const char copyright_text_27[] = "Toutes les marques SPARC sont utilisées sous licence et sont des marques de fabrique ou des marques déposées de SPARC International, Inc. aux Etats-Unis et dans d'autres pay";
+extern const char copyright_text_28[] = "UNIX est une marque déposée aux Etats-Unis et dans d'autres pays et licenciée exlusivement par X/Open Company, Ltd.";