Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index c7c863e325ba9c64a783d7d215007db5e1c6b2b2..ca047bd16c3be9122bde4035d77bbef4978d9fd6 100644 (file)
--- 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"),
+                    "emmanuelpescosta099@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
-                    ki18nc("@info:credit", "Maintainer (since 2012) and developer"),
+                    ki18nc("@info:credit", "Maintainer (2012-2014) and developer"),
                     "frank78ac@googlemail.com");
     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"),
                     "faure@kde.org");
-    about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
-                    ki18nc("@info:credit", "Developer"),
-                    "emmanuelpescosta099@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");