changeset 2105:f18a5b617c34 trunk

[svn] - move to GPLv2-only. Based on my interpretation of the license, we are allowed to do this, so we are.
author nenolod
date Tue, 12 Dec 2006 08:38:32 -0800
parents d3f3badec91c
children 33f768ab6418
files COPYING ChangeLog audacious/about.c audacious/controlsocket.c audacious/controlsocket.h audacious/credits.c audacious/dnd.h audacious/dock.c audacious/dock.h audacious/effect.c audacious/effect.h audacious/equalizer.c audacious/equalizer.h audacious/fft.c audacious/fft.h audacious/general.c audacious/general.h audacious/genevent.c audacious/genevent.h audacious/glade.c audacious/glade.h audacious/hints.c audacious/hints.h audacious/input.c audacious/input.h audacious/logger.c audacious/logger.h audacious/main.c audacious/main.h audacious/mainwin.c audacious/mainwin.h audacious/output.c audacious/output.h audacious/playback.c audacious/playback.h audacious/playlist.c audacious/playlist.h audacious/playlist_container.c audacious/pluginenum.c audacious/pluginenum.h audacious/prefswin.c audacious/prefswin.h audacious/skinwin.c audacious/skinwin.h audacious/ui_fileinfo.c audacious/ui_playlist.c audacious/ui_playlist.h audacious/util.c audacious/util.h audacious/visualization.c audacious/visualization.h libaudacious/beepctrl.c libaudacious/beepctrl.h libaudacious/dirbrowser.c libaudacious/dirbrowser.h libaudacious/formatter.c libaudacious/rcfile.c libaudacious/rcfile.h libaudacious/urldecode.c libaudacious/urldecode.h libaudacious/util.c libaudacious/vfs.c libaudacious/vfs.h libaudacious/vfs_buffer.c libaudacious/vfs_buffer.h libaudacious/xconvert.c
diffstat 66 files changed, 75 insertions(+), 128 deletions(-) [+]
line wrap: on
line diff
--- a/COPYING	Mon Dec 11 19:41:29 2006 -0800
+++ b/COPYING	Tue Dec 12 08:38:32 2006 -0800
@@ -247,6 +247,9 @@
 this License, you may choose any version ever published by the Free Software
 Foundation.
 
+For the record, Audacious should only be considered licensed under 
+version 2 of the license ONLY.
+
   10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
--- a/ChangeLog	Mon Dec 11 19:41:29 2006 -0800
+++ b/ChangeLog	Tue Dec 12 08:38:32 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-12 03:41:29 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3213]
+  - add programfan to translation credits
+  
+  trunk/audacious/credits.c |    1 +
+  1 file changed, 1 insertion(+)
+
+
 2006-12-12 03:32:18 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3211]
   - run update-po
--- a/audacious/about.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/about.c	Tue Dec 12 08:38:32 2006 -0800
@@ -5,8 +5,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/controlsocket.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/controlsocket.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/controlsocket.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/controlsocket.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/credits.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/credits.c	Tue Dec 12 08:38:32 2006 -0800
@@ -8,8 +8,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/dnd.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/dnd.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/dock.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/dock.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/dock.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/dock.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/effect.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/effect.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/effect.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/effect.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/equalizer.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/equalizer.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/equalizer.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/equalizer.h	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/fft.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/fft.c	Tue Dec 12 08:38:32 2006 -0800
@@ -4,8 +4,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/fft.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/fft.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/general.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/general.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/general.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/general.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/genevent.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/genevent.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/genevent.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/genevent.h	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/glade.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/glade.c	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/glade.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/glade.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/hints.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/hints.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/hints.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/hints.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/input.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/input.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/input.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/input.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/logger.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/logger.c	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/logger.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/logger.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/main.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/main.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/main.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/main.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/mainwin.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/mainwin.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/mainwin.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/mainwin.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/output.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/output.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/output.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/output.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/playback.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/playback.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/playback.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/playback.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/playlist.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/playlist.c	Tue Dec 12 08:38:32 2006 -0800
@@ -10,8 +10,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/playlist.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/playlist.h	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/playlist_container.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/playlist_container.c	Tue Dec 12 08:38:32 2006 -0800
@@ -5,8 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; under version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/pluginenum.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/pluginenum.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/pluginenum.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/pluginenum.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/prefswin.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/prefswin.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/prefswin.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/prefswin.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/skinwin.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/skinwin.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/skinwin.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/skinwin.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/ui_fileinfo.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/ui_fileinfo.c	Tue Dec 12 08:38:32 2006 -0800
@@ -5,8 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; under version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/ui_playlist.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/ui_playlist.c	Tue Dec 12 08:38:32 2006 -0800
@@ -9,8 +9,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/ui_playlist.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/ui_playlist.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/util.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/util.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/util.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/util.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/visualization.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/visualization.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/audacious/visualization.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/audacious/visualization.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/beepctrl.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/beepctrl.c	Tue Dec 12 08:38:32 2006 -0800
@@ -8,8 +8,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/beepctrl.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/beepctrl.h	Tue Dec 12 08:38:32 2006 -0800
@@ -5,8 +5,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/dirbrowser.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/dirbrowser.c	Tue Dec 12 08:38:32 2006 -0800
@@ -5,8 +5,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/dirbrowser.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/dirbrowser.h	Tue Dec 12 08:38:32 2006 -0800
@@ -4,8 +4,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/formatter.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/formatter.c	Tue Dec 12 08:38:32 2006 -0800
@@ -8,8 +8,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/rcfile.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/rcfile.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/rcfile.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/rcfile.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/urldecode.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/urldecode.c	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/urldecode.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/urldecode.h	Tue Dec 12 08:38:32 2006 -0800
@@ -6,8 +6,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/util.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/util.c	Tue Dec 12 08:38:32 2006 -0800
@@ -8,8 +8,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/vfs.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/vfs.c	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/vfs.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/vfs.h	Tue Dec 12 08:38:32 2006 -0800
@@ -4,8 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; under version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/vfs_buffer.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/vfs_buffer.c	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/vfs_buffer.h	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/vfs_buffer.h	Tue Dec 12 08:38:32 2006 -0800
@@ -3,8 +3,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/libaudacious/xconvert.c	Mon Dec 11 19:41:29 2006 -0800
+++ b/libaudacious/xconvert.c	Tue Dec 12 08:38:32 2006 -0800
@@ -8,8 +8,7 @@
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  the Free Software Foundation; under version 2 of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of