From dd7df1004032797a6bdb741cd4981bec897ca3b1 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 9 May 2019 13:53:52 +0200 Subject: [PATCH 1/5] GIT_SILENT: Prepare 5.11.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c61aa1ff..59784b5db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.11.1") +set(KDEPIM_VERSION_NUMBER "5.11.2") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From dfbf25a02a212f7c78119c7b3bf51b81fe18cafd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 11 May 2019 09:07:20 +0200 Subject: [PATCH 2/5] 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/kmail2.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index 53a414404..d67623f04 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -348,6 +348,7 @@ Name[ca]=És impossible enviar el correu Name[ca@valencia]=És impossible enviar el correu Name[en_GB]=Impossible to send email Name[es]=No es posible enviar correo +Name[fi]=Sähköpostin lähettäminen on mahdotonta Name[fr]=Impossible d'envoyer le courrier électronique Name[gl]=Non se pode enviar a mensaxe Name[it]=Impossibile inviare il messaggio di posta @@ -363,6 +364,7 @@ Comment[ca]=Problema durant l'enviament del correu Comment[ca@valencia]=Problema durant l'enviament del correu Comment[en_GB]=Problem during send mail Comment[es]=Problema al enviar correo +Comment[fi]=Ongelma lähetettäessä sähköpostia Comment[fr]=Problème lors de l'envoi du courrier électronique Comment[gl]=Problema ao enviar o correo Comment[it]=Problema durante l'invio della posta From 89e31c897b7405c2e201a42559bd49891dc95384 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 21 May 2019 07:21:49 +0200 Subject: [PATCH 3/5] GIT_SILENT: Prepare 5.11.2 --- CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59784b5db..17e8a250b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,19 +42,19 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") -set(AKONADI_MIMELIB_VERSION "5.11.1") -set(AKONADI_CONTACT_VERSION "5.11.1") -set(KCONTACTS_LIB_VERSION "5.11.1") -set(KCALENDARCORE_LIB_VERSION "5.11.1") -set(CALENDARUTILS_LIB_VERSION "5.11.1") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.1") -set(KLDAP_LIB_VERSION "5.11.1") -set(KMAILTRANSPORT_LIB_VERSION "5.11.1") -set(KONTACTINTERFACE_LIB_VERSION "5.11.1") -set(KMIME_LIB_VERSION "5.11.1") -set(KPIMTEXTEDIT_LIB_VERSION "5.11.1") -set(AKONADI_VERSION "5.11.1") -set(KTNEF_LIB_VERSION "5.11.1") +set(AKONADI_MIMELIB_VERSION "5.11.2") +set(AKONADI_CONTACT_VERSION "5.11.2") +set(KCONTACTS_LIB_VERSION "5.11.2") +set(KCALENDARCORE_LIB_VERSION "5.11.2") +set(CALENDARUTILS_LIB_VERSION "5.11.2") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.2") +set(KLDAP_LIB_VERSION "5.11.2") +set(KMAILTRANSPORT_LIB_VERSION "5.11.2") +set(KONTACTINTERFACE_LIB_VERSION "5.11.2") +set(KMIME_LIB_VERSION "5.11.2") +set(KPIMTEXTEDIT_LIB_VERSION "5.11.2") +set(AKONADI_VERSION "5.11.2") +set(KTNEF_LIB_VERSION "5.11.2") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -63,18 +63,18 @@ set(QT_REQUIRED_VERSION "5.10.0") option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) -set(LIBGRAVATAR_VERSION_LIB "5.11.1") -set(MAILCOMMON_LIB_VERSION_LIB "5.11.1") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.1") -set(MESSAGELIB_LIB_VERSION_LIB "5.11.1") -set(LIBKLEO_LIB_VERSION_LIB "5.11.1") -set(PIMCOMMON_LIB_VERSION_LIB "5.11.1") -set(LIBKDEPIM_LIB_VERSION_LIB "5.11.1") -set(LIBKSIEVE_LIB_VERSION_LIB "5.11.1") +set(LIBGRAVATAR_VERSION_LIB "5.11.2") +set(MAILCOMMON_LIB_VERSION_LIB "5.11.2") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.2") +set(MESSAGELIB_LIB_VERSION_LIB "5.11.2") +set(LIBKLEO_LIB_VERSION_LIB "5.11.2") +set(PIMCOMMON_LIB_VERSION_LIB "5.11.2") +set(LIBKDEPIM_LIB_VERSION_LIB "5.11.2") +set(LIBKSIEVE_LIB_VERSION_LIB "5.11.2") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.11.1" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.11.2" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set(GPGMEPP_LIB_VERSION "1.8.0") From 7d5a10d6bfecd1e5f76b0195b5516f765386a5d7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 May 2019 08:46:19 +0200 Subject: [PATCH 4/5] 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/kmail2.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index d67623f04..0d14d36db 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -346,6 +346,7 @@ Action=Popup Name=Impossible to send email Name[ca]=És impossible enviar el correu Name[ca@valencia]=És impossible enviar el correu +Name[de]=Nachrichten kann nicht versendet werden Name[en_GB]=Impossible to send email Name[es]=No es posible enviar correo Name[fi]=Sähköpostin lähettäminen on mahdotonta @@ -362,6 +363,7 @@ Name[x-test]=xxImpossible to send emailxx Comment=Problem during send mail Comment[ca]=Problema durant l'enviament del correu Comment[ca@valencia]=Problema durant l'enviament del correu +Comment[de]=Probleme beim Versenden der E-Mail Comment[en_GB]=Problem during send mail Comment[es]=Problema al enviar correo Comment[fi]=Ongelma lähetettäessä sähköpostia From 0a424812893a65b924dbe157a49e87b56b939b46 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 27 May 2019 07:29:28 +0200 Subject: [PATCH 5/5] Bug 407967 - new mail: cursor jumps into blindcarboncopy FIXED-IN: 5.11.2 BUG: 407967 --- src/editor/kmcomposerwin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 400979960..3a07681fe 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -492,7 +492,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState setMessage(aMsg, lastSignState, lastEncryptState); } - mComposerBase->recipientsEditor()->setFocus(); + mComposerBase->recipientsEditor()->setFocusBottom(); composerEditorNg->composerActions()->updateActionStates(); // set toolbar buttons to correct values mDone = true;