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

Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	plasma/applets/folderview/folderview.cpp

diff --cc src/main.cpp
index c7c863e325ba9c64a783d7d215007db5e1c6b2b2,3ce3204e9b95909954f2b235a41e4fa82e52d7b0..ca047bd16c3be9122bde4035d77bbef4978d9fd6
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -33,15 -31,18 +33,18 @@@
  extern "C"
  KDE_EXPORT int kdemain(int argc, char **argv)
  {
 -    KAboutData about("dolphin", 0,
 +    K4AboutData about("dolphin", 0,
                       ki18nc("@title", "Dolphin"),
 -                     KDE_VERSION_STRING,
 +                     "4.60",
                       ki18nc("@title", "File Manager"),
 -                     KAboutData::License_GPL,
 +                     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)"),

diff --cc src/org.kde.dolphin.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphingeneral.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinnavigation.desktop
Simple merge

diff --cc src/statusbar/dolphinstatusbar.cpp
Simple merge