Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 3f26bbb579023d8bb1c6007cb93ade908a70cc84..cfaaa7480f526deda57d3413243ec7eda36b258d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,14 +33,20 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.6.9",
+                     "2.1",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006-2011 Peter Penz"));
+                     ki18nc("@info:credit", "(C) 2006-2012 Peter Penz and Frank Reininghaus"));
     about.setHomepage("http://dolphin.kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
+                    ki18nc("@info:credit", "Maintainer (since 2012) and developer"),
+                    "frank78ac@googlemail.com");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
-                    ki18nc("@info:credit", "Maintainer and developer"),
+                    ki18nc("@info:credit", "Maintainer and developer (2006-2012)"),
                     "peter.penz19@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Sebastian Trüg"),
+                    ki18nc("@info:credit", "Developer"),
+                    "trueg@kde.org"),
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
@@ -77,8 +83,6 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     KCmdLineArgs::addCmdLineOptions(options);
 
     DolphinApplication app;
-    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
-
     if (app.isSessionRestored()) {
         app.restoreSession();
     }