From ab04158d823a8f352d1f4ef769cd48e2e735f7d8 Mon Sep 17 00:00:00 2001
From: Christoph Feck <cfeck@kde.org>
Date: Wed, 5 Dec 2018 00:32:23 +0100
Subject: [PATCH 1/3] GIT_SILENT Upgrade KDE Applications version to 18.12.0.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 126a365369..d52731e964 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "18")
-set (KDE_APPLICATIONS_VERSION_MINOR "11")
-set (KDE_APPLICATIONS_VERSION_MICRO "90")
+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}")
 project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
 

From 05437365e74d69cb8653b5b0f1d390bf7ffa3506 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 12 Dec 2018 07:47:04 +0100
Subject: [PATCH 2/3] GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 6797c6e1bf..1d293fa273 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -547,6 +547,7 @@
       <caption xml:lang="sv">Filhantering i Dolphin</caption>
       <caption xml:lang="uk">Керування файлами у Dolphin</caption>
       <caption xml:lang="x-test">xxFile management in Dolphinxx</caption>
+      <caption xml:lang="zh-CN">在 Dolphin 中管理文件</caption>
       <caption xml:lang="zh-TW">在 Dolphin 管理檔案</caption>
       <image>https://kde.org/images/screenshots/dolphin.png</image>
     </screenshot>

From f6549f08ea0797bcdf5d584ce41005a741db12cb Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Tue, 18 Dec 2018 22:03:16 -0700
Subject: [PATCH 3/3] Use correct icon for the "New Window" menu item

---
 src/dolphinmainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 3ff2ad1e92..cd4800b7dc 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1037,6 +1037,7 @@ void DolphinMainWindow::setupActions()
 
     QAction* newWindow = KStandardAction::openNew(this, &DolphinMainWindow::openNewMainWindow, actionCollection());
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
+    newWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
 
     QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab"));
     newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));