diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
| commit | 01e4f60a0931aba506b184d384a4e2f926b2233c (patch) | |
| tree | 902da94d4ed035af9da2aea537708cdc2ea14d9c /src/main.cpp | |
| parent | cd601a582d5454dfa1818bae7e50864e9bece575 (diff) | |
| parent | a75e81ca01ea61c615582e93ceed69398967831e (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index c7c863e32..ca047bd16 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,10 +38,13 @@ KDE_EXPORT int kdemain(int argc, char **argv) "4.60", ki18nc("@title", "File Manager"), K4AboutData::License_GPL, - ki18nc("@info:credit", "(C) 2006-2014 Peter Penz and Frank Reininghaus")); + ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); about.setHomepage("http://dolphin.kde.org"); + about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"), + ki18nc("@info:credit", "Maintainer (since 2014) and developer"), + "[email protected]"); about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"), - ki18nc("@info:credit", "Maintainer (since 2012) and developer"), + ki18nc("@info:credit", "Maintainer (2012-2014) and developer"), about.addAuthor(ki18nc("@info:credit", "Peter Penz"), ki18nc("@info:credit", "Maintainer and developer (2006-2012)"), @@ -52,9 +55,6 @@ KDE_EXPORT int kdemain(int argc, char **argv) about.addAuthor(ki18nc("@info:credit", "David Faure"), ki18nc("@info:credit", "Developer"), - about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"), - ki18nc("@info:credit", "Developer"), - "[email protected]"); about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"), ki18nc("@info:credit", "Developer"), |