Fixing the license text.

svn path=/trunk/; revision=14211

123 files changed, 0 insertions, 123 deletions

diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index 753ace8575..b397bd85ef 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h
index 5a729fccfd..2fad0d9e9c 100644
--- a/addressbook/backend/ebook/e-book-util.h
+++ b/addressbook/backend/ebook/e-book-util.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c
index 22ea8e7a87..4723f95b41 100644
--- a/addressbook/backend/ebook/e-card-compare.c
+++ b/addressbook/backend/ebook/e-card-compare.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h
index b78211497b..07ccb54e89 100644
--- a/addressbook/backend/ebook/e-card-compare.h
+++ b/addressbook/backend/ebook/e-card-compare.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 2419cb8efb..5cd6d24379 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
index c8771aa216..4beb199503 100644
--- a/addressbook/backend/ebook/e-destination.h
+++ b/addressbook/backend/ebook/e-destination.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 03425e56b4..75c9a227a6 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
index 7c05006942..9b36873902 100644
--- a/addressbook/gui/component/addressbook-component.h
+++ b/addressbook/gui/component/addressbook-component.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 1f488ddfa9..48b797839f 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 434343afbc..ec0dda84fc 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
index 305915a8d3..8416d4de83 100644
--- a/addressbook/gui/component/addressbook-storage.h
+++ b/addressbook/gui/component/addressbook-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c
index e02af0b9eb..c554fd8d9b 100644
--- a/addressbook/gui/component/e-address-popup.c
+++ b/addressbook/gui/component/e-address-popup.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h
index 4486ec2b3b..b648b79d4f 100644
--- a/addressbook/gui/component/e-address-popup.h
+++ b/addressbook/gui/component/e-address-popup.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c
index 50facda037..d044ddf7b9 100644
--- a/addressbook/gui/component/e-address-widget.c
+++ b/addressbook/gui/component/e-address-widget.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h
index 934d6ff56b..535e51028c 100644
--- a/addressbook/gui/component/e-address-widget.h
+++ b/addressbook/gui/component/e-address-widget.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 0fe4dc9261..ca37ccce21 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
index 3847109837..f254dd6e94 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index d091489dc1..9a6ce6871a 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
index d3a860c037..8b79112569 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ b/addressbook/gui/component/select-names/e-select-names-completion.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
index d685d191e3..d6560d6366 100644
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ b/addressbook/gui/component/select-names/e-select-names-factory.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h
index 49e05288a1..0fe85c8361 100644
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ b/addressbook/gui/component/select-names/e-select-names-factory.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
index 87205d3e74..a6e6bdea8e 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ b/addressbook/gui/component/select-names/e-select-names-popup.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.h b/addressbook/gui/component/select-names/e-select-names-popup.h
index f0afd43c0c..5a4685f8cb 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.h
+++ b/addressbook/gui/component/select-names/e-select-names-popup.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index c51171d67a..13d2d956d0 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index 6109feae5b..379a9ef137 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 30136f70a1..431f041a23 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
index 611449cb4a..ff29c5b7ec 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 9c5bd75509..5ae8b36a9b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 0048870160..0d09b13700 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 7273d4b094..66cc2463f0 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 3670ce4fe1..4d53d10291 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 85fde1aaed..3fb3f58ca1 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index 7fa92cf53f..1bf69ee114 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -11,7 +11,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index b321c0342b..78994ea405 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h
index 2b61873cd8..b97d25ee3a 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.h
+++ b/addressbook/gui/contact-editor/e-contact-save-as.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index aef23e14fc..e6b46adb83 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index a7680bae83..630d84cae0 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
index b8dd83fdee..d83f15d6f7 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 62221e9db0..2dbe9b1e7a 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
index 02e5910c01..a8c4067d29 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ b/addressbook/gui/search/e-addressbook-search-dialog.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 12df794c56..601a1e1183 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h
index 92212f6db0..f6afa31046 100644
--- a/addressbook/gui/widgets/e-addressbook-util.h
+++ b/addressbook/gui/widgets/e-addressbook-util.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index a8783a7f84..d742b9fe4f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 556058af76..bc3c66c612 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 710b7e8256..54779c4ea6 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index 6bdf800d21..32792991a7 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 657e57a34c..5dd8393ca0 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index f56503d889..39fb929bea 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 28f3f0a4d8..342e037337 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 5043435433..1140965106 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c
index 85af04e7bb..566a43b087 100644
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ b/addressbook/gui/widgets/e-minicard-widget.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
index ef82d5049c..eaf0f8edb6 100644
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ b/addressbook/gui/widgets/e-minicard-widget.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 89a6b85b8b..96ae2fad9e 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 7066457a44..bb6a3c072e 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index aadf3fe489..9b53676123 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
index 4cb2c8ff63..4302c4c5d7 100644
--- a/addressbook/printing/e-contact-print-envelope.h
+++ b/addressbook/printing/e-contact-print-envelope.h
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
index 88218773b7..f05a508ed8 100644
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ b/addressbook/printing/e-contact-print-style-editor.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
index 1bb30014fd..e4604d551c 100644
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ b/addressbook/printing/e-contact-print-style-editor.h
@@ -5,7 +5,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
index 3c640d922b..b7082b41f6 100644
--- a/addressbook/printing/e-contact-print-types.h
+++ b/addressbook/printing/e-contact-print-types.h
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 79afa215e1..b386b3bd31 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index b8a22504bb..12f13f4573 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
index 578a840fc4..0ac169468c 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index ebad26a48e..fc868318d8 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -6,7 +6,6 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
index adc87a2831..5078a1db94 100644
--- a/calendar/cal-util/test-recur.c
+++ b/calendar/cal-util/test-recur.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 4613f8f99c..5b6bd08e19 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 60d49e4a72..576255cb6d 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 6849720d9b..f7c18942cd 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 418871071b..a28181a37d 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
index fe3bfdaf19..9c82e3fbff 100644
--- a/calendar/gui/calendar-offline-handler.c
+++ b/calendar/gui/calendar-offline-handler.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
index 512997d2e7..4b87fd659f 100644
--- a/calendar/gui/calendar-offline-handler.h
+++ b/calendar/gui/calendar-offline-handler.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
index f5da17df05..461260ac1f 100644
--- a/calendar/gui/calendar-summary.c
+++ b/calendar/gui/calendar-summary.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
index 3f56878750..e1823cda8a 100644
--- a/calendar/gui/calendar-summary.h
+++ b/calendar/gui/calendar-summary.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 4613f8f99c..5b6bd08e19 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
index 60d49e4a72..576255cb6d 100644
--- a/calendar/gui/component-factory.h
+++ b/calendar/gui/component-factory.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 7a43351613..b2a95d0ba4 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
index 88c81c8bca..322b5a4a4e 100644
--- a/calendar/gui/control-factory.h
+++ b/calendar/gui/control-factory.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index eec7bcd5c6..9372236d56 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 6a35b0eadd..063341c18a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 1af54ab731..7481848d9e 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 45765459ad..c39a79b545 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 93f65488f3..027db3b2a8 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 88ed948653..bb00590622 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index f7af3bbf9b..ba843b828c 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 0050b12b29..70d0dd6394 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index b2e7c1d512..f7f86c6660 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index b17b1e106f..be7f130606 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 193690e207..94af4ee00c 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index bc33132245..f425363c98 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index b734436ff3..c2fd76f86a 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index e5e9b74f5a..daeb37aca7 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index e397b78e41..51e78b279f 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 4146f93f50..1c72a3a78b 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 7771e1dde2..1b1ab423ba 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
index c7db971980..30917fb13d 100644
--- a/calendar/gui/e-itip-control.h
+++ b/calendar/gui/e-itip-control.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index c032c7a97d..3d4a8a4f48 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index baf6d22b0a..69f2ced837 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index 4b02c8bdef..232077a8aa 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-model.h b/calendar/gui/e-meeting-model.h
index 24b91ab654..3e8e39b25e 100644
--- a/calendar/gui/e-meeting-model.h
+++ b/calendar/gui/e-meeting-model.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 9400c05f3b..88147d306e 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index 91dbea5566..11b355dfa0 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 50b3c13bb2..e366b58378 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 34d3a4ed38..eb66c523e2 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 197f8d714e..ab330a6d40 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 4c7b1d7d7d..3d354be7bb 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 1130690390..e7952752ed 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index aa1f38b2ad..32739f5d5a 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index 1c4adbff3d..4a057f681f 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 6c0b93d9f8..47df421f5d 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 436dd76985..20cace0132 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index fe665ed4b2..da9e8c5721 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index c93552f722..2c6d5a29d8 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 2f92282897..007960c826 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 5ce7c8c5ac..35740479da 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 84634fa200..d201a50e35 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 27f17fcc45..77fed506c8 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 1345944041..cf50604760 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 065d0537e0..e10954b9bd 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index a8431c5a4b..16d778fbf3 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 1ba87458e6..e49aa3272b 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
index 570f0a3218..5fd8d61346 100644
--- a/calendar/gui/tasks-control-factory.c
+++ b/calendar/gui/tasks-control-factory.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h
index 26130d4555..468f03b9e7 100644
--- a/calendar/gui/tasks-control-factory.h
+++ b/calendar/gui/tasks-control-factory.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 6ff4eb4e21..b7d6ffcf88 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index 30e326660f..2d701f0c85 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,