CWS-TOOLING: integrate CWS changefileheader2ooo/DEV300_m75ooo/DEV300_m74ooo/DEV300_m73ooo/DEV300_m72

47 files changed, 237 insertions, 398 deletions

diff --git a/extras/source/autotext/lang/makefile.mk b/extras/source/autotext/lang/makefile.mk
index 318b7f5b..c3882b39 100644
--- a/extras/source/autotext/lang/makefile.mk
+++ b/extras/source/autotext/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/autotext/makefile.mk b/extras/source/autotext/makefile.mk
index b973a62c..6ed3e806 100644
--- a/extras/source/autotext/makefile.mk
+++ b/extras/source/autotext/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/database/makefile.mk b/extras/source/database/makefile.mk
index 2f27ca83..66e0d1ea 100644
--- a/extras/source/database/makefile.mk
+++ b/extras/source/database/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/bullets/makefile.mk b/extras/source/gallery/bullets/makefile.mk
index 775fc1c1..3a7d043e 100644
--- a/extras/source/gallery/bullets/makefile.mk
+++ b/extras/source/gallery/bullets/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/gallery_sound/makefile.mk b/extras/source/gallery/gallery_sound/makefile.mk
index f097b949..240afce8 100644
--- a/extras/source/gallery/gallery_sound/makefile.mk
+++ b/extras/source/gallery/gallery_sound/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/gallery_system/makefile.mk b/extras/source/gallery/gallery_system/makefile.mk
index 880492ed..0c53f6c2 100644
--- a/extras/source/gallery/gallery_system/makefile.mk
+++ b/extras/source/gallery/gallery_system/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/htmlexpo/makefile.mk b/extras/source/gallery/htmlexpo/makefile.mk
index 2d9828bc..3004e72d 100644
--- a/extras/source/gallery/htmlexpo/makefile.mk
+++ b/extras/source/gallery/htmlexpo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/makefile.mk b/extras/source/gallery/makefile.mk
index 7050d242..8a339397 100644
--- a/extras/source/gallery/makefile.mk
+++ b/extras/source/gallery/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/rulers/makefile.mk b/extras/source/gallery/rulers/makefile.mk
index 9424e342..cd977c28 100644
--- a/extras/source/gallery/rulers/makefile.mk
+++ b/extras/source/gallery/rulers/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/sdddndx1 b/extras/source/gallery/sdddndx1
deleted file mode 100644
index e4dc47d8..00000000
--- a/extras/source/gallery/sdddndx1
+++ /dev/null
@@ -1 +0,0 @@
-á
\ No newline at end of file
diff --git a/extras/source/gallery/sounds/makefile.mk b/extras/source/gallery/sounds/makefile.mk
index e29991e5..9e7988b4 100644
--- a/extras/source/gallery/sounds/makefile.mk
+++ b/extras/source/gallery/sounds/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/gallery/www-back/makefile.mk b/extras/source/gallery/www-back/makefile.mk
index 51580d69..fb84e6d7 100644
--- a/extras/source/gallery/www-back/makefile.mk
+++ b/extras/source/gallery/www-back/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/misc_config/makefile.mk b/extras/source/misc_config/makefile.mk
index e365e469..e706a04c 100644
--- a/extras/source/misc_config/makefile.mk
+++ b/extras/source/misc_config/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/misc_config/wizard/web/layouts/layout.xsl b/extras/source/misc_config/wizard/web/layouts/layout.xsl
index 679ccf63..4502c2ad 100644
--- a/extras/source/misc_config/wizard/web/layouts/layout.xsl
+++ b/extras/source/misc_config/wizard/web/layouts/layout.xsl
@@ -3,14 +3,10 @@
  *
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: header.hxx,v $
- 
-  $Revision: 1.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************-->
 <!-- =================================================
 
diff --git a/extras/source/misc_config/wizard/web/layouts/layoutF.xsl b/extras/source/misc_config/wizard/web/layouts/layoutF.xsl
index 5f826a38..8f12609b 100644
--- a/extras/source/misc_config/wizard/web/layouts/layoutF.xsl
+++ b/extras/source/misc_config/wizard/web/layouts/layoutF.xsl
@@ -3,14 +3,10 @@
  *
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: header.hxx,v $
- 
-  $Revision: 1.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************-->
 <!-- =================================================
 
diff --git a/extras/source/misc_config/wizard/web/layouts/layoutX.xsl b/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
index 8be4f5d0..2c4ce08f 100644
--- a/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
+++ b/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
@@ -3,14 +3,10 @@
  *
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: header.hxx,v $
- 
-  $Revision: 1.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************-->
 
 <xsl:stylesheet version="1.0" 
diff --git a/extras/source/misc_config/wizard/web/layouts/source.xml.xsl b/extras/source/misc_config/wizard/web/layouts/source.xml.xsl
index 5648d9e0..4a9c471e 100644
--- a/extras/source/misc_config/wizard/web/layouts/source.xml.xsl
+++ b/extras/source/misc_config/wizard/web/layouts/source.xml.xsl
@@ -3,14 +3,10 @@
  *
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: header.hxx,v $
- 
-  $Revision: 1.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************-->
 <!-- =================================
   
diff --git a/extras/source/palettes/lang/makefile.mk b/extras/source/palettes/lang/makefile.mk
index 73f08e85..4b80e36e 100644
--- a/extras/source/palettes/lang/makefile.mk
+++ b/extras/source/palettes/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/palettes/makefile.mk b/extras/source/palettes/makefile.mk
index 3ba4207d..932a506e 100644
--- a/extras/source/palettes/makefile.mk
+++ b/extras/source/palettes/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/symbols/makefile.mk b/extras/source/symbols/makefile.mk
index d9c1f128..09bb0409 100644
--- a/extras/source/symbols/makefile.mk
+++ b/extras/source/symbols/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/lang/makefile.mk b/extras/source/templates/lang/makefile.mk
index 4dfb5ef1..c0cc6e19 100644
--- a/extras/source/templates/lang/makefile.mk
+++ b/extras/source/templates/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/layout/lang/makefile.mk b/extras/source/templates/layout/lang/makefile.mk
index 9562ce17..22260d0f 100644
--- a/extras/source/templates/layout/lang/makefile.mk
+++ b/extras/source/templates/layout/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/presnt/lang/makefile.mk b/extras/source/templates/presnt/lang/makefile.mk
index bf14d7da..fb89d31a 100644
--- a/extras/source/templates/presnt/lang/makefile.mk
+++ b/extras/source/templates/presnt/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/agenda/lang/makefile.mk b/extras/source/templates/wizard/agenda/lang/makefile.mk
index 95750c27..0d1bfa25 100644
--- a/extras/source/templates/wizard/agenda/lang/makefile.mk
+++ b/extras/source/templates/wizard/agenda/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/bitmap/makefile.mk b/extras/source/templates/wizard/bitmap/makefile.mk
index ec7f62c7..62b28f19 100644
--- a/extras/source/templates/wizard/bitmap/makefile.mk
+++ b/extras/source/templates/wizard/bitmap/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/desktop/lang/makefile.mk b/extras/source/templates/wizard/desktop/lang/makefile.mk
index f3c899b9..f50c9dd8 100644
--- a/extras/source/templates/wizard/desktop/lang/makefile.mk
+++ b/extras/source/templates/wizard/desktop/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/desktop/makefile.mk b/extras/source/templates/wizard/desktop/makefile.mk
index aa721d8f..76777ac3 100644
--- a/extras/source/templates/wizard/desktop/makefile.mk
+++ b/extras/source/templates/wizard/desktop/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/fax/lang/makefile.mk b/extras/source/templates/wizard/fax/lang/makefile.mk
index 99ee8d5b..db10bb8c 100644
--- a/extras/source/templates/wizard/fax/lang/makefile.mk
+++ b/extras/source/templates/wizard/fax/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/letter/lang/makefile.mk b/extras/source/templates/wizard/letter/lang/makefile.mk
index 17698869..2eab49c9 100644
--- a/extras/source/templates/wizard/letter/lang/makefile.mk
+++ b/extras/source/templates/wizard/letter/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/report/lang/makefile.mk b/extras/source/templates/wizard/report/lang/makefile.mk
index bbb26db7..b983f774 100644
--- a/extras/source/templates/wizard/report/lang/makefile.mk
+++ b/extras/source/templates/wizard/report/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/styles/lang/makefile.mk b/extras/source/templates/wizard/styles/lang/makefile.mk
index 03bc99d6..67717a28 100644
--- a/extras/source/templates/wizard/styles/lang/makefile.mk
+++ b/extras/source/templates/wizard/styles/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/templates/wizard/web/lang/makefile.mk b/extras/source/templates/wizard/web/lang/makefile.mk
index ed0c2423..f334b908 100644
--- a/extras/source/templates/wizard/web/lang/makefile.mk
+++ b/extras/source/templates/wizard/web/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/wordbook/lang/makefile.mk b/extras/source/wordbook/lang/makefile.mk
index 579b87e6..2e031105 100644
--- a/extras/source/wordbook/lang/makefile.mk
+++ b/extras/source/wordbook/lang/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/source/wordbook/makefile.mk b/extras/source/wordbook/makefile.mk
index 2f57562e..7d4e618a 100644
--- a/extras/source/wordbook/makefile.mk
+++ b/extras/source/wordbook/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/bitmaps/makefile.mk b/extras/unx/source/bitmaps/makefile.mk
index baa7cb74..2f0bc96d 100644
--- a/extras/unx/source/bitmaps/makefile.mk
+++ b/extras/unx/source/bitmaps/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/bitmaps/psetup.xpm b/extras/unx/source/bitmaps/psetup.xpm
index ba867193..f5129757 100644
--- a/extras/unx/source/bitmaps/psetup.xpm
+++ b/extras/unx/source/bitmaps/psetup.xpm
@@ -1,31 +1,31 @@
-/* XPM */

-static char * L3PSetup_t_pm[] = {

-/* width height ncolors cpp [x_hot y_hot] */

-"16 16 9 1 0 0",

-/* colors */

-" 	s none	m none	c none",

-".	c #861782078617",

-"X	s iconColor1	m black	c black",

-"o	c #000000008617",

-"O	s iconColor2	m white	c white",

-"+	c #C71BC30BC71B",

-"@	s iconColor6	m white	c yellow",

-"#	c #00000000FFFF",

-"$	c #861700000000",

-/* pixels */

-"                ",

-"     ..  XXXXX o",

-"   ..OO+XO.OO@Xo",

-" ..OOOOX@.@.OOOo",

-"XXOOOOXOXO.O.@Oo",

-"  XOOX@XOX@.OXXo",

-"   XOOXOO+XXX  o",

-" XX+XOO..+++O+. ",

-"X.++X..+++##++O.",

-"X...++++$$++OOO.",

-"X.....++++OO++O.",

-"X.......OO++++..",

-"XX......+++++.X.",

-"  XX....+++.XX  ",

-"    XX..+.XX    ",

-"      XXXX      "};

+/* XPM */
+static char * L3PSetup_t_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"16 16 9 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	c #861782078617",
+"X	s iconColor1	m black	c black",
+"o	c #000000008617",
+"O	s iconColor2	m white	c white",
+"+	c #C71BC30BC71B",
+"@	s iconColor6	m white	c yellow",
+"#	c #00000000FFFF",
+"$	c #861700000000",
+/* pixels */
+"                ",
+"     ..  XXXXX o",
+"   ..OO+XO.OO@Xo",
+" ..OOOOX@.@.OOOo",
+"XXOOOOXOXO.O.@Oo",
+"  XOOX@XOX@.OXXo",
+"   XOOXOO+XXX  o",
+" XX+XOO..+++O+. ",
+"X.++X..+++##++O.",
+"X...++++$$++OOO.",
+"X.....++++OO++O.",
+"X.......OO++++..",
+"XX......+++++.X.",
+"  XX....+++.XX  ",
+"    XX..+.XX    ",
+"      XXXX      "};
diff --git a/extras/unx/source/bitmaps/psetupl.xpm b/extras/unx/source/bitmaps/psetupl.xpm
index 524aa737..f9cca89f 100644
--- a/extras/unx/source/bitmaps/psetupl.xpm
+++ b/extras/unx/source/bitmaps/psetupl.xpm
@@ -1,49 +1,49 @@
-/* XPM */

-static char * L3PSetup_m_pm[] = {

-/* width height ncolors cpp [x_hot y_hot] */

-"32 32 11 1 0 0",

-/* colors */

-" 	s none	m none	c none",

-".	s iconColor1	m black	c black",

-"X	c #000000008617",

-"o	c #861782078617",

-"O	s iconColor2	m white	c white",

-"+	c #C71BC30BC71B",

-"@	s iconColor6	m white	c yellow",

-"#	c #00000000FFFF",

-"$	c #861782070000",

-"%	c #000082078617",

-"&	c #861700000000",

-/* pixels */

-"                                ",

-"                  ........  XXXX",

-"           .o..oo.OOOOOOO+..X+OX",

-"          .+ooOO.@OO@OOOO@OOXOOX",

-"         .+oo+O.OO.OOOOOOOOOXXXX",

-"        .+oo+O.O@.OOO@OOOO@OXXXX",

-"       .+oo+O.@O.O@O.OO@OOOOXXXX",

-"      .+oo+O.OO.+.O.OOOOOOOOXXXX",

-"     .+oo+O.O@.+O+.O@O.OOO..X.X.",

-"    .+oo+O+...+O++o.O.OO@.  .X. ",

-"   .+oo+O+O+O+O++++o.@O..o  ... ",

-"  .ooo+O+O+O+O++++ooo..         ",

-" .ooo+O+O+O+O++++o..+Oo         ",

-" .oo+O+O+O+O++++o....OO.        ",

-" ..+O+O+O+O++++o......OO.       ",

-" .o+OO+O+O++#+o....$o..OO.      ",

-" .oo+OO+O++%+o....$$$...Oo.     ",

-" .ooo+OO++&+o...$$$+$+...o.     ",

-" .oooo+O+++o...$$$+$+++..o.     ",

-" .oooooOO+o.o.$$++$+OoOO..o     ",

-" .ooooo+Oo..O.$++$OOoOO$O.o     ",

-"o.ooooooO.o.OO.+$OOoOOoOOO.     ",

-"oo.ooooo.O.O.OO.OOoOO$OOoOO.    ",

-" oo.oooo+O.OO.OO.OOOoOOoOO.o    ",

-"  oo.ooo+O.oOo.Oo.O$OO$OO.o     ",

-"   oo.oo+O.o+o.+o.OOOoOO.o      ",

-"    oo.o+O.o+o.+o.OOoOO.o       ",

-"     oo.+..o+o.+o..OOO.o        ",

-"      oo.oo.+..+o.o.O.o         ",

-"       ooooo.o.o.ooo.o          ",

-"           oooo.o  oo           ",

-"              oo                "};

+/* XPM */
+static char * L3PSetup_m_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"32 32 11 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	s iconColor1	m black	c black",
+"X	c #000000008617",
+"o	c #861782078617",
+"O	s iconColor2	m white	c white",
+"+	c #C71BC30BC71B",
+"@	s iconColor6	m white	c yellow",
+"#	c #00000000FFFF",
+"$	c #861782070000",
+"%	c #000082078617",
+"&	c #861700000000",
+/* pixels */
+"                                ",
+"                  ........  XXXX",
+"           .o..oo.OOOOOOO+..X+OX",
+"          .+ooOO.@OO@OOOO@OOXOOX",
+"         .+oo+O.OO.OOOOOOOOOXXXX",
+"        .+oo+O.O@.OOO@OOOO@OXXXX",
+"       .+oo+O.@O.O@O.OO@OOOOXXXX",
+"      .+oo+O.OO.+.O.OOOOOOOOXXXX",
+"     .+oo+O.O@.+O+.O@O.OOO..X.X.",
+"    .+oo+O+...+O++o.O.OO@.  .X. ",
+"   .+oo+O+O+O+O++++o.@O..o  ... ",
+"  .ooo+O+O+O+O++++ooo..         ",
+" .ooo+O+O+O+O++++o..+Oo         ",
+" .oo+O+O+O+O++++o....OO.        ",
+" ..+O+O+O+O++++o......OO.       ",
+" .o+OO+O+O++#+o....$o..OO.      ",
+" .oo+OO+O++%+o....$$$...Oo.     ",
+" .ooo+OO++&+o...$$$+$+...o.     ",
+" .oooo+O+++o...$$$+$+++..o.     ",
+" .oooooOO+o.o.$$++$+OoOO..o     ",
+" .ooooo+Oo..O.$++$OOoOO$O.o     ",
+"o.ooooooO.o.OO.+$OOoOOoOOO.     ",
+"oo.ooooo.O.O.OO.OOoOO$OOoOO.    ",
+" oo.oooo+O.OO.OO.OOOoOOoOO.o    ",
+"  oo.ooo+O.oOo.Oo.O$OO$OO.o     ",
+"   oo.oo+O.o+o.+o.OOOoOO.o      ",
+"    oo.o+O.o+o.+o.OOoOO.o       ",
+"     oo.+..o+o.+o..OOO.o        ",
+"      oo.oo.+..+o.o.O.o         ",
+"       ooooo.o.o.ooo.o          ",
+"           oooo.o  oo           ",
+"              oo                "};
diff --git a/extras/unx/source/kde/applnk/SPAdmin.kdelnk b/extras/unx/source/kde/applnk/SPAdmin.kdelnk
index 8a87838a..d9c278fd 100644
--- a/extras/unx/source/kde/applnk/SPAdmin.kdelnk
+++ b/extras/unx/source/kde/applnk/SPAdmin.kdelnk
@@ -1,23 +1,23 @@
-# KDE Config File

-[KDE Desktop Entry]

-SwallowExec=

-SwallowTitle=

-BinaryPattern=

-MimeType=

-Name=SPAdmin

-Exec=<progpath>/program/spadmin

-Icon=psetup.xpm

-TerminalOptions=

-Path=

-Type=Application

-Comment=OpenOffice printer setup

-Comment[de]=OpenOffice Druckereinstellungen

-Comment[fr]=configuration de l'imprimante de OpenOffice

-Comment[it]=l'impostazione stampante di OpenOffice

-Comment[nl]=printerinstelling

-Comment[es]=configuración de impresora de OpenOffice

-Comment[pt]=configuração da impressora em OpenOffice

-Comment[se]=OpenOffice skrivarinställning

-Comment[zh_CN.GB2312]=OpenOffice printer setup

-Comment[zh_TW.Big5]=OpenOffice printer setup

-Terminal=0

+# KDE Config File
+[KDE Desktop Entry]
+SwallowExec=
+SwallowTitle=
+BinaryPattern=
+MimeType=
+Name=SPAdmin
+Exec=<progpath>/program/spadmin
+Icon=psetup.xpm
+TerminalOptions=
+Path=
+Type=Application
+Comment=OpenOffice printer setup
+Comment[de]=OpenOffice Druckereinstellungen
+Comment[fr]=configuration de l'imprimante de OpenOffice
+Comment[it]=l'impostazione stampante di OpenOffice
+Comment[nl]=printerinstelling
+Comment[es]=configuración de impresora de OpenOffice
+Comment[pt]=configuração da impressora em OpenOffice
+Comment[se]=OpenOffice skrivarinställning
+Comment[zh_CN.GB2312]=OpenOffice printer setup
+Comment[zh_TW.Big5]=OpenOffice printer setup
+Terminal=0
diff --git a/extras/unx/source/kde/applnk/makefile.mk b/extras/unx/source/kde/applnk/makefile.mk
index 4a372b49..0a06b5b9 100644
--- a/extras/unx/source/kde/applnk/makefile.mk
+++ b/extras/unx/source/kde/applnk/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/kde/icons/makefile.mk b/extras/unx/source/kde/icons/makefile.mk
index 32b13d31..a49d73bb 100644
--- a/extras/unx/source/kde/icons/makefile.mk
+++ b/extras/unx/source/kde/icons/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/kde/icons/mini/makefile.mk b/extras/unx/source/kde/icons/mini/makefile.mk
index df0b06fa..f2a02e5b 100644
--- a/extras/unx/source/kde/icons/mini/makefile.mk
+++ b/extras/unx/source/kde/icons/mini/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/kde/icons/mini/psetup.xpm b/extras/unx/source/kde/icons/mini/psetup.xpm
index ba867193..f5129757 100644
--- a/extras/unx/source/kde/icons/mini/psetup.xpm
+++ b/extras/unx/source/kde/icons/mini/psetup.xpm
@@ -1,31 +1,31 @@
-/* XPM */

-static char * L3PSetup_t_pm[] = {

-/* width height ncolors cpp [x_hot y_hot] */

-"16 16 9 1 0 0",

-/* colors */

-" 	s none	m none	c none",

-".	c #861782078617",

-"X	s iconColor1	m black	c black",

-"o	c #000000008617",

-"O	s iconColor2	m white	c white",

-"+	c #C71BC30BC71B",

-"@	s iconColor6	m white	c yellow",

-"#	c #00000000FFFF",

-"$	c #861700000000",

-/* pixels */

-"                ",

-"     ..  XXXXX o",

-"   ..OO+XO.OO@Xo",

-" ..OOOOX@.@.OOOo",

-"XXOOOOXOXO.O.@Oo",

-"  XOOX@XOX@.OXXo",

-"   XOOXOO+XXX  o",

-" XX+XOO..+++O+. ",

-"X.++X..+++##++O.",

-"X...++++$$++OOO.",

-"X.....++++OO++O.",

-"X.......OO++++..",

-"XX......+++++.X.",

-"  XX....+++.XX  ",

-"    XX..+.XX    ",

-"      XXXX      "};

+/* XPM */
+static char * L3PSetup_t_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"16 16 9 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	c #861782078617",
+"X	s iconColor1	m black	c black",
+"o	c #000000008617",
+"O	s iconColor2	m white	c white",
+"+	c #C71BC30BC71B",
+"@	s iconColor6	m white	c yellow",
+"#	c #00000000FFFF",
+"$	c #861700000000",
+/* pixels */
+"                ",
+"     ..  XXXXX o",
+"   ..OO+XO.OO@Xo",
+" ..OOOOX@.@.OOOo",
+"XXOOOOXOXO.O.@Oo",
+"  XOOX@XOX@.OXXo",
+"   XOOXOO+XXX  o",
+" XX+XOO..+++O+. ",
+"X.++X..+++##++O.",
+"X...++++$$++OOO.",
+"X.....++++OO++O.",
+"X.......OO++++..",
+"XX......+++++.X.",
+"  XX....+++.XX  ",
+"    XX..+.XX    ",
+"      XXXX      "};
diff --git a/extras/unx/source/kde/icons/psetup.xpm b/extras/unx/source/kde/icons/psetup.xpm
index 524aa737..f9cca89f 100644
--- a/extras/unx/source/kde/icons/psetup.xpm
+++ b/extras/unx/source/kde/icons/psetup.xpm
@@ -1,49 +1,49 @@
-/* XPM */

-static char * L3PSetup_m_pm[] = {

-/* width height ncolors cpp [x_hot y_hot] */

-"32 32 11 1 0 0",

-/* colors */

-" 	s none	m none	c none",

-".	s iconColor1	m black	c black",

-"X	c #000000008617",

-"o	c #861782078617",

-"O	s iconColor2	m white	c white",

-"+	c #C71BC30BC71B",

-"@	s iconColor6	m white	c yellow",

-"#	c #00000000FFFF",

-"$	c #861782070000",

-"%	c #000082078617",

-"&	c #861700000000",

-/* pixels */

-"                                ",

-"                  ........  XXXX",

-"           .o..oo.OOOOOOO+..X+OX",

-"          .+ooOO.@OO@OOOO@OOXOOX",

-"         .+oo+O.OO.OOOOOOOOOXXXX",

-"        .+oo+O.O@.OOO@OOOO@OXXXX",

-"       .+oo+O.@O.O@O.OO@OOOOXXXX",

-"      .+oo+O.OO.+.O.OOOOOOOOXXXX",

-"     .+oo+O.O@.+O+.O@O.OOO..X.X.",

-"    .+oo+O+...+O++o.O.OO@.  .X. ",

-"   .+oo+O+O+O+O++++o.@O..o  ... ",

-"  .ooo+O+O+O+O++++ooo..         ",

-" .ooo+O+O+O+O++++o..+Oo         ",

-" .oo+O+O+O+O++++o....OO.        ",

-" ..+O+O+O+O++++o......OO.       ",

-" .o+OO+O+O++#+o....$o..OO.      ",

-" .oo+OO+O++%+o....$$$...Oo.     ",

-" .ooo+OO++&+o...$$$+$+...o.     ",

-" .oooo+O+++o...$$$+$+++..o.     ",

-" .oooooOO+o.o.$$++$+OoOO..o     ",

-" .ooooo+Oo..O.$++$OOoOO$O.o     ",

-"o.ooooooO.o.OO.+$OOoOOoOOO.     ",

-"oo.ooooo.O.O.OO.OOoOO$OOoOO.    ",

-" oo.oooo+O.OO.OO.OOOoOOoOO.o    ",

-"  oo.ooo+O.oOo.Oo.O$OO$OO.o     ",

-"   oo.oo+O.o+o.+o.OOOoOO.o      ",

-"    oo.o+O.o+o.+o.OOoOO.o       ",

-"     oo.+..o+o.+o..OOO.o        ",

-"      oo.oo.+..+o.o.O.o         ",

-"       ooooo.o.o.ooo.o          ",

-"           oooo.o  oo           ",

-"              oo                "};

+/* XPM */
+static char * L3PSetup_m_pm[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"32 32 11 1 0 0",
+/* colors */
+" 	s none	m none	c none",
+".	s iconColor1	m black	c black",
+"X	c #000000008617",
+"o	c #861782078617",
+"O	s iconColor2	m white	c white",
+"+	c #C71BC30BC71B",
+"@	s iconColor6	m white	c yellow",
+"#	c #00000000FFFF",
+"$	c #861782070000",
+"%	c #000082078617",
+"&	c #861700000000",
+/* pixels */
+"                                ",
+"                  ........  XXXX",
+"           .o..oo.OOOOOOO+..X+OX",
+"          .+ooOO.@OO@OOOO@OOXOOX",
+"         .+oo+O.OO.OOOOOOOOOXXXX",
+"        .+oo+O.O@.OOO@OOOO@OXXXX",
+"       .+oo+O.@O.O@O.OO@OOOOXXXX",
+"      .+oo+O.OO.+.O.OOOOOOOOXXXX",
+"     .+oo+O.O@.+O+.O@O.OOO..X.X.",
+"    .+oo+O+...+O++o.O.OO@.  .X. ",
+"   .+oo+O+O+O+O++++o.@O..o  ... ",
+"  .ooo+O+O+O+O++++ooo..         ",
+" .ooo+O+O+O+O++++o..+Oo         ",
+" .oo+O+O+O+O++++o....OO.        ",
+" ..+O+O+O+O++++o......OO.       ",
+" .o+OO+O+O++#+o....$o..OO.      ",
+" .oo+OO+O++%+o....$$$...Oo.     ",
+" .ooo+OO++&+o...$$$+$+...o.     ",
+" .oooo+O+++o...$$$+$+++..o.     ",
+" .oooooOO+o.o.$$++$+OoOO..o     ",
+" .ooooo+Oo..O.$++$OOoOO$O.o     ",
+"o.ooooooO.o.OO.+$OOoOOoOOO.     ",
+"oo.ooooo.O.O.OO.OOoOO$OOoOO.    ",
+" oo.oooo+O.OO.OO.OOOoOOoOO.o    ",
+"  oo.ooo+O.oOo.Oo.O$OO$OO.o     ",
+"   oo.oo+O.o+o.+o.OOOoOO.o      ",
+"    oo.o+O.o+o.+o.OOoOO.o       ",
+"     oo.+..o+o.+o..OOO.o        ",
+"      oo.oo.+..+o.o.O.o         ",
+"       ooooo.o.o.ooo.o          ",
+"           oooo.o  oo           ",
+"              oo                "};
diff --git a/extras/unx/source/kde/mimelnk/application/makefile.mk b/extras/unx/source/kde/mimelnk/application/makefile.mk
index 6094c155..93f8ad09 100644
--- a/extras/unx/source/kde/mimelnk/application/makefile.mk
+++ b/extras/unx/source/kde/mimelnk/application/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/unx/source/kde/mimelnk/application/x-sdf.kdelnk b/extras/unx/source/kde/mimelnk/application/x-sdf.kdelnk
index ee1e5bca..faaca2a7 100644
--- a/extras/unx/source/kde/mimelnk/application/x-sdf.kdelnk
+++ b/extras/unx/source/kde/mimelnk/application/x-sdf.kdelnk
@@ -1,10 +1,10 @@
-# KDE Config File

-[KDE Desktop Entry]

-MimeType=application/x-sdf

-Comment=mime type

-DefaultApp=OpenOffice

-Comment[pl]=Typ mime

-Icon=sdf.xpm

-Type=MimeType

-Patterns=*.sdf;

-Comment[de]=Mime Type

+# KDE Config File
+[KDE Desktop Entry]
+MimeType=application/x-sdf
+Comment=mime type
+DefaultApp=OpenOffice
+Comment[pl]=Typ mime
+Icon=sdf.xpm
+Type=MimeType
+Patterns=*.sdf;
+Comment[de]=Mime Type
diff --git a/extras/unx/source/kde/mimelnk/text/makefile.mk b/extras/unx/source/kde/mimelnk/text/makefile.mk
index dbfdea66..f74573e1 100644
--- a/extras/unx/source/kde/mimelnk/text/makefile.mk
+++ b/extras/unx/source/kde/mimelnk/text/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/extras/util/target.pmk b/extras/util/target.pmk
index 041467a1..2280f7d8 100644
--- a/extras/util/target.pmk
+++ b/extras/util/target.pmk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: target.pmk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify