summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-12-14 10:59:17 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-12-14 10:59:17 +0100
commit96298b784efd8d6815d4994f37100ef4e28e7834 (patch)
tree03b2788b55dc0dfa0d1e8d206e2e6a206527b9c3
parent46ec68493089d992587926b827cd816e5bee2088 (diff)
parent10768a0967ed23b31aa3c08b67cfdb3debf7ffdc (diff)
CWS-TOOLING: integrate CWS mh32_last_DEV300
-rw-r--r--desktop/source/app/copyright_ascii_ooo.c4
-rw-r--r--desktop/source/app/copyright_ascii_sun.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index f5b5cfa2ca..8d9d821e19 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -9,8 +9,8 @@ extern const char copyright_text_2[];
extern const char copyright_text_21[];
extern const char copyright_text_22[];
-const char copyright_text_1[] = "Copyright © 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright © 2010 Sun Microsystems, Inc., All rights reserved.";
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.";
-const char copyright_text_21[] = "Copyright © 2008 Sun Microsystems, Tous droits réservés.";
+const char copyright_text_21[] = "Copyright © 2010 Sun Microsystems, Tous droits réservés.";
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 d120e81c04..3d437af856 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -4,12 +4,12 @@
*
*/
-const char copyright_text_1[] = "Copyright © 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright © 2010 Sun Microsystems, Inc., All rights reserved.";
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.";
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.";
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.";
const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
-const char copyright_text_21[] = "Copyright © 2008 Sun Microsystems, Tous droits réservés.";
+const char copyright_text_21[] = "Copyright © 2010 Sun Microsystems, Tous droits réservés.";
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.";
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.";
const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";