From a2c3e3609589f3e7b9ecf1678a914f96e3bd0879 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 29 Nov 2016 05:44:34 +0100
Subject: [PATCH 1/4] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 src/data/kmail_config_plugins.desktop | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop
index 7e5739e75..73105ed66 100644
--- a/src/data/kmail_config_plugins.desktop
+++ b/src/data/kmail_config_plugins.desktop
@@ -97,6 +97,10 @@ Comment[pl]=Wtyczki ustawień
 Comment[pt]='Plugins' de Configuração
 Comment[sk]=Pluginy nastavení
 Comment[sl]=Nastavi vstavke
+Comment[sr]=Прикључци за поставке
+Comment[sr@ijekavian]=Прикључци за поставке
+Comment[sr@ijekavianlatin]=Priključci za postavke
+Comment[sr@latin]=Priključci za postavke
 Comment[sv]=Inställningsinsticksprogram
 Comment[uk]=Додатки параметрів
 Comment[x-test]=xxSettings Pluginsxx
@@ -114,6 +118,10 @@ X-KDE-Keywords[pl]=kmail,wtyczki
 X-KDE-Keywords[pt]=kmail,plugins
 X-KDE-Keywords[sk]=kmail,pluginy
 X-KDE-Keywords[sl]=kmail,vstavki
+X-KDE-Keywords[sr]=kmail,plugins,К‑пошта,прикључци
+X-KDE-Keywords[sr@ijekavian]=kmail,plugins,К‑пошта,прикључци
+X-KDE-Keywords[sr@ijekavianlatin]=kmail,plugins,K‑pošta,priključci
+X-KDE-Keywords[sr@latin]=kmail,plugins,K‑pošta,priključci
 X-KDE-Keywords[sv]=kmail,insticksprogram
 X-KDE-Keywords[uk]=kmail,plugins,додатки,кмейл
 X-KDE-Keywords[x-test]=xxkmailxx,xxpluginsxx

From 4353c9b72d836df4bf9515da54edc408523a4eff Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Sat, 3 Dec 2016 08:05:23 +0100
Subject: [PATCH 2/4] GIT_SILENT: prepare 5.4.0

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d380c6d4..d53fd2289 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,14 +29,14 @@ include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 
 # Do NOT add quote
-set(KDEPIM_DEV_VERSION beta1)
+set(KDEPIM_DEV_VERSION )
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
     set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
-set(KDEPIM_VERSION_NUMBER "5.3.90")
+set(KDEPIM_VERSION_NUMBER "5.4.0")
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 

From a9bf0addb0c0d90fdb9c5e10cac1144468fb9106 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Dec 2016 04:34:47 +0100
Subject: [PATCH 3/4] GIT_SILENT made messages (after extraction)

---
 src/data/org.kde.kmail.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/org.kde.kmail.appdata.xml b/src/data/org.kde.kmail.appdata.xml
index f743b86d4..5c1421f9f 100644
--- a/src/data/org.kde.kmail.appdata.xml
+++ b/src/data/org.kde.kmail.appdata.xml
@@ -723,7 +723,7 @@
       <li xml:lang="nb">Kan erstatte tekst-smilefjes med emotikoner</li>
       <li xml:lang="nds">Kann för Text-Snuten Biller insetten</li>
       <li xml:lang="nl">Kan smilies in de tekst vervangen door emoticons</li>
-      <li xml:lang="pl">Możliwość zastępowania uśmieszków tekstowych emotikonami</li>
+      <li xml:lang="pl">Możliwość zastępowania buziek tekstowych emotikonami</li>
       <li xml:lang="pt">Pode substituir ícones emotivos de texto por gráficos</li>
       <li xml:lang="pt-BR">Substituição carinhas de texto por emoticons</li>
       <li xml:lang="sk">Vie nahradiť textové smajlíky emotikonmi</li>

From 792264dd666c3267eb461b32386776ff20093309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Tue, 6 Dec 2016 11:13:13 +0100
Subject: [PATCH 4/4] Make key generation dialog in Identity page modal

Prevents closing the identity dialog while key generation is in
progress, which lead to crash.
---
 src/identity/identitydialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/identity/identitydialog.cpp b/src/identity/identitydialog.cpp
index 7311ffa7e..f593c3570 100644
--- a/src/identity/identitydialog.cpp
+++ b/src/identity/identitydialog.cpp
@@ -265,7 +265,8 @@ void KeySelectionCombo::onCustomItemSelected(const QVariant &type)
         return;
     }  else if (type == QLatin1String("generate-new-key")) {
         auto job = new KeyGenerationJob(mName, mEmail, this);
-        new Kleo::ProgressDialog(job, i18n("Generating new key pair..."), parentWidget());
+        auto dlg = new Kleo::ProgressDialog(job, i18n("Generating new key pair..."), parentWidget());
+        dlg->setModal(true);
         setEnabled(false);
         connect(job, &KeyGenerationJob::done,
         this, [this]() {