Merge branch 'Applications/15.12'

CMakeLists.txt

@@ -3,8 +3,8 @@ project(Konsole)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "15")
-set (KDE_APPLICATIONS_VERSION_MINOR "08")
-set (KDE_APPLICATIONS_VERSION_MICRO "999")
+set (KDE_APPLICATIONS_VERSION_MINOR "12")
+set (KDE_APPLICATIONS_VERSION_MICRO "0")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 # minimal requirements

desktop/konsole.notifyrc

@@ -423,7 +423,7 @@ Comment[wa]=Cloke ki sone divins ene nén veyåve session
 Comment[x-test]=xxBell emitted within a non-visible sessionxx
 Comment[zh_CN]=不可见会话中发生的响铃
 Comment[zh_TW]=非可見工作階段中的響鈴行為
-Sound=KDE-Sys-App-Message.ogg
+Sound=Oxygen-Sys-App-Message.ogg
 Action=Popup
 
 [Event/Activity]

src/main.cpp

@@ -81,6 +81,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char** argv)
         }
     }
 
+    KLocalizedString::setApplicationDomain("konsole");
+
     KAboutData about(QStringLiteral("konsole"),
                      i18nc("@title", "Konsole"),
                      QStringLiteral(KONSOLE_VERSION),