Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2020-07-14 07:53:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Tue Jul 14 07:53:47 2020 rev:82 rq:820382 version:5.72.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2020-06-16 13:43:43.357307634 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new.3060/knotifications.changes 2020-07-14 07:54:54.628938881 +0200 @@ -1,0 +2,10 @@ +Sun Jul 5 07:55:36 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.72.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.72.0 +- Changes since 5.71.0: + * Don't use notifybysnore.h on MSYS2 + +------------------------------------------------------------------- Old: ---- knotifications-5.71.0.tar.xz knotifications-5.71.0.tar.xz.sig New: ---- knotifications-5.72.0.tar.xz knotifications-5.72.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.pVvNSW/_old 2020-07-14 07:54:55.340941186 +0200 +++ /var/tmp/diff_new_pack.pVvNSW/_new 2020-07-14 07:54:55.344941199 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Notifications5 -%define _tar_path 5.71 +%define _tar_path 5.72 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: knotifications -Version: 5.71.0 +Version: 5.72.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later @@ -36,7 +36,6 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf -BuildRequires: cmake >= 3.5 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ knotifications-5.71.0.tar.xz -> knotifications-5.72.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/CMakeLists.txt new/knotifications-5.72.0/CMakeLists.txt --- old/knotifications-5.71.0/CMakeLists.txt 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/CMakeLists.txt 2020-07-04 15:18:23.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.71.0") # handled by release scripts -set(KF5_DEP_VERSION "5.71.0") # handled by release scripts +set(KF5_VERSION "5.72.0") # handled by release scripts +set(KF5_DEP_VERSION "5.72.0") # handled by release scripts project(KNotifications VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.71.0 NO_MODULE) +find_package(ECM 5.72.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -72,13 +72,13 @@ find_package(Qt5MacExtras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) endif() if (WIN32) - find_package(LibSnoreToast REQUIRED) - set_package_properties(LibSnoreToast PROPERTIES TYPE REQUIRED - PURPOSE "for the Windows Toast Notifications" - DESCRIPTION "A command line application, capable of creating - Windows Toast notifications on Windows (>=)8 " - ) + find_package(LibSnoreToast) find_package(Qt5Network REQUIRED) + + include(CMakeDependentOption) + cmake_dependent_option(WITH_SNORETOAST "for the Windows Toast Notifications" ON + "Qt5Network_FOUND;LibSnoreToast_FOUND" OFF + ) endif() set(HAVE_KWINDOWSYSTEM FALSE) @@ -90,7 +90,7 @@ find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) -if (NOT WIN32 AND NOT ANDROID) +if (NOT ANDROID OR (WIN32 AND NOT ${WITH_SNORETOAST})) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) find_package(Canberra) set_package_properties(Canberra PROPERTIES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/az/knotifications5_qt.po new/knotifications-5.72.0/po/az/knotifications5_qt.po --- old/knotifications-5.71.0/po/az/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/az/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -5,7 +5,7 @@ "PO-Revision-Date: 2020-04-16 00:22+0400\n" "Last-Translator: Xəyyam <[email protected]>\n" "Language-Team: Azerbaijani\n" -"Language: en_US\n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/bn/knotifications5_qt.po new/knotifications-5.72.0/po/bn/knotifications5_qt.po --- old/knotifications-5.71.0/po/bn/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/bn/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -14,7 +14,7 @@ "PO-Revision-Date: 2012-07-16 14:27+0530\n" "Last-Translator: Deepayan Sarkar <[email protected]>\n" "Language-Team: American English <[email protected]>\n" -"Language: en_US\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/cs/knotifications5_qt.po new/knotifications-5.72.0/po/cs/knotifications5_qt.po --- old/knotifications-5.71.0/po/cs/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/cs/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2020-05-18 20:45+0200\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" -"Language: en_US\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/hne/knotifications5_qt.po new/knotifications-5.72.0/po/hne/knotifications5_qt.po --- old/knotifications-5.71.0/po/hne/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/hne/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2009-02-10 20:44+0530\n" "Last-Translator: Ravishankar Shrivastava <[email protected]>\n" "Language-Team: Hindi <[email protected]>\n" -"Language: hi\n" +"Language: hne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/ko/knotifications5_qt.po new/knotifications-5.72.0/po/ko/knotifications5_qt.po --- old/knotifications-5.71.0/po/ko/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/ko/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2020-04-20 23:58+0200\n" +"PO-Revision-Date: 2020-07-01 01:14+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.12.3\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed @@ -32,25 +32,16 @@ msgstr "알 수 없는 프로그램" #: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "최소화(&M)" #: kstatusnotifieritem.cpp:862 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "끝내기" #: kstatusnotifieritem.cpp:1119 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "복원(&R)" @@ -62,9 +53,6 @@ msgstr "<qt><b>%1</b>을(를) 종료하시겠습니까?</qt>" #: kstatusnotifieritem.cpp:1136 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "시스템 트레이에서 종료 확인" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/mai/knotifications5_qt.po new/knotifications-5.72.0/po/mai/knotifications5_qt.po --- old/knotifications-5.71.0/po/mai/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/mai/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -13,7 +13,7 @@ "PO-Revision-Date: 2010-09-24 15:44+0530\n" "Last-Translator: Rajesh Ranjan <[email protected]>\n" "Language-Team: Hindi <[email protected]>\n" -"Language: hi\n" +"Language: mai\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/sr/knotifications5_qt.po new/knotifications-5.72.0/po/sr/knotifications5_qt.po --- old/knotifications-5.71.0/po/sr/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/sr/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -23,35 +23,54 @@ "X-Wrapping: fine\n" "X-Qt-Contexts: true\n" +#. Job name, e.g. Copying has failed +#: knotificationjobuidelegate.cpp:39 +#, qt-format +msgctxt "KNotificationJobUiDelegate|" +msgid "%1 (Failed)" +msgstr "" + # >> @item in message source specification #: knotificationrestrictions.cpp:192 msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "непознат програм" -#: kstatusnotifieritem.cpp:501 kstatusnotifieritem.cpp:1061 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Minimize" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Минимизуј" -#: kstatusnotifieritem.cpp:810 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:862 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Quit" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Напусти" -#: kstatusnotifieritem.cpp:1059 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1119 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Restore" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Обнови" -#: kstatusnotifieritem.cpp:1073 +#: kstatusnotifieritem.cpp:1133 #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Желите ли заиста да напустите програм <b>%1</b>?</qt>" # >> @title:window -#: kstatusnotifieritem.cpp:1076 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1136 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Confirm Quit From System Tray" +msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Потврда напуштања преко системске касете" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/sr@ijekavian/knotifications5_qt.po new/knotifications-5.72.0/po/sr@ijekavian/knotifications5_qt.po --- old/knotifications-5.71.0/po/sr@ijekavian/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/sr@ijekavian/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -22,35 +22,54 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" +#. Job name, e.g. Copying has failed +#: knotificationjobuidelegate.cpp:39 +#, qt-format +msgctxt "KNotificationJobUiDelegate|" +msgid "%1 (Failed)" +msgstr "" + # >> @item in message source specification #: knotificationrestrictions.cpp:192 msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "непознат програм" -#: kstatusnotifieritem.cpp:501 kstatusnotifieritem.cpp:1061 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Minimize" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Минимизуј" -#: kstatusnotifieritem.cpp:810 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:862 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Quit" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Напусти" -#: kstatusnotifieritem.cpp:1059 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1119 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Restore" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Обнови" -#: kstatusnotifieritem.cpp:1073 +#: kstatusnotifieritem.cpp:1133 #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Желите ли заиста да напустите програм <b>%1</b>?</qt>" # >> @title:window -#: kstatusnotifieritem.cpp:1076 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1136 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Confirm Quit From System Tray" +msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Потврда напуштања преко системске касете" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/sr@ijekavianlatin/knotifications5_qt.po new/knotifications-5.72.0/po/sr@ijekavianlatin/knotifications5_qt.po --- old/knotifications-5.71.0/po/sr@ijekavianlatin/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/sr@ijekavianlatin/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -22,35 +22,54 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" +#. Job name, e.g. Copying has failed +#: knotificationjobuidelegate.cpp:39 +#, qt-format +msgctxt "KNotificationJobUiDelegate|" +msgid "%1 (Failed)" +msgstr "" + # >> @item in message source specification #: knotificationrestrictions.cpp:192 msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "nepoznat program" -#: kstatusnotifieritem.cpp:501 kstatusnotifieritem.cpp:1061 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Minimize" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Minimizuj" -#: kstatusnotifieritem.cpp:810 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:862 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Quit" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Napusti" -#: kstatusnotifieritem.cpp:1059 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1119 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Restore" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Obnovi" -#: kstatusnotifieritem.cpp:1073 +#: kstatusnotifieritem.cpp:1133 #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Želite li zaista da napustite program <b>%1</b>?</qt>" # >> @title:window -#: kstatusnotifieritem.cpp:1076 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1136 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Confirm Quit From System Tray" +msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Potvrda napuštanja preko sistemske kasete" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/sr@latin/knotifications5_qt.po new/knotifications-5.72.0/po/sr@latin/knotifications5_qt.po --- old/knotifications-5.71.0/po/sr@latin/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/sr@latin/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -22,35 +22,54 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" +#. Job name, e.g. Copying has failed +#: knotificationjobuidelegate.cpp:39 +#, qt-format +msgctxt "KNotificationJobUiDelegate|" +msgid "%1 (Failed)" +msgstr "" + # >> @item in message source specification #: knotificationrestrictions.cpp:192 msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "nepoznat program" -#: kstatusnotifieritem.cpp:501 kstatusnotifieritem.cpp:1061 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Minimize" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "&Minimizuj" -#: kstatusnotifieritem.cpp:810 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:862 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Quit" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Napusti" -#: kstatusnotifieritem.cpp:1059 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1119 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "&Restore" +msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Obnovi" -#: kstatusnotifieritem.cpp:1073 +#: kstatusnotifieritem.cpp:1133 #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Želite li zaista da napustite program <b>%1</b>?</qt>" # >> @title:window -#: kstatusnotifieritem.cpp:1076 -msgctxt "KStatusNotifierItem|" +#: kstatusnotifieritem.cpp:1136 +#, fuzzy +#| msgctxt "KStatusNotifierItem|" +#| msgid "Confirm Quit From System Tray" +msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Potvrda napuštanja preko sistemske kasete" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/uz@cyrillic/knotifications5_qt.po new/knotifications-5.72.0/po/uz@cyrillic/knotifications5_qt.po --- old/knotifications-5.71.0/po/uz@cyrillic/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/uz@cyrillic/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -10,7 +10,7 @@ "PO-Revision-Date: 2009-10-17 00:34+0200\n" "Last-Translator: Mashrab Kuvatov <[email protected]>\n" "Language-Team: Uzbek <[email protected]>\n" -"Language: uz\n" +"Language: uz@cyrillic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/vi/knotifications5_qt.po new/knotifications-5.72.0/po/vi/knotifications5_qt.po --- old/knotifications-5.71.0/po/vi/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/vi/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-09-23 18:43+0800\n" "Last-Translator: Lê Hoàng Phương <[email protected]>\n" "Language-Team: American English <[email protected]>\n" -"Language: en_US\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.72.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.71.0/po/zh_CN/knotifications5_qt.po 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/po/zh_CN/knotifications5_qt.po 2020-07-04 15:18:23.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-05-09 13:50\n" +"PO-Revision-Date: 2020-06-24 08:00\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -22,8 +22,10 @@ "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/frameworks/knotifications5_qt.pot\n" +"X-Crowdin-File: /kf5-trunk/messages/knotifications/knotifications5_qt.pot\n" +"X-Crowdin-File-ID: 5541\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:39 @@ -38,28 +40,19 @@ msgstr "未知程序" #: kstatusnotifieritem.cpp:544 kstatusnotifieritem.cpp:1121 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" -msgstr "最小化(&M)" +msgstr "" #: kstatusnotifieritem.cpp:862 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" -msgstr "退出" +msgstr "" #: kstatusnotifieritem.cpp:1119 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" -msgstr "恢复(&R)" +msgstr "" #: kstatusnotifieritem.cpp:1133 #, qt-format @@ -68,9 +61,6 @@ msgstr "<qt>您确定要退出 <b>%1</b> 吗？</qt>" #: kstatusnotifieritem.cpp:1136 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" -msgstr "确认从系统托盘退出" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/src/CMakeLists.txt new/knotifications-5.72.0/src/CMakeLists.txt --- old/knotifications-5.71.0/src/CMakeLists.txt 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/src/CMakeLists.txt 2020-07-04 15:18:23.000000000 +0200 @@ -43,7 +43,7 @@ list(APPEND knotifications_SRCS notifybyandroid.cpp knotifications.qrc) endif() -if (WIN32) +if (WITH_SNORETOAST) list(APPEND knotifications_SRCS notifybysnore.cpp) endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/src/config-knotifications.h.cmake new/knotifications-5.72.0/src/config-knotifications.h.cmake --- old/knotifications-5.71.0/src/config-knotifications.h.cmake 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/src/config-knotifications.h.cmake 2020-07-04 15:18:23.000000000 +0200 @@ -7,3 +7,5 @@ #cmakedefine01 HAVE_DBUSMENUQT #cmakedefine01 HAVE_KWINDOWSYSTEM + +#cmakedefine WITH_SNORETOAST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/src/knotificationmanager.cpp new/knotifications-5.72.0/src/knotificationmanager.cpp --- old/knotifications-5.71.0/src/knotificationmanager.cpp 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/src/knotificationmanager.cpp 2020-07-04 15:18:23.000000000 +0200 @@ -21,6 +21,8 @@ #include "knotificationmanager_p.h" #include "knotification.h" +#include <config-knotifications.h> + #include <QHash> #include <QFileInfo> #include <KPluginLoader> @@ -42,7 +44,7 @@ #include "notifybyandroid.h" #elif defined(Q_OS_MACOS) #include "notifybymacosnotificationcenter.h" -#elif defined(Q_OS_WIN) +#elif defined(WITH_SNORETOAST) #include "notifybysnore.h" #else #include "notifybypopup.h" @@ -137,7 +139,7 @@ if (action == QLatin1String("Popup")) { #if defined(Q_OS_ANDROID) plugin = new NotifyByAndroid(this); -#elif defined(Q_OS_WIN) +#elif defined(WITH_SNORETOAST) plugin = new NotifyBySnore(this); #elif defined(Q_OS_MACOS) plugin = new NotifyByMacOSNotificationCenter(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.71.0/src/kpassivepopup.cpp new/knotifications-5.72.0/src/kpassivepopup.cpp --- old/knotifications-5.71.0/src/kpassivepopup.cpp 2020-06-07 20:30:16.000000000 +0200 +++ new/knotifications-5.72.0/src/kpassivepopup.cpp 2020-07-04 15:18:23.000000000 +0200 @@ -287,8 +287,12 @@ delete d->topLayout; d->topLayout = new QVBoxLayout(this); if (d->popupStyle == Balloon) { - const int marginHint = 2 * style()->pixelMetric(QStyle::PM_DefaultChildMargin); - d->topLayout->setContentsMargins(marginHint, marginHint, marginHint, marginHint); + auto *style = this->style(); + const int leftMarginHint = 2 * style->pixelMetric(QStyle::PM_LayoutLeftMargin); + const int topMarginHint = 2 * style->pixelMetric(QStyle::PM_LayoutTopMargin); + const int rightMarginHint = 2 * style->pixelMetric(QStyle::PM_LayoutRightMargin); + const int bottomMarginHint = 2 * style->pixelMetric(QStyle::PM_LayoutBottomMargin); + d->topLayout->setContentsMargins(leftMarginHint, topMarginHint, rightMarginHint, bottomMarginHint); } d->topLayout->addWidget(d->msgView); d->topLayout->activate();
