Index: src/gui/dialogs/AboutDialog.cpp =================================================================== --- src/gui/dialogs/AboutDialog.cpp.orig 2011-12-11 22:09:15.000000000 +0200 +++ src/gui/dialogs/AboutDialog.cpp 2012-03-08 10:16:23.262430415 +0200 @@ -51,7 +51,7 @@ AboutDialog::AboutDialog(QWidget *parent mainLayout->addLayout(headerLayout); QLabel *label2 = new QLabel; - label2->setText(tr("

Copyright 2000-2011 the Rosegarden development team

Version: %1   Qt version: %2
Build key: %3

Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit http://www.rosegardenmusic.com/resources/authors.
For more information about Rosegarden, visit http://www.rosegardenmusic.com.

License: GNU General Public License Version 2

").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY)); + label2->setText(tr("

Copyright 2000-2011 the Rosegarden development team

Version: %1   Qt version: %2
Build key: %3

Rosegarden was brought to you by a team of volunteers across the world. For a list of contributors, visit http://www.rosegardenmusic.com/resources/authors.
For more information about Rosegarden, visit http://www.rosegardenmusic.com.

License: GNU General Public License Version 2 or later

").arg(VERSION).arg(QT_VERSION_STR).arg(BUILDKEY)); label2->setWordWrap(true); label2->setAlignment(Qt::AlignHCenter); label2->setOpenExternalLinks(true); Index: COPYING =================================================================== --- COPYING.orig 2011-12-11 22:09:53.000000000 +0200 +++ COPYING 2012-03-08 10:16:23.263430385 +0200 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is f General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -255,7 +255,7 @@ make exceptions for this. Our decision of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,4 +277,63 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License.