From 8b67eda6c3621783778261f8ea9ced1e19c6e029 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Nov 2018 07:27:44 +0100 Subject: [PATCH 1/3] GIT_SILENT made messages (after extraction) --- src/data/org.kde.kmail2.appdata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/org.kde.kmail2.appdata.xml b/src/data/org.kde.kmail2.appdata.xml index d287beaa0..35de568c8 100644 --- a/src/data/org.kde.kmail2.appdata.xml +++ b/src/data/org.kde.kmail2.appdata.xml @@ -12,6 +12,7 @@ La comunidad de KDE La communauté KDE A comunidade de KDE + La comunità KDE De KDE gemeenschap A Comunidade do KDE KDE-gemenskapen @@ -155,6 +156,7 @@
  • Integrated - Meeting invitations can be easily added as events into KOrganizer, address auto-completion, avatars and crypto preferences are loaded from KAddressBook.
  • Integrado - Las invitaciones a reuniones pueden añadirse fácilmente como eventos en KOrganizer, el autocompletado de direcciones, avatares y preferencias de cifrado se cargan desde KAddressBook.
  • Integrado — As invitacións a reunións poden engadirse facilmente como eventos a KOrganizer, permite completar automaticamente enderezos, e carta as imaxes de usuario e as preferencias criptográficas de KAddressBook.
    • +
  • Integrato - gli inviti alle riunioni possono essere aggiunti in modo semplice come eventi in KOrganizer, mentre il completamento automatico degli indirizzi, gli avatar e le preferenze di cifratura sono caricati da KAddressBook.
  • Geïntegreerd - invitaties voor bijeenkomsten kunnen gemakkelijk als afspraken in KOrganizer worden toegevoegd, automatisch aanvullen van adressen, avatars en voorkeuren voor versleuteling worden geladen uit KAddressBook.
  • Integrado - Os convites para reuniões podem ser facilmente adicionados como eventos ao KOrganizer; as definições de completação automática de endereços, avatars e encriptação são carregadas a partir do KAddressBook.
  • Integrerat: Mötesinbjudan kan enkelt läggas till som händelser i Korganizer, automatisk komplettering av adresser, avatarer och kryptoinställningar läses in från adressboken.
    • From 4e18c96715080752a7c615bd248d4a0acc847f93 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 22 Nov 2018 08:20:30 +0100 Subject: [PATCH 2/3] GIT_SILENT: prepare 5.10rc --- CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d92985058..f618676a7 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.9.80") -set(AKONADI_CONTACT_VERSION "5.9.80") -set(KCONTACTS_LIB_VERSION "5.9.80") -set(KCALENDARCORE_LIB_VERSION "5.9.80") -set(CALENDARUTILS_LIB_VERSION "5.9.80") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.9.80") -set(KLDAP_LIB_VERSION "5.9.80") -set(KMAILTRANSPORT_LIB_VERSION "5.9.80") -set(KONTACTINTERFACE_LIB_VERSION "5.9.80") -set(KMIME_LIB_VERSION "5.9.80") -set(KPIMTEXTEDIT_LIB_VERSION "5.9.80") -set(AKONADI_VERSION "5.9.80") -set(KTNEF_LIB_VERSION "5.9.80") +set(AKONADI_MIMELIB_VERSION "5.9.90") +set(AKONADI_CONTACT_VERSION "5.9.90") +set(KCONTACTS_LIB_VERSION "5.9.90") +set(KCALENDARCORE_LIB_VERSION "5.9.90") +set(CALENDARUTILS_LIB_VERSION "5.9.90") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.9.90") +set(KLDAP_LIB_VERSION "5.9.90") +set(KMAILTRANSPORT_LIB_VERSION "5.9.90") +set(KONTACTINTERFACE_LIB_VERSION "5.9.90") +set(KMIME_LIB_VERSION "5.9.90") +set(KPIMTEXTEDIT_LIB_VERSION "5.9.90") +set(AKONADI_VERSION "5.9.90") +set(KTNEF_LIB_VERSION "5.9.90") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -63,18 +63,18 @@ set(QT_REQUIRED_VERSION "5.9.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.9.80") -set(MAILCOMMON_LIB_VERSION_LIB "5.9.80") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.9.80") -set(MESSAGELIB_LIB_VERSION_LIB "5.9.80") -set(LIBKLEO_LIB_VERSION_LIB "5.9.80") -set(PIMCOMMON_LIB_VERSION_LIB "5.9.80") -set(LIBKDEPIM_LIB_VERSION_LIB "5.9.80") -set(LIBKSIEVE_LIB_VERSION_LIB "5.9.80") +set(LIBGRAVATAR_VERSION_LIB "5.9.90") +set(MAILCOMMON_LIB_VERSION_LIB "5.9.90") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.9.90") +set(MESSAGELIB_LIB_VERSION_LIB "5.9.90") +set(LIBKLEO_LIB_VERSION_LIB "5.9.90") +set(PIMCOMMON_LIB_VERSION_LIB "5.9.90") +set(LIBKDEPIM_LIB_VERSION_LIB "5.9.90") +set(LIBKSIEVE_LIB_VERSION_LIB "5.9.90") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.9.80" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.9.90" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set(GPGMEPP_LIB_VERSION "1.8.0") From 625312f9c1188e3f2e4c2982bfabe82479f7ec7c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 22 Nov 2018 22:55:50 +0100 Subject: [PATCH 3/3] Fix mem leak --- src/editor/kmcomposercreatenewcomposerjob.cpp | 2 +- src/editor/kmcomposerupdatetemplatejob.cpp | 2 +- src/editor/kmcomposerwin.cpp | 3 +-- src/job/composenewmessagejob.cpp | 2 +- src/job/fillcomposerjob.cpp | 2 +- src/job/handleclickedurljob.cpp | 2 +- src/job/newmessagejob.cpp | 2 +- src/job/opencomposerhiddenjob.cpp | 2 +- src/kmmainwidget.cpp | 8 ++++---- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/editor/kmcomposercreatenewcomposerjob.cpp b/src/editor/kmcomposercreatenewcomposerjob.cpp index ce2522fc2..e3f824afa 100644 --- a/src/editor/kmcomposercreatenewcomposerjob.cpp +++ b/src/editor/kmcomposercreatenewcomposerjob.cpp @@ -40,7 +40,7 @@ void KMComposerCreateNewComposerJob::start() mMsg = KMime::Message::Ptr(new KMime::Message()); MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager(), mCurrentIdentity); - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerCreateNewComposerJob::slotCreateNewComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); parser->process(mMsg, mCollectionForNewMessage.id()); diff --git a/src/editor/kmcomposerupdatetemplatejob.cpp b/src/editor/kmcomposerupdatetemplatejob.cpp index 4a57b48f5..0142ebf5a 100644 --- a/src/editor/kmcomposerupdatetemplatejob.cpp +++ b/src/editor/kmcomposerupdatetemplatejob.cpp @@ -37,7 +37,7 @@ KMComposerUpdateTemplateJob::~KMComposerUpdateTemplateJob() void KMComposerUpdateTemplateJob::start() { - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerUpdateTemplateJob::slotFinished); parser->setSelection(mTextSelection); parser->setAllowDecryption(true); diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 945665e60..df39b57e5 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -343,7 +343,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState mSplitter->addWidget(mSnippetSplitter); QWidget *editorAndCryptoStateIndicators = new QWidget(mSplitter); - mCryptoStateIndicatorWidget = new CryptoStateIndicatorWidget; + mCryptoStateIndicatorWidget = new CryptoStateIndicatorWidget(this); mCryptoStateIndicatorWidget->setShowAlwaysIndicator(KMailSettings::self()->showCryptoLabelIndicator()); QVBoxLayout *vbox = new QVBoxLayout(editorAndCryptoStateIndicators); @@ -824,7 +824,6 @@ void KMComposerWin::rethinkFields(bool fromSlot, bool forceAllHeaders) QWidget *prevFocus = mEdtFrom; - mGrid->addWidget(mComposerBase->recipientsEditor(), row, 0, 1, 2); ++row; connect(mEdtFrom, &MessageComposer::ComposerLineEdit::focusDown, mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::setFocusTop); diff --git a/src/job/composenewmessagejob.cpp b/src/job/composenewmessagejob.cpp index ff08bd319..a14ef2b59 100644 --- a/src/job/composenewmessagejob.cpp +++ b/src/job/composenewmessagejob.cpp @@ -46,7 +46,7 @@ void ComposeNewMessageJob::start() mIdentity = mFolder ? mFolder->identity() : 0; MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager(), mIdentity); - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &ComposeNewMessageJob::slotOpenComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); if (mFolder) { diff --git a/src/job/fillcomposerjob.cpp b/src/job/fillcomposerjob.cpp index 27797cb04..49d5f0386 100644 --- a/src/job/fillcomposerjob.cpp +++ b/src/job/fillcomposerjob.cpp @@ -63,7 +63,7 @@ void FillComposerJob::start() mMsg->setBody(mSettings.mBody.toUtf8()); slotOpenComposer(); } else { - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &FillComposerJob::slotOpenComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); parser->process(KMime::Message::Ptr()); diff --git a/src/job/handleclickedurljob.cpp b/src/job/handleclickedurljob.cpp index 060bc53e4..43914c6c3 100644 --- a/src/job/handleclickedurljob.cpp +++ b/src/job/handleclickedurljob.cpp @@ -70,7 +70,7 @@ void HandleClickedUrlJob::start() //TODO } - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &HandleClickedUrlJob::slotOpenComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); parser->process(mMsg, mCurrentCollection.id()); diff --git a/src/job/newmessagejob.cpp b/src/job/newmessagejob.cpp index c3ad4ba50..1f72d0de4 100644 --- a/src/job/newmessagejob.cpp +++ b/src/job/newmessagejob.cpp @@ -56,7 +56,7 @@ void NewMessageJob::start() mMsg->assemble(); mCollection = mNewMessageJobSettings.mCurrentCollection; - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &NewMessageJob::slotOpenComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); parser->process(mMsg, mCollection.id()); diff --git a/src/job/opencomposerhiddenjob.cpp b/src/job/opencomposerhiddenjob.cpp index 5126c4233..f8e25eb29 100644 --- a/src/job/opencomposerhiddenjob.cpp +++ b/src/job/opencomposerhiddenjob.cpp @@ -58,7 +58,7 @@ void OpenComposerHiddenJob::start() mMsg->setBody(mSettings.mBody.toUtf8()); slotOpenComposer(); } else { - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &OpenComposerHiddenJob::slotOpenComposer); parser->setIdentityManager(KMKernel::self()->identityManager()); parser->process(KMime::Message::Ptr()); diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index e1e82ce56..d35cc9bda 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -4666,8 +4666,8 @@ void KMMainWidget::slotChangeDisplayMessageFormat(MessageViewer::Viewer::Display mFolderDisplayFormatPreference = format; //Update mPrefererHtmlLoadExtAction - const bool useHtml = (mFolderDisplayFormatPreference == MessageViewer::Viewer::Html || - (mHtmlGlobalSetting && mFolderDisplayFormatPreference == MessageViewer::Viewer::UseGlobalSetting)); + const bool useHtml = (mFolderDisplayFormatPreference == MessageViewer::Viewer::Html + || (mHtmlGlobalSetting && mFolderDisplayFormatPreference == MessageViewer::Viewer::UseGlobalSetting)); mPreferHtmlLoadExtAction->setEnabled(useHtml); if (mMsgView) { @@ -4840,9 +4840,9 @@ void KMMainWidget::setupUnifiedMailboxChecker() } const auto answer = KMessageBox::questionYesNo( - this, i18n("You have more than one email account set up. Do you want to enable the Unified Mailbox feature to " + this, i18n("You have more than one email account set up.\nDo you want to enable the Unified Mailbox feature to " "show unified content of your inbox, sent and drafts folders?\n" - "You can configure unified mailboxes, create custom ones or disable the feature completely in KMail's Plugin settings."), + "You can configure unified mailboxes, create custom ones or\ndisable the feature completely in KMail's Plugin settings."), i18n("Enable Unified Mailboxes?"), KGuiItem(i18n("Enable Unified Mailboxes"), QStringLiteral("dialog-ok")), KGuiItem(i18n("Cancel"), QStringLiteral("dialog-cancel")));