Fix the license text to make sense.

svn path=/trunk/; revision=14192

101 files changed, 0 insertions, 101 deletions

diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index 8fc47bae9b..98f75619aa 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-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/shell/e-activity-handler.h b/shell/e-activity-handler.h
index 8d9e16edc5..18121f8886 100644
--- a/shell/e-activity-handler.h
+++ b/shell/e-activity-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/shell/e-component-registry.c b/shell/e-component-registry.c
index 41d8c09b24..07762ac9e5 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.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/e-component-registry.h b/shell/e-component-registry.h
index 5d596ecfd6..f5193d8be7 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.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/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c
index 48fba2a379..fa416f6723 100644
--- a/shell/e-corba-shortcuts.c
+++ b/shell/e-corba-shortcuts.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/e-corba-shortcuts.h b/shell/e-corba-shortcuts.h
index 544e5ef243..20d344ff13 100644
--- a/shell/e-corba-shortcuts.h
+++ b/shell/e-corba-shortcuts.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/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c
index 6d0fa5788d..982ae6fc48 100644
--- a/shell/e-corba-storage-registry.c
+++ b/shell/e-corba-storage-registry.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/e-corba-storage-registry.h b/shell/e-corba-storage-registry.h
index 75237df417..fc6c4084a7 100644
--- a/shell/e-corba-storage-registry.h
+++ b/shell/e-corba-storage-registry.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/e-corba-storage.c b/shell/e-corba-storage.c
index 54a8caf0e6..3aae784489 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-corba-storage.h b/shell/e-corba-storage.h
index 1619a2a172..0bd8b6cf37 100644
--- a/shell/e-corba-storage.h
+++ b/shell/e-corba-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c
index 0bba263b16..0368b4b23f 100644
--- a/shell/e-folder-tree.c
+++ b/shell/e-folder-tree.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/e-folder-tree.h b/shell/e-folder-tree.h
index 4db02bf029..0c851d67f9 100644
--- a/shell/e-folder-tree.h
+++ b/shell/e-folder-tree.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/e-folder-type-registry.c b/shell/e-folder-type-registry.c
index 894d245523..285ae33760 100644
--- a/shell/e-folder-type-registry.c
+++ b/shell/e-folder-type-registry.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/e-folder-type-registry.h b/shell/e-folder-type-registry.h
index fa03a81ad5..c772754ff3 100644
--- a/shell/e-folder-type-registry.h
+++ b/shell/e-folder-type-registry.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/e-folder.c b/shell/e-folder.c
index a6bff2dfc8..01177f3cc7 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.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/e-folder.h b/shell/e-folder.h
index 69864e1ab9..eb7ac516f3 100644
--- a/shell/e-folder.h
+++ b/shell/e-folder.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/e-gray-bar.c b/shell/e-gray-bar.c
index a7527c8afe..44d64f16ff 100644
--- a/shell/e-gray-bar.c
+++ b/shell/e-gray-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/shell/e-gray-bar.h b/shell/e-gray-bar.h
index 95b144c043..29b1ee2869 100644
--- a/shell/e-gray-bar.h
+++ b/shell/e-gray-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/shell/e-local-folder.c b/shell/e-local-folder.c
index c0172d8ccd..2e25bf0279 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.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/e-local-folder.h b/shell/e-local-folder.h
index 38a012e74c..ca3cf6c364 100644
--- a/shell/e-local-folder.h
+++ b/shell/e-local-folder.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/e-local-storage.c b/shell/e-local-storage.c
index 0ad338a9f4..f2e8a671b9 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-local-storage.h b/shell/e-local-storage.h
index 7f533fa3c3..555d1ff812 100644
--- a/shell/e-local-storage.h
+++ b/shell/e-local-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-setup.c b/shell/e-setup.c
index 31f46c5286..fb5930bef6 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.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/e-setup.h b/shell/e-setup.h
index eb31551d1d..3355dc90ad 100644
--- a/shell/e-setup.h
+++ b/shell/e-setup.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/e-shell-about-box.c b/shell/e-shell-about-box.c
index c0b1d729f9..c21275fa12 100644
--- a/shell/e-shell-about-box.c
+++ b/shell/e-shell-about-box.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/e-shell-about-box.h b/shell/e-shell-about-box.h
index f58c98fe09..831cfb0916 100644
--- a/shell/e-shell-about-box.h
+++ b/shell/e-shell-about-box.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/e-shell-constants.h b/shell/e-shell-constants.h
index f39f7a70bd..00635161d0 100644
--- a/shell/e-shell-constants.h
+++ b/shell/e-shell-constants.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/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index ccd56c411f..24c8dd2744 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.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/e-shell-folder-commands.h b/shell/e-shell-folder-commands.h
index 72198bca79..5e573ef566 100644
--- a/shell/e-shell-folder-commands.h
+++ b/shell/e-shell-folder-commands.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/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index ff4199a352..9def913951 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.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/e-shell-folder-creation-dialog.h b/shell/e-shell-folder-creation-dialog.h
index 165c6a37ae..8e3e990835 100644
--- a/shell/e-shell-folder-creation-dialog.h
+++ b/shell/e-shell-folder-creation-dialog.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/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index 3578604b09..2fab2077f3 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.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/e-shell-folder-selection-dialog.h b/shell/e-shell-folder-selection-dialog.h
index e475098290..32c34cb52b 100644
--- a/shell/e-shell-folder-selection-dialog.h
+++ b/shell/e-shell-folder-selection-dialog.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/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 5b864c2972..0623778d09 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-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/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
index e5968f30f6..a5c324560c 100644
--- a/shell/e-shell-folder-title-bar.h
+++ b/shell/e-shell-folder-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/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 2c80e70301..dcd48a054d 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-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/e-shell-importer.h b/shell/e-shell-importer.h
index eed610bfa6..4e9b91ff26 100644
--- a/shell/e-shell-importer.h
+++ b/shell/e-shell-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/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c
index 862cad9acd..4566584a82 100644
--- a/shell/e-shell-offline-handler.c
+++ b/shell/e-shell-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/shell/e-shell-offline-handler.h b/shell/e-shell-offline-handler.h
index 04d0aaca2d..12218a5c3e 100644
--- a/shell/e-shell-offline-handler.h
+++ b/shell/e-shell-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/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index c4b69ed3b6..b7452e2367 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.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/e-shell-startup-wizard.h b/shell/e-shell-startup-wizard.h
index 7a97254f2b..4e849b8feb 100644
--- a/shell/e-shell-startup-wizard.h
+++ b/shell/e-shell-startup-wizard.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/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index 612f67519d..4b2554fb66 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-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/shell/e-shell-user-creatable-items-handler.h b/shell/e-shell-user-creatable-items-handler.h
index 271354ed70..a743e234be 100644
--- a/shell/e-shell-user-creatable-items-handler.h
+++ b/shell/e-shell-user-creatable-items-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/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 19b38ac1e7..5ba0304331 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-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/shell/e-shell-utils.h b/shell/e-shell-utils.h
index 3d8f1adb76..f6bf62de8a 100644
--- a/shell/e-shell-utils.h
+++ b/shell/e-shell-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/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 8c95ccf937..b20c2e3545 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.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/e-shell-view-menu.h b/shell/e-shell-view-menu.h
index 838761b34e..976d70c281 100644
--- a/shell/e-shell-view-menu.h
+++ b/shell/e-shell-view-menu.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/e-shell-view.c b/shell/e-shell-view.c
index ca64151096..a87bcd5152 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.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/e-shell-view.h b/shell/e-shell-view.h
index 42fc9416ba..9738171b9a 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.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/e-shell.c b/shell/e-shell.c
index a83d3e39cc..83942aa4fc 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.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/e-shell.h b/shell/e-shell.h
index 5ab65420f1..70f5c203d1 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.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/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
index e068942111..105ccb0df9 100644
--- a/shell/e-shortcuts-view-model.c
+++ b/shell/e-shortcuts-view-model.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-shortcuts-view-model.h b/shell/e-shortcuts-view-model.h
index 562ce46895..45e680ecb3 100644
--- a/shell/e-shortcuts-view-model.h
+++ b/shell/e-shortcuts-view-model.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index 49ae439da5..29c2a7e0c6 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.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/e-shortcuts-view.h b/shell/e-shortcuts-view.h
index 7dc395961b..531718283a 100644
--- a/shell/e-shortcuts-view.h
+++ b/shell/e-shortcuts-view.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/e-shortcuts.c b/shell/e-shortcuts.c
index 2dd589acc3..3b155f0acc 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.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/e-shortcuts.h b/shell/e-shortcuts.h
index 667c62c12b..3b93d5c032 100644
--- a/shell/e-shortcuts.h
+++ b/shell/e-shortcuts.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/e-splash.c b/shell/e-splash.c
index baee0cdf19..41f1e1e8a7 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.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/e-splash.h b/shell/e-splash.h
index 036a325f30..209b815bfe 100644
--- a/shell/e-splash.h
+++ b/shell/e-splash.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/e-storage-set-view.c b/shell/e-storage-set-view.c
index 3a13994004..70538cd9ef 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.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/e-storage-set-view.h b/shell/e-storage-set-view.h
index ecfc2a8421..3468feff12 100644
--- a/shell/e-storage-set-view.h
+++ b/shell/e-storage-set-view.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/e-storage-set.c b/shell/e-storage-set.c
index e55a928c21..84748d70c2 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.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/e-storage-set.h b/shell/e-storage-set.h
index 1845c4ef86..16e717df16 100644
--- a/shell/e-storage-set.h
+++ b/shell/e-storage-set.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/e-storage.c b/shell/e-storage.c
index ebfb3ec1eb..f49cddcf39 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-storage.h b/shell/e-storage.h
index 7e5dfaa831..ae74f242a6 100644
--- a/shell/e-storage.h
+++ b/shell/e-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-summary-storage.c b/shell/e-summary-storage.c
index 725c1485fe..1938529c38 100644
--- a/shell/e-summary-storage.c
+++ b/shell/e-summary-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-summary-storage.h b/shell/e-summary-storage.h
index 70407800e2..4d5aab7641 100644
--- a/shell/e-summary-storage.h
+++ b/shell/e-summary-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/e-task-bar.c b/shell/e-task-bar.c
index 89284f7a0c..745e8f1a5e 100644
--- a/shell/e-task-bar.c
+++ b/shell/e-task-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/shell/e-task-bar.h b/shell/e-task-bar.h
index a7db1d1b22..c20ca1871c 100644
--- a/shell/e-task-bar.h
+++ b/shell/e-task-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/shell/e-task-widget.c b/shell/e-task-widget.c
index c084012d87..f1d8ed435e 100644
--- a/shell/e-task-widget.c
+++ b/shell/e-task-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/shell/e-task-widget.h b/shell/e-task-widget.h
index bcffa25ea6..6173623a80 100644
--- a/shell/e-task-widget.h
+++ b/shell/e-task-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/shell/e-uri-schema-registry.c b/shell/e-uri-schema-registry.c
index 4226ce4a72..f6a64b06b9 100644
--- a/shell/e-uri-schema-registry.c
+++ b/shell/e-uri-schema-registry.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/e-uri-schema-registry.h b/shell/e-uri-schema-registry.h
index 5122e4457a..1826f8a65a 100644
--- a/shell/e-uri-schema-registry.h
+++ b/shell/e-uri-schema-registry.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/evolution-activity-client.c b/shell/evolution-activity-client.c
index ac2f1bf9ff..5de8a4c217 100644
--- a/shell/evolution-activity-client.c
+++ b/shell/evolution-activity-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/evolution-activity-client.h b/shell/evolution-activity-client.h
index 21cbbccad6..d212dad219 100644
--- a/shell/evolution-activity-client.h
+++ b/shell/evolution-activity-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/evolution-session.c b/shell/evolution-session.c
index c301ba7e83..3c9647981f 100644
--- a/shell/evolution-session.c
+++ b/shell/evolution-session.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/evolution-session.h b/shell/evolution-session.h
index 604e750fc5..a0a36fa810 100644
--- a/shell/evolution-session.h
+++ b/shell/evolution-session.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/evolution-shell-client.c b/shell/evolution-shell-client.c
index c369e58e0a..5b2502b239 100644
--- a/shell/evolution-shell-client.c
+++ b/shell/evolution-shell-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/evolution-shell-client.h b/shell/evolution-shell-client.h
index 4a2d4187b9..ee5fd7ced0 100644
--- a/shell/evolution-shell-client.h
+++ b/shell/evolution-shell-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/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 3d2dbf382b..4b35e2ac7a 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-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/evolution-shell-component-client.h b/shell/evolution-shell-component-client.h
index a4de45769d..bea54f4b35 100644
--- a/shell/evolution-shell-component-client.h
+++ b/shell/evolution-shell-component-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/evolution-shell-component-dnd.c b/shell/evolution-shell-component-dnd.c
index d4d2d3864c..c2d2d247a8 100644
--- a/shell/evolution-shell-component-dnd.c
+++ b/shell/evolution-shell-component-dnd.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/evolution-shell-component-dnd.h b/shell/evolution-shell-component-dnd.h
index 97696a8121..78df2b6ee2 100644
--- a/shell/evolution-shell-component-dnd.h
+++ b/shell/evolution-shell-component-dnd.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/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 174506352c..f7e3ebdf54 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-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/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index 363a7f4c59..4d2eb9e7d6 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-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/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index c58fb3fe96..dc27a951c9 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/evolution-shell-component.h b/shell/evolution-shell-component.h
index ee5de402da..3a3a1cff5e 100644
--- a/shell/evolution-shell-component.h
+++ b/shell/evolution-shell-component.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index 15e68bfff5..f0d3eb32f5 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.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/evolution-shell-view.h b/shell/evolution-shell-view.h
index 3f53fc2300..3d20ee3d4d 100644
--- a/shell/evolution-shell-view.h
+++ b/shell/evolution-shell-view.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/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index 700c55c71e..ede46a2f2d 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-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/evolution-storage-listener.h b/shell/evolution-storage-listener.h
index bbd494a1e7..084d4acc19 100644
--- a/shell/evolution-storage-listener.h
+++ b/shell/evolution-storage-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/evolution-storage-set-view-factory.c b/shell/evolution-storage-set-view-factory.c
index 46de8fd15e..5d85692080 100644
--- a/shell/evolution-storage-set-view-factory.c
+++ b/shell/evolution-storage-set-view-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/shell/evolution-storage-set-view-factory.h b/shell/evolution-storage-set-view-factory.h
index 1f4a2bfc2b..75d45cf1b8 100644
--- a/shell/evolution-storage-set-view-factory.h
+++ b/shell/evolution-storage-set-view-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/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
index d9dbf1bf88..69dd778ec5 100644
--- a/shell/evolution-storage-set-view-listener.c
+++ b/shell/evolution-storage-set-view-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/evolution-storage-set-view-listener.h b/shell/evolution-storage-set-view-listener.h
index bf476ae266..2176a859eb 100644
--- a/shell/evolution-storage-set-view-listener.h
+++ b/shell/evolution-storage-set-view-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/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c
index 937499bd51..ad5f0101dc 100644
--- a/shell/evolution-storage-set-view.c
+++ b/shell/evolution-storage-set-view.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/evolution-storage-set-view.h b/shell/evolution-storage-set-view.h
index e3f9d988a6..edbaad77ff 100644
--- a/shell/evolution-storage-set-view.h
+++ b/shell/evolution-storage-set-view.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/evolution-storage.c b/shell/evolution-storage.c
index 355691ea41..9fd4288863 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index f8a2c142c8..c0ef46a300 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c
index 2c614c0541..23358ab6a6 100644
--- a/shell/evolution-test-component.c
+++ b/shell/evolution-test-component.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/shell/main.c b/shell/main.c
index d943515479..69d8ba9cd6 100644
--- a/shell/main.c
+++ b/shell/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,