Fixing the license text.

svn path=/trunk/; revision=14211

60 files changed, 0 insertions, 60 deletions

diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
index adc87a2831..5078a1db94 100644
--- a/calendar/cal-util/test-recur.c
+++ b/calendar/cal-util/test-recur.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 4613f8f99c..5b6bd08e19 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 60d49e4a72..576255cb6d 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 6849720d9b..f7c18942cd 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 418871071b..a28181a37d 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c
index fe3bfdaf19..9c82e3fbff 100644
--- a/calendar/gui/calendar-offline-handler.c
+++ b/calendar/gui/calendar-offline-handler.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h
index 512997d2e7..4b87fd659f 100644
--- a/calendar/gui/calendar-offline-handler.h
+++ b/calendar/gui/calendar-offline-handler.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
index f5da17df05..461260ac1f 100644
--- a/calendar/gui/calendar-summary.c
+++ b/calendar/gui/calendar-summary.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
index 3f56878750..e1823cda8a 100644
--- a/calendar/gui/calendar-summary.h
+++ b/calendar/gui/calendar-summary.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 4613f8f99c..5b6bd08e19 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
index 60d49e4a72..576255cb6d 100644
--- a/calendar/gui/component-factory.h
+++ b/calendar/gui/component-factory.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 7a43351613..b2a95d0ba4 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
index 88c81c8bca..322b5a4a4e 100644
--- a/calendar/gui/control-factory.h
+++ b/calendar/gui/control-factory.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index eec7bcd5c6..9372236d56 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 6a35b0eadd..063341c18a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 1af54ab731..7481848d9e 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 45765459ad..c39a79b545 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 93f65488f3..027db3b2a8 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 88ed948653..bb00590622 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index f7af3bbf9b..ba843b828c 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 0050b12b29..70d0dd6394 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index b2e7c1d512..f7f86c6660 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index b17b1e106f..be7f130606 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 193690e207..94af4ee00c 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index bc33132245..f425363c98 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index b734436ff3..c2fd76f86a 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index e5e9b74f5a..daeb37aca7 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index e397b78e41..51e78b279f 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 4146f93f50..1c72a3a78b 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 7771e1dde2..1b1ab423ba 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
index c7db971980..30917fb13d 100644
--- a/calendar/gui/e-itip-control.h
+++ b/calendar/gui/e-itip-control.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index c032c7a97d..3d4a8a4f48 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index baf6d22b0a..69f2ced837 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index 4b02c8bdef..232077a8aa 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-model.h b/calendar/gui/e-meeting-model.h
index 24b91ab654..3e8e39b25e 100644
--- a/calendar/gui/e-meeting-model.h
+++ b/calendar/gui/e-meeting-model.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 9400c05f3b..88147d306e 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index 91dbea5566..11b355dfa0 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 50b3c13bb2..e366b58378 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 34d3a4ed38..eb66c523e2 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 197f8d714e..ab330a6d40 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 4c7b1d7d7d..3d354be7bb 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 1130690390..e7952752ed 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index aa1f38b2ad..32739f5d5a 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index 1c4adbff3d..4a057f681f 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 6c0b93d9f8..47df421f5d 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 436dd76985..20cace0132 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index fe665ed4b2..da9e8c5721 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index c93552f722..2c6d5a29d8 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 2f92282897..007960c826 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 5ce7c8c5ac..35740479da 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 84634fa200..d201a50e35 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 27f17fcc45..77fed506c8 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 1345944041..cf50604760 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 065d0537e0..e10954b9bd 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index a8431c5a4b..16d778fbf3 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 1ba87458e6..e49aa3272b 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c
index 570f0a3218..5fd8d61346 100644
--- a/calendar/gui/tasks-control-factory.c
+++ b/calendar/gui/tasks-control-factory.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h
index 26130d4555..468f03b9e7 100644
--- a/calendar/gui/tasks-control-factory.h
+++ b/calendar/gui/tasks-control-factory.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 6ff4eb4e21..b7d6ffcf88 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index 30e326660f..2d701f0c85 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,