From 68396c90aeae1e2802f84d4e373df40b7207165c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 2 Dec 2017 08:17:39 +0100 Subject: [PATCH 1/8] GIT_SILENT: prepare 5.7.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f16e3d5a..f1263c7a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.6.90") +set(KDEPIM_VERSION_NUMBER "5.7.0") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) @@ -33,7 +33,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) # Do NOT add quote -set(KDEPIM_DEV_VERSION rc) +set(KDEPIM_DEV_VERSION ) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) From 648edc929a75d2701633eacde090fe9d539113b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Dec 2017 05:22:26 +0100 Subject: [PATCH 2/8] GIT_SILENT made messages (after extraction) --- src/data/org.kde.kmail2.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/data/org.kde.kmail2.appdata.xml b/src/data/org.kde.kmail2.appdata.xml index 087259581..61e04fb89 100644 --- a/src/data/org.kde.kmail2.appdata.xml +++ b/src/data/org.kde.kmail2.appdata.xml @@ -53,6 +53,7 @@ Sähköpostisovellus. Application de messagerie électronique Programma di posta elettronica + 이메일 프로그램 E-mailtoepassing Aplikacja pocztowa Aplicação de e-mail From 57beba92844a75d8e3d136291111457588fbeb8f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Dec 2017 06:15:01 +0100 Subject: [PATCH 3/8] 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" --- agents/archivemailagent/akonadi_archivemail_agent.notifyrc | 1 + .../akonadi_followupreminder_agent.notifyrc | 2 ++ agents/followupreminderagent/followupreminder.desktop | 2 ++ agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc | 4 ++++ agents/mailfilteragent/mailfilteragent.desktop | 2 ++ ktnef/src/org.kde.ktnef.desktop | 3 +++ src/data/dbusmail.desktop | 2 +- src/data/kmail2.notifyrc | 2 ++ src/data/kmail_config_plugins.desktop | 2 ++ src/data/org.kde.kmail2.desktop | 3 +++ src/kontactplugin/kmail/kcmkmailsummary.desktop | 1 + 11 files changed, 23 insertions(+), 1 deletion(-) diff --git a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc index 8de724d6f..b7bb11bd5 100644 --- a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc +++ b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc @@ -193,6 +193,7 @@ Name[gl]=O directorio non existe Name[hu]=A könyvtár nem létezik Name[ia]=Le directorio non existe Name[it]=La cartella non esiste +Name[ko]=디렉터리 서비스가 존재하지 않음 Name[nb]=Mappa finnes ikke Name[nds]=Gifft Orner nich Name[nl]=Map bestaat niet diff --git a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc index 154ae642b..67c3df308 100644 --- a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc +++ b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc @@ -17,6 +17,7 @@ Comment[hu]=Nyomkövető emlékeztető ügynök Comment[ia]=Agente de memorar de continuation (Followup Reminder Agent) Comment[it]=Agente per gli avvisi delle azioni da seguire Comment[kk]=Жауап беру туралы ескерту агенті +Comment[ko]=후속 작업 알림 에이전트 Comment[nb]=Agent for påminnelse om oppfølging Comment[nds]=Antwoortnaricht-Anstoothölper Comment[nl]=Agent voor herinneren aan vervolgactie @@ -52,6 +53,7 @@ Name[gl]=Recibiuse un seguimento de correo Name[hu]=Levél nyomkövető érkezett Name[ia]=Posta a continuar recipite Name[it]=Ricevuta risposta ad un messaggio seguito +Name[ko]=메일 후속 작업을 받음 Name[nb]=Oppfølgings-epost mottatt Name[nds]=Antwoortnaricht kregen Name[nl]=Ontvangen e-mailbericht van vervolgactie diff --git a/agents/followupreminderagent/followupreminder.desktop b/agents/followupreminderagent/followupreminder.desktop index b0ea7b2bf..c26cad308 100644 --- a/agents/followupreminderagent/followupreminder.desktop +++ b/agents/followupreminderagent/followupreminder.desktop @@ -16,6 +16,7 @@ Name[hu]=Nyomkövető emlékeztető ügynök Name[ia]=Followup Reminder Agent Name[it]=Agente per gli avvisi delle azioni da seguire Name[kk]=Жауап беру туралы ескерту агенті +Name[ko]=후속 작업 알림 에이전트 Name[nb]=Agent for påminnelse om oppfølging Name[nds]=Antwoortnaricht-Anstoothölper Name[nl]=Agent voor herinneren aan vervolgactie @@ -52,6 +53,7 @@ Comment[hu]=A Nyomkövető emlékeztető ügynök lehetővé teszi, hogy emléke Comment[ia]=Follorwup Reminder Agent permitte te de memorar te quando un message de e-posta esseva sin responsa. Comment[it]=L'agente per gli avvisi delle azioni da seguire permette di avvisarti quando un messaggio di posta non ha avuto una risposta. Comment[kk]=Жауап беру туралы ескерту агенті эл.поштаға жауап берілмегеніңізді ескереді. +Comment[ko]=후속 작업 알림 에이전트는 이메일에 답장을 보내지 않았을 때 알려 줍니다. Comment[nb]=Agenten for påminnelse om oppfølging kan minne deg om at det ikke er sendt svar på en e-post. Comment[nds]=De Antwoortnaricht-Anstoothölper stööt Di an, wenn Du op en Nettbreef noch nich antert hest. Comment[nl]=Agent voor herinneren aan vervolgactie stelt u in staat om u te herinneren aan een nog niet beantwoord e-mailbericht. diff --git a/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc b/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc index 74c0e22e0..318034525 100644 --- a/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc +++ b/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc @@ -19,6 +19,7 @@ Comment[ia]=Agente de filtro de posta Comment[it]=Agente per il filtraggio della posta Comment[kk]=Пошта сүзгіш агенті Comment[km]=ភ្នាក់ងារ​តម្រង​សំបុត្រ +Comment[ko]=메일 필터 마법사 Comment[lt]=El. pašto filtravimo agentas Comment[mr]=मेल गाळणी प्रतिनिधी Comment[nb]=E-post filteragent @@ -61,6 +62,7 @@ Name[ia]=Agente de filtro de posta Name[it]=Agente per il filtraggio della posta Name[kk]=Пошта сүзгіш агенті Name[km]=ភ្នាក់ងារ​ត្រង​សំបុត្រ +Name[ko]=메일 필터 마법사 Name[lt]=El. pašto filtravimo agentas Name[mr]=मेल गाळणी प्रतिनिधी Name[nb]=E-post filteragent @@ -105,6 +107,7 @@ Name[ia]=Registro de filtro de posta habilitate Name[it]=Log dei filtri di posta abilitato Name[kk]=Пошта сүзгіш агенті Name[km]=បាន​បើក​កំណត់ហេតុ​តម្រង​សំបុត្រ +Name[ko]=메일 필터 기록 사용함 Name[lt]=El. pašto filtravimo agentas Name[mr]=मेल गाळणी नोंद कार्यान्वित Name[nb]=E-post filterlogg slått på @@ -144,6 +147,7 @@ Name[fr]=Une erreur s'est produite lors du filtrage Name[gl]=Produciuse un erro ao filtrar Name[ia]=Un error occurreva durante le operation de filtrar Name[it]=Si è verificato un errore durante il filtraggio +Name[ko]=필터 중 오류 발생 Name[nb]=En feil oppsto under filtrering Name[nl]=Er is een fout opgetreden bij het filteren Name[pl]=Podczas filtrowania wystąpił błąd diff --git a/agents/mailfilteragent/mailfilteragent.desktop b/agents/mailfilteragent/mailfilteragent.desktop index 90bee3349..81b041fda 100644 --- a/agents/mailfilteragent/mailfilteragent.desktop +++ b/agents/mailfilteragent/mailfilteragent.desktop @@ -18,6 +18,7 @@ Name[ia]=Agente de filtro de posta Name[it]=Agente per il filtraggio della posta Name[kk]=Пошта сүзгіш агенті Name[km]=ភ្នាក់ងារ​ត្រង​សំបុត្រ +Name[ko]=메일 필터 마법사 Name[lt]=El. pašto filtravimo agentas Name[mr]=मेल गाळणी प्रतिनिधी Name[nb]=E-post filteragent @@ -59,6 +60,7 @@ Comment[ia]=Extension per filtrar messages de e-posta Comment[it]=Estensione per filtrare i messaggi di posta elettronica Comment[kk]=Эл.поштаны сузгілеу модулі Comment[km]=ផ្នែក​បន្ថែម​សម្រាប់​ត្រង​អ៊ីមែល +Comment[ko]=메일을 필터하는 확장 기능 Comment[lt]=Papildinys el. laiškų filtravimui Comment[mr]=इमेल्स गाळणी करण्याकरिता विस्तारण Comment[nb]=Utvidelse som filtrerer e-poster diff --git a/ktnef/src/org.kde.ktnef.desktop b/ktnef/src/org.kde.ktnef.desktop index 3fda92124..b1f3eb89c 100755 --- a/ktnef/src/org.kde.ktnef.desktop +++ b/ktnef/src/org.kde.ktnef.desktop @@ -28,6 +28,7 @@ Name[ja]=KTnef Name[ka]=KTnef Name[kk]=KTnef Name[km]=KTnef +Name[ko]=KTnef Name[lt]=KTnef Name[mr]=KTnef Name[ms]=KTnef @@ -72,6 +73,7 @@ GenericName[hu]=TNEF fájlmegjelenítő (az outlook által használt zárt form GenericName[ia]=Visor de file TNEF (formato proprietari usate per outlook) GenericName[it]=Visualizzatore di file TNEF (formato proprietario usato da Outlook) GenericName[kk]=TNEF файлын қарау құралы (Outlook-та қолданатын меншікті пішім) +GenericName[ko]=TNEF 파일 뷰어(Outlook에서 사용하는 형식) GenericName[nb]=TNEF filviser (godseid format som outlook bruker) GenericName[nds]=TNEF-Dateikieker (warflich Egenformaat vun Outlook) GenericName[nl]=TNEF Bestandsviewer (formaat met eigendomsrechten gebruikt door outlook) @@ -122,6 +124,7 @@ Comment[ja]=TNEF ファイルのためのビューア/展開ツール Comment[ka]= TNEF ფაილების ექსტრაქტორი/დამთვალიერებელი Comment[kk]=TNEF файдарды қарау/тарқату Comment[km]=កម្មវិធី​មើល/កម្មវិធី​ស្រង់​ចេញ​សម្រាប់​ឯកសារ TNEF +Comment[ko]=TNEF 파일 표시/내용 추출 Comment[lt]=TNEF failų žiūryklė, išskleidimo programa Comment[mr]=TNEF फाईल्स करिता प्रदर्शक/बाहेर काढणारा Comment[ms]=Pemapar/pengekstrak untuk fail TNEF diff --git a/src/data/dbusmail.desktop b/src/data/dbusmail.desktop index a9cc32f1e..c1aa09642 100644 --- a/src/data/dbusmail.desktop +++ b/src/data/dbusmail.desktop @@ -23,7 +23,7 @@ Comment[it]=Programma di posta con un'interfaccia D-Bus Comment[ja]=D-Bus インターフェースを持つメールクライアント Comment[kk]=DBUS интерфейсті пошта бағдарламасы Comment[km]=កម្មវិធី​សំបុត្រ​ដែល​មាន​ចំណុច​ប្រទាក់ D-BUS -Comment[ko]=DBUS 인터페이스를 사용하는 이메일 프로그램 +Comment[ko]=D-Bus 인터페이스를 사용하는 이메일 프로그램 Comment[lt]=Pašto programa su D-Bus sąsaja Comment[lv]=Pasta programma ar D-BUS saskarni Comment[mr]=DBus संवादासहीतचा मेल कार्यक्रम diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index ab187b504..79a9548de 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -452,6 +452,7 @@ Name[hu]=A levelek archiválása a mappában befejeződött Name[ia]=Action de archivar posta in dossier terminate Name[it]=Operazione di archiviazione della posta per cartelle completata Name[kk]=Поштаны қапшықта архивтеу аяқталды +Name[ko]=폴더 보관 완료 Name[nb]=Postarkiv fullført Name[nds]=Nettbreven na Orner archiveren afslaten Name[nl]=E-mail in map archiveren is gereed @@ -491,6 +492,7 @@ Name[hu]=Mappaarchiválási hiba Name[ia]=Error de archivo de dossier Name[it]=Errore nell'archiviazione per cartelle Name[kk]=Қапшық архивтеу қатесі +Name[ko]=폴더 보관 오류 Name[nb]=Feil i postarkiv Name[nds]=Orner-Archiveerfehler Name[nl]=fout in archiveren van map diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index fbf3cd4d5..49d9b8021 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -95,6 +95,7 @@ Comment[et]=Seadistusplugin Comment[fi]=Asetusliitännäiset Comment[fr]=Modules de paramètres Comment[it]=Estensioni per le impostazioni +Comment[ko]=설정 플러그인 Comment[nl]=Plug-ins voor instellingen Comment[pl]=Wtyczki ustawień Comment[pt]='Plugins' de Configuração @@ -122,6 +123,7 @@ X-KDE-Keywords[et]=kmail,pluginad X-KDE-Keywords[fi]=kmail,liitännäiset X-KDE-Keywords[fr]=kmail,modules X-KDE-Keywords[it]=kmail,estensioni +X-KDE-Keywords[ko]=kmail,plugins,플러그인 X-KDE-Keywords[nl]=kmail,plug-ins X-KDE-Keywords[pl]=kmail,wtyczki X-KDE-Keywords[pt]=kmail,plugins diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop index fd5147463..e7b976e97 100755 --- a/src/data/org.kde.kmail2.desktop +++ b/src/data/org.kde.kmail2.desktop @@ -165,6 +165,7 @@ Comment[fr]=Envoyez, recevez et gérez vos courriels avec KMail Comment[gl]=Enviar, recibir e xestionar o correo con KMail. Comment[ia]=Invia, recipe e gere tu e-posta con KMail Comment[it]=Invia, ricevi e gestisci la tua posta con KMail +Comment[ko]=KMail로 내 이메일을 보내고 받고 관리하기 Comment[nb]=Send. motta og hold styr på e-posten din med KMail Comment[nl]=Verzend, ontvang en beheer uw e-mail met KMail Comment[nn]=Send, ta imot og organiser dine e-postar med KMail @@ -207,6 +208,7 @@ Name[et]=Uus kiri Name[fi]=Uusi viesti Name[fr]=Nouveau message Name[it]=Nuovo messaggio +Name[ko]=새 메시지 Name[nl]=Nieuw bericht Name[pl]=Nowa wiadomość Name[pt]=Nova Mensagem @@ -238,6 +240,7 @@ Name[et]=E-posti kontrollimine Name[fi]=Tarkista posti Name[fr]=Relever le courriel Name[it]=Controlla posta +Name[ko]=메일 확인 Name[nl]=E-mail controleren Name[pl]=Sprawdź pocztę Name[pt]=Verificar o Correio diff --git a/src/kontactplugin/kmail/kcmkmailsummary.desktop b/src/kontactplugin/kmail/kcmkmailsummary.desktop index b0693aefd..f03511d9f 100644 --- a/src/kontactplugin/kmail/kcmkmailsummary.desktop +++ b/src/kontactplugin/kmail/kcmkmailsummary.desktop @@ -149,6 +149,7 @@ X-KDE-Keywords[ia]=e-posta,summario,configura,preferentias X-KDE-Keywords[it]=posta elettronica, sommario, configurazione, impostazioni X-KDE-Keywords[kk]=email, summary, configure, settings X-KDE-Keywords[km]=អ៊ីមែល សង្ខេប កំណត់​រចនាសម្ព័ន្ធ កំណត់ +X-KDE-Keywords[ko]=email, summary, configure, settings, 이메일, 요약, 설정 X-KDE-Keywords[lt]=el. paštas, santrauka, konfigūruoti, nuostatos X-KDE-Keywords[mr]=इमेल, सारांश, संयोजना, संयोजना X-KDE-Keywords[nb]=e-post,sammendrag,oppsett,innstillinger From cb8d0778e3772f8143a07c8007765e68fba936dc Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 4 Dec 2017 11:18:58 +0100 Subject: [PATCH 4/8] GIT_SILENT: prepare 5.7.0 --- CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1263c7a7..f2354dd41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,19 +43,19 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") -set(AKONADI_MIMELIB_VERSION "5.6.90") -set(AKONADI_CONTACT_VERSION "5.6.90") -set(KCONTACTS_LIB_VERSION "5.6.90") -set(KCALENDARCORE_LIB_VERSION "5.6.90") -set(CALENDARUTILS_LIB_VERSION "5.6.90") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.6.90") -set(KLDAP_LIB_VERSION "5.6.90") -set(KMAILTRANSPORT_LIB_VERSION "5.6.90") -set(KONTACTINTERFACE_LIB_VERSION "5.6.90") -set(KMIME_LIB_VERSION "5.6.90") -set(KPIMTEXTEDIT_LIB_VERSION "5.6.90") -set(AKONADI_VERSION "5.6.90") -set(KTNEF_LIB_VERSION "5.6.90") +set(AKONADI_MIMELIB_VERSION "5.7.0") +set(AKONADI_CONTACT_VERSION "5.7.0") +set(KCONTACTS_LIB_VERSION "5.7.0") +set(KCALENDARCORE_LIB_VERSION "5.7.0") +set(CALENDARUTILS_LIB_VERSION "5.7.0") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.0") +set(KLDAP_LIB_VERSION "5.7.0") +set(KMAILTRANSPORT_LIB_VERSION "5.7.0") +set(KONTACTINTERFACE_LIB_VERSION "5.7.0") +set(KMIME_LIB_VERSION "5.7.0") +set(KPIMTEXTEDIT_LIB_VERSION "5.7.0") +set(AKONADI_VERSION "5.7.0") +set(KTNEF_LIB_VERSION "5.7.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,18 +64,18 @@ set(QT_REQUIRED_VERSION "5.8.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 Xml) -set(LIBGRAVATAR_VERSION_LIB "5.6.90") -set(MAILCOMMON_LIB_VERSION_LIB "5.6.90") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.6.90") -set(MESSAGELIB_LIB_VERSION_LIB "5.6.90") -set(LIBKLEO_LIB_VERSION_LIB "5.6.90") -set(PIMCOMMON_LIB_VERSION_LIB "5.6.90") -set(LIBKDEPIM_LIB_VERSION_LIB "5.6.90") -set(LIBKSIEVE_LIB_VERSION_LIB "5.6.90") +set(LIBGRAVATAR_VERSION_LIB "5.7.0") +set(MAILCOMMON_LIB_VERSION_LIB "5.7.0") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.7.0") +set(MESSAGELIB_LIB_VERSION_LIB "5.7.0") +set(LIBKLEO_LIB_VERSION_LIB "5.7.0") +set(PIMCOMMON_LIB_VERSION_LIB "5.7.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.7.0") +set(LIBKSIEVE_LIB_VERSION_LIB "5.7.0") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.6.90" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.7.0" 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 2deaf19cac1a6d2a1a40ebe9fe13796c4e270284 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 15 Dec 2017 07:58:10 +0100 Subject: [PATCH 5/8] GIT_SILENT: Prepare 5.7.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2354dd41..a8ad60017 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.7.0") +set(KDEPIM_VERSION_NUMBER "5.7.1") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From 0d2f200bb32ec44b3ac15b439fdbcb721046f09b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 31 Dec 2017 12:37:57 +0100 Subject: [PATCH 6/8] GIT_SILENT: Prepare 5.7.1 --- CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8ad60017..9365f6314 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,19 +43,19 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") -set(AKONADI_MIMELIB_VERSION "5.7.0") -set(AKONADI_CONTACT_VERSION "5.7.0") -set(KCONTACTS_LIB_VERSION "5.7.0") -set(KCALENDARCORE_LIB_VERSION "5.7.0") -set(CALENDARUTILS_LIB_VERSION "5.7.0") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.0") -set(KLDAP_LIB_VERSION "5.7.0") -set(KMAILTRANSPORT_LIB_VERSION "5.7.0") -set(KONTACTINTERFACE_LIB_VERSION "5.7.0") -set(KMIME_LIB_VERSION "5.7.0") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.0") -set(AKONADI_VERSION "5.7.0") -set(KTNEF_LIB_VERSION "5.7.0") +set(AKONADI_MIMELIB_VERSION "5.7.1") +set(AKONADI_CONTACT_VERSION "5.7.1") +set(KCONTACTS_LIB_VERSION "5.7.1") +set(KCALENDARCORE_LIB_VERSION "5.7.1") +set(CALENDARUTILS_LIB_VERSION "5.7.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.1") +set(KLDAP_LIB_VERSION "5.7.1") +set(KMAILTRANSPORT_LIB_VERSION "5.7.1") +set(KONTACTINTERFACE_LIB_VERSION "5.7.1") +set(KMIME_LIB_VERSION "5.7.1") +set(KPIMTEXTEDIT_LIB_VERSION "5.7.1") +set(AKONADI_VERSION "5.7.1") +set(KTNEF_LIB_VERSION "5.7.1") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,18 +64,18 @@ set(QT_REQUIRED_VERSION "5.8.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 Xml) -set(LIBGRAVATAR_VERSION_LIB "5.7.0") -set(MAILCOMMON_LIB_VERSION_LIB "5.7.0") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.7.0") -set(MESSAGELIB_LIB_VERSION_LIB "5.7.0") -set(LIBKLEO_LIB_VERSION_LIB "5.7.0") -set(PIMCOMMON_LIB_VERSION_LIB "5.7.0") -set(LIBKDEPIM_LIB_VERSION_LIB "5.7.0") -set(LIBKSIEVE_LIB_VERSION_LIB "5.7.0") +set(LIBGRAVATAR_VERSION_LIB "5.7.1") +set(MAILCOMMON_LIB_VERSION_LIB "5.7.1") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.7.1") +set(MESSAGELIB_LIB_VERSION_LIB "5.7.1") +set(LIBKLEO_LIB_VERSION_LIB "5.7.1") +set(PIMCOMMON_LIB_VERSION_LIB "5.7.1") +set(LIBKDEPIM_LIB_VERSION_LIB "5.7.1") +set(LIBKSIEVE_LIB_VERSION_LIB "5.7.1") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.7.0" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.7.1" 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 9d4137d0f5ad868d1481259512d773de52081218 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 12 Jan 2018 07:10:33 +0100 Subject: [PATCH 7/8] GIT_SILENT: Prepare 5.7.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9365f6314..0fe0a0a71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.7.1") +set(KDEPIM_VERSION_NUMBER "5.7.2") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 15 Jan 2018 13:50:15 +0100 Subject: [PATCH 8/8] Fix Bug 388953 - Apply filters on folder doesn't work anymore FIXED-IN: 5.7.2 BUG: 388953 --- src/kmmainwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index d0edc48ef..ab0996e1c 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions() { mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction); - connect(mServerSideSubscription, &QAction::triggered, + connect(mApplyAllFiltersFolderAction, &QAction::triggered, this, [this] { slotApplyFiltersOnFolder(/* recursive */ false); }); } @@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions() { mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction); - connect(mServerSideSubscription, &QAction::triggered, + connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered, this, [this] { slotApplyFiltersOnFolder(/* recursive */ true); }); }