aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/camel-charset-map.c1
-rw-r--r--camel/camel-data-wrapper.c1
-rw-r--r--camel/camel-data-wrapper.h1
-rw-r--r--camel/camel-disco-diary.c1
-rw-r--r--camel/camel-disco-diary.h1
-rw-r--r--camel/camel-disco-folder.c1
-rw-r--r--camel/camel-disco-folder.h1
-rw-r--r--camel/camel-disco-store.h1
-rw-r--r--camel/camel-exception.c1
-rw-r--r--camel/camel-exception.h1
-rw-r--r--camel/camel-file-utils.c1
-rw-r--r--camel/camel-file-utils.h1
-rw-r--r--camel/camel-folder.c1
-rw-r--r--camel/camel-folder.h1
-rw-r--r--camel/camel-lock-client.c1
-rw-r--r--camel/camel-lock-client.h1
-rw-r--r--camel/camel-lock-helper.c1
-rw-r--r--camel/camel-lock-helper.h1
-rw-r--r--camel/camel-lock.c1
-rw-r--r--camel/camel-lock.h1
-rw-r--r--camel/camel-medium.c1
-rw-r--r--camel/camel-medium.h1
-rw-r--r--camel/camel-mime-message.c1
-rw-r--r--camel/camel-mime-message.h1
-rw-r--r--camel/camel-mime-part-utils.c1
-rw-r--r--camel/camel-mime-part-utils.h1
-rw-r--r--camel/camel-mime-part.c1
-rw-r--r--camel/camel-mime-part.h1
-rw-r--r--camel/camel-movemail.c1
-rw-r--r--camel/camel-movemail.h1
-rw-r--r--camel/camel-multipart.c1
-rw-r--r--camel/camel-multipart.h1
-rw-r--r--camel/camel-object.c1
-rw-r--r--camel/camel-object.h1
-rw-r--r--camel/camel-operation.h1
-rw-r--r--camel/camel-private.h1
-rw-r--r--camel/camel-provider.c1
-rw-r--r--camel/camel-provider.h1
-rw-r--r--camel/camel-remote-store.h1
-rw-r--r--camel/camel-seekable-stream.c1
-rw-r--r--camel/camel-seekable-stream.h1
-rw-r--r--camel/camel-seekable-substream.c1
-rw-r--r--camel/camel-seekable-substream.h1
-rw-r--r--camel/camel-service.c1
-rw-r--r--camel/camel-service.h1
-rw-r--r--camel/camel-session.c1
-rw-r--r--camel/camel-session.h1
-rw-r--r--camel/camel-store.c1
-rw-r--r--camel/camel-store.h1
-rw-r--r--camel/camel-stream-buffer.c1
-rw-r--r--camel/camel-stream-buffer.h1
-rw-r--r--camel/camel-stream-fs.c1
-rw-r--r--camel/camel-stream-fs.h1
-rw-r--r--camel/camel-stream-mem.c1
-rw-r--r--camel/camel-stream-mem.h1
-rw-r--r--camel/camel-stream-null.c1
-rw-r--r--camel/camel-stream.c1
-rw-r--r--camel/camel-stream.h1
-rw-r--r--camel/camel-transport.c1
-rw-r--r--camel/camel-transport.h1
-rw-r--r--camel/camel-types.h1
-rw-r--r--camel/camel-uid-cache.c1
-rw-r--r--camel/camel-uid-cache.h1
-rw-r--r--camel/camel-url.c1
-rw-r--r--camel/camel-url.h1
-rw-r--r--camel/camel.c1
-rw-r--r--camel/camel.h1
-rw-r--r--camel/gstring-util.c1
-rw-r--r--camel/gstring-util.h1
-rw-r--r--camel/hash-table-utils.c1
-rw-r--r--camel/hash-table-utils.h1
-rw-r--r--camel/providers/imap/camel-imap-command.h1
-rw-r--r--camel/providers/imap/camel-imap-folder.c1
-rw-r--r--camel/providers/imap/camel-imap-folder.h1
-rw-r--r--camel/providers/imap/camel-imap-message-cache.c1
-rw-r--r--camel/providers/imap/camel-imap-message-cache.h1
-rw-r--r--camel/providers/imap/camel-imap-private.h1
-rw-r--r--camel/providers/imap/camel-imap-store.h1
-rw-r--r--camel/providers/imap/camel-imap-types.h1
-rw-r--r--camel/providers/imap/camel-imap-wrapper.c1
-rw-r--r--camel/providers/imap/camel-imap-wrapper.h1
-rw-r--r--camel/providers/local/camel-local-folder.c1
-rw-r--r--camel/providers/local/camel-local-folder.h1
-rw-r--r--camel/providers/local/camel-local-private.h1
-rw-r--r--camel/providers/local/camel-local-provider.c1
-rw-r--r--camel/providers/local/camel-local-store.c1
-rw-r--r--camel/providers/local/camel-local-store.h1
-rw-r--r--camel/providers/local/camel-maildir-folder.c1
-rw-r--r--camel/providers/local/camel-maildir-folder.h1
-rw-r--r--camel/providers/local/camel-maildir-store.c1
-rw-r--r--camel/providers/local/camel-maildir-store.h1
-rw-r--r--camel/providers/local/camel-mbox-folder.c1
-rw-r--r--camel/providers/local/camel-mbox-folder.h1
-rw-r--r--camel/providers/local/camel-mbox-store.c1
-rw-r--r--camel/providers/local/camel-mbox-store.h1
-rw-r--r--camel/providers/local/camel-mh-folder.c1
-rw-r--r--camel/providers/local/camel-mh-folder.h1
-rw-r--r--camel/providers/local/camel-mh-store.c1
-rw-r--r--camel/providers/local/camel-mh-store.h1
-rw-r--r--camel/providers/local/camel-spool-folder.c1
-rw-r--r--camel/providers/local/camel-spool-folder.h1
-rw-r--r--camel/providers/local/camel-spool-store.c1
-rw-r--r--camel/providers/local/camel-spool-store.h1
-rw-r--r--camel/providers/nntp/camel-nntp-auth.c1
-rw-r--r--camel/providers/nntp/camel-nntp-auth.h1
-rw-r--r--camel/providers/nntp/camel-nntp-folder.c1
-rw-r--r--camel/providers/nntp/camel-nntp-folder.h1
-rw-r--r--camel/providers/nntp/camel-nntp-grouplist.c1
-rw-r--r--camel/providers/nntp/camel-nntp-grouplist.h1
-rw-r--r--camel/providers/nntp/camel-nntp-newsrc.c1
-rw-r--r--camel/providers/nntp/camel-nntp-provider.c1
-rw-r--r--camel/providers/nntp/camel-nntp-resp-codes.h1
-rw-r--r--camel/providers/nntp/camel-nntp-store.c1
-rw-r--r--camel/providers/nntp/camel-nntp-store.h1
-rw-r--r--camel/providers/nntp/camel-nntp-types.h1
-rw-r--r--camel/providers/nntp/camel-nntp-utils.c1
-rw-r--r--camel/providers/nntp/camel-nntp-utils.h1
-rw-r--r--camel/providers/pop3/camel-pop3-folder.c1
-rw-r--r--camel/providers/pop3/camel-pop3-folder.h1
-rw-r--r--camel/providers/pop3/camel-pop3-provider.c1
-rw-r--r--camel/providers/pop3/camel-pop3-store.c1
-rw-r--r--camel/providers/pop3/camel-pop3-store.h1
-rw-r--r--camel/providers/sendmail/camel-sendmail-provider.c1
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.c1
-rw-r--r--camel/providers/sendmail/camel-sendmail-transport.h1
-rw-r--r--camel/providers/smtp/camel-smtp-provider.c1
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c1
-rw-r--r--camel/providers/smtp/camel-smtp-transport.h1
-rw-r--r--camel/string-utils.c1
-rw-r--r--camel/string-utils.h1
-rw-r--r--e-util/e-bonobo-factory-util.c1
-rw-r--r--e-util/e-bonobo-factory-util.h1
-rw-r--r--e-util/e-corba-utils.c1
-rw-r--r--e-util/e-corba-utils.h1
-rw-r--r--e-util/e-dialog-utils.c1
-rw-r--r--e-util/e-dialog-utils.h1
-rw-r--r--e-util/e-gtk-utils.c1
-rw-r--r--e-util/e-gtk-utils.h1
-rw-r--r--e-util/e-host-utils.c1
-rw-r--r--e-util/e-host-utils.h1
-rw-r--r--e-util/e-html-utils.c1
-rw-r--r--e-util/e-html-utils.h1
-rw-r--r--e-util/e-memory.c1
-rw-r--r--e-util/e-memory.h1
-rw-r--r--e-util/e-passwords.c1
-rw-r--r--e-util/e-passwords.h1
-rw-r--r--e-util/e-path.c1
-rw-r--r--e-util/e-path.h1
-rw-r--r--e-util/e-request.c1
-rw-r--r--e-util/e-request.h1
-rw-r--r--e-util/e-sexp.c1
-rw-r--r--e-util/e-url.c1
-rw-r--r--e-util/e-url.h1
-rw-r--r--executive-summary/component/component-factory.c1
-rw-r--r--executive-summary/component/component-factory.h1
-rw-r--r--executive-summary/component/e-summary-callbacks.c1
-rw-r--r--executive-summary/component/e-summary-factory.c1
-rw-r--r--executive-summary/component/e-summary-factory.h1
-rw-r--r--executive-summary/component/e-summary-prefs.c1
-rw-r--r--executive-summary/component/e-summary-prefs.h1
-rw-r--r--executive-summary/component/e-summary-url.c1
-rw-r--r--executive-summary/component/e-summary-url.h1
-rw-r--r--executive-summary/component/e-summary-util.c1
-rw-r--r--executive-summary/component/e-summary-util.h1
-rw-r--r--executive-summary/component/e-summary.c1
-rw-r--r--executive-summary/component/e-summary.h1
-rw-r--r--executive-summary/component/main.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-client.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-client.h1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-client.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-client.h1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-factory-client.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-factory-client.h1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-view.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-component-view.h1
-rw-r--r--executive-summary/evolution-services/executive-summary-component.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-component.h1
-rw-r--r--executive-summary/evolution-services/executive-summary-html-view.c1
-rw-r--r--executive-summary/evolution-services/executive-summary-html-view.h1
-rw-r--r--executive-summary/evolution-services/executive-summary.c1
-rw-r--r--executive-summary/evolution-services/executive-summary.h1
-rw-r--r--executive-summary/test-service/main.c1
-rw-r--r--executive-summary/widgets/e-summary-subwindow.c1
-rw-r--r--executive-summary/widgets/e-summary-subwindow.h1
-rw-r--r--executive-summary/widgets/e-summary-title-button.c1
-rw-r--r--executive-summary/widgets/e-summary-title-button.h1
-rw-r--r--executive-summary/widgets/e-summary-titlebar.c1
-rw-r--r--executive-summary/widgets/e-summary-titlebar.h1
-rw-r--r--filter/filter-source.c1
-rw-r--r--filter/filter-source.h1
-rw-r--r--importers/elm-importer.c1
-rw-r--r--importers/evolution-gnomecard-importer.c1
-rw-r--r--importers/netscape-importer.c1
-rw-r--r--importers/pine-importer.c1
-rw-r--r--my-evolution/component-factory.c1
-rw-r--r--my-evolution/component-factory.h1
-rw-r--r--my-evolution/e-summary-calendar.c1
-rw-r--r--my-evolution/e-summary-calendar.h1
-rw-r--r--my-evolution/e-summary-factory.c1
-rw-r--r--my-evolution/e-summary-factory.h1
-rw-r--r--my-evolution/e-summary-mail.c1
-rw-r--r--my-evolution/e-summary-mail.h1
-rw-r--r--my-evolution/e-summary-offline-handler.c1
-rw-r--r--my-evolution/e-summary-offline-handler.h1
-rw-r--r--my-evolution/e-summary-preferences.c1
-rw-r--r--my-evolution/e-summary-preferences.h1
-rw-r--r--my-evolution/e-summary-rdf.c1
-rw-r--r--my-evolution/e-summary-rdf.h1
-rw-r--r--my-evolution/e-summary-tasks.c1
-rw-r--r--my-evolution/e-summary-tasks.h1
-rw-r--r--my-evolution/e-summary-type.h1
-rw-r--r--my-evolution/e-summary-weather.c1
-rw-r--r--my-evolution/e-summary-weather.h1
-rw-r--r--my-evolution/e-summary.c1
-rw-r--r--my-evolution/e-summary.h1
-rw-r--r--my-evolution/main.c1
-rw-r--r--my-evolution/my-evolution-html.h1
-rw-r--r--my-evolution/weather.h1
-rw-r--r--shell/importer/evolution-importer-client.c1
-rw-r--r--shell/importer/evolution-importer-client.h1
-rw-r--r--shell/importer/evolution-importer-listener.c1
-rw-r--r--shell/importer/evolution-importer-listener.h1
-rw-r--r--shell/importer/evolution-importer.c1
-rw-r--r--shell/importer/evolution-importer.h1
-rw-r--r--shell/importer/evolution-intelligent-importer.c1
-rw-r--r--shell/importer/evolution-intelligent-importer.h1
-rw-r--r--shell/importer/intelligent.c1
-rw-r--r--shell/importer/intelligent.h1
-rw-r--r--widgets/misc/e-bonobo-widget.c1
-rw-r--r--widgets/misc/e-bonobo-widget.h1
-rw-r--r--widgets/misc/e-calendar-item.c1
-rw-r--r--widgets/misc/e-calendar-item.h1
-rw-r--r--widgets/misc/e-calendar.c1
-rw-r--r--widgets/misc/e-calendar.h1
-rw-r--r--widgets/misc/e-cell-date-edit.c1
-rw-r--r--widgets/misc/e-cell-date-edit.h1
-rw-r--r--widgets/misc/e-cell-percent.c1
-rw-r--r--widgets/misc/e-cell-percent.h1
-rw-r--r--widgets/misc/e-charset-picker.c1
-rw-r--r--widgets/misc/e-charset-picker.h1
-rw-r--r--widgets/misc/e-clipped-label.c1
-rw-r--r--widgets/misc/e-clipped-label.h1
-rw-r--r--widgets/misc/e-dateedit.c1
-rw-r--r--widgets/misc/e-dateedit.h1
-rw-r--r--widgets/misc/e-dropdown-button.c1
-rw-r--r--widgets/misc/e-dropdown-button.h1
-rw-r--r--widgets/misc/e-filter-bar.c1
-rw-r--r--widgets/misc/e-filter-bar.h1
-rw-r--r--widgets/misc/e-search-bar.c1
-rw-r--r--widgets/misc/e-search-bar.h1
-rw-r--r--widgets/misc/e-title-bar.c1
-rw-r--r--widgets/misc/e-title-bar.h1
-rw-r--r--widgets/misc/test-calendar.c1
-rw-r--r--widgets/misc/test-dateedit.c1
-rw-r--r--widgets/misc/test-dropdown-button.c1
-rw-r--r--widgets/misc/test-title-bar.c1
256 files changed, 0 insertions, 256 deletions
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 687345ba6d..10897b2025 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.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/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index 7cfa5d37d4..541b140de1 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.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/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index a72448c284..329304e143 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -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/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 463dfe8ff8..a437f5aa09 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.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/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 80ab205304..e2094adc8a 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.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/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index ce9465cef7..eb3d8633aa 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.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/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index b128b10719..b35c913f5f 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.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/camel/camel-disco-store.h b/camel/camel-disco-store.h
index 1d1cbd58a6..575ce1a5ba 100644
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.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/camel/camel-exception.c b/camel/camel-exception.c
index 7c24b22f03..c5eec66908 100644
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.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/camel/camel-exception.h b/camel/camel-exception.h
index 0eaf7a813a..77c2c16066 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -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/camel/camel-file-utils.c b/camel/camel-file-utils.c
index 85c2301c71..9331c64bfa 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.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/camel/camel-file-utils.h b/camel/camel-file-utils.h
index 17b7c8384b..b45063752a 100644
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.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/camel/camel-folder.c b/camel/camel-folder.c
index 9bc38df846..405107e2a8 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.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/camel/camel-folder.h b/camel/camel-folder.h
index 4ba36e9d03..fb987922c6 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.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/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 05a70f06cc..b73ca68b1d 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.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/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 7e02223b08..fc45e1d127 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.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/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
index 1e7179f089..9e5dc012a3 100644
--- a/camel/camel-lock-helper.c
+++ b/camel/camel-lock-helper.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/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 07307e1d7a..c61a097642 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.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/camel/camel-lock.c b/camel/camel-lock.c
index c9010d6f71..8faae9f2aa 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.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/camel/camel-lock.h b/camel/camel-lock.h
index 55e0bb781d..d54f7ed071 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.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/camel/camel-medium.c b/camel/camel-medium.c
index fee9858f1d..2537989639 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.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/camel/camel-medium.h b/camel/camel-medium.h
index 81be789683..26040b2a94 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -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/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 19c24a4b3e..02ed187929 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.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/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 3401f91188..7e8687a57d 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.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/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index cff58ce15c..3bad8de1b6 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.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/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 516e147a68..576f7bd3e4 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.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/camel/camel-mime-part.c b/camel/camel-mime-part.c
index efb4cee74b..637973a6e6 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.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/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 605bf1d64a..785fecf9d9 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -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/camel/camel-movemail.c b/camel/camel-movemail.c
index b8d0711809..c4f22b6332 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.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/camel/camel-movemail.h b/camel/camel-movemail.h
index a5d5207cae..3e5206f672 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.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/camel/camel-multipart.c b/camel/camel-multipart.c
index 83cafbd9d9..a9e95c230e 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -14,7 +14,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/camel/camel-multipart.h b/camel/camel-multipart.h
index aa2f87a79c..dfa8908bb2 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -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/camel/camel-object.c b/camel/camel-object.c
index 9e508c079c..6d8b301f80 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.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/camel/camel-object.h b/camel/camel-object.h
index b8f2e14951..63f3520809 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.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/camel/camel-operation.h b/camel/camel-operation.h
index 4b6a608ba2..08da410b68 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.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/camel/camel-private.h b/camel/camel-private.h
index f3986cb75c..c6a31575e0 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -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/camel/camel-provider.c b/camel/camel-provider.c
index 7f1d3b0e2f..68ceccb0c0 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -12,7 +12,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/camel/camel-provider.h b/camel/camel-provider.h
index 8a13e5a101..9269745786 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.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/camel/camel-remote-store.h b/camel/camel-remote-store.h
index 5b21ad07c3..a596ed7235 100644
--- a/camel/camel-remote-store.h
+++ b/camel/camel-remote-store.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/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 78b979eb8d..874d68e40c 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.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/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 8c3cb61d77..9ac73c7ee8 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.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/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index e15714f7eb..c51b52b99f 100644
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.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/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 871f2a54e3..897342c737 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.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/camel/camel-service.c b/camel/camel-service.c
index e0304f2232..ade9a1d5b2 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.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/camel/camel-service.h b/camel/camel-service.h
index fd34d144fa..98d3de41f3 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -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/camel/camel-session.c b/camel/camel-session.c
index 061c62a95f..bcd680299a 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.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/camel/camel-session.h b/camel/camel-session.h
index 583339d3e0..00083fcdf8 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -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/camel/camel-store.c b/camel/camel-store.c
index f4b15a045c..c6ffdcdaae 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.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/camel/camel-store.h b/camel/camel-store.h
index 157bc196a0..6b66811e24 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.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/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 8695a5db48..ff7df172ae 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.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/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 5d0244d13c..db93971fd2 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -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/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 7fb43aac5c..230d3ba6bd 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.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/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index eb1cc5ba78..7db13ac244 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.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/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 5e491f28fa..d81b304231 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.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/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 011c540232..af51c36ff7 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.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/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 1519fb7409..3c0fdee47b 100644
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.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/camel/camel-stream.c b/camel/camel-stream.c
index fe35c4175e..709bfe107c 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.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/camel/camel-stream.h b/camel/camel-stream.h
index c0a4a05af3..f75e882a70 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.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/camel/camel-transport.c b/camel/camel-transport.c
index 33f22683b8..0dc56a8d67 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.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/camel/camel-transport.h b/camel/camel-transport.h
index 5b50eb0401..5951d1145c 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -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/camel/camel-types.h b/camel/camel-types.h
index ec63948bcf..6765424b39 100644
--- a/camel/camel-types.h
+++ b/camel/camel-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/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index 48bfa98d20..933f8b68e1 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.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/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index 072e036ac0..e4327c9b12 100644
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.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/camel/camel-url.c b/camel/camel-url.c
index ea707b38cc..a2d4e73dac 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.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/camel/camel-url.h b/camel/camel-url.h
index 56724425a9..d60c9594c2 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -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/camel/camel.c b/camel/camel.c
index 05daa30d83..2bdc67b1a3 100644
--- a/camel/camel.c
+++ b/camel/camel.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/camel/camel.h b/camel/camel.h
index 4fd01a609b..07d0cb9c7c 100644
--- a/camel/camel.h
+++ b/camel/camel.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/camel/gstring-util.c b/camel/gstring-util.c
index 6cb6b3cda6..e0d404aede 100644
--- a/camel/gstring-util.c
+++ b/camel/gstring-util.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/camel/gstring-util.h b/camel/gstring-util.h
index 1d60aefe87..39fdf32fd1 100644
--- a/camel/gstring-util.h
+++ b/camel/gstring-util.h
@@ -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/camel/hash-table-utils.c b/camel/hash-table-utils.c
index 35a6425af7..f17f6ce5d5 100644
--- a/camel/hash-table-utils.c
+++ b/camel/hash-table-utils.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/camel/hash-table-utils.h b/camel/hash-table-utils.h
index f977271c88..80e9a6057c 100644
--- a/camel/hash-table-utils.h
+++ b/camel/hash-table-utils.h
@@ -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/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index da7ce3f9f6..69c28237cc 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -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/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6df3833db1..e1bd4bc101 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.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/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 888c5d8f0a..05e46ce6a1 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -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/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index 1758377696..ab5d125d6e 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.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/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index 5f05e337e0..efdc832694 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.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/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 187b145e00..07b790c6a1 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -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/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index adbbf7ba34..66ebe13f1d 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.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/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
index 9714fd21be..c5ea41acff 100644
--- a/camel/providers/imap/camel-imap-types.h
+++ b/camel/providers/imap/camel-imap-types.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/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index f75c7070e8..53646bb201 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.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/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index f0b6ceff24..4f7ca5097a 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.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/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 985081a266..6077a66da0 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.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/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index cb4cabe641..3eb4b02c32 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.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/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index d193524a3c..4dfe9f635c 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -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/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index a5bb651d27..f4a4301022 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.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/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 912494232d..918b8db420 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.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/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 3c8eb35a1a..21d854c562 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -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/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index e786833074..fc9ab999cb 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.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/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 6e93aa4ab1..c495d9b14d 100644
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -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/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index ae06d372b8..4d754e5f12 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.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/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 9882485d2a..f7725bc189 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.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/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 7f1162d538..534269d455 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.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/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index fa521f904e..aa0b67201f 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.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/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 280e9d049c..f401632b8d 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.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/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index 6cce47538d..5b6fbdd926 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.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/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 109d1232f5..6795ab3fbf 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.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/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 544ef271cd..125f8c8ac5 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -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/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index dd44f015e7..8b8c2e5f0e 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.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/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index f83404f85e..b69bddb7c2 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.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/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index afec08382d..298f04428e 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.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/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 04a79b274b..717ec4abd9 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.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/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index c16d106f07..fdf5640d99 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.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/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 74a8495d91..677f6aa0ed 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.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/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index b3f788269f..f8d3a62e27 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.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/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 67636dbc21..fc96cf6a4e 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.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/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 1de28c16ab..9f291d9fb8 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.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/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 6acbf09f9e..223323cb95 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.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/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index ff2bf7b2e5..7f3850f9c1 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.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/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 6ee18a5320..edd1e64cb9 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.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/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 3e0d0ac206..8c7ef1d5cd 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.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/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index e529c9b1e1..773e3d7e0e 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.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/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 6c00c5745d..d9aace81ef 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -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/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c2ee46348b..9ff097f7f5 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.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/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 02cca63e46..0f373dd0bc 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -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/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index 81cc334a67..a37179c521 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.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/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 46dac10bf6..5f26d7100f 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.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/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 7d648bff5c..48fd7490c9 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.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/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 0801d6d83f..5452144eab 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.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/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 15a29585bb..0b6296a09c 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.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/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 91b9a94137..9e7a022482 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.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/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 42a35794d1..e959aa2de3 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.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/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 89814845a3..fcc488f3e8 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.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/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 4f0ad07766..4d546a081d 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.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/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index f218dacb24..28bc488c1d 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.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/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 74b58811d9..056be03bc8 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -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/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 9c25186e83..13f0cb6369 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.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/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 2b35f49e15..c37b35ce44 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.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/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index dba6369bb4..7a6b631c46 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.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/camel/string-utils.c b/camel/string-utils.c
index 0331d6209d..1e2fa103ef 100644
--- a/camel/string-utils.c
+++ b/camel/string-utils.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/camel/string-utils.h b/camel/string-utils.h
index 7b4e900c93..0402eb15ad 100644
--- a/camel/string-utils.h
+++ b/camel/string-utils.h
@@ -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/e-util/e-bonobo-factory-util.c b/e-util/e-bonobo-factory-util.c
index da6cfc085f..560bfc57c4 100644
--- a/e-util/e-bonobo-factory-util.c
+++ b/e-util/e-bonobo-factory-util.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/e-util/e-bonobo-factory-util.h b/e-util/e-bonobo-factory-util.h
index 1ce471fba7..4b20ed6351 100644
--- a/e-util/e-bonobo-factory-util.h
+++ b/e-util/e-bonobo-factory-util.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/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 3de17b1954..01aec1f6df 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.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/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 8dc8478fe1..582e3da6c1 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.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/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 890d5d5529..6b1da99156 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.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/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index bfd36890d6..a00ab75d21 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.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/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c
index c85469af52..ed233be3f5 100644
--- a/e-util/e-gtk-utils.c
+++ b/e-util/e-gtk-utils.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/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h
index 21097d5d36..3eae136152 100644
--- a/e-util/e-gtk-utils.h
+++ b/e-util/e-gtk-utils.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/e-util/e-host-utils.c b/e-util/e-host-utils.c
index d58b1ee737..1b97c2e3f3 100644
--- a/e-util/e-host-utils.c
+++ b/e-util/e-host-utils.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/e-util/e-host-utils.h b/e-util/e-host-utils.h
index b2f08ca359..3153cc7581 100644
--- a/e-util/e-host-utils.h
+++ b/e-util/e-host-utils.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/e-util/e-html-utils.c b/e-util/e-html-utils.c
index e65e611cbe..ac8e7c6425 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.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/e-util/e-html-utils.h b/e-util/e-html-utils.h
index dfec48e20d..551996e089 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.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/e-util/e-memory.c b/e-util/e-memory.c
index 1dd465cf68..0dc865225d 100644
--- a/e-util/e-memory.c
+++ b/e-util/e-memory.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/e-util/e-memory.h b/e-util/e-memory.h
index e8e61bde4e..9cc89f2f23 100644
--- a/e-util/e-memory.h
+++ b/e-util/e-memory.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/e-util/e-passwords.c b/e-util/e-passwords.c
index 6cc216c2c0..bf632c26eb 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.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/e-util/e-passwords.h b/e-util/e-passwords.h
index a5c7b5e8ac..aad7e8569c 100644
--- a/e-util/e-passwords.h
+++ b/e-util/e-passwords.h
@@ -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/e-util/e-path.c b/e-util/e-path.c
index bb3b5994d5..06ac05ef25 100644
--- a/e-util/e-path.c
+++ b/e-util/e-path.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/e-util/e-path.h b/e-util/e-path.h
index 13048411b8..a40cf9fb16 100644
--- a/e-util/e-path.h
+++ b/e-util/e-path.h
@@ -4,7 +4,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/e-util/e-request.c b/e-util/e-request.c
index d920df6356..22ba53f21b 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.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/e-util/e-request.h b/e-util/e-request.h
index 953e9da749..7ebb70c43f 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.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/e-util/e-sexp.c b/e-util/e-sexp.c
index 72a68ff97c..3a2a37d5fb 100644
--- a/e-util/e-sexp.c
+++ b/e-util/e-sexp.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/e-util/e-url.c b/e-util/e-url.c
index 1d7fe12ef3..6c24b20b8d 100644
--- a/e-util/e-url.c
+++ b/e-util/e-url.c
@@ -12,7 +12,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/e-util/e-url.h b/e-util/e-url.h
index aa9c74c7c3..e37b5d68f3 100644
--- a/e-util/e-url.h
+++ b/e-util/e-url.h
@@ -12,7 +12,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/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 811108f52e..ab917251d2 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.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/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h
index 30115ceceb..fc10a08046 100644
--- a/executive-summary/component/component-factory.h
+++ b/executive-summary/component/component-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/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
index 93af920800..1eff427af9 100644
--- a/executive-summary/component/e-summary-callbacks.c
+++ b/executive-summary/component/e-summary-callbacks.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/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 562eb9219f..735074bcc3 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.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/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
index 6bae93eb5e..d047ebd491 100644
--- a/executive-summary/component/e-summary-factory.h
+++ b/executive-summary/component/e-summary-factory.h
@@ -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/executive-summary/component/e-summary-prefs.c b/executive-summary/component/e-summary-prefs.c
index 7cac7c2752..fdf51ead1e 100644
--- a/executive-summary/component/e-summary-prefs.c
+++ b/executive-summary/component/e-summary-prefs.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/executive-summary/component/e-summary-prefs.h b/executive-summary/component/e-summary-prefs.h
index 5e82c77d3c..e7b2b9b127 100644
--- a/executive-summary/component/e-summary-prefs.h
+++ b/executive-summary/component/e-summary-prefs.h
@@ -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/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index 0113aadebf..ed4aa7af69 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.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/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h
index cec3d5c5c7..03db66353b 100644
--- a/executive-summary/component/e-summary-url.h
+++ b/executive-summary/component/e-summary-url.h
@@ -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/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
index 0777dc39f0..4f7b5f5d6d 100644
--- a/executive-summary/component/e-summary-util.c
+++ b/executive-summary/component/e-summary-util.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/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h
index 70681572f8..185bafcf1f 100644
--- a/executive-summary/component/e-summary-util.h
+++ b/executive-summary/component/e-summary-util.h
@@ -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/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index 5422f64a4c..7a33ba14ef 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.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/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
index 30700284eb..5469adc6fe 100644
--- a/executive-summary/component/e-summary.h
+++ b/executive-summary/component/e-summary.h
@@ -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/executive-summary/component/main.c b/executive-summary/component/main.c
index a2dd07faef..e23b59c23a 100644
--- a/executive-summary/component/main.c
+++ b/executive-summary/component/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/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
index 5580a2bd93..b2415810ba 100644
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ b/executive-summary/evolution-services/executive-summary-client.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/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h
index 4e8c19d262..765f9e3988 100644
--- a/executive-summary/evolution-services/executive-summary-client.h
+++ b/executive-summary/evolution-services/executive-summary-client.h
@@ -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/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
index 9156343b46..98247bdb00 100644
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ b/executive-summary/evolution-services/executive-summary-component-client.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/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h
index abede97dd2..5a8e70f0fe 100644
--- a/executive-summary/evolution-services/executive-summary-component-client.h
+++ b/executive-summary/evolution-services/executive-summary-component-client.h
@@ -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/executive-summary/evolution-services/executive-summary-component-factory-client.c b/executive-summary/evolution-services/executive-summary-component-factory-client.c
index 06d63b4fa5..23b5034849 100644
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.c
+++ b/executive-summary/evolution-services/executive-summary-component-factory-client.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/executive-summary/evolution-services/executive-summary-component-factory-client.h b/executive-summary/evolution-services/executive-summary-component-factory-client.h
index e6a6cebb9c..71cd7af613 100644
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.h
+++ b/executive-summary/evolution-services/executive-summary-component-factory-client.h
@@ -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/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c
index afea0330f3..2b769b3bbe 100644
--- a/executive-summary/evolution-services/executive-summary-component-view.c
+++ b/executive-summary/evolution-services/executive-summary-component-view.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/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h
index de4185881d..a204dbe007 100644
--- a/executive-summary/evolution-services/executive-summary-component-view.h
+++ b/executive-summary/evolution-services/executive-summary-component-view.h
@@ -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/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
index 348906ff66..cb2fd95ee9 100644
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ b/executive-summary/evolution-services/executive-summary-component.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/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h
index cb8d7e6e64..23b653d488 100644
--- a/executive-summary/evolution-services/executive-summary-component.h
+++ b/executive-summary/evolution-services/executive-summary-component.h
@@ -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/executive-summary/evolution-services/executive-summary-html-view.c b/executive-summary/evolution-services/executive-summary-html-view.c
index 61a2432699..054da34fae 100644
--- a/executive-summary/evolution-services/executive-summary-html-view.c
+++ b/executive-summary/evolution-services/executive-summary-html-view.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/executive-summary/evolution-services/executive-summary-html-view.h b/executive-summary/evolution-services/executive-summary-html-view.h
index ba92f33941..d5cf6741fc 100644
--- a/executive-summary/evolution-services/executive-summary-html-view.h
+++ b/executive-summary/evolution-services/executive-summary-html-view.h
@@ -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/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
index 7239d407d1..8be483b750 100644
--- a/executive-summary/evolution-services/executive-summary.c
+++ b/executive-summary/evolution-services/executive-summary.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/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h
index d003838675..704da9a721 100644
--- a/executive-summary/evolution-services/executive-summary.h
+++ b/executive-summary/evolution-services/executive-summary.h
@@ -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/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
index 4e89abc1cd..b80f3e6a89 100644
--- a/executive-summary/test-service/main.c
+++ b/executive-summary/test-service/main.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/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c
index 9c4b6465c9..336b73bb76 100644
--- a/executive-summary/widgets/e-summary-subwindow.c
+++ b/executive-summary/widgets/e-summary-subwindow.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/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h
index 1acfe4a0ae..27771d296d 100644
--- a/executive-summary/widgets/e-summary-subwindow.h
+++ b/executive-summary/widgets/e-summary-subwindow.h
@@ -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/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c
index 3bff5712d2..518ce692c6 100644
--- a/executive-summary/widgets/e-summary-title-button.c
+++ b/executive-summary/widgets/e-summary-title-button.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/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h
index c681a22493..59b9e92445 100644
--- a/executive-summary/widgets/e-summary-title-button.h
+++ b/executive-summary/widgets/e-summary-title-button.h
@@ -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/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c
index 6aab2fd257..fa76661a78 100644
--- a/executive-summary/widgets/e-summary-titlebar.c
+++ b/executive-summary/widgets/e-summary-titlebar.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/executive-summary/widgets/e-summary-titlebar.h b/executive-summary/widgets/e-summary-titlebar.h
index cae91244dd..b754fd9108 100644
--- a/executive-summary/widgets/e-summary-titlebar.h
+++ b/executive-summary/widgets/e-summary-titlebar.h
@@ -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/filter/filter-source.c b/filter/filter-source.c
index 4e6d473caf..fce8208ca7 100644
--- a/filter/filter-source.c
+++ b/filter/filter-source.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/filter/filter-source.h b/filter/filter-source.h
index e9908956e5..54e51d5b0e 100644
--- a/filter/filter-source.h
+++ b/filter/filter-source.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/importers/elm-importer.c b/importers/elm-importer.c
index 7cf54fe779..5b0aeac77a 100644
--- a/importers/elm-importer.c
+++ b/importers/elm-importer.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/importers/evolution-gnomecard-importer.c b/importers/evolution-gnomecard-importer.c
index 7dedef0a9d..c98b8d52f3 100644
--- a/importers/evolution-gnomecard-importer.c
+++ b/importers/evolution-gnomecard-importer.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/importers/netscape-importer.c b/importers/netscape-importer.c
index f323d1fa7c..24e8548bca 100644
--- a/importers/netscape-importer.c
+++ b/importers/netscape-importer.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/importers/pine-importer.c b/importers/pine-importer.c
index b70b995c82..170d84fe3c 100644
--- a/importers/pine-importer.c
+++ b/importers/pine-importer.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/my-evolution/component-factory.c b/my-evolution/component-factory.c
index 42948d46bb..d194e061dc 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-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/my-evolution/component-factory.h b/my-evolution/component-factory.h
index d3186aa1d0..f15b012009 100644
--- a/my-evolution/component-factory.h
+++ b/my-evolution/component-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/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 0ba95cb62d..c4640f0a62 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.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/my-evolution/e-summary-calendar.h b/my-evolution/e-summary-calendar.h
index 0292ceb2b6..ab15e3d2a9 100644
--- a/my-evolution/e-summary-calendar.h
+++ b/my-evolution/e-summary-calendar.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/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c
index 574179c83e..52cba39849 100644
--- a/my-evolution/e-summary-factory.c
+++ b/my-evolution/e-summary-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/my-evolution/e-summary-factory.h b/my-evolution/e-summary-factory.h
index 58e6a8ff89..9d413979fe 100644
--- a/my-evolution/e-summary-factory.h
+++ b/my-evolution/e-summary-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/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index 028a12c5f9..cad51b1c2d 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.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/my-evolution/e-summary-mail.h b/my-evolution/e-summary-mail.h
index 5cc6d822d9..58e363d113 100644
--- a/my-evolution/e-summary-mail.h
+++ b/my-evolution/e-summary-mail.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/my-evolution/e-summary-offline-handler.c b/my-evolution/e-summary-offline-handler.c
index f07450d9f8..fe8824ed0d 100644
--- a/my-evolution/e-summary-offline-handler.c
+++ b/my-evolution/e-summary-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/my-evolution/e-summary-offline-handler.h b/my-evolution/e-summary-offline-handler.h
index fd332f386d..56575f88c3 100644
--- a/my-evolution/e-summary-offline-handler.h
+++ b/my-evolution/e-summary-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/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 26df055393..647bf07333 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.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/my-evolution/e-summary-preferences.h b/my-evolution/e-summary-preferences.h
index 72acff3f48..ea53db5113 100644
--- a/my-evolution/e-summary-preferences.h
+++ b/my-evolution/e-summary-preferences.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/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c
index d822c986d6..7fab2f8957 100644
--- a/my-evolution/e-summary-rdf.c
+++ b/my-evolution/e-summary-rdf.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/my-evolution/e-summary-rdf.h b/my-evolution/e-summary-rdf.h
index 972f7df94c..0cf3b4236b 100644
--- a/my-evolution/e-summary-rdf.h
+++ b/my-evolution/e-summary-rdf.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/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 8cf9cf18b2..8fc60f66f5 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.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/my-evolution/e-summary-tasks.h b/my-evolution/e-summary-tasks.h
index 3d159002e7..a9d3d6b698 100644
--- a/my-evolution/e-summary-tasks.h
+++ b/my-evolution/e-summary-tasks.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/my-evolution/e-summary-type.h b/my-evolution/e-summary-type.h
index d25f13b689..8a40dfe991 100644
--- a/my-evolution/e-summary-type.h
+++ b/my-evolution/e-summary-type.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/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index 1808b62087..10968d8bc1 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.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/my-evolution/e-summary-weather.h b/my-evolution/e-summary-weather.h
index 769f5ce361..f587e5f271 100644
--- a/my-evolution/e-summary-weather.h
+++ b/my-evolution/e-summary-weather.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/my-evolution/e-summary.c b/my-evolution/e-summary.c
index d277f5ac75..6c22e9cd64 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.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/my-evolution/e-summary.h b/my-evolution/e-summary.h
index 2f827f0472..febd81c997 100644
--- a/my-evolution/e-summary.h
+++ b/my-evolution/e-summary.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/my-evolution/main.c b/my-evolution/main.c
index 0b51aeb8d2..28649f1810 100644
--- a/my-evolution/main.c
+++ b/my-evolution/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/my-evolution/my-evolution-html.h b/my-evolution/my-evolution-html.h
index 4524752047..2e2300d002 100644
--- a/my-evolution/my-evolution-html.h
+++ b/my-evolution/my-evolution-html.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/my-evolution/weather.h b/my-evolution/weather.h
index 5d133079ed..cd04c9621f 100644
--- a/my-evolution/weather.h
+++ b/my-evolution/weather.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/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 44d07d0e1f..0597b1127b 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.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/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index ea9294b230..9485c7307f 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.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/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index e82845c883..ea20431c9c 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.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/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index cf7c86714b..2c9c28422c 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.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/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index c759cb5d9a..8ae67a3e22 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.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/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index ab08aeefe2..eea1eb6078 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.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/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index 9a2a1ddfae..436b019c60 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.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/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 76f8e64be3..27aa35fd41 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.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/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 1ed4c85898..44b0be9398 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.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/shell/importer/intelligent.h b/shell/importer/intelligent.h
index ce0ddbced6..1e6f3e0b1b 100644
--- a/shell/importer/intelligent.h
+++ b/shell/importer/intelligent.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/widgets/misc/e-bonobo-widget.c b/widgets/misc/e-bonobo-widget.c
index 3f886121fb..491c0ed7cb 100644
--- a/widgets/misc/e-bonobo-widget.c
+++ b/widgets/misc/e-bonobo-widget.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/widgets/misc/e-bonobo-widget.h b/widgets/misc/e-bonobo-widget.h
index cb3c14f7f9..2ccf54c8ec 100644
--- a/widgets/misc/e-bonobo-widget.h
+++ b/widgets/misc/e-bonobo-widget.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/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index a20ed85304..48febd1f23 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-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/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 60b0b7def7..b5aab144ef 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-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/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index db7b73cfae..94dd4a61bc 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.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/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 040035037e..87ed8b2f3d 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.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/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index a70438053d..1643687714 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.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/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index 2eff47f49d..da7a19ef8a 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.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/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c
index 590859e631..8fdd124e11 100644
--- a/widgets/misc/e-cell-percent.c
+++ b/widgets/misc/e-cell-percent.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/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h
index fb7cab86ac..0fea27c9e6 100644
--- a/widgets/misc/e-cell-percent.h
+++ b/widgets/misc/e-cell-percent.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/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 1d0913853c..d48f180218 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -4,7 +4,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/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h
index 44ee7ab8fd..97c945c32e 100644
--- a/widgets/misc/e-charset-picker.h
+++ b/widgets/misc/e-charset-picker.h
@@ -4,7 +4,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/widgets/misc/e-clipped-label.c b/widgets/misc/e-clipped-label.c
index ab251e7b71..6da313940c 100644
--- a/widgets/misc/e-clipped-label.c
+++ b/widgets/misc/e-clipped-label.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/widgets/misc/e-clipped-label.h b/widgets/misc/e-clipped-label.h
index 73dd9f846b..e6e2851538 100644
--- a/widgets/misc/e-clipped-label.h
+++ b/widgets/misc/e-clipped-label.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/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 3fe0af00fb..c0456c6437 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.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/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
index 789f2dfbac..68529fa563 100644
--- a/widgets/misc/e-dateedit.h
+++ b/widgets/misc/e-dateedit.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/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index 1f9e5deee1..fbd5f76c78 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.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/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index 6b62104a83..72c34f729f 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.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/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 507a391f26..172080e8d6 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -9,7 +9,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/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index eafbcf3dbf..8f1dec2b41 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.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/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 7125315a25..3524dc7b0f 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -12,7 +12,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/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 94dca5146f..88782cb27b 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.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/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c
index f8f2f5c82c..301aad108e 100644
--- a/widgets/misc/e-title-bar.c
+++ b/widgets/misc/e-title-bar.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/widgets/misc/e-title-bar.h b/widgets/misc/e-title-bar.h
index ac32ba21ad..388a0e6585 100644
--- a/widgets/misc/e-title-bar.h
+++ b/widgets/misc/e-title-bar.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/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index c2c64e5113..3fcf7d3706 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.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/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index 510b9159ba..94771d8ebb 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.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/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
index 2cf5830000..36609faddd 100644
--- a/widgets/misc/test-dropdown-button.c
+++ b/widgets/misc/test-dropdown-button.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/widgets/misc/test-title-bar.c b/widgets/misc/test-title-bar.c
index e3746f8936..a3a5b359e3 100644
--- a/widgets/misc/test-title-bar.c
+++ b/widgets/misc/test-title-bar.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,