Revert r1154600: Modified (some) 'About' windows to carry legally enforceable Copyright messages. Also looks better than '(c)'. ;-)

Also fixed a few typos where I noticed them.


Please don't do huge sweeping changes of KAboutData things without talking to the authors first.  I'm sure they don't appreciate having their names removed from the about dialogs.

Note that
(a) the unicode copyright character is no more enforcible than (c)
(b) while "the KDE developers" is not a legal entity, neither is "Dolphin authors"
(c) it was decided a while back that we don't care about whether the copyrights in about dialogs are meaningful, since they can't hope to encompass everyone who holds copyrights on the application code or any of the libraries it is linked to; the copyright headers in the source files are the important ones.

I realise that I'm reverting more than necessary, but that's just a reason for breaking up commits :-)

CCMAIL: kamikazow@web.de
CCMAIL: kde-licensing@kde.org


svn path=/trunk/KDE/kdebase/apps/; revision=1154884
This commit is contained in:
Alex Merry 2010-07-26 13:07:14 +00:00
parent e86be0ca58
commit c3086a56e1
3 changed files with 10 additions and 10 deletions

View file

@ -36,10 +36,10 @@ KDE_EXPORT int kdemain(int argc, char **argv)
"1.5",
ki18nc("@title", "File Manager"),
KAboutData::License_GPL,
ki18nc("@info:credit", "Copyright © 20062011 Dolphin authors"));
ki18nc("@info:credit", "(C) 2006-2010 Peter Penz"));
about.setHomepage("http://dolphin.kde.org");
about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
ki18nc("@info:credit", "Maintainer and lead developer"),
ki18nc("@info:credit", "Maintainer and developer"),
"peter.penz@gmx.at");
about.addAuthor(ki18nc("@info:credit", "David Faure"),
ki18nc("@info:credit", "Developer"),

View file

@ -1,19 +1,19 @@
/*******************************************************************
* main.cpp
*
*
* 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
* 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, see <http://www.gnu.org/licenses/>.
*
*
******************************************************************/
#include <QtCore/QDir>
@ -33,7 +33,7 @@ int main( int argc, char ** argv )
{
KAboutData aboutData( "kfind", "kfindpart", ki18n("KFind"),
KFIND_VERSION, ki18n(description), KAboutData::License_GPL,
ki18n("Copyright © 19982011 KFind authors"));
ki18n("(c) 1998-2003, The KDE Developers"));
aboutData.addAuthor(ki18n("Eric Coquelle"), ki18n("Current Maintainer"), "coquelle@caramail.com");
aboutData.addAuthor(ki18n("Mark W. Webb"), ki18n("Developer"), "markwebb@adelphia.net");

View file

@ -624,8 +624,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KAboutData aboutData ( "kwrite", 0,
ki18n("KWrite"),
KDE_VERSION_STRING,
ki18n( "KWrite Text Editor" ), KAboutData::License_LGPL_V2,
ki18n( "Copyright © 20002011 The Kate authors" ), KLocalizedString(), "http://www.kate-editor.org" );
ki18n( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
ki18n( "(c) 2000-2010 The Kate Authors" ), KLocalizedString(), "http://www.kate-editor.org" );
aboutData.addAuthor (ki18n("Christoph Cullmann"), ki18n("Maintainer"), "cullmann@kde.org", "http://www.babylon2k.de");
aboutData.addAuthor (ki18n("Anders Lund"), ki18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk");
aboutData.addAuthor (ki18n("Joseph Wenninger"), ki18n("Core Developer"), "jowenn@kde.org","http://stud3.tuwien.ac.at/~e9925371");