Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2014-11-11 01:09:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2014-10-07 15:59:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2014-11-11 01:09:41.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Nov 2 17:47:19 UTC 2014 - [email protected] + +- Update to 5.4.0 + * Add support for custom icons (convenience method + KNotification::Event with icon name) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.4.0.php + +------------------------------------------------------------------- Old: ---- knotifications-5.3.0.tar.xz New: ---- knotifications-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.tkJNrc/_old 2014-11-11 01:09:42.000000000 +0100 +++ /var/tmp/diff_new_pack.tkJNrc/_new 2014-11-11 01:09:42.000000000 +0100 @@ -18,11 +18,11 @@ %define lname libKF5Notifications5 Name: knotifications -Version: 5.3.0 +Version: 5.4.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.3.0 +BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes BuildRequires: kcodecs-devel >= %{kf5_version} BuildRequires: kconfig-devel >= %{kf5_version} @@ -43,7 +43,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ knotifications-5.3.0.tar.xz -> knotifications-5.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/CMakeLists.txt new/knotifications-5.4.0/CMakeLists.txt --- old/knotifications-5.3.0/CMakeLists.txt 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/CMakeLists.txt 2014-11-02 13:16:10.000000000 +0100 @@ -3,7 +3,7 @@ project(KNotifications) # ECM setup -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +find_package(ECM 1.4.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -13,8 +13,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.3.0") # handled by release scripts -set(KF5_DEP_VERSION "5.3.0") # handled by release scripts +set(KF5_VERSION "5.4.0") # handled by release scripts +set(KF5_DEP_VERSION "5.4.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KNOTIFICATIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/af/knotifications5_qt.po new/knotifications-5.4.0/po/af/knotifications5_qt.po --- old/knotifications-5.3.0/po/af/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/af/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -12,6 +12,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/as/knotifications5_qt.po new/knotifications-5.4.0/po/as/knotifications5_qt.po --- old/knotifications-5.3.0/po/as/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/as/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 0.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ast/knotifications5_qt.po new/knotifications-5.4.0/po/ast/knotifications5_qt.po --- old/knotifications-5.3.0/po/ast/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ast/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: asturian\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/be/knotifications5_qt.po new/knotifications-5.4.0/po/be/knotifications5_qt.po --- old/knotifications-5.3.0/po/be/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/be/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/be@latin/knotifications5_qt.po new/knotifications-5.4.0/po/be@latin/knotifications5_qt.po --- old/knotifications-5.3.0/po/be@latin/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/be@latin/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/bg/knotifications5_qt.po new/knotifications-5.4.0/po/bg/knotifications5_qt.po --- old/knotifications-5.3.0/po/bg/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/bg/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/bn/knotifications5_qt.po new/knotifications-5.4.0/po/bn/knotifications5_qt.po --- old/knotifications-5.3.0/po/bn/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/bn/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/bn_IN/knotifications5_qt.po new/knotifications-5.4.0/po/bn_IN/knotifications5_qt.po --- old/knotifications-5.3.0/po/bn_IN/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/bn_IN/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -19,6 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/br/knotifications5_qt.po new/knotifications-5.4.0/po/br/knotifications5_qt.po --- old/knotifications-5.3.0/po/br/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/br/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/bs/knotifications5_qt.po new/knotifications-5.4.0/po/bs/knotifications5_qt.po --- old/knotifications-5.3.0/po/bs/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/bs/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -27,6 +27,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" "X-Environment: kde\n" +"X-Qt-Contexts: true\n" # >> @item in message source specification #: knotificationrestrictions.cpp:184 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ca/knotifications5_qt.po new/knotifications-5.4.0/po/ca/knotifications5_qt.po --- old/knotifications-5.3.0/po/ca/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ca/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -24,6 +24,7 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ca@valencia/knotifications5_qt.po new/knotifications-5.4.0/po/ca@valencia/knotifications5_qt.po --- old/knotifications-5.3.0/po/ca@valencia/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ca@valencia/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/crh/knotifications5_qt.po new/knotifications-5.4.0/po/crh/knotifications5_qt.po --- old/knotifications-5.3.0/po/crh/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/crh/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/cs/knotifications5_qt.po new/knotifications-5.4.0/po/cs/knotifications5_qt.po --- old/knotifications-5.3.0/po/cs/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/cs/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "X-Generator: Lokalize 1.5\n" "X-Language: cs_CZ\n" "X-Source-Language: en_US\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/csb/knotifications5_qt.po new/knotifications-5.4.0/po/csb/knotifications5_qt.po --- old/knotifications-5.3.0/po/csb/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/csb/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2)\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/cy/knotifications5_qt.po new/knotifications-5.4.0/po/cy/knotifications5_qt.po --- old/knotifications-5.3.0/po/cy/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/cy/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -27,8 +27,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9\n" -"\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/da/knotifications5_qt.po new/knotifications-5.4.0/po/da/knotifications5_qt.po --- old/knotifications-5.3.0/po/da/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/da/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/de/knotifications5_qt.po new/knotifications-5.4.0/po/de/knotifications5_qt.po --- old/knotifications-5.3.0/po/de/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/de/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -22,6 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: knotificationrestrictions.cpp:184 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/el/knotifications5_qt.po new/knotifications-5.4.0/po/el/knotifications5_qt.po --- old/knotifications-5.3.0/po/el/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/el/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -29,6 +29,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/en_GB/knotifications5_qt.po new/knotifications-5.4.0/po/en_GB/knotifications5_qt.po --- old/knotifications-5.3.0/po/en_GB/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/en_GB/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/eo/knotifications5_qt.po new/knotifications-5.4.0/po/eo/knotifications5_qt.po --- old/knotifications-5.3.0/po/eo/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/eo/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/es/knotifications5_qt.po new/knotifications-5.4.0/po/es/knotifications5_qt.po --- old/knotifications-5.3.0/po/es/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/es/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "First-Translator: Boris Wesslowski <[email protected]>\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/et/knotifications5_qt.po new/knotifications-5.4.0/po/et/knotifications5_qt.po --- old/knotifications-5.3.0/po/et/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/et/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -19,6 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/eu/knotifications5_qt.po new/knotifications-5.4.0/po/eu/knotifications5_qt.po --- old/knotifications-5.3.0/po/eu/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/eu/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/fa/knotifications5_qt.po new/knotifications-5.4.0/po/fa/knotifications5_qt.po --- old/knotifications-5.3.0/po/fa/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/fa/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/fi/knotifications5_qt.po new/knotifications-5.4.0/po/fi/knotifications5_qt.po --- old/knotifications-5.3.0/po/fi/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/fi/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -29,7 +29,7 @@ "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2014-03-30 00:13+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,6 +37,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" "X-POT-Import-Date: 2013-01-13 20:43:21+0000\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/fr/knotifications5_qt.po new/knotifications-5.4.0/po/fr/knotifications5_qt.po --- old/knotifications-5.3.0/po/fr/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/fr/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -33,6 +33,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/fy/knotifications5_qt.po new/knotifications-5.4.0/po/fy/knotifications5_qt.po --- old/knotifications-5.3.0/po/fy/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/fy/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KAider 0.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ga/knotifications5_qt.po new/knotifications-5.4.0/po/ga/knotifications5_qt.po --- old/knotifications-5.3.0/po/ga/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ga/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -19,6 +19,7 @@ "X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/gl/knotifications5_qt.po new/knotifications-5.4.0/po/gl/knotifications5_qt.po --- old/knotifications-5.3.0/po/gl/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/gl/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -26,6 +26,7 @@ "X-Environment: kde, development\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/gu/knotifications5_qt.po new/knotifications-5.4.0/po/gu/knotifications5_qt.po --- old/knotifications-5.3.0/po/gu/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/gu/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ha/knotifications5_qt.po new/knotifications-5.4.0/po/ha/knotifications5_qt.po --- old/knotifications-5.3.0/po/ha/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ha/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 0.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/he/knotifications5_qt.po new/knotifications-5.4.0/po/he/knotifications5_qt.po --- old/knotifications-5.3.0/po/he/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/he/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -30,6 +30,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hi/knotifications5_qt.po new/knotifications-5.4.0/po/hi/knotifications5_qt.po --- old/knotifications-5.3.0/po/hi/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hi/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -19,6 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hne/knotifications5_qt.po new/knotifications-5.4.0/po/hne/knotifications5_qt.po --- old/knotifications-5.3.0/po/hne/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hne/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 0.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hr/knotifications5_qt.po new/knotifications-5.4.0/po/hr/knotifications5_qt.po --- old/knotifications-5.3.0/po/hr/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hr/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -28,6 +28,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hsb/knotifications5_qt.po new/knotifications-5.4.0/po/hsb/knotifications5_qt.po --- old/knotifications-5.3.0/po/hsb/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hsb/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3;\n" "X-Generator: KAider 0.1\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hu/knotifications5_qt.po new/knotifications-5.4.0/po/hu/knotifications5_qt.po --- old/knotifications-5.3.0/po/hu/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hu/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -15,6 +15,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/hy/knotifications5_qt.po new/knotifications-5.4.0/po/hy/knotifications5_qt.po --- old/knotifications-5.3.0/po/hy/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/hy/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ia/knotifications5_qt.po new/knotifications-5.4.0/po/ia/knotifications5_qt.po --- old/knotifications-5.3.0/po/ia/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ia/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/id/knotifications5_qt.po new/knotifications-5.4.0/po/id/knotifications5_qt.po --- old/knotifications-5.3.0/po/id/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/id/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/is/knotifications5_qt.po new/knotifications-5.4.0/po/is/knotifications5_qt.po --- old/knotifications-5.3.0/po/is/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/is/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,12 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.2\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" -"\n" -"\n" -"\n" -"\n" -"\n" -"\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/it/knotifications5_qt.po new/knotifications-5.4.0/po/it/knotifications5_qt.po --- old/knotifications-5.3.0/po/it/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/it/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -8,7 +8,7 @@ # Luciano Montanaro <[email protected]>, 2007. # Dario Panico <[email protected]>, 2008. # Pino Toscano <[email protected]>, 2008. -# Federico Zenith <[email protected]>, 2008, 2012, 2013. +# Federico Zenith <[email protected]>, 2008, 2012, 2013, 2014. # Innocenzo Ventre <[email protected]>, 2012. # Vincenzo Reale <[email protected]>, 2014. msgid "" @@ -25,6 +25,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ja/knotifications5_qt.po new/knotifications-5.4.0/po/ja/knotifications5_qt.po --- old/knotifications-5.3.0/po/ja/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ja/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" "X-Generator: Lokalize 1.1\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ka/knotifications5_qt.po new/knotifications-5.4.0/po/ka/knotifications5_qt.po --- old/knotifications-5.3.0/po/ka/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ka/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -15,6 +15,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/kk/knotifications5_qt.po new/knotifications-5.4.0/po/kk/knotifications5_qt.po --- old/knotifications-5.3.0/po/kk/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/kk/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,11 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=1; plural=0;\n" -"\n" -"\n" -"\n" -"\n" -"\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/km/knotifications5_qt.po new/knotifications-5.4.0/po/km/knotifications5_qt.po --- old/knotifications-5.3.0/po/km/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/km/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -15,6 +15,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.11.4\n" "X-Language: km-KH\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/kn/knotifications5_qt.po new/knotifications-5.4.0/po/kn/knotifications5_qt.po --- old/knotifications-5.3.0/po/kn/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/kn/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,8 +18,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"\n" "X-Generator: Lokalize 1.0\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ko/knotifications5_qt.po new/knotifications-5.4.0/po/ko/knotifications5_qt.po --- old/knotifications-5.3.0/po/ko/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ko/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ku/knotifications5_qt.po new/knotifications-5.4.0/po/ku/knotifications5_qt.po --- old/knotifications-5.3.0/po/ku/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ku/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "X-Poedit-Language: Kurdish\n" "X-Poedit-Country: Kurdistan\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/lb/knotifications5_qt.po new/knotifications-5.4.0/po/lb/knotifications5_qt.po --- old/knotifications-5.3.0/po/lb/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/lb/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -15,6 +15,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/lt/knotifications5_qt.po new/knotifications-5.4.0/po/lt/knotifications5_qt.po --- old/knotifications-5.3.0/po/lt/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/lt/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -22,6 +22,7 @@ "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/lv/knotifications5_qt.po new/knotifications-5.4.0/po/lv/knotifications5_qt.po --- old/knotifications-5.3.0/po/lv/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/lv/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -24,6 +24,7 @@ "2);\n" "X-Launchpad-Export-Date: 2007-11-22 17:44+0000\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/mai/knotifications5_qt.po new/knotifications-5.4.0/po/mai/knotifications5_qt.po --- old/knotifications-5.3.0/po/mai/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/mai/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -19,6 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/mk/knotifications5_qt.po new/knotifications-5.4.0/po/mk/knotifications5_qt.po --- old/knotifications-5.3.0/po/mk/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/mk/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -28,6 +28,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: Plural-Forms: nplurals=3; plural=n%10==1 ? 0 : n%10==2 ? 1 : " "2;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ml/knotifications5_qt.po new/knotifications-5.4.0/po/ml/knotifications5_qt.po --- old/knotifications-5.3.0/po/ml/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ml/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -22,6 +22,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Country: INDIA\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/mr/knotifications5_qt.po new/knotifications-5.4.0/po/mr/knotifications5_qt.po --- old/knotifications-5.3.0/po/mr/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/mr/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Sandeep Shedmake <[email protected]>, 2008, 2009. -# Chetan Khona <[email protected]>, 2012, 2013. +# Chetan Khona <[email protected]>, 2012, 2013, 2014. msgid "" msgstr "" "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: 2013-03-29 16:14+0530\n" +"PO-Revision-Date: 2014-10-28 14:31+0530\n" "Last-Translator: Chetan Khona <[email protected]>\n" "Language-Team: Marathi <[email protected]>\n" "Language: mr\n" @@ -18,45 +18,35 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 -#, fuzzy -#| msgid "Unknown Application" msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "अपरिचीत अनुप्रयोग" #: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 -#, fuzzy -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "लहान करा (&M)" #: kstatusnotifieritem.cpp:724 -#, fuzzy -#| msgid "Quit" msgctxt "KStatusNotifierItem|" msgid "Quit" msgstr "बाहेर पडा" #: kstatusnotifieritem.cpp:897 -#, fuzzy -#| msgid "&Restore" msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "पुन्हस्थापन (&R)" #: kstatusnotifieritem.cpp:911 -#, fuzzy, qt-format -#| msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" +#, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt><b>%1</b> : मधून तुम्हाला नक्की बाहेर पडायचे आहे का?</qt>" #: kstatusnotifieritem.cpp:914 -#, fuzzy -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "प्रणाली ट्रे जाण्याची पुष्टि करा" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ms/knotifications5_qt.po new/knotifications-5.4.0/po/ms/knotifications5_qt.po --- old/knotifications-5.3.0/po/ms/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ms/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/nb/knotifications5_qt.po new/knotifications-5.4.0/po/nb/knotifications5_qt.po --- old/knotifications-5.3.0/po/nb/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/nb/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -24,13 +24,14 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" msgid "Unknown Application" msgstr "Ukjent program" -#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:903 +#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Minimer" @@ -40,18 +41,18 @@ msgid "Quit" msgstr "Avslutt" -#: kstatusnotifieritem.cpp:901 +#: kstatusnotifieritem.cpp:897 msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Gjenopprett" -#: kstatusnotifieritem.cpp:915 +#: kstatusnotifieritem.cpp:911 #, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Vil du avslutte <b>%1</b>?</qt>" -#: kstatusnotifieritem.cpp:918 +#: kstatusnotifieritem.cpp:914 msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "Bekreft «Avslutt» fra systemkurven" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/nds/knotifications5_qt.po new/knotifications-5.4.0/po/nds/knotifications5_qt.po --- old/knotifications-5.3.0/po/nds/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/nds/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ne/knotifications5_qt.po new/knotifications-5.4.0/po/ne/knotifications5_qt.po --- old/knotifications-5.3.0/po/ne/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ne/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n !=1\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/nl/knotifications5_qt.po new/knotifications-5.4.0/po/nl/knotifications5_qt.po --- old/knotifications-5.3.0/po/nl/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/nl/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -30,6 +30,7 @@ "kftabdlg.cpp kftypes.cpp kfwin.cpp main.cpp mkfdird.cpp mkfind.cpp\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/nn/knotifications5_qt.po new/knotifications-5.4.0/po/nn/knotifications5_qt.po --- old/knotifications-5.3.0/po/nn/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/nn/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -2,7 +2,7 @@ # # Gaute Hvoslef Kvalnes <[email protected]>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <[email protected]>, 2003, 2005. -# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. msgid "" msgstr "" @@ -21,6 +21,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/oc/knotifications5_qt.po new/knotifications-5.4.0/po/oc/knotifications5_qt.po --- old/knotifications-5.3.0/po/oc/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/oc/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/or/knotifications5_qt.po new/knotifications-5.4.0/po/or/knotifications5_qt.po --- old/knotifications-5.3.0/po/or/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/or/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,11 +17,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"\n" -"\n" -"\n" -"\n" "X-Generator: KBabel 1.11.4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/pa/knotifications5_qt.po new/knotifications-5.4.0/po/pa/knotifications5_qt.po --- old/knotifications-5.3.0/po/pa/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/pa/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -23,6 +23,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/pl/knotifications5_qt.po new/knotifications-5.4.0/po/pl/knotifications5_qt.po --- old/knotifications-5.3.0/po/pl/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/pl/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -27,6 +27,7 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ps/knotifications5_qt.po new/knotifications-5.4.0/po/ps/knotifications5_qt.po --- old/knotifications-5.3.0/po/ps/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ps/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Pashto, Pushto\n" "X-Poedit-Country: AFGHANISTAN\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/pt/knotifications5_qt.po new/knotifications-5.4.0/po/pt/knotifications5_qt.po --- old/knotifications-5.3.0/po/pt/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/pt/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -105,6 +105,7 @@ "X-POFile-SpellExtra: DQTDECLARATIVEDEBUG QML slot pedro mantê Pocinhas\n" "X-POFile-SpellExtra: Reconstrói ii Del iii querê\n" "X-POFile-IgnoreConsistency: Update\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/pt_BR/knotifications5_qt.po new/knotifications-5.4.0/po/pt_BR/knotifications5_qt.po --- old/knotifications-5.3.0/po/pt_BR/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/pt_BR/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -27,6 +27,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ro/knotifications5_qt.po new/knotifications-5.4.0/po/ro/knotifications5_qt.po --- old/knotifications-5.3.0/po/ro/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ro/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ru/knotifications5_qt.po new/knotifications-5.4.0/po/ru/knotifications5_qt.po --- old/knotifications-5.3.0/po/ru/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ru/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -32,6 +32,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/se/knotifications5_qt.po new/knotifications-5.4.0/po/se/knotifications5_qt.po --- old/knotifications-5.3.0/po/se/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/se/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/si/knotifications5_qt.po new/knotifications-5.4.0/po/si/knotifications5_qt.po --- old/knotifications-5.3.0/po/si/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/si/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -15,6 +15,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sk/knotifications5_qt.po new/knotifications-5.4.0/po/sk/knotifications5_qt.po --- old/knotifications-5.3.0/po/sk/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sk/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sl/knotifications5_qt.po new/knotifications-5.4.0/po/sl/knotifications5_qt.po --- old/knotifications-5.3.0/po/sl/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sl/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -27,6 +27,7 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sq/knotifications5_qt.po new/knotifications-5.4.0/po/sq/knotifications5_qt.po --- old/knotifications-5.3.0/po/sq/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sq/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -14,6 +14,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Launchpad-Export-Date: 2010-11-24 03:19+0000\n" "X-Generator: Lokalize 1.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sr/knotifications5_qt.po new/knotifications-5.4.0/po/sr/knotifications5_qt.po --- old/knotifications-5.3.0/po/sr/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sr/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "X-Text-Markup: qtrich\n" "X-Environment: kde\n" "X-Wrapping: fine\n" +"X-Qt-Contexts: true\n" # >> @item in message source specification #: knotificationrestrictions.cpp:184 @@ -28,7 +29,7 @@ msgid "Unknown Application" msgstr "непознат програм" -#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:903 +#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Минимизуј" @@ -38,19 +39,19 @@ msgid "Quit" msgstr "Напусти" -#: kstatusnotifieritem.cpp:901 +#: kstatusnotifieritem.cpp:897 msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Обнови" -#: kstatusnotifieritem.cpp:915 +#: kstatusnotifieritem.cpp:911 #, 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:918 +#: kstatusnotifieritem.cpp:914 msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "Потврда напуштања преко системске касете" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sr@ijekavian/knotifications5_qt.po new/knotifications-5.4.0/po/sr@ijekavian/knotifications5_qt.po --- old/knotifications-5.3.0/po/sr@ijekavian/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sr@ijekavian/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" "X-Environment: kde\n" +"X-Qt-Contexts: true\n" # >> @item in message source specification #: knotificationrestrictions.cpp:184 @@ -27,7 +28,7 @@ msgid "Unknown Application" msgstr "непознат програм" -#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:903 +#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Минимизуј" @@ -37,19 +38,19 @@ msgid "Quit" msgstr "Напусти" -#: kstatusnotifieritem.cpp:901 +#: kstatusnotifieritem.cpp:897 msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Обнови" -#: kstatusnotifieritem.cpp:915 +#: kstatusnotifieritem.cpp:911 #, 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:918 +#: kstatusnotifieritem.cpp:914 msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "Потврда напуштања преко системске касете" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/sr@ijekavianlatin/knotifications5_qt.po new/knotifications-5.4.0/po/sr@ijekavianlatin/knotifications5_qt.po --- old/knotifications-5.3.0/po/sr@ijekavianlatin/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sr@ijekavianlatin/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" "X-Environment: kde\n" +"X-Qt-Contexts: true\n" # >> @item in message source specification #: knotificationrestrictions.cpp:184 @@ -27,7 +28,7 @@ msgid "Unknown Application" msgstr "nepoznat program" -#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:903 +#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Minimizuj" @@ -37,19 +38,19 @@ msgid "Quit" msgstr "Napusti" -#: kstatusnotifieritem.cpp:901 +#: kstatusnotifieritem.cpp:897 msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Obnovi" -#: kstatusnotifieritem.cpp:915 +#: kstatusnotifieritem.cpp:911 #, 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:918 +#: kstatusnotifieritem.cpp:914 msgctxt "KStatusNotifierItem|" 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.3.0/po/sr@latin/knotifications5_qt.po new/knotifications-5.4.0/po/sr@latin/knotifications5_qt.po --- old/knotifications-5.3.0/po/sr@latin/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/sr@latin/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" "X-Environment: kde\n" +"X-Qt-Contexts: true\n" # >> @item in message source specification #: knotificationrestrictions.cpp:184 @@ -27,7 +28,7 @@ msgid "Unknown Application" msgstr "nepoznat program" -#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:903 +#: kstatusnotifieritem.cpp:459 kstatusnotifieritem.cpp:899 msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Minimizuj" @@ -37,19 +38,19 @@ msgid "Quit" msgstr "Napusti" -#: kstatusnotifieritem.cpp:901 +#: kstatusnotifieritem.cpp:897 msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Obnovi" -#: kstatusnotifieritem.cpp:915 +#: kstatusnotifieritem.cpp:911 #, 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:918 +#: kstatusnotifieritem.cpp:914 msgctxt "KStatusNotifierItem|" 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.3.0/po/ta/knotifications5_qt.po new/knotifications-5.4.0/po/ta/knotifications5_qt.po --- old/knotifications-5.3.0/po/ta/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ta/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/te/knotifications5_qt.po new/knotifications-5.4.0/po/te/knotifications5_qt.po --- old/knotifications-5.3.0/po/te/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/te/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -24,6 +24,7 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/tg/knotifications5_qt.po new/knotifications-5.4.0/po/tg/knotifications5_qt.po --- old/knotifications-5.3.0/po/tg/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/tg/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/th/knotifications5_qt.po new/knotifications-5.4.0/po/th/knotifications5_qt.po --- old/knotifications-5.3.0/po/th/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/th/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -20,6 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/tr/knotifications5_qt.po new/knotifications-5.4.0/po/tr/knotifications5_qt.po --- old/knotifications-5.3.0/po/tr/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/tr/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -30,6 +30,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/tt/knotifications5_qt.po new/knotifications-5.4.0/po/tt/knotifications5_qt.po --- old/knotifications-5.3.0/po/tt/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/tt/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.2\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/ug/knotifications5_qt.po new/knotifications-5.4.0/po/ug/knotifications5_qt.po --- old/knotifications-5.3.0/po/ug/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/ug/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -17,6 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/uk/knotifications5_qt.po new/knotifications-5.4.0/po/uk/knotifications5_qt.po --- old/knotifications-5.3.0/po/uk/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/uk/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -22,6 +22,7 @@ "X-Generator: Lokalize 1.5\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-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/uz/knotifications5_qt.po new/knotifications-5.4.0/po/uz/knotifications5_qt.po --- old/knotifications-5.3.0/po/uz/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/uz/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/uz@cyrillic/knotifications5_qt.po new/knotifications-5.4.0/po/uz@cyrillic/knotifications5_qt.po --- old/knotifications-5.3.0/po/uz@cyrillic/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/uz@cyrillic/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -16,6 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/vi/knotifications5_qt.po new/knotifications-5.4.0/po/vi/knotifications5_qt.po --- old/knotifications-5.3.0/po/vi/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/vi/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -18,6 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/wa/knotifications5_qt.po new/knotifications-5.4.0/po/wa/knotifications5_qt.po --- old/knotifications-5.3.0/po/wa/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/wa/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -21,6 +21,7 @@ "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Walloon\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/xh/knotifications5_qt.po new/knotifications-5.4.0/po/xh/knotifications5_qt.po --- old/knotifications-5.3.0/po/xh/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/xh/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -22,6 +22,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0beta2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.4.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.3.0/po/zh_CN/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/zh_CN/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -24,6 +24,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/zh_HK/knotifications5_qt.po new/knotifications-5.4.0/po/zh_HK/knotifications5_qt.po --- old/knotifications-5.3.0/po/zh_HK/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/zh_HK/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -12,10 +12,10 @@ # Wang Jian <[email protected]>, 2002. # Anthony Fok <[email protected]>, 2002. # Yuan-Chen Cheng <[email protected]>, 2002. -# Wang Jian <[email protected]>, 1998. -# Funda Wang <[email protected]>, 2002. -# Sarah Smith <[email protected]>, 2002. -# Xiong Jiang <[email protected]>, 2002. +# Wang Jian <[email protected]>, 1998. +# Funda Wang <[email protected]>, 2002. +# Sarah Smith <[email protected]>, 2002. +# Xiong Jiang <[email protected]>, 2002. # Chia-Lin, Kao <[email protected]>, 2004. # Stanley Wong <[email protected]>, 2005. # Abel Cheung <[email protected]>, 2005. @@ -34,6 +34,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/po/zh_TW/knotifications5_qt.po new/knotifications-5.4.0/po/zh_TW/knotifications5_qt.po --- old/knotifications-5.3.0/po/zh_TW/knotifications5_qt.po 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/po/zh_TW/knotifications5_qt.po 2014-11-02 13:16:10.000000000 +0100 @@ -25,6 +25,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 msgctxt "KNotificationRestrictions|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/src/knotification.cpp new/knotifications-5.4.0/src/knotification.cpp --- old/knotifications-5.3.0/src/knotification.cpp 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/src/knotification.cpp 2014-11-02 13:16:10.000000000 +0100 @@ -49,6 +49,7 @@ QWidget *widget; QString title; QString text; + QString iconName; QStringList actions; QPixmap pixmap; ContextList contexts; @@ -147,6 +148,20 @@ } } +void KNotification::setIconName(const QString &icon) +{ + d->needUpdate = true; + d->iconName = icon; + if (d->id > 0) { + d->updateTimer.start(); + } +} + +QString KNotification::iconName() const +{ + return d->iconName; +} + QPixmap KNotification::pixmap() const { return d->pixmap; @@ -326,6 +341,21 @@ return event(eventid, QString(), text, pixmap, widget, flags); } +KNotification *KNotification::event(const QString &eventid, const QString &title, const QString &text, + const QString &iconName, QWidget *widget, + const NotificationFlags &flags, const QString &componentName) +{ + KNotification *notify = new KNotification(eventid, widget, flags); + notify->setTitle(title); + notify->setText(text); + notify->setIconName(iconName); + notify->setComponentName(flags & DefaultEvent ? QStringLiteral("plasma_workspace") : componentName); + + QTimer::singleShot(0, notify, SLOT(sendEvent())); + + return notify; +} + void KNotification::ref() { d->ref++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/src/knotification.h new/knotifications-5.4.0/src/knotification.h --- old/knotifications-5.3.0/src/knotification.h 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/src/knotification.h 2014-11-02 13:16:10.000000000 +0100 @@ -350,6 +350,20 @@ void setText(const QString &text); /** + * \return the icon shown in the popup + * \see setIconName + * \since 5.4 + */ + QString iconName() const; + + /** + * set the icon that will be shown in the popup. + * @param icon the icon + * @since 5.4 + */ + void setIconName(const QString &icon); + + /** * \return the pixmap shown in the popup * \see setPixmap */ @@ -558,7 +572,7 @@ * @param pixmap is a picture which may be shown in the popup. * @param widget is a widget where the notification reports to * @param flags is a bitmask of NotificationFlag - * @param componentData used to determine the location of the config file. by default, kapp is used + * @param componentName used to determine the location of the config file. by default, plasma_workspace is used */ static KNotification *event(const QString &eventId, const QString &text = QString(), const QPixmap &pixmap = QPixmap(), QWidget *widget = 0L, @@ -602,6 +616,27 @@ const NotificationFlags &flags = CloseOnTimeout); /** + * @brief emit a standard event with the possibility of setting an icon by icon name + * + * @overload + * + * This will emit a standard event + * + * @param eventId is the name of the event + * @param title is title of the notification to show in the popup. + * @param text is the text of the notification to show in the popup + * @param iconName a Freedesktop compatible icon name to be shown in the popup + * @param widget is a widget where the notification reports to + * @param flags is a bitmask of NotificationFlag + * @param componentName used to determine the location of the config file. by default, plasma_workspace is used + * @since 5.4 + */ + static KNotification *event(const QString &eventId, const QString &title, const QString &text, + const QString &iconName, QWidget *widget = 0L, + const NotificationFlags &flags = CloseOnTimeout, + const QString &componentName = QString()); + + /** * This is a simple substitution for QApplication::beep() * * @param reason a short text explaining what has happened (may be empty) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.3.0/src/notifybypopup.cpp new/knotifications-5.4.0/src/notifybypopup.cpp --- old/knotifications-5.3.0/src/notifybypopup.cpp 2014-10-04 19:09:21.000000000 +0200 +++ new/knotifications-5.4.0/src/notifybypopup.cpp 2014-11-02 13:16:10.000000000 +0100 @@ -256,6 +256,11 @@ QString appCaption, iconName; d->getAppCaptionAndIconName(notifyConfig, &appCaption, &iconName); + //did the user override the icon name? + if (!notification->iconName().isEmpty()) { + iconName = notification->iconName(); + } + KIconLoader iconLoader(iconName); QPixmap appIcon = iconLoader.loadIcon(iconName, KIconLoader::Small); @@ -588,6 +593,11 @@ QString iconName; getAppCaptionAndIconName(notifyConfig_nocheck, &appCaption, &iconName); + //did the user override the icon name? + if (!notification->iconName().isEmpty()) { + iconName = notification->iconName(); + } + // FIXME: rename this to something better reflecting what this is doing...maybe ensurePopupCompatibility(notification); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
