Hello community, here is the log from the commit of package libkleo for openSUSE:Factory checked in at 2018-01-17 21:53:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkleo (Old) and /work/SRC/openSUSE:Factory/.libkleo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkleo" Wed Jan 17 21:53:20 2018 rev:23 rq:564394 version:17.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libkleo/libkleo.changes 2017-12-18 08:54:24.701559916 +0100 +++ /work/SRC/openSUSE:Factory/.libkleo.new/libkleo.changes 2018-01-17 21:53:22.081095448 +0100 @@ -1,0 +2,10 @@ +Thu Jan 11 23:41:22 CET 2018 - lbeltr...@kde.org + +- Update to 17.12.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.1.php +- Changes since 17.12.0: + * Fix sorting in KeyRearrangeColumnsProxyModel + +------------------------------------------------------------------- Old: ---- libkleo-17.12.0.tar.xz New: ---- libkleo-17.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkleo.spec ++++++ --- /var/tmp/diff_new_pack.xCBL8z/_old 2018-01-17 21:53:23.101047740 +0100 +++ /var/tmp/diff_new_pack.xCBL8z/_new 2018-01-17 21:53:23.105047553 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkleo # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without lang Name: libkleo -Version: 17.12.0 +Version: 17.12.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ libkleo-17.12.0.tar.xz -> libkleo-17.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/CMakeLists.txt new/libkleo-17.12.1/CMakeLists.txt --- old/libkleo-17.12.0/CMakeLists.txt 2017-12-08 02:04:08.000000000 +0100 +++ new/libkleo-17.12.1/CMakeLists.txt 2018-01-09 02:20:14.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.0") +set(PIM_VERSION "5.7.1") project(libkleo VERSION ${PIM_VERSION}) @@ -25,7 +25,7 @@ set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) set(QT_REQUIRED_VERSION "5.8.0") -set(KDEPIMTEXTEDIT_VERSION "5.7.0") +set(KDEPIMTEXTEDIT_VERSION "5.7.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/po/fr/libkleopatra.po new/libkleo-17.12.1/po/fr/libkleopatra.po --- old/libkleo-17.12.0/po/fr/libkleopatra.po 2017-12-08 02:04:07.000000000 +0100 +++ new/libkleo-17.12.1/po/fr/libkleopatra.po 2018-01-09 02:20:13.000000000 +0100 @@ -9,7 +9,7 @@ # Sébastien Renard <sebastien.ren...@digitalfox.org>, 2007, 2008. # Sébastien Renard <ren...@kde.org>, 2011, 2015. # xavier <xavier.besn...@neuf.fr>, 2013. -# Vincent Pinon <vpi...@kde.org>, 2017. +# Vincent Pinon <vpi...@kde.org>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libkleopatra\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/po/pl/libkleopatra.po new/libkleo-17.12.1/po/pl/libkleopatra.po --- old/libkleo-17.12.0/po/pl/libkleopatra.po 2017-12-08 02:04:08.000000000 +0100 +++ new/libkleo-17.12.1/po/pl/libkleopatra.po 2018-01-09 02:20:14.000000000 +0100 @@ -1,5 +1,5 @@ # translation of libkleopatra.po to -# Version: $Revision: 1501348 $ +# Version: $Revision: 1506126 $ # Copyright (C) 2002,2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. # # Krzysztof Lichota <lich...@mimuw.edu.pl>, 2002, 2004, 2005. @@ -12,7 +12,7 @@ "Project-Id-Version: libkleopatra\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-12 03:26+0200\n" -"PO-Revision-Date: 2017-10-22 05:53+0100\n" +"PO-Revision-Date: 2017-12-09 07:43+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" @@ -584,7 +584,7 @@ #, kde-format msgid "<b>(Optional)</b> Enter your user name here, if needed." msgstr "" -"<b>(Opcjonalne)</b> Proszę wpisać tutaj swoją nazwę użytkownika, jeśli jest " +"<b>(Opcjonalne)</b> Wpisz tutaj swoją nazwę użytkownika, jeśli jest " "potrzebna." #: ui/directoryserviceswidget.cpp:746 @@ -594,7 +594,7 @@ "that the password will be saved in the clear in a config file in your home " "directory." msgstr "" -"<b>(Opcjonalne, nie zalecane)</b> Proszę wpisać tu swoje hasło, jeśli jest " +"<b>(Opcjonalne, nie zalecane)</b> Wpisz tu swoje hasło, jeśli jest " "potrzebne. Uwaga: hasło zostanie zapisane jawnym tekstem w pliku ustawień w " "twoim katalogu domowym." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/po/tr/libkleopatra.po new/libkleo-17.12.1/po/tr/libkleopatra.po --- old/libkleo-17.12.0/po/tr/libkleopatra.po 2017-12-08 02:04:08.000000000 +0100 +++ new/libkleo-17.12.1/po/tr/libkleopatra.po 2018-01-09 02:20:14.000000000 +0100 @@ -816,8 +816,8 @@ "<qt><p>An error occurred while fetching the keys from the backend:</p><p><b>" "%1</b></p></qt>" msgstr "" -"<qt><p>Arka uçtan anahtarlar alınırken bir hata oluştu:</p><p><b>%1</b></p></" -"qt>" +"<qt><p>Arka uçtan anahtarlar alınırken bir hata " +"oluştu:</p><p><b>%1</b></p></qt>" #: ui/keyrequester.cpp:251 ui/keyrequester.cpp:283 ui/keyrequester.cpp:306 #: ui/keyselectiondialog.cpp:628 ui/keyselectiondialog.cpp:660 @@ -1517,8 +1517,7 @@ #: utils/formatting.cpp:748 #, kde-format msgid "The import contained no new data for this certificate. It is unchanged." -msgstr "" -"İçe aktarma, bu sertifika için yeni bir veri içermiyor. Değiştirilmedi." +msgstr "İçe aktarma, bu sertifika için yeni bir veri içermiyor. Değiştirilmedi." #: utils/formatting.cpp:765 #, kde-format @@ -1627,21 +1626,18 @@ #~ msgid "" #~ "Select the access scheme (scheme) that the directory service is available " #~ "through." -#~ msgstr "" -#~ "Dizin hizmetinin kullanılabilir olduğu erişim şemasını (şema) seçin." +#~ msgstr "Dizin hizmetinin kullanılabilir olduğu erişim şemasını (şema) seçin." #~ msgid "" #~ "Check this column if this directory service is providing S/MIME (X.509) " #~ "certificates." #~ msgstr "" -#~ "Dizin hizmeti S/MIME (X.509) sertifikaları sağlıyorsa bu sütunu kontrol " -#~ "edin." +#~ "Dizin hizmeti S/MIME (X.509) sertifikaları sağlıyorsa bu sütunu kontrol edin." #~ msgid "" #~ "Check this column if this directory service is providing OpenPGP " #~ "certificates." -#~ msgstr "" -#~ "Dizin hizmeti OpenPGP sertifikaları sağlıyorsa bu sütunu kontrol edin." +#~ msgstr "Dizin hizmeti OpenPGP sertifikaları sağlıyorsa bu sütunu kontrol edin." #~ msgid "0 - None (no debugging at all)" #~ msgstr "0 - Hiçbiri (hata ayıklama yok)" @@ -1868,21 +1864,20 @@ #~ msgid "" #~ "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" #~ msgstr "" -#~ "Kullanıcının gizli anahtarını açmak için bir şifreye ihtiyacınız var:<br/" -#~ "> %1 (retry)" +#~ "Kullanıcının gizli anahtarını açmak için bir şifreye ihtiyacınız var:<br/> %" +#~ "1 (retry)" #~ msgid "You need a passphrase to unlock the secret key for user:<br/> %1" #~ msgstr "" -#~ "Kullanıcının gizli anahtarını açmak için bir şifreye ihtiyacınız var:<br/" -#~ "> %1" +#~ "Kullanıcının gizli anahtarını açmak için bir şifreye ihtiyacınız var:<br/> %1" #~ msgid "" #~ "This dialog will reappear every time the passphrase is needed. For a more " #~ "secure solution that also allows caching the passphrase, use gpg-agent." #~ msgstr "" -#~ "Bu diyalog kutusu her şifreye ihtiyaç duyulduğunda tekrar görünecektir. " -#~ "Daha güvenli bir çözüm olarak şifreyi kaydetmeye de izin veren gpg-agent' " -#~ "i kullanın." +#~ "Bu diyalog kutusu her şifreye ihtiyaç duyulduğunda tekrar görünecektir. Daha " +#~ "güvenli bir çözüm olarak şifreyi kaydetmeye de izin veren gpg-agent' i " +#~ "kullanın." #~ msgid "gpg-agent was found in %1, but does not appear to be running." #~ msgstr "%1 içinde gpg-agent bulundu, ama çalışır gibi görünmüyor." @@ -1924,9 +1919,9 @@ #~ "<qt>\n" #~ "<h1>X.500 Dizin Servisleri</h1>\n" #~ "X.500 dizin servislerini, sertifikaları ve yerel olarak kaydedilmeyen " -#~ "sertifika iptal listelerini almak için kullanabilirsiniz. Eğer bu " -#~ "özelliği kullanmak istiyor ve hangi dizin servisini kullanacağınızdan " -#~ "emin değilseniz, sistem yöneticinize danışın.\n" +#~ "sertifika iptal listelerini almak için kullanabilirsiniz. Eğer bu özelliği " +#~ "kullanmak istiyor ve hangi dizin servisini kullanacağınızdan emin " +#~ "değilseniz, sistem yöneticinize danışın.\n" #~ "<p> \n" #~ "Eğer bir dizin servisi kullanmıyorsanız, hâlâ yerel sertifikaları " #~ "kullanabilirsiniz.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/po/zh_CN/libkleopatra.po new/libkleo-17.12.1/po/zh_CN/libkleopatra.po --- old/libkleo-17.12.0/po/zh_CN/libkleopatra.po 2017-12-08 02:04:08.000000000 +0100 +++ new/libkleo-17.12.1/po/zh_CN/libkleopatra.po 2018-01-09 02:20:14.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-12 03:26+0200\n" -"PO-Revision-Date: 2017-11-09 08:20-0500\n" +"PO-Revision-Date: 2018-01-08 18:07-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -20,7 +20,7 @@ "X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/pim/libkleopatra.pot\n" +"X-Crowdin-File: /kf5-stable/messages/pim/libkleopatra.pot\n" #: kleo/checksumdefinition.cpp:107 #, kde-format @@ -1179,7 +1179,7 @@ #: utils/formatting.cpp:271 #, kde-format msgid "Encryption" -msgstr "" +msgstr "仅加密" #: utils/formatting.cpp:274 #, kde-format @@ -1370,7 +1370,7 @@ #, kde-format msgctxt "as in good/valid signature" msgid "good" -msgstr "良好" +msgstr "良好 " #: utils/formatting.cpp:591 #, kde-format @@ -1381,7 +1381,7 @@ #, kde-format msgctxt "good/valid signature" msgid "good" -msgstr "良好" +msgstr "良好 " #: utils/formatting.cpp:601 #, kde-format @@ -1398,7 +1398,7 @@ #, kde-format msgctxt "name, email, key id" msgid "%1 %2 (%3)" -msgstr "" +msgstr "%1 %2 (%3)" #: utils/formatting.cpp:671 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/src/models/keyrearrangecolumnsproxymodel.cpp new/libkleo-17.12.1/src/models/keyrearrangecolumnsproxymodel.cpp --- old/libkleo-17.12.0/src/models/keyrearrangecolumnsproxymodel.cpp 2017-12-04 11:20:17.000000000 +0100 +++ new/libkleo-17.12.1/src/models/keyrearrangecolumnsproxymodel.cpp 2018-01-05 08:07:44.000000000 +0100 @@ -81,3 +81,15 @@ } return myIdxs; } + +void KeyRearrangeColumnsProxyModel::sort(int column, Qt::SortOrder order) +{ + const auto fakeIdx = createIndex(0, column); + if (!fakeIdx.isValid()) { + // Empty model? + KRearrangeColumnsProxyModel::sort(column, order); + return; + } + const auto remappedIdx = mapToSource(fakeIdx); + KRearrangeColumnsProxyModel::sort(remappedIdx.column(), order); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/src/models/keyrearrangecolumnsproxymodel.h new/libkleo-17.12.1/src/models/keyrearrangecolumnsproxymodel.h --- old/libkleo-17.12.0/src/models/keyrearrangecolumnsproxymodel.h 2017-12-04 11:20:17.000000000 +0100 +++ new/libkleo-17.12.1/src/models/keyrearrangecolumnsproxymodel.h 2018-01-05 08:07:44.000000000 +0100 @@ -54,6 +54,8 @@ QModelIndex index(const GpgME::Key &key) const override; QList<QModelIndex> indexes(const std::vector<GpgME::Key> &keys) const override; + + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; private: KeyListModelInterface *klm() const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/src/ui/auditlogviewer.cpp new/libkleo-17.12.1/src/ui/auditlogviewer.cpp --- old/libkleo-17.12.0/src/ui/auditlogviewer.cpp 2017-12-04 11:20:17.000000000 +0100 +++ new/libkleo-17.12.1/src/ui/auditlogviewer.cpp 2018-01-05 08:07:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (c) 2015-2018 Montel Laurent <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.0/src/ui/auditlogviewer.h new/libkleo-17.12.1/src/ui/auditlogviewer.h --- old/libkleo-17.12.0/src/ui/auditlogviewer.h 2017-12-04 11:20:17.000000000 +0100 +++ new/libkleo-17.12.1/src/ui/auditlogviewer.h 2018-01-05 08:07:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2017 Montel Laurent <mon...@kde.org> + Copyright (c) 2015-2018 Montel Laurent <mon...@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by
