diff -Nru akonadi-21.08.0/CMakeLists.txt akonadi-21.08.1/CMakeLists.txt --- akonadi-21.08.0/CMakeLists.txt 2021-08-05 18:18:01.000000000 +0000 +++ akonadi-21.08.1/CMakeLists.txt 2021-08-11 19:39:20.000000000 +0000 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.0") +set(PIM_VERSION "5.18.1") project(Akonadi VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 17) @@ -37,7 +37,7 @@ include(AkonadiMacros) set(QT_REQUIRED_VERSION "5.15.0") -set(RELEASE_SERVICE_VERSION "21.08.0") +set(RELEASE_SERVICE_VERSION "21.08.1") set(AKONADI_FULL_VERSION "${PIM_VERSION} (${RELEASE_SERVICE_VERSION})") configure_file(akonadifull-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadifull-version.h @ONLY) diff -Nru akonadi-21.08.0/debian/changelog akonadi-21.08.1/debian/changelog --- akonadi-21.08.0/debian/changelog 2021-08-12 18:52:26.000000000 +0000 +++ akonadi-21.08.1/debian/changelog 2021-09-09 21:27:52.000000000 +0000 @@ -1,3 +1,9 @@ +akonadi (4:21.08.1-0ubuntu1) impish; urgency=medium + + * New upstream release (21.08.1) + + -- José Manuel Santamaría Lema Thu, 09 Sep 2021 22:27:52 +0100 + akonadi (4:21.08.0-0ubuntu2) impish; urgency=medium * Mark a symbol as optional. diff -Nru akonadi-21.08.0/debian/control akonadi-21.08.1/debian/control --- akonadi-21.08.0/debian/control 2021-08-12 18:52:26.000000000 +0000 +++ akonadi-21.08.1/debian/control 2021-09-09 21:27:52.000000000 +0000 @@ -14,7 +14,7 @@ libaccounts-qt5-dev, libboost-dev (>= 1.34.0~), libboost-graph-dev, - libkaccounts-dev (>= 4:21.08.0~), + libkaccounts-dev (>= 4:21.08.1~), libkf5completion-dev (>= 5.31.0~), libkf5config-dev (>= 5.31.0~), libkf5crash-dev (>= 5.31.0~), diff -Nru akonadi-21.08.0/po/fr/libakonadi5.po akonadi-21.08.1/po/fr/libakonadi5.po --- akonadi-21.08.0/po/fr/libakonadi5.po 2021-08-06 00:22:08.000000000 +0000 +++ akonadi-21.08.1/po/fr/libakonadi5.po 2021-08-31 00:36:06.000000000 +0000 @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 21.07.80\n" +"X-Generator: Lokalize 21.07.90\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -Nru akonadi-21.08.0/po/ru/libakonadi5.po akonadi-21.08.1/po/ru/libakonadi5.po --- akonadi-21.08.0/po/ru/libakonadi5.po 2021-08-06 00:22:08.000000000 +0000 +++ akonadi-21.08.1/po/ru/libakonadi5.po 2021-08-31 00:36:06.000000000 +0000 @@ -5,13 +5,13 @@ # Andrey Cherepanov , 2009. # Alexander Potashev , 2010, 2011, 2014, 2015, 2016, 2017. # Alexander Lakhin , 2013. -# Alexander Yavorsky , 2017, 2018, 2019, 2020. +# Alexander Yavorsky , 2017, 2018, 2019, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: libakonadi\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-07-16 01:42+0000\n" -"PO-Revision-Date: 2020-05-10 11:39+0300\n" +"PO-Revision-Date: 2021-08-20 21:53+0300\n" "Last-Translator: Alexander Yavorsky \n" "Language-Team: Russian \n" "Language: ru\n" @@ -20,7 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 20.04.0\n" +"X-Generator: Lokalize 21.08.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -86,7 +86,7 @@ #, kde-format msgctxt "@info:status" msgid "Syncing..." -msgstr "Выполняется синхронизация..." +msgstr "Выполняется синхронизация…" #: agentbase/agentbase_p.h:61 #, kde-format @@ -393,7 +393,7 @@ #, kde-format msgctxt "@info:status" msgid "Loading..." -msgstr "Загрузка..." +msgstr "Загрузка…" #: core/models/entitytreemodel.cpp:489 #, kde-format @@ -601,7 +601,7 @@ #: widgets/agentactionmanager.cpp:34 #, kde-format msgid "&New Agent Instance..." -msgstr "&Создать экземпляр агента..." +msgstr "&Создать экземпляр агента…" #: widgets/agentactionmanager.cpp:35 #, kde-format @@ -611,7 +611,7 @@ #: widgets/agentactionmanager.cpp:36 #, kde-format msgid "&Configure Agent Instance" -msgstr "&Настроить экземпляр агента..." +msgstr "&Настроить экземпляр агента…" #: widgets/agentactionmanager.cpp:52 #, kde-format @@ -771,7 +771,7 @@ #: widgets/collectiondialog.cpp:224 #, kde-format msgid "&New Subfolder..." -msgstr "&Создать подпапку..." +msgstr "&Создать подпапку…" #: widgets/collectiondialog.cpp:226 #, kde-format @@ -893,7 +893,7 @@ #: widgets/collectionmaintenancepage.cpp:136 #, kde-format msgid "Calculating indexed items..." -msgstr "Подсчёт проиндексированных объектов..." +msgstr "Подсчёт проиндексированных объектов…" #. i18n: ectx: property (title), widget (QGroupBox, filesGroup) #: widgets/collectionmaintenancepage.ui:23 @@ -1058,12 +1058,12 @@ #: widgets/controlgui.cpp:230 #, kde-format msgid "Starting Akonadi server..." -msgstr "Запуск сервера Akonadi..." +msgstr "Запуск сервера Akonadi…" #: widgets/controlgui.cpp:236 #, kde-format msgid "Stopping Akonadi server..." -msgstr "Остановка сервера Akonadi..." +msgstr "Остановка сервера Akonadi…" #: widgets/dragdropmanager.cpp:212 #, kde-format @@ -1100,12 +1100,12 @@ #: widgets/erroroverlay.cpp:231 widgets/erroroverlay.cpp:232 #, kde-format msgid "Personal information management service is starting..." -msgstr "Запуск службы управления личной информацией..." +msgstr "Запуск службы управления личной информацией…" #: widgets/erroroverlay.cpp:236 widgets/erroroverlay.cpp:237 #, kde-format msgid "Personal information management service is shutting down..." -msgstr "Завершение работы службы управления личной информацией..." +msgstr "Завершение работы службы управления личной информацией…" #: widgets/erroroverlay.cpp:241 #, kde-format @@ -1167,7 +1167,7 @@ #: widgets/erroroverlay.ui:259 #, kde-format msgid "Details..." -msgstr "Подробности..." +msgstr "Подробности…" #: widgets/manageaccountwidget.cpp:199 #, kde-format @@ -1190,13 +1190,13 @@ #: widgets/manageaccountwidget.ui:36 #, kde-format msgid "A&dd..." -msgstr "&Добавить..." +msgstr "&Добавить…" #. i18n: ectx: property (text), widget (QPushButton, mModifyAccountButton) #: widgets/manageaccountwidget.ui:46 #, kde-format msgid "&Modify..." -msgstr "&Изменить..." +msgstr "&Изменить…" #. i18n: ectx: property (text), widget (QPushButton, mRemoveAccountButton) #: widgets/manageaccountwidget.ui:56 @@ -1236,7 +1236,7 @@ #: widgets/selftestdialog.cpp:71 #, kde-format msgid "Save Report..." -msgstr "Сохранить отчёт..." +msgstr "Сохранить отчёт…" #: widgets/selftestdialog.cpp:73 #, kde-format @@ -1870,7 +1870,7 @@ #: widgets/standardactionmanager.cpp:76 #, kde-format msgid "&New Folder..." -msgstr "&Создать папку..." +msgstr "&Создать папку…" #: widgets/standardactionmanager.cpp:76 #, kde-format @@ -1878,11 +1878,9 @@ msgstr "Создать" #: widgets/standardactionmanager.cpp:78 -#, fuzzy, kde-format -#| msgid "&Delete Folder" -#| msgid_plural "&Delete %1 Folders" +#, kde-format msgid "&Delete Folder" -msgstr "&Удалить %1 папку" +msgstr "&Удалить папку" #: widgets/standardactionmanager.cpp:78 #, kde-format @@ -1890,11 +1888,9 @@ msgstr "Удалить" #: widgets/standardactionmanager.cpp:80 -#, fuzzy, kde-format -#| msgid "&Synchronize Folder" -#| msgid_plural "&Synchronize %1 Folders" +#, kde-format msgid "&Synchronize Folder" -msgstr "С&инхронизировать %1 папку" +msgstr "С&инхронизировать папку" #: widgets/standardactionmanager.cpp:81 widgets/standardactionmanager.cpp:162 #: widgets/standardactionmanager.cpp:255 @@ -1925,7 +1921,7 @@ #: widgets/standardactionmanager.cpp:99 #, kde-format msgid "Manage Local &Subscriptions..." -msgstr "Управление п&одпиской..." +msgstr "Управление п&одпиской…" #: widgets/standardactionmanager.cpp:100 #, kde-format @@ -1955,7 +1951,7 @@ #: widgets/standardactionmanager.cpp:123 #, kde-format msgid "Rename Favorite..." -msgstr "Переименовать в избранных..." +msgstr "Переименовать в избранных…" #: widgets/standardactionmanager.cpp:124 #, kde-format @@ -1965,7 +1961,7 @@ #: widgets/standardactionmanager.cpp:131 widgets/standardactionmanager.cpp:170 #, kde-format msgid "Copy Folder To..." -msgstr "Копировать папку в..." +msgstr "Копировать папку в…" #: widgets/standardactionmanager.cpp:132 widgets/standardactionmanager.cpp:138 #: widgets/standardactionmanager.cpp:171 widgets/standardactionmanager.cpp:185 @@ -1976,12 +1972,12 @@ #: widgets/standardactionmanager.cpp:138 widgets/standardactionmanager.cpp:185 #, kde-format msgid "Copy Item To..." -msgstr "Копировать объект в..." +msgstr "Копировать объект в…" #: widgets/standardactionmanager.cpp:139 widgets/standardactionmanager.cpp:186 #, kde-format msgid "Move Item To..." -msgstr "Переместить объект в..." +msgstr "Переместить объект в…" #: widgets/standardactionmanager.cpp:139 widgets/standardactionmanager.cpp:142 #: widgets/standardactionmanager.cpp:179 widgets/standardactionmanager.cpp:186 @@ -1992,14 +1988,12 @@ #: widgets/standardactionmanager.cpp:141 widgets/standardactionmanager.cpp:178 #, kde-format msgid "Move Folder To..." -msgstr "Переместить папку в..." +msgstr "Переместить папку в…" #: widgets/standardactionmanager.cpp:148 -#, fuzzy, kde-format -#| msgid "&Cut Item" -#| msgid_plural "&Cut %1 Items" +#, kde-format msgid "&Cut Item" -msgstr "&Копировать %1 объект" +msgstr "В&ырезать объект" #: widgets/standardactionmanager.cpp:148 widgets/standardactionmanager.cpp:149 #, kde-format @@ -2007,11 +2001,9 @@ msgstr "Вырезать" #: widgets/standardactionmanager.cpp:149 -#, fuzzy, kde-format -#| msgid "&Cut Folder" -#| msgid_plural "&Cut %1 Folders" +#, kde-format msgid "&Cut Folder" -msgstr "В&ырезать %1 папку" +msgstr "В&ырезать папку" #: widgets/standardactionmanager.cpp:150 #, kde-format @@ -2019,11 +2011,9 @@ msgstr "Создать источник данных" #: widgets/standardactionmanager.cpp:151 -#, fuzzy, kde-format -#| msgid "Delete Resource" -#| msgid_plural "Delete %1 Resources" +#, kde-format msgid "Delete Resource" -msgstr "Удалить %1 источник данных" +msgstr "Удалить источник данных" #: widgets/standardactionmanager.cpp:153 #, kde-format @@ -2031,11 +2021,9 @@ msgstr "&Свойства источника данных" #: widgets/standardactionmanager.cpp:161 -#, fuzzy, kde-format -#| msgid "Synchronize Resource" -#| msgid_plural "Synchronize %1 Resources" +#, kde-format msgid "Synchronize Resource" -msgstr "Синхронизировать %1 источник данных" +msgstr "Синхронизировать источник данных" #: widgets/standardactionmanager.cpp:168 #, kde-format @@ -2138,9 +2126,7 @@ msgstr[3] "&Копировать объект" #: widgets/standardactionmanager.cpp:342 -#, fuzzy, kde-format -#| msgid "&Cut Item" -#| msgid_plural "&Cut %1 Items" +#, kde-format msgctxt "@action" msgid "&Cut Item" msgid_plural "&Cut %1 Items" @@ -2150,9 +2136,7 @@ msgstr[3] "&Копировать объект" #: widgets/standardactionmanager.cpp:343 -#, fuzzy, kde-format -#| msgid "&Cut Folder" -#| msgid_plural "&Cut %1 Folders" +#, kde-format msgctxt "@action" msgid "&Cut Folder" msgid_plural "&Cut %1 Folders" @@ -2171,9 +2155,7 @@ msgstr[3] "&Удалить объект" #: widgets/standardactionmanager.cpp:345 -#, fuzzy, kde-format -#| msgid "&Delete Folder" -#| msgid_plural "&Delete %1 Folders" +#, kde-format msgctxt "@action" msgid "&Delete Folder" msgid_plural "&Delete %1 Folders" @@ -2183,9 +2165,7 @@ msgstr[3] "&Удалить папку" #: widgets/standardactionmanager.cpp:346 -#, fuzzy, kde-format -#| msgid "&Synchronize Folder" -#| msgid_plural "&Synchronize %1 Folders" +#, kde-format msgctxt "@action" msgid "&Synchronize Folder" msgid_plural "&Synchronize %1 Folders" @@ -2276,9 +2256,7 @@ msgstr[3] "Синхронизировать папку" #: widgets/standardactionmanager.cpp:357 -#, fuzzy, kde-format -#| msgid "Delete Resource" -#| msgid_plural "Delete %1 Resources" +#, kde-format msgctxt "@action" msgid "Delete Resource" msgid_plural "Delete %1 Resources" @@ -2288,9 +2266,7 @@ msgstr[3] "Удалить источник данных" #: widgets/standardactionmanager.cpp:358 -#, fuzzy, kde-format -#| msgid "Synchronize Resource" -#| msgid_plural "Synchronize %1 Resources" +#, kde-format msgctxt "@action" msgid "Synchronize Resource" msgid_plural "Synchronize %1 Resources" @@ -2565,7 +2541,7 @@ #, kde-format msgctxt "@label Placeholder text in tag selection combobox" msgid "Select tags..." -msgstr "Выберите метки..." +msgstr "Выберите метки…" #. i18n: ectx: property (windowTitle), widget (QDialog, TagSelectionDialog) #: widgets/tagselectiondialog.ui:14 @@ -2588,7 +2564,7 @@ #: widgets/tagwidget.ui:27 #, kde-format msgid "..." -msgstr "..." +msgstr "…" #: xml/akonadi2xml.cpp:25 #, kde-format diff -Nru akonadi-21.08.0/po/zh_CN/akonadi_knut_resource.po akonadi-21.08.1/po/zh_CN/akonadi_knut_resource.po --- akonadi-21.08.0/po/zh_CN/akonadi_knut_resource.po 2021-08-06 00:22:08.000000000 +0000 +++ akonadi-21.08.1/po/zh_CN/akonadi_knut_resource.po 2021-08-31 00:36:06.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-01-27 03:05+0100\n" -"PO-Revision-Date: 2021-07-26 13:50\n" +"PO-Revision-Date: 2021-08-30 11:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru akonadi-21.08.0/po/zh_CN/libakonadi5.po akonadi-21.08.1/po/zh_CN/libakonadi5.po --- akonadi-21.08.0/po/zh_CN/libakonadi5.po 2021-08-06 00:22:08.000000000 +0000 +++ akonadi-21.08.1/po/zh_CN/libakonadi5.po 2021-08-31 00:36:06.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-07-16 01:42+0000\n" -"PO-Revision-Date: 2021-07-26 13:50\n" +"PO-Revision-Date: 2021-08-30 11:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru akonadi-21.08.0/src/core/searchquery.cpp akonadi-21.08.1/src/core/searchquery.cpp --- akonadi-21.08.0/src/core/searchquery.cpp 2021-08-05 18:18:01.000000000 +0000 +++ akonadi-21.08.1/src/core/searchquery.cpp 2021-08-11 19:39:20.000000000 +0000 @@ -335,7 +335,7 @@ QMap incidenceSearchFieldMapping() { - QMap mapping; + static QMap mapping; if (mapping.isEmpty()) { mapping.insert(IncidenceSearchTerm::All, QStringLiteral("all")); mapping.insert(IncidenceSearchTerm::PartStatus, QStringLiteral("partstatus"));