diff -r 9a27d526e23b gnome2-accessibility-guide/de/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/de/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/de/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="de"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2007</year><holder>Jan Arne Petersen (jap@gnome.org)</holder></copyright><copyright><year>2008, 2009</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright><copyright><year>2009</year><holder>Simon Bienlein (simon@linux-fuer-blinde.de)</holder></copyright><copyright><year>2009</year><holder>Wolfgang Stroh (Wolfgang.Stroh@chello.at)</holder></copyright><copyright><year>2009</year><holder>Christian Kirbach (christian.kirbach@googlemail.com)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java-Desktop-System Dokumentationsteam</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/el/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/el/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/el/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="el"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Desktop System Documentation Team</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/en_GB/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/en_GB/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/en_GB/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="en_GB"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2007</year><holder>David Lodge (dave@cirt.net)</holder></copyright><copyright><year>2009</year><holder>Jen Ockwell (jenfraggleubuntu@gmail.com)</holder></copyright><copyright><year>2009</year><holder>Philip Withnall (philip@tecnocode.co.uk)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Desktop System Documentation Team</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/es/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/es/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/es/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="es"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2007-2009</year><holder>Jorge González (jorgegonz@svn.gnome.org)</holder></copyright><copyright><year>2005</year><holder>Alejandro Arevena (traductores@es.gnome.org)</holder></copyright><copyright><year>2008</year><holder>Ricardo Varas Santana (rvaras81@yahoo.com)</holder></copyright><copyright><year>2005</year><holder>QA: Francisco Javier F. Serrador (serrador@cvs.gnome.org)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Equipo de documentación del escritorio de Sun Java Desktop System</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/eu/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/eu/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/eu/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="eu"> 
@@ -30,11 +30,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2008.</year><holder>Hizkuntza Politikarako Sailburuordetza (hizkpol@ej-gv.es)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -95,10 +93,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Mahaigaineko Sistemaren Dokumentazio-taldea</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/fi/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/fi/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/fi/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="fi"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2007-2009.</year><holder>Timo Jyrinki (timo.jyrinki@iki.fi)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java-työpöytäjärjestelmän dokumentointitiimi</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/fr/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/fr/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/fr/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="fr"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2006</year><holder>Jonathan Ernst (jonathan@ernstfamily.ch)</holder></copyright><copyright><year>2006-2009</year><holder>Claude Paroz (claude@2xlibre.net)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>L'équipe de documentation du Java Desktop System</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/hu/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/hu/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/hu/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="hu"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2008.</year><holder>Hammer Attila (hammera@pickup.hu)</holder></copyright><copyright><year>2008.</year><holder>Kelemen Gábor (kelemeng@gnome.hu)</holder></copyright><copyright><year>2008.</year><holder>Kiss Gergely (mail.gery@gmail.com)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Desktop System Documentation Team</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/it/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/it/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/it/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="it"> 
@@ -87,7 +87,7 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Team di documentazione di Java Desktop System</surname> 
 <affiliation> 
 <orgname>Sun Microsystem, Inc.</orgname>  
diff -r 9a27d526e23b gnome2-accessibility-guide/oc/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/oc/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/oc/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="oc"> 
@@ -30,11 +30,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright>
 
 <!--  translators: uncomment this:
@@ -107,10 +105,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Desktop System Documentation Team</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/pt/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/pt/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/pt/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="pt"> 
@@ -30,11 +30,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2007, 2008</year><holder>Duarte Loreto (happyguy_pt@hotmail.com)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -95,10 +93,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Equipa de Documentação do Sistema de Trabalho Java</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/ru/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/ru/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/ru/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="ru"> 
@@ -28,11 +28,9 @@
 <holder>Брент Смит (Brent Smith)</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2008</year><holder>Анатолий Камынин (anatol@tiflocomp.ru)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Команда Документирования Java Desktop System</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/sv/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/sv/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/sv/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="sv"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2006, 2007, 2008, 2009</year><holder>Daniel Nylander (po@danielnylander.se)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java Desktop System Documentation Team</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/uk/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/uk/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/uk/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="uk"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2010.</year><holder>Sergiy Gavrylov (sergiovana@bigmir.net)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Команда документування Java Desktop System</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-accessibility-guide/zh_CN/gnome-access-guide.xml
--- a/gnome2-accessibility-guide/zh_CN/gnome-access-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-accessibility-guide/zh_CN/gnome-access-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -9,8 +9,8 @@
 <!ENTITY low-vision SYSTEM "low-vision.xml">
 <!ENTITY mobility SYSTEM "mobility.xml">
 <!ENTITY general SYSTEM "general.xml">
-<!ENTITY author1 "Sun">
-<!ENTITY author2 "Java Desktop System Documentation Team">
+<!ENTITY author1 "Oracle Solaris">
+<!ENTITY author2 "Desktop Documentation Team">
 ]>
 <?db.chunk.max_depth 4?>
 <book id="index" lang="zh_CN"> 
@@ -28,11 +28,9 @@
 <holder>Brent Smith</holder>
 </copyright>
 <copyright> 
-<year>2005</year>
-<year>2004</year>
-<year>2003</year>
 <year>2002</year>
-<holder>Sun Microsystems, Inc.</holder> 
+<year>2011</year>
+<holder>Oracle and/or its affiliates. All rights reserved.</holder> 
 </copyright><copyright><year>2008.Launchpad Contributions:</year><holder>Aron Xu (aronmalache@163.com)</holder></copyright>
 
 <!--  translators: uncomment this:
@@ -87,10 +85,10 @@
 </author>
 
 <author> 
-<firstname>Sun</firstname> 
+<firstname>Oracle Solaris</firstname> 
 <surname>Java桌面系统文档团队</surname> 
 <affiliation> 
-<orgname>Sun Microsystems, Inc.</orgname>  
+<orgname>Oracle Corporation</orgname>  
 </affiliation> 
 </author> 
 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/ca/system-admin-guide.xml
--- a/gnome2-system-admin-guide/ca/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/ca/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2008, 2009</year><holder>Joan Duran (jodufi@gmail.com)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008, 2009</year><holder>Joan Duran (jodufi@gmail.com)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Equip de documentació del GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/cs/system-admin-guide.xml
--- a/gnome2-system-admin-guide/cs/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/cs/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2009</year><holder>Marek Černocký (marek@manet.cz)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2009</year><holder>Marek Černocký (marek@manet.cz)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Dokumentační tým GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/de/system-admin-guide.xml
--- a/gnome2-system-admin-guide/de/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/de/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2008, 2009</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008, 2009</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>GNOME-Dokumentationsteam</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/el/system-admin-guide.xml
--- a/gnome2-system-admin-guide/el/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/el/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2009</year><holder>Τζένη Πετούμενου (epetoumenou@gmail.com)</holder></copyright><copyright><year>2008</year><holder>Κώστας Παπαδήμας (pkst@gnome.org)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2009</year><holder>Τζένη Πετούμενου (epetoumenou@gmail.com)</holder></copyright><copyright><year>2008</year><holder>Κώστας Παπαδήμας (pkst@gnome.org)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Ομάδα Τεκμηρίωσης GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/es/system-admin-guide.xml
--- a/gnome2-system-admin-guide/es/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/es/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2007-2009</year><holder>Jorge González (jorgegonz@svn.gnome.org)</holder></copyright><copyright><year>2006</year><holder>Francisco Javier F. Serrador (serrador@cvs.gnome.org)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007-2009</year><holder>Jorge González (jorgegonz@svn.gnome.org)</holder></copyright><copyright><year>2006</year><holder>Francisco Javier F. Serrador (serrador@cvs.gnome.org)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Equipo de documentación GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/eu/system-admin-guide.xml
--- a/gnome2-system-admin-guide/eu/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/eu/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -76,10 +76,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>GNOMEren dokumentazio-taldea</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems </orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/fi/system-admin-guide.xml
--- a/gnome2-system-admin-guide/fi/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/fi/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2008-2009.</year><holder>Timo Jyrinki (timo.jyrinki@iki.fi)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008-2009.</year><holder>Timo Jyrinki (timo.jyrinki@iki.fi)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -135,10 +130,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Gnomen dokumentaatioryhmä</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/fr/system-admin-guide.xml
--- a/gnome2-system-admin-guide/fr/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/fr/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2006-2009</year><holder>Claude Paroz (claude@2xlibre.net)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006-2009</year><holder>Claude Paroz (claude@2xlibre.net)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Équipe de documentation GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/it/system-admin-guide.xml
--- a/gnome2-system-admin-guide/it/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/it/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -76,7 +76,7 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Team di documentazione di GNOME</surname> 
 		  <affiliation> 
 			 <orgname>Sun Microsystem</orgname> 
diff -r 9a27d526e23b gnome2-system-admin-guide/ja/system-admin-guide.xml
--- a/gnome2-system-admin-guide/ja/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/ja/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2008</year><holder>相花毅 (takeshi.aihana@gmail.com)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008</year><holder>相花毅 (takeshi.aihana@gmail.com)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>GNOME ドキュメンテーション・プロジェクト・チーム</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/ko/system-admin-guide.xml
--- a/gnome2-system-admin-guide/ko/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/ko/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2008.</year><holder>김남형 Namhyung Kim (namhyung@gmail.com)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008.</year><holder>김남형 Namhyung Kim (namhyung@gmail.com)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>그놈 문서 팀</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/oc/system-admin-guide.xml
--- a/gnome2-system-admin-guide/oc/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/oc/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -33,14 +33,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -136,10 +131,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Còla de documentacion de GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/pt/system-admin-guide.xml
--- a/gnome2-system-admin-guide/pt/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/pt/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2007</year><holder>Duarte Loreto (happyguy_pt@hotmail.com)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007</year><holder>Duarte Loreto (happyguy_pt@hotmail.com)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -76,10 +71,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>Equipa de Documentação do GNOME</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/sv/system-admin-guide.xml
--- a/gnome2-system-admin-guide/sv/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/sv/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -32,14 +32,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright><copyright><year>2007, 2008, 2009</year><holder>Daniel Nylander (po@danielnylander.se)</holder></copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007, 2008, 2009</year><holder>Daniel Nylander (po@danielnylander.se)</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -79,7 +74,7 @@
 		  <firstname>Suns</firstname> 
 		  <surname>GNOME-dokumentationsteam</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-system-admin-guide/zh_CN/system-admin-guide.xml
--- a/gnome2-system-admin-guide/zh_CN/system-admin-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-system-admin-guide/zh_CN/system-admin-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -33,14 +33,9 @@
 		<year>2005</year> 
 		<holder>Brent Smith</holder> 
 	 </copyright>
-	 <copyright> 
-		<year>2004</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
-	 <copyright> 
-		<year>2003</year> 
-		<holder>Sun Microsystems</holder> 
-	 </copyright>
+	 <copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright>
 
 <!-- translators: uncomment this:
   <copyright>
@@ -136,10 +131,10 @@
 		  </affiliation> 
 		</author> 
 		<author> 
-		  <firstname>Sun</firstname> 
+		  <firstname>Oracle Solaris</firstname> 
 		  <surname>GNOME 文档团队</surname> 
 		  <affiliation> 
-			 <orgname>Sun Microsystems</orgname> 
+			 <orgname>Oracle Corporation</orgname> 
 		  </affiliation> 
 		</author> 
 	 </authorgroup>
diff -r 9a27d526e23b gnome2-user-guide/ar/user-guide.xml
--- a/gnome2-user-guide/ar/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/ar/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -19,13 +19,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -115,10 +110,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
-        <surname>GNOME Documentation Team</surname>
+        <firstname>Oracle Solaris</firstname>
+        <surname>Desktop Documentation Team</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/bg/user-guide.xml
--- a/gnome2-user-guide/bg/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/bg/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2004, 2005, 2006.</year><holder>Владимир „kaladan“ Петков (vpetkov@i-space.org)</holder></copyright><copyright><year>2004, 2005, 2006.</year><holder>Ростислав „zbrox“ Райков (zbrox@i-space.org)</holder></copyright><copyright><year>2004, 2005, 2006.</year><holder>Юлия „konfeta“ Велкова (konfeta@gmail.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2004, 2005, 2006.</year><holder>Владимир „kaladan“ Петков (vpetkov@i-space.org)</holder></copyright><copyright><year>2004, 2005, 2006.</year><holder>Ростислав „zbrox“ Райков (zbrox@i-space.org)</holder></copyright><copyright><year>2004, 2005, 2006.</year><holder>Юлия „konfeta“ Велкова (konfeta@gmail.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -113,10 +108,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Проектът за документация на GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/cs/user-guide.xml
--- a/gnome2-user-guide/cs/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/cs/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -19,13 +19,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2008, 2009, 2010</year><holder>Lucas Lommer (llommer@svn.gnome.org)</holder></copyright><copyright><year>2010</year><holder>Jakub Lepic (j.lepic@post.cz)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008, 2009, 2010</year><holder>Lucas Lommer (llommer@svn.gnome.org)</holder></copyright><copyright><year>2010</year><holder>Jakub Lepic (j.lepic@post.cz)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -72,10 +67,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Dokumentační tým GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/de/user-guide.xml
--- a/gnome2-user-guide/de/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/de/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007</year><holder>Jan Arne Petersen (jap@gnome.org)</holder></copyright><copyright><year>2008, 2009, 2010</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright><copyright><year>2009</year><holder>Jochen Skulj (jochen@jochenskulj.de)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007</year><holder>Jan Arne Petersen (jap@gnome.org)</holder></copyright><copyright><year>2008, 2009, 2010</year><holder>Mario Blättermann (mariobl@gnome.org)</holder></copyright><copyright><year>2009</year><holder>Jochen Skulj (jochen@jochenskulj.de)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>GNOME Dokumentationsteam</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/el/user-guide.xml
--- a/gnome2-user-guide/el/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/el/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Ομάδα Τεκμηρίωσης GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/es/user-guide.xml
--- a/gnome2-user-guide/es/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/es/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007-2010</year><holder>Jorge González (jorgegonz@svn.gnome.org)</holder></copyright><copyright><year>2006</year><holder>Francisco Javier F. Serrador (serrador@cvs.gnome.org)</holder></copyright><copyright><year>2005</year><holder>Alejandro Aravena (raidenblast@gmail.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007-2010</year><holder>Jorge González (jorgegonz@svn.gnome.org)</holder></copyright><copyright><year>2006</year><holder>Francisco Javier F. Serrador (serrador@cvs.gnome.org)</holder></copyright><copyright><year>2005</year><holder>Alejandro Aravena (raidenblast@gmail.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Proyecto de Documentación de GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/eu/user-guide.xml
--- a/gnome2-user-guide/eu/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/eu/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2008.</year><holder>Hizkuntza Politikarako Sailburuordetza (hizkpol@ej-gv.es)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2008.</year><holder>Hizkuntza Politikarako Sailburuordetza (hizkpol@ej-gv.es)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>GNOMEren dokumentazio-taldea</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/fi/user-guide.xml
--- a/gnome2-user-guide/fi/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/fi/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007-2009.</year><holder>Timo Jyrinki (timo.jyrinki@iki.fi)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007-2009.</year><holder>Timo Jyrinki (timo.jyrinki@iki.fi)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -113,10 +108,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Gnomen dokumentointiryhmä</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/fr/user-guide.xml
--- a/gnome2-user-guide/fr/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/fr/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006</year><holder>Jonathan Ernst (jonathan@ernstfamily.ch)</holder></copyright><copyright><year>2006-2010</year><holder>Claude Paroz (claude@2xlibre.net)</holder></copyright><copyright><year>2006, 2007</year><holder>Christophe Bliard (christophe.bliard@trux.info)</holder></copyright><copyright><year>2006</year><holder>Marc Lorber (linux-lorber@club-internet.fr)</holder></copyright><copyright><year>2009-2010</year><holder>Bruno Brouard (annoa.b@gmail.com)</holder></copyright><copyright><year>2009</year><holder>Laurent Coudeur (laurentc@iol.ie)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006</year><holder>Jonathan Ernst (jonathan@ernstfamily.ch)</holder></copyright><copyright><year>2006-2010</year><holder>Claude Paroz (claude@2xlibre.net)</holder></copyright><copyright><year>2006, 2007</year><holder>Christophe Bliard (christophe.bliard@trux.info)</holder></copyright><copyright><year>2006</year><holder>Marc Lorber (linux-lorber@club-internet.fr)</holder></copyright><copyright><year>2009-2010</year><holder>Bruno Brouard (annoa.b@gmail.com)</holder></copyright><copyright><year>2009</year><holder>Laurent Coudeur (laurentc@iol.ie)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>L'équipe de documentation GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/hu/user-guide.xml
--- a/gnome2-user-guide/hu/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/hu/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007</year><holder>Kiss Péter Zoltán (pz.kiss@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Kelemen Gábor (kelemeng@gnome.hu)</holder></copyright><copyright><year>2007</year><holder>Kováts Dóra (dorcssa@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Magyarkúti Barna (bmagyarkuti@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Nyitrai István (sianis@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Őry Máté (orymate@gmail.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007</year><holder>Kiss Péter Zoltán (pz.kiss@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Kelemen Gábor (kelemeng@gnome.hu)</holder></copyright><copyright><year>2007</year><holder>Kováts Dóra (dorcssa@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Magyarkúti Barna (bmagyarkuti@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Nyitrai István (sianis@gmail.com)</holder></copyright><copyright><year>2007</year><holder>Őry Máté (orymate@gmail.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>GNOME dokumentációs csapat</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/it/user-guide.xml
--- a/gnome2-user-guide/it/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/it/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006,2007, 2008, 2009.</year><holder>Luca Ferretti (elle.uca@libero.it)</holder></copyright><copyright><year>2007, 2008, 2009.</year><holder>Milo Casagrande (milo@ubuntu.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006,2007, 2008, 2009.</year><holder>Luca Ferretti (elle.uca@libero.it)</holder></copyright><copyright><year>2007, 2008, 2009.</year><holder>Milo Casagrande (milo@ubuntu.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Team di documentazione di GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/ja/user-guide.xml
--- a/gnome2-user-guide/ja/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/ja/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007,2008</year><holder>相花 毅 (takeshi.aihana@gmail.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007,2008</year><holder>相花 毅 (takeshi.aihana@gmail.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>GNOME ドキュメンテーション・チーム</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/ko/user-guide.xml
--- a/gnome2-user-guide/ko/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/ko/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -19,13 +19,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007</year><holder>류창우 (cwryu at debian dot org)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007</year><holder>류창우 (cwryu at debian dot org)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -56,10 +51,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
-        <surname>GNOME Documentation Team</surname>
+        <firstname>Oracle Solaris</firstname>
+        <surname>Desktop Documentation Team</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/oc/user-guide.xml
--- a/gnome2-user-guide/oc/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/oc/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -19,13 +19,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -115,10 +110,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Còla de documentacion de GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/pt/user-guide.xml
--- a/gnome2-user-guide/pt/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/pt/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2007</year><holder>Duarte Loreto (happyguy_pt@hotmail.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2007</year><holder>Duarte Loreto (happyguy_pt@hotmail.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Equipa de Documentação do GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/pt_BR/user-guide.xml
--- a/gnome2-user-guide/pt_BR/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/pt_BR/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006-2008.</year><holder>Equipe Brasileira de Tradução do GNOME (gnome-l10n-br@listas.cipsga.org.br)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006-2008.</year><holder>Equipe Brasileira de Tradução do GNOME (gnome-l10n-br@listas.cipsga.org.br)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Equipe de Documentação do GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/ru/user-guide.xml
--- a/gnome2-user-guide/ru/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/ru/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006</year><holder>Николай Шмырёв (nshmyrev@yandex.ru)</holder></copyright><copyright><year>2007</year><holder>Василий Фаронов (qvvx@yandex.ru)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006</year><holder>Николай Шмырёв (nshmyrev@yandex.ru)</holder></copyright><copyright><year>2007</year><holder>Василий Фаронов (qvvx@yandex.ru)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Команда документирования GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/sv/user-guide.xml
--- a/gnome2-user-guide/sv/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/sv/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006, 2007, 2008, 2009</year><holder>Daniel Nylander (po@danielnylander.se)</holder></copyright><copyright><year>2006</year><holder>Robin Sonefors (ozamosi@dory.nu)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006, 2007, 2008, 2009</year><holder>Daniel Nylander (po@danielnylander.se)</holder></copyright><copyright><year>2006</year><holder>Robin Sonefors (ozamosi@dory.nu)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -57,7 +52,7 @@
         <firstname>Suns</firstname>
         <surname>GNOME-dokumentationsteam</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/uk/user-guide.xml
--- a/gnome2-user-guide/uk/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/uk/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2009.</year><holder>Sergiy Gavrylov (sergiovana@bigmir.net)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2009.</year><holder>Sergiy Gavrylov (sergiovana@bigmir.net)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>Команда документування GNOME</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
diff -r 9a27d526e23b gnome2-user-guide/zh_CN/user-guide.xml
--- a/gnome2-user-guide/zh_CN/user-guide.xml	Fri Jul 08 15:35:46 2011 +0800
+++ b/gnome2-user-guide/zh_CN/user-guide.xml	Fri Jul 08 16:41:36 2011 +0800
@@ -17,13 +17,8 @@
       <holder>Shaun McCance</holder>
     </copyright>
     <copyright>
-      <year>2004</year>
-      <holder>Sun Microsystems</holder>
-    </copyright>
-    <copyright>
-      <year>2003</year>
-      <holder>Sun Microsystems</holder>
-    </copyright><copyright><year>2006.</year><holder>Funda Wang (fundawang@linux.net.cn)</holder></copyright><copyright><year>2008.</year><holder>Aron Xu (aronmalache@163.com)</holder></copyright><copyright><year>2009.</year><holder>TeliuTe (teliute@163.com)</holder></copyright>
+               <year>2003</year> <year>2011</year>
+               <holder>Oracle and/or its affiliates. All rights reserved.</holder></copyright><copyright><year>2006.</year><holder>Funda Wang (fundawang@linux.net.cn)</holder></copyright><copyright><year>2008.</year><holder>Aron Xu (aronmalache@163.com)</holder></copyright><copyright><year>2009.</year><holder>TeliuTe (teliute@163.com)</holder></copyright>
     <!-- translators: uncomment this:
     <copyright>
       <year>2002</year>
@@ -54,10 +49,10 @@
 
     <authorgroup>
       <author>
-        <firstname>Sun</firstname>
+        <firstname>Oracle Solaris</firstname>
         <surname>GNOME 文档团队</surname>
         <affiliation>
-          <orgname>Sun Microsystems</orgname>
+          <orgname>Oracle Corporation</orgname>
         </affiliation>
       </author>
       <author>
