Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2017-03-03 17:20:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Fri Mar 3 17:20:38 2017 rev:41 rq:461465 version:5.31.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2017-02-08 10:49:20.272947391 +0100 +++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2017-03-03 17:20:39.455644027 +0100 @@ -1,0 +2,7 @@ +Thu Feb 9 09:34:13 UTC 2017 - [email protected] + +- Update to 5.31.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.31.0.php + +------------------------------------------------------------------- Old: ---- kwallet-5.30.0.tar.xz New: ---- kwallet-5.31.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.7mQpDI/_old 2017-03-03 17:20:40.099552948 +0100 +++ /var/tmp/diff_new_pack.7mQpDI/_new 2017-03-03 17:20:40.099552948 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Wallet5 -%define _tar_path 5.30 +%define _tar_path 5.31 Name: kwallet -Version: 5.30.0 +Version: 5.31.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -51,9 +51,9 @@ BuildRequires: kwidgetsaddons-devel >= %{_tar_path} BuildRequires: kwindowsystem-devel >= %{_tar_path} BuildRequires: libgcrypt-devel >= 1.5.0 -BuildRequires: cmake(Qt5DBus) >= 5.5.0 -BuildRequires: cmake(Qt5Test) >= 5.5.0 -BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5DBus) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 Summary: Safe desktop-wide storage for passwords License: LGPL-2.1+ Group: System/GUI/KDE @@ -124,7 +124,7 @@ Requires: %lname = %{version} Requires: extra-cmake-modules Requires: libkwalletbackend5-5 = %{version} -Requires: cmake(Qt5Gui) >= 5.5.0 +Requires: cmake(Qt5Gui) >= 5.6.0 # Was shortly present in K:F5 Obsoletes: kwallet-framework-devel <= %{version} Provides: kwallet-framework-devel = %{version} ++++++ kwallet-5.30.0.tar.xz -> kwallet-5.31.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/CMakeLists.txt new/kwallet-5.31.0/CMakeLists.txt --- old/kwallet-5.30.0/CMakeLists.txt 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/CMakeLists.txt 2017-02-05 12:15:10.000000000 +0100 @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.30.0") # handled by release scripts -set(KF5_DEP_VERSION "5.30.0") # handled by release scripts +set(KF5_VERSION "5.31.0") # handled by release scripts +set(KF5_DEP_VERSION "5.31.0") # handled by release scripts project(KWallet VERSION ${KF5_VERSION}) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) include(FeatureSummary) -find_package(ECM 5.30.0 NO_MODULE) +find_package(ECM 5.31.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/po/de/kwalletd5.po new/kwallet-5.31.0/po/de/kwalletd5.po --- old/kwallet-5.30.0/po/de/kwalletd5.po 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/po/de/kwalletd5.po 2017-02-05 12:15:10.000000000 +0100 @@ -1,5 +1,5 @@ # Thomas Reitelbach <[email protected]>, 2008, 2009. -# Burkhard Lück <[email protected]>, 2009, 2013, 2014, 2015. +# Burkhard Lück <[email protected]>, 2009, 2013, 2014, 2015, 2017. # Panagiotis Papadopoulos <[email protected]>, 2010. # Frederik Schwarzer <[email protected]>, 2010, 2011, 2013, 2016. # Benjamin Weis <[email protected]>, 2013. @@ -8,8 +8,8 @@ "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-15 04:19+0100\n" -"PO-Revision-Date: 2016-08-12 13:00+0100\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2017-01-08 21:28+0100\n" +"Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -239,15 +239,12 @@ #: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162 #: kwalletwizard.cpp:166 -#, fuzzy, kde-format -#| msgid "" -#| "The QGpgME library failed to initialize for the OpenPGP protocol. Please " -#| "check your system's configuration then try again." +#, kde-format msgid "" "The GpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." msgstr "" -"Die Bibliothek QGpgME konnte für das OpenPGP-Protokoll nicht initialisiert " +"Die Bibliothek GpgME konnte für das OpenPGP-Protokoll nicht initialisiert " "werden. Bitte überprüfen Sie Ihre Systemeinrichtung und versuchen es dann " "erneut." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/po/gl/kwalletd5.po new/kwallet-5.31.0/po/gl/kwalletd5.po --- old/kwallet-5.30.0/po/gl/kwalletd5.po 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/po/gl/kwalletd5.po 2017-02-05 12:15:10.000000000 +0100 @@ -41,9 +41,9 @@ "wallet <b>%1</b>. Error code is <b>%2</b>. Please fix your system " "configuration, then try again.</qt>" msgstr "" -"<qt>Produciuse un erro ao tentar inicializar OpenPGP mentres se tentaba " +"<qt>Produciuse un erro ao intentar inicializar OpenPGP mentres se intentaba " "gardar a carteira <b>%1</b>. O código do erro é <b>%2</b>. Arranxe a " -"configuración do sistema e ténteo de novo.</qt>" +"configuración do sistema e inténteo de novo.</qt>" #: backend/backendpersisthandler.cpp:512 #, kde-format @@ -51,9 +51,9 @@ "<qt>Error when attempting to initialize OpenPGP while attempting to save the " "wallet <b>%1</b>. Please fix your system configuration, then try again.</qt>" msgstr "" -"<qt>Produciuse un erro ao tentar inicializar OpenPGP mentres se tentaba " -"gardar a carteira <b>%1</b>. Arranxe a configuración do sistema e ténteo de " -"novo.</qt>" +"<qt>Produciuse un erro ao intentar inicializar OpenPGP mentres se intentaba " +"gardar a carteira <b>%1</b>. Arranxe a configuración do sistema e inténteo " +"de novo.</qt>" #: backend/backendpersisthandler.cpp:563 #, kde-format @@ -63,11 +63,11 @@ "again. This error may occur if you are not using a full trust GPG key. " "Please ensure you have the secret key for the key you are using.</qt>" msgstr "" -"<qt>Produciuse un erro de cifrado ao tentar gardar a carteira <b>%1</b>. O " -"código do erro é <b>%2 (%3)</b>. Arranxe a configuración do sistema e ténteo " -"de novo. Este erro pode ocorrer se non usa unha chave GPG de completa " -"confianza. Asegúrese de que dispón da chave secreta correspondente á chave " -"pública que está a usar.</qt>" +"<qt>Produciuse un erro de cifrado ao intentar gardar a carteira <b>%1</b>. " +"O código do erro é <b>%2 (%3)</b>. Arranxe a configuración do sistema e " +"inténteo de novo. Este erro pode ocorrer se non usa unha chave GPG de " +"completa confianza. Asegúrese de que dispón da chave secreta correspondente " +"á chave pública que está a usar.</qt>" #: backend/backendpersisthandler.cpp:575 #, kde-format @@ -75,9 +75,9 @@ "<qt>File handling error while attempting to save the wallet <b>%1</b>. Error " "was <b>%2</b>. Please fix your system configuration, then try again.</qt>" msgstr "" -"<qt>Produciuse un erro de manexo de ficheiro ao tentar gardar a carteira <b>" -"%1</b>. O erro foi <b>%2</b>, Arranxe a configuración do sistema e ténteo de " -"novo.</qt>" +"<qt>Produciuse un erro de manexo de ficheiro ao intentar gardar a carteira " +"<b>%1</b>. O erro foi <b>%2</b>, Arranxe a configuración do sistema e " +"inténteo de novo.</qt>" #: backend/backendpersisthandler.cpp:593 #, kde-format @@ -86,9 +86,9 @@ "wallet <b>%1</b>. Error code is <b>%2</b>. Please fix your system " "configuration, then try again.</qt>" msgstr "" -"<qt>Produciuse un erro ao tentar inicializar OpenPGP mentres se tentaba " +"<qt>Produciuse un erro ao intentar inicializar OpenPGP mentres se intentaba " "abrir a carteira <b>%1</b>. O código do erro é <b>%2</b>. Arranxe a " -"configuración do sistema e ténteo de novo.</qt>" +"configuración do sistema e inténteo de novo.</qt>" #: backend/backendpersisthandler.cpp:611 #, kde-format @@ -96,8 +96,8 @@ "<qt>Error when attempting to initialize OpenPGP while attempting to open the " "wallet <b>%1</b>. Please fix your system configuration, then try again.</qt>" msgstr "" -"<qt>Produciuse un erro ao tentar inicializar OpenPGP mentres se tentaba " -"abrir a carteira <b>%1</b>. Arranxe a configuración do sistema e ténteo de " +"<qt>Produciuse un erro ao intentar inicializar OpenPGP mentres se intentaba " +"abrir a carteira <b>%1</b>. Arranxe a configuración do sistema e inténteo de " "novo.</qt>" #: backend/backendpersisthandler.cpp:621 @@ -112,8 +112,8 @@ "you're using a SmartCard, please ensure it's inserted then try again." "<br><br>GPG error was <b>%2</b></qt>" msgstr "" -"<qt>Aconteceu un erro ao tentar descifrar a carteira <b>%1</b> usando GPG. " -"Se está a usar unha SmartCard asegúrese de que está inserida e ténteo de " +"<qt>Aconteceu un erro ao intentar descifrar a carteira <b>%1</b> usando GPG. " +"Se está a usar unha SmartCard asegúrese de que está inserida e inténteo de " "novo. <br><br>O erro de GPG foi <b>%2</b></qt>" #: backend/backendpersisthandler.cpp:624 @@ -128,7 +128,7 @@ "encrypted using the GPG Key ID <b>%2</b> but this key was not found on your " "system.</qt>" msgstr "" -"<qt>Produciuse un erro ao tentar abrir a carteira <b>%1</b>. A carteira " +"<qt>Produciuse un erro ao intentar abrir a carteira <b>%1</b>. A carteira " "estaba cifrada coa chave GPG con ID <b>%2</b> pero esta chave non se atopou " "no sistema.</qt>" @@ -224,8 +224,8 @@ "type below or click cancel to deny the application's request.</qt>" msgstr "" "<qt>KDE pediu crear unha carteira chamada «<b>%1</b>». Hase usar para gardar " -"datos sensíbeis dun xeito seguro. Escolla o tipo desta carteira ou prema en " -"cancelar para denegar o pedido do programa.</qt>" +"datos sensíbeis dun xeito seguro. Escolla o tipo desta carteira ou prema " +"cancelar para denegar o pedido do aplicativo.</qt>" #: knewwalletdialog.cpp:67 #, kde-format @@ -235,9 +235,9 @@ "Please choose the new wallet's type below or click cancel to deny the " "application's request.</qt>" msgstr "" -"<qt>O programa «<b>%1</b>» pediu crear unha carteira chamada «<b>%2</b>». " +"<qt>O aplicativo «<b>%1</b>» pediu crear unha carteira chamada «<b>%2</b>». " "Hase usar para gardar datos sensíbeis dun xeito seguro. Escolla o tipo desta " -"carteira ou prema en cancelar para denegar o pedido do programa.</qt>" +"carteira ou prema cancelar para denegar o pedido do aplicativo.</qt>" #: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162 #: kwalletwizard.cpp:166 @@ -316,10 +316,10 @@ "data in a secure fashion. Please choose the new wallet's type below or click " "cancel to deny the application's request.</p></body></html>" msgstr "" -"<html><head/><body><p>O programa «<span style=\" font-weight:600;\">%1</" +"<html><head/><body><p>O aplicativo «<span style=\" font-weight:600;\">%1</" "span>» pediu abrir a carteira de KDE, que se usa para gardar datos sensíbeis " -"dun xeito seguro. Escolla o tipo da nova carteira ou prema en cancelar para " -"denegar o pedido do programa.</p></body></html>" +"dun xeito seguro. Escolla o tipo da nova carteira ou prema cancelar para " +"denegar o pedido do aplicativo.</p></body></html>" #. i18n: ectx: property (text), widget (QRadioButton, radioBlowfish) #. i18n: ectx: property (text), widget (QRadioButton, _radioBlowfish) @@ -350,7 +350,7 @@ "<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</" "b>'. Please enter the password for this wallet below.</qt>" msgstr "" -"<qt>O programa «<b>%1</b>» pediu abrir a carteira «<b>%2</b>». Por favor, " +"<qt>O aplicativo «<b>%1</b>» pediu abrir a carteira «<b>%2</b>». Por favor, " "introduza en baixo o contrasinal desta carteira.</qt>" #. i18n( "&Open" ), "wallet-open")); @@ -364,7 +364,7 @@ #: kwalletd.cpp:639 #, kde-format msgid "An application has requested to open a wallet (%1)." -msgstr "Un programa pediu abrir unha carteira (%1)." +msgstr "Un aplicativo pediu abrir unha carteira (%1)." #: kwalletd.cpp:646 #, kde-format @@ -392,8 +392,8 @@ "<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br />(Error code " "%2: %3)</qt>" msgstr "" -"<qt>Produciuse un erro ao abrir a carteira «<b>%1</b>». Por favor, ténteo de " -"novo.<br/>(Código de erro %2: %3)</qt>" +"<qt>Produciuse un erro ao abrir a carteira «<b>%1</b>». Por favor, inténteo " +"de novo.<br/>(Código de erro %2: %3)</qt>" #: kwalletd.cpp:732 #, kde-format @@ -403,8 +403,8 @@ "click cancel to deny the application's request." msgstr "" "KDE pediu abrir a carteira. Esta é usada para gardar datos sensíbeis dun " -"xeito seguro. Introduza o contrasinal desta carteira ou prema en cancelar " -"para denegar o pedido do programa." +"xeito seguro. Introduza o contrasinal desta carteira ou prema cancelar para " +"denegar o pedido do aplicativo." #: kwalletd.cpp:740 #, kde-format @@ -414,9 +414,9 @@ "to use with this wallet or click cancel to deny the application's request.</" "qt>" msgstr "" -"<qt>O programa «<b>%1</b>» pediu abrir a carteira de KDE. Esta é usada para " -"gardar datos sensíbeis dun xeito seguro. Introduza o contrasinal desta " -"carteira ou prema en cancelar para denegar o pedido do programa.</qt>" +"<qt>O aplicativo «<b>%1</b>» pediu abrir a carteira de KDE. Esta é usada " +"para gardar datos sensíbeis dun xeito seguro. Introduza o contrasinal desta " +"carteira ou prema cancelar para denegar o pedido do aplicativo.</qt>" #: kwalletd.cpp:752 #, kde-format @@ -427,7 +427,7 @@ msgstr "" "<qt>KDE pediu crear unha carteira nova chamada «<b>%1</b>». Por favor, " "escolla un contrasinal para esta carteira, ou cancele para denegar o pedido " -"do programa.</qt>" +"do aplicativo.</qt>" #: kwalletd.cpp:760 #, kde-format @@ -436,9 +436,9 @@ "'<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the " "application's request.</qt>" msgstr "" -"<qt>O programa «<b>%1</b>» pediu crear unha nova carteira chamada «<b>%2</" +"<qt>O aplicativo «<b>%1</b>» pediu crear unha nova carteira chamada «<b>%2</" "b>». Por favor, escolla un contrasinal para esta carteira, ou cancele para " -"denegar o pedido do programa.</qt>" +"denegar o pedido do aplicativo.</qt>" #: kwalletd.cpp:887 #, kde-format @@ -451,7 +451,7 @@ "<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>" "%2</b>'.</qt>" msgstr "" -"<qt>O programa «<b>%1</b>» pediu acceso á carteira aberta «<b>%2</b>».</qt>" +"<qt>O aplicativo «<b>%1</b>» pediu acceso á carteira aberta «<b>%2</b>».</qt>" #: kwalletd.cpp:1012 #, kde-format @@ -497,7 +497,7 @@ "There have been repeated failed attempts to gain access to a wallet. An " "application may be misbehaving." msgstr "" -"Houbo fallos repetidos de obter acceso á carteira. Poida que un programa " +"Houbo fallos repetidos de obter acceso á carteira. Poida que un aplicativo " "teña un mal comportamento." #: kwalletwizard.cpp:52 @@ -537,8 +537,8 @@ "ficheiro de <span style=\" font-style:italic;\">carteira</span> no disco " "duro local. Os datos só se escriben cifrados do xeito que escolla, sexa co " "algoritmo blowfish co contrasinal como chave ou mediante unha chave GPG. " -"Cando se abre unha carteira, o programa de xestión da carteira iniciará e " -"mostrará unha icona na bandexa do sistema. Pode usar este programa para " +"Cando se abre unha carteira, o aplicativo de xestión da carteira iniciará e " +"mostrará unha icona na bandexa do sistema. Pode usar este aplicativo para " "xestionar as súas carteiras. Permítelle mesmo arrastrar carteiras e o seu " "contido, para que copie con facilidade a carteira nun sistema remoto.</p></" "body></html>" @@ -558,7 +558,7 @@ "<html><head/><body><p>As carteiras baseadas en GPG usan unha chave GPG para " "cifrar dun xeito seguro os datos no disco. A chave debe estar dispoñíbel " "cando se descifre ou non ha ter acceso á carteira. Por ex., se escolle unha " -"chave baseada nunha SmartCard, cando tente abrir a carteira o sistema GPG " +"chave baseada nunha SmartCard, cando intente abrir a carteira o sistema GPG " "halle pedir que a insira xunto co PIN asociado.<span style=\" font-" "weight:600;\">NOTA:</span> esta lista só contén as chaves con autenticación " "de «nivel máximo»</p></body></html>" @@ -582,7 +582,7 @@ msgstr "" "Non foi posíbel atopar polo menos unha <b>chave de cifrado GPG</b>. A " "carteira de KDE precisa dunha <b>chave de cifrado</b> para gardar no disco " -"dun xeito seguro os contrasinais ou outros datos sensíbeis. Se aínda desexa " +"dun xeito seguro os contrasinais ou outros datos sensíbeis. Se aínda quere " "confgurar unha carteira baseada en GPG cancele este asistente, defina unha " "<b>chave de cifrado GPG</b> e volte a este asistente. Tamén pode voltar " "atrás e escoller o formato de cifrado blowfish na páxina anterior." @@ -598,7 +598,7 @@ msgstr "" "Benvido a KWallet, o sistema de carteiras de KDE. KWallet permítelle gardar " "os seus contrasinais e outra información persoal nun ficheiro cifrado no " -"disco, evitando que outros podan ver esa información. Este asistente " +"disco, evitando que outros poidan ver esa información. Este asistente " "axudarao a configurar KWallet." #. i18n: ectx: property (text), widget (QRadioButton, _basic) @@ -652,9 +652,9 @@ "and will allow anyone who knows it to obtain all the information contained " "in the wallet." msgstr "" -"Varios programas poden tentar usar a carteira de KDE para gardar " +"Varios aplicativos poden intentar usar a carteira de KDE para gardar " "contrasinais ou outra información como datos de formularios web e cookies. " -"Se quer que eses programas usen a carteira, debe indicalo agora e escoller " +"Se quer que eses aplicativos usen a carteira, debe indicalo agora e escoller " "un contrasinal. O contrasinal que escolla <i>non ha poder</i> recuperarse se " "o perde, e permitirá que calquera que o coñeza obteña toda a información " "contida na carteira." @@ -692,14 +692,15 @@ "is lost, and will allow anyone who knows it to obtain all the information " "contained in the wallet.</p></body></html>" msgstr "" -"<html><head/><body><p>Varios programas poden tentar usar a carteira de KDE " -"para gardar contrasinais ou outra información como datos de formularios web " -"e cookies. Se quer que eses programas usen a carteira, debe indicalo agora e " -"escoller o método de cifrado.</p><p>O método GPG é máis seguro pero debe ter " -"configurada no sistema polo menos unha chave de cifrado.</p> <p>Se escolle o " -"formato clásico o contrasinal que escolla <span style=\" font-style:italic;" -"\">non ha poder</span> recuperarse se o perde, e permitirá que calquera que " -"o coñeza obteña toda a información contida na carteira.</p></body></html>" +"<html><head/><body><p>Varios aplicativos poden intentar usar a carteira de " +"KDE para gardar contrasinais ou outra información como datos de formularios " +"web e cookies. Se quer que eses aplicativos usen a carteira, debe indicalo " +"agora e escoller o método de cifrado.</p><p>O método GPG é máis seguro pero " +"debe ter configurada no sistema polo menos unha chave de cifrado.</p> <p>Se " +"escolle o formato clásico o contrasinal que escolla <span style=\" font-" +"style:italic;\">non ha poder</span> recuperarse se o perde, e permitirá que " +"calquera que o coñeza obteña toda a información contida na carteira.</p></" +"body></html>" #. i18n: ectx: property (title), widget (QGroupBox, _groupBox) #: kwalletwizardpagepasswordgpg.ui:46 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/po/ko/kwalletd5.po new/kwallet-5.31.0/po/ko/kwalletd5.po --- old/kwallet-5.30.0/po/ko/kwalletd5.po 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/po/ko/kwalletd5.po 2017-02-05 12:15:10.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <[email protected]>, 2008, 2009, 2014, 2015, 2016. +# Shinjo Park <[email protected]>, 2008, 2009, 2014, 2015, 2016, 2017. # msgid "" msgstr "" "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-15 04:19+0100\n" -"PO-Revision-Date: 2016-10-20 23:20+0100\n" +"PO-Revision-Date: 2017-01-22 19:44+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -223,15 +223,12 @@ #: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162 #: kwalletwizard.cpp:166 -#, fuzzy, kde-format -#| msgid "" -#| "The QGpgME library failed to initialize for the OpenPGP protocol. Please " -#| "check your system's configuration then try again." +#, kde-format msgid "" "The GpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." msgstr "" -"QGpgME 라이브러리에서 OpenPGP 프로토콜을 초기화할 수 없습니다. 시스템 설정 상" +"GpgME 라이브러리에서 OpenPGP 프로토콜을 초기화할 수 없습니다. 시스템 설정 상" "태를 확인한 다음 다시 시도하십시오." #: knewwalletdialog.cpp:156 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/po/nb/kwalletd5.po new/kwallet-5.31.0/po/nb/kwalletd5.po --- old/kwallet-5.30.0/po/nb/kwalletd5.po 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/po/nb/kwalletd5.po 2017-02-05 12:15:10.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2016-12-05 02:46+0100\n" +"POT-Creation-Date: 2016-12-15 04:19+0100\n" "PO-Revision-Date: 2015-04-27 19:45+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -233,11 +233,9 @@ #: kwalletwizard.cpp:166 #, kde-format msgid "" -"The QGpgME library failed to initialize for the OpenPGP protocol. Please " +"The GpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." msgstr "" -"QGpgME-biblioteket ble ikke klargjort for OpenPGP-protokollen. Kontroller " -"systemoppsettet og forsøk igjen." #: knewwalletdialog.cpp:156 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/po/ru/kwalletd5.po new/kwallet-5.31.0/po/ru/kwalletd5.po --- old/kwallet-5.30.0/po/ru/kwalletd5.po 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/po/ru/kwalletd5.po 2017-02-05 12:15:10.000000000 +0100 @@ -4,13 +4,13 @@ # Nick Shaforostoff <[email protected]>, 2008, 2009. # Andrey Cherepanov <[email protected]>, 2009. # Nick Shaforostoff <[email protected]>, 2009. -# Alexander Potashev <[email protected]>, 2010, 2014, 2015, 2016. +# Alexander Potashev <[email protected]>, 2010, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-12-15 04:19+0100\n" -"PO-Revision-Date: 2016-08-25 01:20+0300\n" +"PO-Revision-Date: 2017-01-20 00:04+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" @@ -239,15 +239,12 @@ #: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162 #: kwalletwizard.cpp:166 -#, fuzzy, kde-format -#| msgid "" -#| "The QGpgME library failed to initialize for the OpenPGP protocol. Please " -#| "check your system's configuration then try again." +#, kde-format msgid "" "The GpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." msgstr "" -"Библиотека QGpgME не смогла инициализировать протокол OpenPGP. Убедитесь в " +"Библиотека GpgME не смогла инициализировать протокол OpenPGP. Убедитесь в " "правильности настройки вашей системы и повторите попытку." #: knewwalletdialog.cpp:156 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/api/KWallet/kwallet.cpp new/kwallet-5.31.0/src/api/KWallet/kwallet.cpp --- old/kwallet-5.30.0/src/api/KWallet/kwallet.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/api/KWallet/kwallet.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -230,7 +230,7 @@ static const char s_kwalletdServiceName[] = "org.kde.kwalletd5"; Wallet::Wallet(int handle, const QString &name) - : QObject(0L), d(new WalletPrivate(this, handle, name)) + : QObject(nullptr), d(new WalletPrivate(this, handle, name)) { if (walletLauncher()->m_useKSecretsService) { // see openWallet for initialization code; this constructor does not have any code @@ -436,7 +436,7 @@ if (!walletLauncher()->m_walletEnabled) { qDebug() << "User disabled the wallet system so returning 0 here."; - return 0; + return nullptr; } #if HAVE_KSECRETSSERVICE @@ -481,13 +481,13 @@ r = interface.openPathAsync(name, (qlonglong)w, appid(), true); } else { delete wallet; - return 0; + return nullptr; } // error communicating with the daemon (maybe not running) if (!r.isValid()) { qDebug() << "Invalid DBus reply: " << r.error(); delete wallet; - return 0; + return nullptr; } wallet->d->transactionId = r.value(); @@ -495,7 +495,7 @@ // check for an immediate error if (wallet->d->transactionId < 0) { delete wallet; - wallet = 0; + wallet = nullptr; } else { wallet->d->handle = r.value(); } @@ -1609,7 +1609,7 @@ } KWalletDLauncher::KWalletDLauncher() - : m_wallet_deamon(0) + : m_wallet_deamon(nullptr) , m_cgroup(KSharedConfig::openConfig(QStringLiteral("kwalletrc") , KConfig::NoGlobals)->group("Wallet")) , m_walletEnabled(false) @@ -1639,7 +1639,7 @@ org::kde::KWallet &KWalletDLauncher::getInterface() { // Q_ASSERT(!m_useKSecretsService); - Q_ASSERT(m_wallet_deamon != 0); + Q_ASSERT(m_wallet_deamon != nullptr); // check if kwalletd is already running QDBusConnectionInterface *bus = QDBusConnection::sessionBus().interface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwallet-query/src/querydriver.cpp new/kwallet-5.31.0/src/runtime/kwallet-query/src/querydriver.cpp --- old/kwallet-5.30.0/src/runtime/kwallet-query/src/querydriver.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwallet-query/src/querydriver.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -35,7 +35,7 @@ QueryDriver::QueryDriver(int &argc, char* argv[]) : QApplication(argc, argv) - , theWallet(0) + , theWallet(nullptr) , verbose(false) , entryFolder(QStringLiteral("Passwords")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp new/kwallet-5.31.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/backend/backendpersisthandler.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -157,7 +157,7 @@ #endif // HAVE_GPGMEPP default: Q_ASSERT(0); - return 0; + return nullptr; } } @@ -177,7 +177,7 @@ return new GpgPersistHandler; } #endif // HAVE_GPGMEPP - return 0; // unknown cipher or hash + return nullptr; // unknown cipher or hash } int BlowfishPersistHandler::write(Backend *wb, QSaveFile &sf, QByteArray &version, WId) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/backend/blowfish.cc new/kwallet-5.31.0/src/runtime/kwalletd/backend/blowfish.cc --- old/kwallet-5.30.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/backend/blowfish.cc 2017-02-05 12:15:10.000000000 +0100 @@ -38,7 +38,7 @@ BlowFish::BlowFish() { _blksz = 8; - _key = 0L; + _key = nullptr; _init = false; } @@ -102,7 +102,7 @@ BlowFish::~BlowFish() { delete[](unsigned char *)_key; - _key = 0L; + _key = nullptr; } int BlowFish::keyLen() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/backend/kwalletbackend.cc new/kwallet-5.31.0/src/runtime/kwalletd/backend/kwalletbackend.cc --- old/kwallet-5.30.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2017-02-05 12:15:10.000000000 +0100 @@ -68,7 +68,7 @@ // } Backend::Backend(const QString &name, bool isPath) - : d(0), + : d(nullptr), _name(name), _useNewHash(false), _ref(0), @@ -373,7 +373,7 @@ } BackendPersistHandler *phandler = BackendPersistHandler::getPersistHandler(magicBuf); - if (0 == phandler) { + if (nullptr == phandler) { return -41; // unknown cipher or hash } int result = phandler->read(this, db, w); @@ -449,7 +449,7 @@ } BackendPersistHandler *phandler = BackendPersistHandler::getPersistHandler(_cipherType); - if (0 == phandler) { + if (nullptr == phandler) { return -4; // write error } int rc = phandler->write(this, sf, version, w); @@ -513,7 +513,7 @@ Entry *Backend::readEntry(const QString &key) { - Entry *rc = 0L; + Entry *rc = nullptr; if (_open && hasEntry(key)) { rc = _entries[_folder][key]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/backend/sha1.cc new/kwallet-5.31.0/src/runtime/kwalletd/backend/sha1.cc --- old/kwallet-5.30.0/src/runtime/kwalletd/backend/sha1.cc 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/backend/sha1.cc 2017-02-05 12:15:10.000000000 +0100 @@ -235,7 +235,7 @@ for (; len && _count < 64; --len, ++cnt) { _buf[_count++] = *_block++; } - process(0, 0); // flush the buffer if necessary + process(nullptr, 0); // flush the buffer if necessary if (!len) { return cnt; } @@ -266,7 +266,7 @@ return (unsigned char *)_buf; } - process(0, 0); + process(nullptr, 0); msb = 0; t = _nblocks; @@ -300,7 +300,7 @@ while (_count < 64) { _buf[_count++] = 0; } - process(0, 0); + process(nullptr, 0); memset(_buf, 0, 56); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kbetterthankdialog.h new/kwallet-5.31.0/src/runtime/kwalletd/kbetterthankdialog.h --- old/kwallet-5.30.0/src/runtime/kwalletd/kbetterthankdialog.h 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kbetterthankdialog.h 2017-02-05 12:15:10.000000000 +0100 @@ -27,7 +27,7 @@ Q_OBJECT public: - KBetterThanKDialog(QWidget *parent = 0); + KBetterThanKDialog(QWidget *parent = nullptr); void init(); void setLabel(const QString &label); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/ktimeout.h new/kwallet-5.31.0/src/runtime/kwalletd/ktimeout.h --- old/kwallet-5.30.0/src/runtime/kwalletd/ktimeout.h 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/ktimeout.h 2017-02-05 12:15:10.000000000 +0100 @@ -30,7 +30,7 @@ { Q_OBJECT public: - KTimeout(QObject *parent = 0); + KTimeout(QObject *parent = nullptr); ~KTimeout(); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd.cpp new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -104,17 +104,17 @@ int KWalletTransaction::nextTransactionId = 0; KWalletD::KWalletD() - : QObject(0) + : QObject(nullptr) , _failed(0) , _syncTime(5000) - , _curtrans(0) + , _curtrans(nullptr) , _useGpg(false) { #ifdef HAVE_GPGMEPP _useGpg = true; #endif - srand(time(0)); + srand(time(nullptr)); _showingFailureNotify = false; _closeIdle = false; _idleTime = 0; @@ -201,7 +201,7 @@ return qMakePair(it.key(), it.value()); } } - return qMakePair(-1, static_cast<KWallet::Backend*>(0)); + return qMakePair(-1, static_cast<KWallet::Backend*>(nullptr)); } bool KWalletD::_processing = false; @@ -292,7 +292,7 @@ } delete _curtrans; - _curtrans = 0; + _curtrans = nullptr; } _processing = false; @@ -1134,7 +1134,7 @@ bool KWalletD::isOpen(const QString& wallet) { const QPair<int, KWallet::Backend*> walletInfo = findWallet(wallet); - return walletInfo.second != 0; + return walletInfo.second != nullptr; } bool KWalletD::isOpen(int handle) @@ -1145,15 +1145,15 @@ KWallet::Backend* rc = _wallets.value(handle); - if (rc == 0 && ++_failed > 5) { + if (rc == nullptr && ++_failed > 5) { _failed = 0; QTimer::singleShot(0, this, SLOT(notifyFailures())); } - else if (rc != 0) { + else if (rc != nullptr) { _failed = 0; } - return rc != 0; + return rc != nullptr; } QStringList KWalletD::wallets() const @@ -1537,7 +1537,7 @@ // with several appids, we can't stop if we found one. QString service(oldOwner); QList<KWalletAppHandlePair> sessremove(_sessions.findSessions(service)); - KWallet::Backend* b = 0; + KWallet::Backend* b = nullptr; // check all sessions for wallets to close Q_FOREACH (const KWalletAppHandlePair& s, sessremove) { @@ -1559,10 +1559,10 @@ if ((*tit)->tType == KWalletTransaction::Open && (*tit)->service == oldOwner) { delete (*tit); - *tit = 0; + *tit = nullptr; } } - _transactions.removeAll(0); + _transactions.removeAll(nullptr); // if there's currently an open-transaction being handled, // mark it as cancelled. @@ -1577,7 +1577,7 @@ KWallet::Backend* KWalletD::getWallet(const QString& appid, int handle) { if (handle == 0) { - return 0L; + return nullptr; } KWallet::Backend* w = _wallets.value(handle); @@ -1598,14 +1598,14 @@ QTimer::singleShot(0, this, SLOT(notifyFailures())); } - return 0L; + return nullptr; } void KWalletD::notifyFailures() { if (!_showingFailureNotify) { _showingFailureNotify = true; - KMessageBox::information(0, + KMessageBox::information(nullptr, i18n("There have been repeated failed attempts to gain access to " "a wallet. An application may be misbehaving."), i18n("KDE Wallet Service")); @@ -1872,7 +1872,7 @@ return -1; } - KWallet::Backend* b = 0; + KWallet::Backend* b = nullptr; // If the wallet we want to open does not exists. create it and set pam // hash if (!wallets().contains(wallet)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd.notifyrc new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd.notifyrc --- old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd.notifyrc 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd.notifyrc 2017-02-05 12:15:10.000000000 +0100 @@ -146,7 +146,7 @@ [Event/needsPassword] Name=Needs password -Name[ar]=يحتاج كلمة السر +Name[ar]=يحتاج كلمة السّرّ Name[ast]=Precisa contraseña Name[bg]=Нужна е парола Name[bn]=পাসওয়ার্ড প্রয়োজন @@ -219,7 +219,7 @@ Name[zh_CN]=需要密码 Name[zh_TW]=需要密碼 Comment=The KDE Wallet Daemon requests a password -Comment[ar]=مراقب محفظة كدي يطلب كلمة سر +Comment[ar]=«عفريت محفظة كدي» يطلب كلمة سرّ Comment[ast]=El degorriu de carteres de KDE solicita una contraseña Comment[bg]=Услугата "портфейл" на KDE изисква парола Comment[bn]=কে.ডি.ই. ওয়ালেট ডিমন একটি পাসওয়ার্ড চাইছে @@ -295,6 +295,7 @@ [Event/syncFailed] Name=Sync Failed +Name[ar]=فشلت المزامنة Name[ast]=Falló la sincronización Name[bs]=Sinhronizacija neuspjela Name[ca]=La sincronització ha fallat @@ -342,6 +343,7 @@ Name[zh_CN]=同步失败 Name[zh_TW]=同步失敗 Comment=KDE Wallet System failed to sync a wallet file to disk +Comment[ar]=فشل نظام «محفظة كدي» في مزامنة ملفّ المحفظة مع القرص Comment[ast]=El sistema de carteres KDE falló al sincronizar un ficheru de cartera nel discu Comment[bs]=KDE Wallet Sistem nije uspio da sinhronizuje datoteku novčanika na disk Comment[ca]=El sistema de carteres del KDE ha fallat en sincronitzar un fitxer de cartera al disc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd5.desktop new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd5.desktop --- old/kwallet-5.30.0/src/runtime/kwalletd/kwalletd5.desktop 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kwalletd5.desktop 2017-02-05 12:15:10.000000000 +0100 @@ -6,7 +6,7 @@ X-DBUS-StartupType=Unique X-KDE-StartupNotify=false Name=Wallet Server -Name[ar]=خادم المحفظة +Name[ar]=خادوم المحفظة Name[as]=Wallet Server Name[ast]=Sirvidor de carteres Name[bg]=Сървър "портфейл" @@ -87,7 +87,7 @@ Name[zh_CN]=钱包服务器 Name[zh_TW]=錢包伺服器 Comment=Wallet Server -Comment[ar]=خادم المحفظة +Comment[ar]=خادوم المحفظة Comment[as]=Wallet Server Comment[ast]=Sirvidor de carteres Comment[bg]=Сървър "портфейл" (Wallet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kwalletsessionstore.cpp new/kwallet-5.31.0/src/runtime/kwalletd/kwalletsessionstore.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/kwalletsessionstore.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kwalletsessionstore.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -118,11 +118,11 @@ Q_ASSERT(*it); if ((*it)->m_handle == handle) { delete *it; - *it = 0; + *it = nullptr; } } - int removed = m_sessions[appid].removeAll(0); + int removed = m_sessions[appid].removeAll(nullptr); if (m_sessions[appid].isEmpty()) { m_sessions.remove(appid); } @@ -142,12 +142,12 @@ Q_ASSERT(*it); if ((*it)->m_handle == handle) { delete *it; - *it = 0; + *it = nullptr; numrem++; } } // remove all zeroed sessions - m_sessions[appid].removeAll(0); + m_sessions[appid].removeAll(nullptr); if (m_sessions[appid].isEmpty()) { appremove.append(appid); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/kwalletwizard.h new/kwallet-5.31.0/src/runtime/kwalletd/kwalletwizard.h --- old/kwallet-5.30.0/src/runtime/kwalletd/kwalletwizard.h 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/kwalletwizard.h 2017-02-05 12:15:10.000000000 +0100 @@ -45,7 +45,7 @@ static const int PageOptionsId = 3; static const int PageExplanationId = 4; - KWalletWizard(QWidget *parent = 0); + KWalletWizard(QWidget *parent = nullptr); WizardType wizardType() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/main.cpp new/kwallet-5.31.0/src/runtime/kwalletd/main.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/main.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/main.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -67,7 +67,7 @@ readBytes = read(pipefd, buf + totalRead, PBKDF2_SHA512_KEYSIZE - totalRead); if (readBytes == -1 || attempts > 5) { free(buf); - return NULL; + return nullptr; } totalRead += readBytes; ++attempts; @@ -114,42 +114,42 @@ char* checkPamModule(int argc, char **argv) { printf("kwalletd5: Checking for pam module\n"); - char *hash = NULL; + char *hash = nullptr; int x = 1; for (; x < argc; ++x) { if (strcmp(argv[x], "--pam-login") != 0) { continue; } printf("kwalletd5: Got pam-login param\n"); - argv[x] = NULL; + argv[x] = nullptr; x++; //We need at least 2 extra arguments after --pam-login if (x + 1 > argc) { printf("kwalletd5: Invalid arguments (less than needed)\n"); - return NULL; + return nullptr; } //first socket for the hash, comes from a pipe pipefd = atoi(argv[x]); - argv[x] = NULL; + argv[x] = nullptr; x++; //second socket for environment, comes from a localsocket socketfd = atoi(argv[x]); - argv[x] = NULL; + argv[x] = nullptr; break; } if (!pipefd || !socketfd) { printf("Lacking a socket, pipe: %d, env:%d\n", pipefd, socketfd); - return NULL; + return nullptr; } hash = waitForHash(); - if (hash == NULL || waitForEnvironment() == -1) { + if (hash == nullptr || waitForEnvironment() == -1) { printf("kwalletd5: Hash or environment not received\n"); free(hash); - return NULL; + return nullptr; } return hash; @@ -162,7 +162,7 @@ int main(int argc, char **argv) #endif { - char *hash = NULL; + char *hash = nullptr; #ifndef Q_OS_WIN if (getenv("PAM_KWALLET5_LOGIN")) { hash = checkPamModule(argc, argv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/migrationagent.cpp new/kwallet-5.31.0/src/runtime/kwalletd/migrationagent.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/migrationagent.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/migrationagent.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -38,7 +38,7 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) : _kf5_daemon(kd) - , _kde4_daemon(0) + , _kde4_daemon(nullptr) , _pam_hash(hash) { QTimer::singleShot(100, this, SLOT(migrateWallets())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/src/runtime/kwalletd/migrationwizard.cpp new/kwallet-5.31.0/src/runtime/kwalletd/migrationwizard.cpp --- old/kwallet-5.30.0/src/runtime/kwalletd/migrationwizard.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/src/runtime/kwalletd/migrationwizard.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -69,8 +69,8 @@ bool _migrationCompleted; }; -MigrationPage1 *page1 = NULL; -MigrationPage2 *page2 = NULL; +MigrationPage1 *page1 = nullptr; +MigrationPage2 *page2 = nullptr; MigrationWizard::MigrationWizard(MigrationAgent *agent) : _agent(agent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/KWallet/kwallettest.cpp new/kwallet-5.31.0/tests/KWallet/kwallettest.cpp --- old/kwallet-5.30.0/tests/KWallet/kwallettest.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/KWallet/kwallettest.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -47,10 +47,10 @@ // open Wallet *wallet = Wallet::openWallet(testWallet, 0, Wallet::Synchronous); - if (wallet == 0) { + if (wallet == nullptr) { qDebug() << "Couldn't open the wallet. Maybe the wallet daemon is not running?"; } - QVERIFY2(wallet != 0, "openWallet failed!"); + QVERIFY2(wallet != nullptr, "openWallet failed!"); QVERIFY2(Wallet::isOpen(testWallet), "opwnWallet succeeded but the wallet !isOpen"); // create folder @@ -84,7 +84,7 @@ // open wallet = Wallet::openWallet(testWallet, 0, Wallet::Synchronous); - QVERIFY2(wallet != 0, "openWallet failed"); + QVERIFY2(wallet != nullptr, "openWallet failed"); QVERIFY2(Wallet::isOpen(testWallet), "openWallet succeeded but the wallet !isOpen (2)"); // set folder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/kwalletd/kwalletasync.cpp new/kwallet-5.31.0/tests/kwalletd/kwalletasync.cpp --- old/kwallet-5.30.0/tests/kwalletd/kwalletasync.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/kwalletd/kwalletasync.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -29,7 +29,7 @@ // we have no wallet: ask for one. KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous); - QVERIFY(wallet != 0); + QVERIFY(wallet != nullptr); WalletReceiver r; QVERIFY(r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool)))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/kwalletd/kwalletboth.cpp new/kwallet-5.31.0/tests/kwalletd/kwalletboth.cpp --- old/kwallet-5.30.0/tests/kwalletd/kwalletboth.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/kwalletd/kwalletboth.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -29,7 +29,7 @@ // we have no wallet: ask for one. KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous); - QVERIFY(wallet != 0); + QVERIFY(wallet != nullptr); WalletReceiver r; r.connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); @@ -37,9 +37,9 @@ _out << "About to ask for wallet sync" << endl; wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); - QVERIFY(wallet != 0); + QVERIFY(wallet != nullptr); - _out << "Got sync wallet: " << (wallet != 0) << endl; + _out << "Got sync wallet: " << (wallet != nullptr) << endl; _out << "About to start 30 second event loop" << endl; QTimer::singleShot(30000, qApp, SLOT(quit())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/kwalletd/kwalletmany.cpp new/kwallet-5.31.0/tests/kwalletd/kwalletmany.cpp --- old/kwallet-5.30.0/tests/kwalletd/kwalletmany.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/kwalletd/kwalletmany.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -66,7 +66,7 @@ _out << "About to ask for wallet async" << endl; Wallet *wallet; wallet = Wallet::openWallet(Wallet::NetworkWallet(), 0, Wallet::Asynchronous); - QVERIFY(wallet != 0); + QVERIFY(wallet != nullptr); connect(wallet, SIGNAL(walletOpened(bool)), SLOT(walletOpened(bool))); _wallets.append(wallet); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/kwalletd/kwalletpath.cpp new/kwallet-5.31.0/tests/kwalletd/kwalletpath.cpp --- old/kwallet-5.30.0/tests/kwalletd/kwalletpath.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/kwalletd/kwalletpath.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -26,9 +26,9 @@ _out << "About to ask for wallet /tmp/test.kwl sync" << endl; KWallet::Wallet *wallet = KWallet::Wallet::openWallet(QStringLiteral("/tmp/test.kwl"), 0, KWallet::Wallet::Path); - QVERIFY(wallet != 0); + QVERIFY(wallet != nullptr); - _out << "Got path wallet: " << (wallet != 0) << endl; + _out << "Got path wallet: " << (wallet != nullptr) << endl; if (wallet) { _out << "Closing wallet" << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.30.0/tests/kwalletd/kwalletsync.cpp new/kwallet-5.31.0/tests/kwalletd/kwalletsync.cpp --- old/kwallet-5.30.0/tests/kwalletd/kwalletsync.cpp 2017-01-08 22:03:12.000000000 +0100 +++ new/kwallet-5.31.0/tests/kwalletd/kwalletsync.cpp 2017-02-05 12:15:10.000000000 +0100 @@ -26,9 +26,9 @@ _out << "About to ask for wallet sync" << endl; KWallet::Wallet *w = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); - QVERIFY(w != 0); + QVERIFY(w != nullptr); - _out << "Got sync wallet: " << (w != 0) << endl; + _out << "Got sync wallet: " << (w != nullptr) << endl; } QTEST_GUILESS_MAIN(KWalletSyncTest)
