[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase
From: Martin Tobias Holmedahl Sandsmark <sandsmark () samfundet ! no>
Date: 2010-07-26 16:42:15
Message-ID: 20100726164215.C145BAC854 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1154990 by sandsmark:
Re-revert hodge-podge commits by `markuss` with bogus or without commit messages.
(White space changes, breaking of copyright headers,
fudging of dates in copyright notices, re-assignments
of copyrights to fictitious entities, and more.)
Commits reverted:
markuss * r1154942 runtime/trunk/KDE/kdebase/runtime/kdesu/FAQ:
markuss * r1154943 workspace/trunk/KDE/kdebase/workspace/plasma/README:
markuss * r1154952 apps/trunk/KDE/kdebase/apps/dolphin/src/main.cpp:
markuss * r1154953 apps/trunk/KDE/kdebase/apps/kfind/main.cpp:
markuss * r1154955 apps/trunk/KDE/kdebase/apps/konsole/src/main.cpp:
markuss * r1154956 apps/trunk/KDE/kdebase/apps/kwrite/kwritemain.cpp:
markuss * r1154957 runtime/trunk/KDE/kdebase/runtime/kcmshell/main.cpp:
markuss * r1154958 runtime/trunk/KDE/kdebase/runtime/kde-menu/kde-menu.cpp:
markuss * r1154960 runtime/trunk/KDE/kdebase/runtime/kdesu/kdesu/kdesu.cpp:
markuss * r1154961 runtime/trunk/KDE/kdebase/runtime/kquitapp/kquitapp.cpp:
markuss * r1154962 workspace/trunk/KDE/kdebase/workspace/kinfocenter/main.cpp:
markuss * r1154963 workspace/trunk/KDE/kdebase/workspace/klipper/klipper.cpp:
markuss * r1154965 workspace/trunk/KDE/kdebase/workspace/powerdevil/ (3 files in 2 \
dirs): markuss * r1154969 \
workspace/trunk/KDE/kdebase/workspace/systemsettings/app/main.cpp:
M +2 -2 apps/dolphin/src/main.cpp
M +1 -1 apps/kfind/main.cpp
M +1 -2 apps/konsole/src/main.cpp
M +2 -2 apps/kwrite/kwritemain.cpp
M +1 -1 runtime/kcmshell/main.cpp
M +1 -1 runtime/kde-menu/kde-menu.cpp
M +4 -0 runtime/kdesu/FAQ
M +1 -1 runtime/kdesu/kdesu/kdesu.cpp
M +1 -1 runtime/kquitapp/kquitapp.cpp
M +1 -1 workspace/kinfocenter/main.cpp
M +3 -5 workspace/klipper/klipper.cpp
M +1 -1 workspace/plasma/README
M +2 -2 workspace/powerdevil/daemon/PowerDevilDaemon.cpp
M +4 -4 workspace/powerdevil/kcmodule/PowerDevilKCM.cpp
M +1 -1 workspace/powerdevil/kcmodule/powerdevilconfig.desktop
M +1 -1 workspace/systemsettings/app/main.cpp
--- trunk/KDE/kdebase/apps/dolphin/src/main.cpp #1154989:1154990
@@ -36,10 +36,10 @@
"1.5",
ki18nc("@title", "File Manager"),
KAboutData::License_GPL,
- ki18nc("@info:credit", "Copyright 2006–2010 Peter Penz"));
+ 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"),
--- trunk/KDE/kdebase/apps/kfind/main.cpp #1154989:1154990
@@ -33,7 +33,7 @@
{
KAboutData aboutData( "kfind", "kfindpart", ki18n("KFind"),
KFIND_VERSION, ki18n(description), KAboutData::License_GPL,
- ki18n("Copyright 1998–2003 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");
--- trunk/KDE/kdebase/apps/konsole/src/main.cpp #1154989:1154990
@@ -51,8 +51,7 @@
ki18n("Konsole"),
KONSOLE_VERSION,
ki18n("Terminal emulator"),
- KAboutData::License_GPL_V2,
- ki18n("Copyright 2006–2011 Konsole authors")
+ KAboutData::License_GPL_V2
);
fillAboutData(about);
--- trunk/KDE/kdebase/apps/kwrite/kwritemain.cpp #1154989:1154990
@@ -624,8 +624,8 @@
KAboutData aboutData ( "kwrite", 0,
ki18n("KWrite"),
KDE_VERSION_STRING,
- ki18n( "KWrite – Text Editor" ), \
KAboutData::License_LGPL_V2,
- ki18n( "Copyright 2000–2010 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");
--- trunk/KDE/kdebase/runtime/kcmshell/main.cpp #1154989:1154990
@@ -167,7 +167,7 @@
0,
ki18n("A tool to start single KDE control modules"),
KAboutData::License_GPL,
- ki18n("Copyright 1999–2004, KCMShell authors") );
+ ki18n("(c) 1999-2004, The KDE Developers") );
aboutData.addAuthor(ki18n("Frans Englich"), ki18n("Maintainer"), \
"frans.englich@kde.org");
aboutData.addAuthor(ki18n("Daniel Molkentin"), KLocalizedString(), \
"molkentin@kde.org");
--- trunk/KDE/kdebase/runtime/kde-menu/kde-menu.cpp #1154989:1154990
@@ -110,7 +110,7 @@
KAboutData d(appName, "kde-menu", ki18n("kde-menu"), appVersion,
ki18n(description),
- KAboutData::License_GPL, ki18n("Copyright 2003 Waldo Bastian"));
+ KAboutData::License_GPL, ki18n("(c) 2003 Waldo Bastian"));
d.addAuthor(ki18n("Waldo Bastian"), ki18n("Author"), "bastian@kde.org");
KCmdLineArgs::init(argc, argv, &d);
--- trunk/KDE/kdebase/runtime/kdesu/FAQ #1154989:1154990
@@ -1,3 +1,7 @@
+Q: On my SuSE system, KDE su does not compile. I get an error that some Qt
+ header files cannot be found.
+A: Install the package qtcompat.
+
Q: Is KDE su safe?
A: No program is 100% safe. However, KDE su is not setuid root and it
handles the password you enter with great care so it should be safe
--- trunk/KDE/kdebase/runtime/kdesu/kdesu/kdesu.cpp #1154989:1154990
@@ -85,7 +85,7 @@
KAboutData aboutData("kdesu", 0, ki18n("KDE su"),
Version, ki18n("Runs a program with elevated privileges."),
KAboutData::License_Artistic,
- ki18n("Copyright 1998-2000 Geert Jansen, Pietro Iglio"));
+ ki18n("Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"));
aboutData.addAuthor(ki18n("Geert Jansen"), ki18n("Maintainer"),
"jansen@kde.org", "http://www.stack.nl/~geertj/");
aboutData.addAuthor(ki18n("Pietro Iglio"), ki18n("Original author"),
--- trunk/KDE/kdebase/runtime/kquitapp/kquitapp.cpp #1154989:1154990
@@ -27,7 +27,7 @@
{
KAboutData aboutData( "kquitapp", 0, ki18n("Command-line application quitter"),
"1.0", ki18n("Quit a D-Bus enabled application easily"), \
KAboutData::License_GPL,
- ki18n("Copyright 2006 Aaron Seigo") );
+ ki18n("(c) 2006, Aaron Seigo") );
aboutData.addAuthor(ki18n("Aaron J. Seigo"), ki18n("Current maintainer"), \
"aseigo@kde.org"); KCmdLineArgs::init(argc, argv, &aboutData);
--- trunk/KDE/kdebase/workspace/kinfocenter/main.cpp #1154989:1154990
@@ -39,7 +39,7 @@
KAboutData aboutKInfoCenter( "kinfocenter", 0, ki18n("KDE Info Center"),
KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL,
- ki18n("Copyright 2009–2010, The KDE Info Center authors"));
+ ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team"));
QByteArray argv_0 = argv[0];
KAboutData *aboutData = &aboutKInfoCenter;
--- trunk/KDE/kdebase/workspace/klipper/klipper.cpp #1154989:1154990
@@ -1042,11 +1042,9 @@
{
m_about_data = new KAboutData("klipper", 0, ki18n("Klipper"),
klipper_version, ki18n(description), KAboutData::License_GPL,
- ki18n("Copyright 1998, Andrew Stanley-Jones\n"
- "Copyright 1998–2002, Carsten Pfeiffer\n"
- "Copyright 2001, Patrick Dubroy\n"
- "Copyright 1998–2010 various other Klipper authors"
- ));
+ ki18n("(c) 1998, Andrew Stanley-Jones\n"
+ "1998-2002, Carsten Pfeiffer\n"
+ "2001, Patrick Dubroy"));
m_about_data->addAuthor(ki18n("Carsten Pfeiffer"),
ki18n("Author"),
--- trunk/KDE/kdebase/workspace/plasma/README #1154989:1154990
@@ -1,7 +1,7 @@
PLASMA
======
-This is the application that provides the panels and desktop work area in KDE SC 4.
+This is the application that provides the panels and desktop work area in KDE4.
Much of the functionality that the code here is based on resides in
workspace/libs/plasma/.
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp \
#1154989:1154990 @@ -139,8 +139,8 @@
KGlobal::locale()->insertCatalog("powerdevil");
KAboutData aboutData("powerdevil", "powerdevil", ki18n("PowerDevil"),
- POWERDEVIL_VERSION, ki18n("A Power Management tool"),
- KAboutData::License_GPL, ki18n("Copyright 2008 Dario \
Freddi"), + POWERDEVIL_VERSION, ki18n("A Power Management \
tool for KDE4"), + KAboutData::License_GPL, ki18n("(c) 2008 \
Dario Freddi"), KLocalizedString(), "http://www.kde.org");
aboutData.addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer"), "drf@kde.org",
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/PowerDevilKCM.cpp \
#1154989:1154990 @@ -51,9 +51,9 @@
KAboutData *about =
new KAboutData("kcmpowerdevil", "powerdevil", ki18n("PowerDevil \
Configuration"),
POWERDEVIL_VERSION, ki18n("A configurator for PowerDevil"),
- KAboutData::License_GPL, ki18n("Copyright 2008 Dario \
Freddi"), + KAboutData::License_GPL, ki18n("(c), 2008 Dario \
Freddi"),
ki18n("From this module, you can configure the Daemon, create \
"
- "and edit powersaving profiles, and see your system's "
+ "and edit powersaving profiles, and see your system's "
"capabilities."));
about->addAuthor(ki18n("Dario Freddi"), ki18n("Maintainer") , "drf@kde.org",
@@ -63,10 +63,10 @@
setQuickHelp(i18n("<h1>PowerDevil configuration</h1> <p>This module lets you \
configure "
"PowerDevil. PowerDevil is a daemon (so it runs in background) \
that is started "
- "upon startup.</p> <p>PowerDevil has two levels of \
configuration: a general one, " + "upon KDE startup.</p> \
<p>PowerDevil has 2 levels of configuration: a general one, "
"that is always applied, and a profile-based one, that lets \
you configure a specific "
"behavior in every situation. You can also have a look at your \
system capabilities in "
- "the last tab. To get you started, first configure the options \
in the first two tabs. " + "the last tab. To get you started, \
first configure the options in the first 2 tabs. "
"Then switch to the fourth one, and create/edit your profiles. \
Last but not least, "
"assign your profiles in the third Tab. You do not have to \
restart PowerDevil, just click " "\"Apply\", and you are done.</p>"));
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/powerdevilconfig.desktop \
#1154989:1154990 @@ -84,7 +84,7 @@
Name[zh_CN]=电源管理
Name[zh_TW]=電源管理
-Comment=Display brightness, suspend, and power profile settings
+Comment=Display brightness, suspend and power profile settings
Comment[x-test]=xxDisplay brightness, suspend, and power profile settingsxx
X-KDE-Keywords=system,power,power \
management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid
--- trunk/KDE/kdebase/workspace/systemsettings/app/main.cpp #1154989:1154990
@@ -33,7 +33,7 @@
{
// About data
KAboutData aboutData("systemsettings", 0, ki18n("System Settings"), "1.0", \
ki18n("Central configuration center for KDE."),
- KAboutData::License_GPL, ki18n("Copyright 2009 System \
Settings authors")); + KAboutData::License_GPL, ki18n("(c) \
2009, Ben Cooksley"));
aboutData.addAuthor(ki18n("Ben Cooksley"), ki18n("Maintainer"), \
"ben@eclipse.endoftheinternet.org");
aboutData.addAuthor(ki18n("Mathias Soeken"), ki18n("Developer"), \
"msoeken@informatik.uni-bremen.de");
aboutData.addAuthor(ki18n("Will Stephenson"), ki18n("Internal module \
representation, internal module model"), "wstephenson@kde.org");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic