# HG changeset patch # User nenolod # Date 1165941512 28800 # Node ID f18a5b617c34967e9c5bddde6c5f1f47cb09d4ff # Parent d3f3badec91c331c4bca0bec53dda099cca1cbbf [svn] - move to GPLv2-only. Based on my interpretation of the license, we are allowed to do this, so we are. diff -r d3f3badec91c -r f18a5b617c34 COPYING --- 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 diff -r d3f3badec91c -r f18a5b617c34 ChangeLog --- 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 + 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 revision [3211] - run update-po diff -r d3f3badec91c -r f18a5b617c34 audacious/about.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/controlsocket.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/controlsocket.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/credits.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/dnd.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/dock.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/dock.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/effect.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/effect.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/equalizer.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/equalizer.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/fft.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/fft.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/general.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/general.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/genevent.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/genevent.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/glade.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/glade.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/hints.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/hints.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/input.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/input.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/logger.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/logger.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/main.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/main.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/mainwin.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/mainwin.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/output.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/output.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/playback.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/playback.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/playlist.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/playlist.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/playlist_container.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/pluginenum.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/pluginenum.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/prefswin.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/prefswin.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/skinwin.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/skinwin.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/ui_fileinfo.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/ui_playlist.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/ui_playlist.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/util.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/util.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/visualization.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 audacious/visualization.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/beepctrl.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/beepctrl.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/dirbrowser.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/dirbrowser.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/formatter.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/rcfile.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/rcfile.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/urldecode.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/urldecode.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/util.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/vfs.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/vfs.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/vfs_buffer.c --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/vfs_buffer.h --- 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 diff -r d3f3badec91c -r f18a5b617c34 libaudacious/xconvert.c --- 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