Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2016-03-16 10:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2016-02-24 18:57:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2016-03-16 10:32:05.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Mar 6 10:02:35 UTC 2016 - [email protected] + +- Update to 5.20.0 (boo#970856) + * Make sure KDocTools is looked-up + * Don't pass a negative number to dbus, it asserts in libdbus + * Clean cmake files + * KWallet::openWallet(Synchronous): don't time out after 25 seconds + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.20.0.php + +------------------------------------------------------------------- Old: ---- kwallet-5.19.0.tar.xz New: ---- kwallet-5.20.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.RL6VhK/_old 2016-03-16 10:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.RL6VhK/_new 2016-03-16 10:32:06.000000000 +0100 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Wallet5 -%define _tar_path 5.19 +%define _tar_path 5.20 Name: kwallet -Version: 5.19.0 +Version: 5.20.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kwallet-5.19.0.tar.xz -> kwallet-5.20.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/CMakeLists.txt new/kwallet-5.20.0/CMakeLists.txt --- old/kwallet-5.19.0/CMakeLists.txt 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/CMakeLists.txt 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS 1) include(FeatureSummary) -find_package(ECM 5.19.0 NO_MODULE) +find_package(ECM 5.20.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) @@ -14,8 +14,8 @@ set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "5.19.0") # handled by release scripts -set(KF5_DEP_VERSION "5.19.0") # handled by release scripts +set(KF5_VERSION "5.20.0") # handled by release scripts +set(KF5_DEP_VERSION "5.20.0") # handled by release scripts include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) @@ -25,9 +25,11 @@ option(BUILD_KWALLETD "Build the kwallet daemon" ON) option(BUILD_KWALLET_QUERY "Build kwallet-query tool" ON) +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5DocTools ${KF5_DEP_VERSION}) add_definitions(-DTRANSLATION_DOMAIN=\"kwalletd5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ast/kwallet-query.po new/kwallet-5.20.0/po/ast/kwallet-query.po --- old/kwallet-5.19.0/po/ast/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ast/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2016-02-04 20:07+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfaz de solicitú de KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ast/kwalletd5.po new/kwallet-5.20.0/po/ast/kwalletd5.po --- old/kwallet-5.19.0/po/ast/kwalletd5.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ast/kwalletd5.po 2016-03-05 20:10:45.000000000 +0100 @@ -9,8 +9,8 @@ "Project-Id-Version: kdebase-runtime\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-01-05 09:00+0000\n" -"PO-Revision-Date: 2016-02-05 03:10+0100\n" -"Last-Translator: enolp <[email protected]>\n" +"PO-Revision-Date: 2016-02-07 13:20+0100\n" +"Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <>\n" "Language: ast\n" "MIME-Version: 1.0\n" @@ -51,6 +51,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>Fallu de cifráu entrín s'intentaba guardar la cartera <b>%1</b>. El " +"códigu de fallu ye <b>%2 (%3)</b>. Igua la configuración del to sistema ya " +"inténtalo de nueves, por favor. Esti fallu podría asoceder si nun tas usando " +"una clave de GPG d'enfotu completu. Asegúrate que tienes la clave secreta pa " +"la clave que tas usando.</qt>" #: backend/backendpersisthandler.cpp:584 #, kde-format @@ -58,6 +63,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>Fallu de remanamientu de ficheros entrín s'intentaba guardar la cartera " +"<b>%1</b>. El fallu foi <b>%2</b>. Igua la configuración del to sistema ya " +"inténtalo de nueves, por favor.</qt>" #: backend/backendpersisthandler.cpp:602 #, kde-format @@ -85,6 +93,9 @@ "you're using a SmartCard, please ensure it's inserted then try again." "<br><br>GPG error was <b>%2</b></qt>" msgstr "" +"<qt>Fallu al intentar descifrar la cartera <b>%1</b> usando GPG. Si tas " +"usando una tarxeta intelixente, asegúrate por favor que ta inxertada ya " +"inténtalo de nueves. <br><br>El fallu de GPG foi <b>%2</b></qt>" #: backend/backendpersisthandler.cpp:633 msgid "kwalletd GPG backend" @@ -193,6 +204,8 @@ "The QGpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." msgstr "" +"Falló al aniciase la biblioteca QGpgME pal protocolu OpenPGP. Comprueba la " +"configuración del to sistema ya inténtalos de nueves." #: knewwalletdialog.cpp:156 msgid "" @@ -205,7 +218,7 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: knewwalletdialoggpg.ui:17 msgid "Please select the signing key from the list below:" -msgstr "" +msgstr "Por favor, esbilla la clave de robláu del llistáu d'embaxo:" #. i18n: ectx: property (text), widget (QLabel, label_2) #: knewwalletdialoggpg.ui:24 @@ -306,7 +319,7 @@ msgstr "<b>%1</b> solicitó abrir una cartera (%2)." #: kwalletd.cpp:667 -#, fuzzy, kde-format +#, kde-format msgctxt "" "Text of a button for switching to the application requesting a password" msgid "Switch to %1" @@ -332,7 +345,7 @@ "Encaboxar pa ñegar la solicitú de l'aplicación." #: kwalletd.cpp:749 -#, fuzzy, kde-format +#, kde-format msgid "" "<qt>The application '<b>%1</b>' has requested to open the KDE wallet. This " "is used to store sensitive data in a secure fashion. Please enter a password " @@ -340,9 +353,9 @@ "qt>" msgstr "" "<qt>L'aplicación «<b>%1</b>» solicitó abrir la cartera de KDE. Esto úsase " -"p'atroxar información importante d'un mou seguru. Introduza la contraseña " -"d'esta cartera más abaxo si quier abrila, o encaboxe si quier torgar la " -"petición de l'aplicación.</qt>" +"p'atroxar datos importantes d'un mou seguru. Introduz la contraseña pa usar " +"con esta cartera o primi pa ñegar la solicitú de l'aplicación, por favor.</" +"qt>" #: kwalletd.cpp:761 #, kde-format @@ -372,13 +385,13 @@ msgstr "<qt>KDE solicitó acceder a la cartera abierta «<b>%1</b>».</qt>" #: kwalletd.cpp:902 -#, fuzzy, kde-format +#, kde-format msgid "" "<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>" "%2</b>'.</qt>" msgstr "" -"<qt>L'aplicación «<b>%1</b>» solicitó acceder a la cartera «<b>%2</b>», yá " -"abierta.</qt>" +"<qt>L'aplicación «<b>%1</b>» solicitó l'accesu a la cartera abierta «<b>%2</" +"b>»" #: kwalletd.cpp:1021 msgid "" @@ -401,9 +414,8 @@ "<qt>Escueyi una contraseña nueva pa la cartera «<b>%1</b>», por favor.</qt>" #: kwalletd.cpp:1062 -#, fuzzy msgid "Error re-encrypting the wallet. Password was not changed." -msgstr "Fallu al cifrar de nuevu la cartera. La contraseña nun camudó." +msgstr "Fallu al recifrar la cartera. La contraseña nun se camudó." #: kwalletd.cpp:1071 msgid "Error reopening the wallet. Data may be lost." @@ -435,15 +447,6 @@ #. i18n: ectx: property (text), widget (QLabel, textLabel2_3) #: kwalletwizardpageexplanation.ui:17 -#, fuzzy -#| msgid "" -#| "The KDE Wallet system stores your data in a <i>wallet</i> file on your " -#| "local hard disk. The data is only written in encrypted form, presently " -#| "using the blowfish algorithm with your password as the key. When a " -#| "wallet is opened, the wallet manager application will launch and display " -#| "an icon in the system tray. You can use this application to manage your " -#| "wallets. It even permits you to drag wallets and wallet contents, " -#| "allowing you to easily copy a wallet to a remote system." msgid "" "<html><head/><body><p>The KDE Wallet system stores your data in a <span " "style=\" font-style:italic;\">wallet</span> file on your local hard disk. " @@ -454,13 +457,15 @@ "your wallets. It even permits you to drag wallets and wallet contents, " "allowing you to easily copy a wallet to a remote system.</p></body></html>" msgstr "" -"La cartera de KDE atroxa los sos datos nún ficheru <i>cartera</i> nel so " -"discu duru llocal. Los datos tan cifraos usando l'algoritmu blowfish cola so " -"contraseña como llave. Cuando s'abre una cartera, l'aplicación de xestión de " -"la cartera llanzaráse y amosará un iconu na bandexa d'iconos. Puede usar " -"esta aplicación p'alministrar les sos carteres. Inclusu-y dexa arrastrar " -"carteres y el so conteníu, permitiéndo-y copiar cenciellamente una cartera a " -"un sistema remotu." +"<html><head/><body><p>El sistema de carteres de KDE atroxar los tos datos " +"nun ficheru de <span style=\" font-style:italic;\">cartera</span> nel to " +"discu duru. Los datos namái s'escriben nel mou de cifráu de la to escoyeta - " +"l'algoritmu blowfish cola to contraseña como clave o usando una clave de " +"cifráu GPG. Al abrise una cartera, llanciaráse l'aplicación de xestión de " +"carteres y amosaráse un iconu na bandexa'l sistema. Pues usar esta " +"aplicación pa xestionar toles tos carteres. Incluso déxate arrastrar les " +"carteres y los conteníos de les cartetes, permitiéndote copiar " +"cenciellamente una carpeta a un sistema remotu.</p></body></html>" #. i18n: ectx: property (text), widget (QLabel, label_3) #: kwalletwizardpagegpgkey.ui:24 @@ -530,17 +535,14 @@ #. i18n: ectx: property (text), widget (QCheckBox, _closeIdle) #: kwalletwizardpageoptions.ui:48 -#, fuzzy msgid "Automatically close idle wallets" -msgstr "Zarrar automáticamente carteres ocioses" +msgstr "Zarrar automáticamente carteres inactives" #. i18n: ectx: property (text), widget (QCheckBox, _networkWallet) #: kwalletwizardpageoptions.ui:55 -#, fuzzy msgid "Store network passwords and local passwords in separate wallet files" msgstr "" -"Atroxar les contraseñes llocales en distintos ficheros de cartera que les " -"contraseñes de rede" +"Atroxar les contraseñes llocales y de rede en ficheros de cartera separtaos" #. i18n: ectx: property (text), widget (QLabel, textLabel3) #: kwalletwizardpagepassword.ui:16 @@ -568,9 +570,8 @@ #. i18n: ectx: property (text), widget (QLabel, textLabel1_3) #: kwalletwizardpagepassword.ui:88 kwalletwizardpagepasswordgpg.ui:106 -#, fuzzy msgid "Enter a new password:" -msgstr "Inxerte una nueva contraseña" +msgstr "Introduz una contraseña nueva:" #. i18n: ectx: property (text), widget (QLabel, textLabel2_3) #: kwalletwizardpagepassword.ui:104 kwalletwizardpagepasswordgpg.ui:122 @@ -624,7 +625,7 @@ #: main.cpp:186 msgid "Maintainer, GPG backend support" -msgstr "" +msgstr "Caltenedor, sofitu del backend GPG" #: main.cpp:187 msgid "Michael Leupold" @@ -754,4 +755,4 @@ #. i18n: ectx: property (text), widget (QRadioButton, _optionNotInterested) #: migrationwizard1.ui:77 msgid "No, and p&lease do not prompt me again." -msgstr "" +msgstr "Non y nun suxerímelo de n&ueves, por favor." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ca/kwallet-query.po new/kwallet-5.20.0/po/ca/kwallet-query.po --- old/kwallet-5.19.0/po/ca/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ca/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 13:26+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -29,10 +29,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfície per consultar el KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ca@valencia/kwallet-query.po new/kwallet-5.20.0/po/ca@valencia/kwallet-query.po --- old/kwallet-5.19.0/po/ca@valencia/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ca@valencia/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 13:26+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -29,10 +29,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfície per consultar el KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/cs/kwallet-query.po new/kwallet-5.20.0/po/cs/kwallet-query.po --- old/kwallet-5.19.0/po/cs/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/cs/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-05-11 13:16+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/da/kwallet-query.po new/kwallet-5.20.0/po/da/kwallet-query.po --- old/kwallet-5.19.0/po/da/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/da/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-11-23 21:16+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Grænseflade til KWallet-forespørgsel" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/de/kwallet-query.po new/kwallet-5.20.0/po/de/kwallet-query.po --- old/kwallet-5.19.0/po/de/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/de/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-24 21:45+0200\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -22,10 +22,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Abfrageschnittstelle für KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/en_GB/kwallet-query.po new/kwallet-5.20.0/po/en_GB/kwallet-query.po --- old/kwallet-5.19.0/po/en_GB/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/en_GB/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-21 16:23+0100\n" "Last-Translator: \n" "Language-Team: British English <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "KWallet query interface" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/es/kwallet-query.po new/kwallet-5.20.0/po/es/kwallet-query.po --- old/kwallet-5.19.0/po/es/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/es/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-07-11 19:22+0200\n" "Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" @@ -27,10 +27,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfaz de consulta para KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/fi/kwallet-query.po new/kwallet-5.20.0/po/fi/kwallet-query.po --- old/kwallet-5.19.0/po/fi/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/fi/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-16 18:38+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "KDE:n lompakon kyselykäyttöliittymä" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/fr/kwallet-query.po new/kwallet-5.20.0/po/fr/kwallet-query.po --- old/kwallet-5.19.0/po/fr/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/fr/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-05-29 00:20+0100\n" "Last-Translator: Maxime Corteel <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -28,10 +28,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interface de requête KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/gd/kwallet-query.po new/kwallet-5.20.0/po/gd/kwallet-query.po --- old/kwallet-5.19.0/po/gd/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/gd/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-11-04 15:14+0000\n" "Last-Translator: Michael Bauer <[email protected]>\n" "Language-Team: Fòram na Gàidhlig\n" @@ -27,10 +27,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Eadar-aghaidh ceistean KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/gl/kwallet-query.po new/kwallet-5.20.0/po/gl/kwallet-query.po --- old/kwallet-5.19.0/po/gl/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/gl/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-18 06:45+0200\n" "Last-Translator: Adrián Chaves Fernández <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interface de consulta de KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ia/kwallet-query.po new/kwallet-5.20.0/po/ia/kwallet-query.po --- old/kwallet-5.19.0/po/ia/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ia/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2016-02-01 13:41+0100\n" "Last-Translator: Giovanni Sora <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/it/kwallet-query.po new/kwallet-5.20.0/po/it/kwallet-query.po --- old/kwallet-5.19.0/po/it/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/it/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-07-18 07:49+0100\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfaccia di interrogazione di KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ja/kwallet-query.po new/kwallet-5.20.0/po/ja/kwallet-query.po --- old/kwallet-5.19.0/po/ja/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ja/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-05-09 17:21-0700\n" "Last-Translator: Japanese KDE translation team <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ -22,10 +22,6 @@ msgid "Your emails" msgstr "" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ko/kwallet-query.po new/kwallet-5.20.0/po/ko/kwallet-query.po --- old/kwallet-5.19.0/po/ko/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ko/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-27 14:16+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "KWallet 질의 인터페이스" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/lt/kwallet-query.po new/kwallet-5.20.0/po/lt/kwallet-query.po --- old/kwallet-5.19.0/po/lt/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/lt/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: trunk-kf 5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-16 11:56+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/nl/kwallet-query.po new/kwallet-5.20.0/po/nl/kwallet-query.po --- old/kwallet-5.19.0/po/nl/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/nl/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 12:01+0200\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interface van KWallet-query" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/nn/kwallet-query.po new/kwallet-5.20.0/po/nn/kwallet-query.po --- old/kwallet-5.19.0/po/nn/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/nn/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-08-28 20:25+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -27,10 +27,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Spørjegrensesnitt for KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/pl/kwallet-query.po new/kwallet-5.20.0/po/pl/kwallet-query.po --- old/kwallet-5.19.0/po/pl/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/pl/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-20 06:23+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interfejs odpytywani KPortfela" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/pt/kwallet-query.po new/kwallet-5.20.0/po/pt/kwallet-query.po --- old/kwallet-5.19.0/po/pt/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/pt/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 16:08+0100\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" @@ -21,10 +21,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interface de pesquisa na KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/pt_BR/kwallet-query.po new/kwallet-5.20.0/po/pt_BR/kwallet-query.po --- old/kwallet-5.19.0/po/pt_BR/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/pt_BR/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 09:30UTC-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" @@ -27,10 +27,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Interface de pesquisa do KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/ru/kwallet-query.po new/kwallet-5.20.0/po/ru/kwallet-query.po --- old/kwallet-5.19.0/po/ru/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/ru/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-26 06:14+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Интерфейс запросов к бумажнику KDE" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sk/kwallet-query.po new/kwallet-5.20.0/po/sk/kwallet-query.po --- old/kwallet-5.19.0/po/sk/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sk/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-07-17 17:22+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" @@ -23,10 +23,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Rozhranie dotazov KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sl/kwallet-query.po new/kwallet-5.20.0/po/sl/kwallet-query.po --- old/kwallet-5.19.0/po/sl/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sl/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-07-06 14:05+0200\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Vmesnik za poizvedbe v KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sr/kwallet-query.po new/kwallet-5.20.0/po/sr/kwallet-query.po --- old/kwallet-5.19.0/po/sr/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sr/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-19 22:24+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Сучеље за упите К‑новчанику" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sr@ijekavian/kwallet-query.po new/kwallet-5.20.0/po/sr@ijekavian/kwallet-query.po --- old/kwallet-5.19.0/po/sr@ijekavian/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sr@ijekavian/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-19 22:24+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Сучеље за упите К‑новчанику" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sr@ijekavianlatin/kwallet-query.po new/kwallet-5.20.0/po/sr@ijekavianlatin/kwallet-query.po --- old/kwallet-5.19.0/po/sr@ijekavianlatin/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sr@ijekavianlatin/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-19 22:24+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Sučelje za upite K‑novčaniku" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sr@latin/kwallet-query.po new/kwallet-5.20.0/po/sr@latin/kwallet-query.po --- old/kwallet-5.19.0/po/sr@latin/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sr@latin/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-19 22:24+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -26,10 +26,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Sučelje za upite K‑novčaniku" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/sv/kwallet-query.po new/kwallet-5.20.0/po/sv/kwallet-query.po --- old/kwallet-5.19.0/po/sv/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/sv/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 19:32+0200\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Frågegränssnitt för plånboken" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/uk/kwallet-query.po new/kwallet-5.20.0/po/uk/kwallet-query.po --- old/kwallet-5.19.0/po/uk/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/uk/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kwallet-query\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-15 19:15+0300\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" @@ -28,10 +28,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "Інтерфейс запитів до KWallet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/zh_CN/kwallet-query.po new/kwallet-5.20.0/po/zh_CN/kwallet-query.po --- old/kwallet-5.19.0/po/zh_CN/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/zh_CN/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-09-08 15:38UTC-0800\n" "Last-Translator: Xuetian Weng <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "KWallet 查询界面" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/zh_CN/kwalletd5.po new/kwallet-5.20.0/po/zh_CN/kwalletd5.po --- old/kwallet-5.19.0/po/zh_CN/kwalletd5.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/zh_CN/kwalletd5.po 2016-03-05 20:10:45.000000000 +0100 @@ -4,15 +4,15 @@ # # Ni Hui <[email protected]>, 2008. # Lie Ex <[email protected]>, 2008, 2009. -# Weng Xuetian <[email protected]>, 2014, 2015. +# Weng Xuetian <[email protected]>, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kwalletd\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-01-05 09:00+0000\n" -"PO-Revision-Date: 2015-06-23 09:10UTC-0800\n" -"Last-Translator: Weng Xuetian <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"PO-Revision-Date: 2016-02-19 12:10-0800\n" +"Last-Translator: Weng Xuetian <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,6 +35,8 @@ "wallet <b>%1</b>. Error code is <b>%2</b>. Please fix your system " "configuration, then try again.</qt>" msgstr "" +"<qt>在尝试保存钱包 <b>%1</b> 时尝试初始化 OpenPGP 出错。出错代码为 <b>%2</" +"b>。请修复您的系统配置，并重试。</qt>" #: backend/backendpersisthandler.cpp:521 #, kde-format @@ -42,6 +44,8 @@ "<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>在尝试保存钱包 <b>%1</b> 时尝试初始化 OpenPGP 出错。请修复您的系统配置，" +"并重试。</qt>" #: backend/backendpersisthandler.cpp:572 #, kde-format @@ -51,6 +55,9 @@ "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>尝试保存钱包 <b>%1</b> 时加密出错。错误代码为 <b>%2 (%3)</b>。请修复您的" +"系统配置，并重试。这个错误可能在您未使用完全信任 GPG 密钥时发生。请保证您持有" +"使用的密钥的私钥。</qt>" #: backend/backendpersisthandler.cpp:584 #, kde-format @@ -58,6 +65,8 @@ "<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>在尝试保存钱包 <b>%1</b> 时文件处理出错。错误为 <b>%2</b>。请修复您的系统" +"配置，并重试。</qt>" #: backend/backendpersisthandler.cpp:602 #, kde-format @@ -66,6 +75,8 @@ "wallet <b>%1</b>. Error code is <b>%2</b>. Please fix your system " "configuration, then try again.</qt>" msgstr "" +"<qt>在尝试打开钱包 <b>%1</b> 时尝试初始化 OpenPGP 出错。出错代码为 <b>%2</" +"b>。请修复您的系统配置，并重试。</qt>" #: backend/backendpersisthandler.cpp:620 #, kde-format @@ -73,6 +84,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>在尝试打开钱包 <b>%1</b> 时尝试初始化 OpenPGP 出错。请修复您的系统配置，" +"并重试。</qt>" #: backend/backendpersisthandler.cpp:630 msgid "Retry" @@ -85,6 +98,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>尝试使用 GPG 解密钱包 <b>%1</b> 时出错。如果您使用智能卡，请确认您已将其" +"插入并重试。<br><br>GPG 错误为 <b>%2</b></qt>" #: backend/backendpersisthandler.cpp:633 msgid "kwalletd GPG backend" @@ -97,6 +112,8 @@ "encrypted using the GPG Key ID <b>%2</b> but this key was not found on your " "system.</qt>" msgstr "" +"<qt>尝试打开钱包 <b>%1</b> 时出错。这个钱包使用 GPG 密钥 ID <b>%2</b> 加密但" +"此密钥在您的系统不可用。</qt>" #: backend/kwalletbackend.cc:264 msgid "Already open." @@ -141,6 +158,9 @@ "RC <b>%2</b>\n" "SF <b>%3</b>. Please file a BUG report using this information to bugs.kde.org" msgstr "" +"同步钱包 <b>%1</b> 到磁盘失败。错误代码为：\n" +"RC <b>%2</b>\n" +"SF <b>%3</b>。请用此信息提交错误报告到 bugs.kde.org" #. i18n: ectx: property (text), widget (QPushButton, _allowOnce) #: kbetterthankdialogbase.ui:50 @@ -163,47 +183,38 @@ msgstr "永久拒绝(&F)" #: knewwalletdialog.cpp:65 -#, fuzzy, kde-format -#| msgid "" -#| "KDE has requested to open the wallet. This is used to store sensitive " -#| "data in a secure fashion. Please enter a password to use with this wallet " -#| "or click cancel to deny the application's request." +#, kde-format msgid "" "<qt>KDE has requested to create a new wallet named '<b>%1</b>'. This is used " "to store sensitive data in a secure fashion. Please choose the new wallet's " "type below or click cancel to deny the application's request.</qt>" msgstr "" -"KDE 正在请求打开钱包，这是一种安全存储敏感数据的方式。请输入钱包的密码，或单" -"击取消以拒绝应用程序的请求。" +"<qt>KDE 请求创建名为“<b>%1</b>”的新钱包。它将用于安全地存储敏感数据。请在下方" +"选择新钱包的类型或者点击取消来拒绝应用程序的请求。</qt>" #: knewwalletdialog.cpp:67 -#, fuzzy, kde-format -#| msgid "" -#| "<qt>The application '<b>%1</b>' has requested to open the KDE wallet. " -#| "This is used to store sensitive data in a secure fashion. Please enter a " -#| "password to use with this wallet or click cancel to deny the " -#| "application's request.</qt>" +#, kde-format msgid "" "<qt>The application '<b>%1</b>' has requested to create a new wallet named " "'<b>%2</b>'. This is used to store sensitive data in a secure fashion. " "Please choose the new wallet's type below or click cancel to deny the " "application's request.</qt>" msgstr "" -"<qt>程序“<b>%1</b>” 已请求打开钱包，这是一种安全存储敏感数据的方式。请输入钱" -"包的密码，或单击取消以拒绝应用程序的请求。</qt>" +"<qt>应用程序“<b>%1</b>”请求创建名为“<b>%2</b>”的新钱包。它将用于安全地存储敏" +"感数据。请在下方选择新钱包的类型或者点击取消来拒绝应用程序的请求。</qt>" #: knewwalletdialog.cpp:129 knewwalletdialog.cpp:135 kwalletwizard.cpp:162 #: kwalletwizard.cpp:166 msgid "" "The QGpgME library failed to initialize for the OpenPGP protocol. Please " "check your system's configuration then try again." -msgstr "" +msgstr "QGpgME 库初始化 OpenPGP 协议失败。请检查您的系统配置并重试。" #: knewwalletdialog.cpp:156 msgid "" "Seems that your system has no keys suitable for encryption. Please set-up at " "least an encryption key, then try again." -msgstr "" +msgstr "看起来您的系统没有可用于加密的密钥。请设置至少一个加密密钥并重试。" #. i18n: ectx: property (text), widget (QLabel, label) #: knewwalletdialoggpg.ui:17 @@ -216,6 +227,8 @@ "<html><head/><body><p><span style=\" font-weight:600;\">NOTE:</span> this " "list shows only \"ultimate-level\" trusted keys</p></body></html>" msgstr "" +"<html><head/><body><p><span style=\" font-weight:600;\">注意：</span> 这个列" +"表仅显示“绝对级别”信任的密钥</p></body></html>" #. i18n: ectx: property (text), widget (QTableWidget, listCertificates) #: knewwalletdialoggpg.ui:59 @@ -241,20 +254,16 @@ #. i18n: ectx: property (text), widget (QLabel, labelIntro) #: knewwalletdialogintro.ui:30 -#, fuzzy, no-c-format, kde-format -#| msgid "" -#| "<qt>The application '<b>%1</b>' has requested to open the KDE wallet. " -#| "This is used to store sensitive data in a secure fashion. Please enter a " -#| "password to use with this wallet or click cancel to deny the " -#| "application's request.</qt>" +#, no-c-format, kde-format msgid "" "<html><head/><body><p>The application '<span style=\" font-weight:600;\">%1</" "span>' has requested to open the KDE wallet. This is used to store sensitive " "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 "" -"<qt>程序“<b>%1</b>” 已请求打开钱包，这是一种安全存储敏感数据的方式。请输入钱" -"包的密码，或单击取消以拒绝应用程序的请求。</qt>" +"<html><head/><body><p>应用程序“<span style=\" font-weight:600;\">%1</span>”请" +"求打开 KDE 钱包。它将用于安全地存储敏感数据。请在下方选择新钱包的类型或者点击" +"取消来拒绝应用程序的请求。</p></body></html>" #. i18n: ectx: property (text), widget (QRadioButton, _radioBlowfish) #. i18n: ectx: property (text), widget (QRadioButton, radioBlowfish) @@ -291,10 +300,9 @@ msgstr "KDE 钱包服务" #: kwalletd.cpp:648 -#, fuzzy, kde-format -#| msgid "<b>KDE</b> has requested to open a wallet (%1)." +#, kde-format msgid "An application has requested to open a wallet (%1)." -msgstr "<b>KDE</b> 请求打开钱包(%1)。" +msgstr "一个应用程序请求打开钱包(%1)。" #: kwalletd.cpp:655 msgctxt "" @@ -387,6 +395,8 @@ "<b>GPG</b> tools (such as <b>kleopatra</b>) to change the passphrase " "associated to that key.</qt>" msgstr "" +"<qt>钱包 <b>%1</b> 使用 GPG 密钥 <b>%2</b> 加密。请使用 <b>GPG</b> 工具 (例" +"如 <b>kleopatra</b>) 来修改那个密钥的密码。</qt>" #: kwalletd.cpp:1047 #, kde-format @@ -425,15 +435,6 @@ #. i18n: ectx: property (text), widget (QLabel, textLabel2_3) #: kwalletwizardpageexplanation.ui:17 -#, fuzzy -#| msgid "" -#| "The KDE Wallet system stores your data in a <i>wallet</i> file on your " -#| "local hard disk. The data is only written in encrypted form, presently " -#| "using the blowfish algorithm with your password as the key. When a " -#| "wallet is opened, the wallet manager application will launch and display " -#| "an icon in the system tray. You can use this application to manage your " -#| "wallets. It even permits you to drag wallets and wallet contents, " -#| "allowing you to easily copy a wallet to a remote system." msgid "" "<html><head/><body><p>The KDE Wallet system stores your data in a <span " "style=\" font-style:italic;\">wallet</span> file on your local hard disk. " @@ -444,10 +445,12 @@ "your wallets. It even permits you to drag wallets and wallet contents, " "allowing you to easily copy a wallet to a remote system.</p></body></html>" msgstr "" -"KDE 钱包系统可以将数据存储在本地磁盘上的<b>钱包</b>文件内。所有数据都是采用 " -"blowfish 加密算法写入的，您的密码就是密钥。当钱包被打开时，钱包管理器会自动启" -"动并在系统托盘内显示为一个图标，您可以使用此程序来管理自己的钱包。钱包管理器" -"允许您进行钱包及钱包内容的拖放操作，这可以使您轻松地将钱包复制到远程系统上。" +"<html><head/><body><p>KDE 钱包系统可以将数据存储在本地磁盘上的<span style=\" " +"font-style:italic;\">钱包</span> 文件内。所有数据都是采用您选择的加密方式 - " +"使用您的密码作为密钥的 blowfish 加密算法，或者使用 GPG 加密密钥。当钱包被打开" +"时，钱包管理器会自动启动并在系统托盘内显示为一个图标，您可以使用此程序来管理" +"自己所有的钱包。钱包管理器允许您进行钱包及钱包内容的拖放操作，这可以使您轻松" +"地将钱包复制到远程系统上。</p></body></html>" #. i18n: ectx: property (text), widget (QLabel, label_3) #: kwalletwizardpagegpgkey.ui:24 @@ -460,6 +463,11 @@ "font-weight:600;\">NOTE:</span> this list contains only \"ultimate-level\" " "trusted keys.</p></body></html>" msgstr "" +"<html><head/><body><p>基于 GPG 的钱包使用 GPG 加密密钥来安全地在磁盘上加密数" +"据。密钥必须在需要解密时可用，否则您的钱包将无法访问。例如，您选择了一个基于" +"智能卡的加密密钥，GPG 系统将在尝试打开钱包时提示您输入它和它关联的 PIN。" +"<span style=\" font-weight:600;\">注意：</span>这个列表进包括了“绝对级别”信任" +"的密钥。</p></body></html>" #. i18n: ectx: property (text), widget (QLabel, label) #: kwalletwizardpagegpgkey.ui:42 @@ -476,6 +484,10 @@ "Otherwise, you may still click back, then choose a classic, blowfish " "encrypted file format on the previous page." msgstr "" +"无法定位至少一个 <b>GPG 加密密钥</b>。KDE Wallet 需要这样一个<b>加密密钥</b>" +"来安全地在磁盘上保存密码和其他敏感信息。如果您依然希望设置一个基于 GPG 的钱" +"包，取消这个向导，设置一个 <b>GPG 加密密钥</b>，并重试此助手。或者，您也可以" +"点击后退，并在上一页选择传统的 blowfish 加密文件格式。" #. i18n: ectx: property (text), widget (QLabel, textLabel2) #: kwalletwizardpageintro.ui:30 @@ -553,14 +565,6 @@ #. i18n: ectx: property (text), widget (QLabel, textLabel3) #: kwalletwizardpagepasswordgpg.ui:17 -#, fuzzy -#| msgid "" -#| "Various applications may attempt to use the KDE wallet to store passwords " -#| "or other information such as web form data and cookies. If you would " -#| "like these applications to use the wallet, you must enable it now and " -#| "choose a password. The password you choose <i>cannot</i> be recovered if " -#| "it is lost, and will allow anyone who knows it to obtain all the " -#| "information contained in the wallet." msgid "" "<html><head/><body><p>Various applications may attempt to use the KDE wallet " "to store passwords or other information such as web form data and cookies. " @@ -572,9 +576,12 @@ "is lost, and will allow anyone who knows it to obtain all the information " "contained in the wallet.</p></body></html>" msgstr "" -"有些程序会试图使用 KDE 钱包存储密码或如表单数据、cookies 一类其它信息。如果您" -"想要这么做，需要现在启用此功能并指定密码。如果密码丢失，它将<b>无法</b>被恢" -"复，一旦任何人知道此密码，他就可以获取钱包内的所有信息。" +"<html><head/><body><p>有些程序会试图使用 KDE 钱包存储密码或如表单数据、" +"cookies 一类其它信息。如果您想要这么做，需要现在启用此功能并选择加密方式。</" +"p><p>GPG 方式更加安全，但是您需要在系统上配置至少一个加密密钥。</p><p>如果您" +"选择传统格式，请注意您选择的密码一旦丢失就<span style=\" font-style:italic;" +"\">无法恢复</span>，一旦任何人知道此密码，他就可以获取钱包内的所有信息。</" +"p></body></html>" #. i18n: ectx: property (title), widget (QGroupBox, _groupBox) #: kwalletwizardpagepasswordgpg.ui:46 @@ -630,10 +637,9 @@ msgstr "KDE 钱包迁移助手" #: migrationagent.cpp:192 -#, fuzzy, kde-format -#| msgid "Migrating wallet: %1</p>" +#, kde-format msgid "Migrating wallet: %1" -msgstr "正在迁移钱包： %1</p>" +msgstr "正在迁移钱包： %1" #: migrationagent.cpp:193 #, kde-format @@ -652,45 +658,45 @@ #: migrationagent.cpp:212 #, kde-format msgid "* Opened KDE4 wallet: %1" -msgstr "" +msgstr "* 已打开 KDE4 钱包：%1" #: migrationagent.cpp:216 msgid "Cannot retrieve folder list. Aborting." -msgstr "" +msgstr "无法获取文件夹列表。中止。" #: migrationagent.cpp:219 #, kde-format msgid "* Migrating folder %1" -msgstr "" +msgstr "* 正在迁移文件夹 %1" #: migrationagent.cpp:223 #, kde-format msgid "Cannot retrieve folder %1 entries. Aborting." -msgstr "" +msgstr "无法获取文件夹 %1 条目。中止。" #: migrationagent.cpp:229 #, kde-format msgid "Cannot retrieve key %1 info. Aborting." -msgstr "" +msgstr "无法获取密钥 %1 信息。中止。" #: migrationagent.cpp:233 #, kde-format msgid "* SKIPPING entry %1 in folder %2 as it seems already migrated" -msgstr "" +msgstr "* 跳过文件夹 %2 中的条目 %1 因为看起来它已经迁移了" #: migrationagent.cpp:237 #, kde-format msgid "Cannot retrieve key %1 data. Aborting." -msgstr "" +msgstr "无法获取密钥 %1 数据。中止。" #: migrationagent.cpp:239 #, kde-format msgid "Cannot write entry %1 in the new wallet. Aborting." -msgstr "" +msgstr "无法写入条目 %1 到新钱包。中止。" #: migrationagent.cpp:250 msgid "DONE migrating wallet\n" -msgstr "" +msgstr "迁移钱包完成\n" #. i18n: ectx: property (text), widget (QLabel, label) #: migrationwizard1.ui:29 @@ -703,11 +709,16 @@ "Would you like them to be migrated to this new KWallet version? The " "operation will only take one minute to be performed.\n" msgstr "" +"恭喜！系统检测到您正在使用最新版的使用 KDE 框架 5 的 KWallet。\n" +"\n" +"看起来您的系统上也有 KDE4 的钱包。\n" +"\n" +"您是否想要迁移他们到新的 KWallet 版本？操作仅需一分钟即可完成。\n" #. i18n: ectx: property (text), widget (QRadioButton, _optionYes) #: migrationwizard1.ui:59 msgid "&Yes, migrate my wallets now." -msgstr "" +msgstr "是的，现在迁移我的钱包(&Y)" #. i18n: ectx: property (text), widget (QRadioButton, _optionNo) #: migrationwizard1.ui:70 @@ -715,8 +726,10 @@ "No, I'd rather do this upon ne&xt session start,\n" "and I'll cancel this wizard for now." msgstr "" +"否，我想在下个会话启动时迁移，\n" +"现在取消这个向导。(&X)" #. i18n: ectx: property (text), widget (QRadioButton, _optionNotInterested) #: migrationwizard1.ui:77 msgid "No, and p&lease do not prompt me again." -msgstr "" +msgstr "否，并且请不要再提示我。(&L)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/po/zh_TW/kwallet-query.po new/kwallet-5.20.0/po/zh_TW/kwallet-query.po --- old/kwallet-5.19.0/po/zh_TW/kwallet-query.po 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/po/zh_TW/kwallet-query.po 2016-03-05 20:10:45.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-16 11:56+0000\n" +"POT-Creation-Date: 2016-02-25 07:46+0000\n" "PO-Revision-Date: 2015-06-17 09:22+0800\n" "Last-Translator: Franklin\n" "Language-Team: Chinese Traditional <[email protected]>\n" @@ -25,10 +25,6 @@ msgid "Your emails" msgstr "[email protected]" -#: main.cpp:37 -msgid "kwallet-query" -msgstr "kwallet-query" - #: main.cpp:38 main.cpp:40 msgid "KWallet query interface" msgstr "KWallet 查詢介面" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/src/api/KWallet/kwallet.cpp new/kwallet-5.20.0/src/api/KWallet/kwallet.cpp --- old/kwallet-5.19.0/src/api/KWallet/kwallet.cpp 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/src/api/KWallet/kwallet.cpp 2016-03-05 20:10:45.000000000 +0100 @@ -462,17 +462,21 @@ // Make sure the password prompt window will be visible and activated KWindowSystem::allowExternalProcessWindowActivation(); + org::kde::KWallet &interface = walletLauncher->getInterface(); + // do the call QDBusReply<int> r; if (ot == Synchronous) { - r = walletLauncher->getInterface().open(name, (qlonglong)w, appid()); + interface.setTimeout(0x7FFFFFFF); // Don't timeout after 25s, but 24 days + r = interface.open(name, (qlonglong)w, appid()); + interface.setTimeout(-1); // Back to the default 25s // after this call, r would contain a transaction id >0 if OK or -1 if NOK // if OK, the slot walletAsyncOpened should have been received, but the transaction id // will not match. We'll get that handle from the reply - see below } else if (ot == Asynchronous) { - r = walletLauncher->getInterface().openAsync(name, (qlonglong)w, appid(), true); + r = interface.openAsync(name, (qlonglong)w, appid(), true); } else if (ot == Path) { - r = walletLauncher()->getInterface().openPathAsync(name, (qlonglong)w, appid(), true); + r = interface.openPathAsync(name, (qlonglong)w, appid(), true); } else { delete wallet; return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/src/runtime/kwallet-query/CMakeLists.txt new/kwallet-5.20.0/src/runtime/kwallet-query/CMakeLists.txt --- old/kwallet-5.19.0/src/runtime/kwallet-query/CMakeLists.txt 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/src/runtime/kwallet-query/CMakeLists.txt 2016-03-05 20:10:45.000000000 +0100 @@ -1,19 +1,7 @@ -PROJECT(kwallet-dmenu) +project(kwallet-dmenu) -set(CMAKE_EXPORT_COMPILE_COMMANDS "ON") - -FIND_PACKAGE(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets) - -include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) -include(FeatureSummary) - - -ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(doc) - -#if("${CMAKE_BINARY_DIR}" STREQUAL "{CMAKE_CURRENT_BINARY_DIR}") - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -#endif() +add_subdirectory(src) +if (KF5DocTools_FOUND) + add_subdirectory(doc) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/src/runtime/kwallet-query/src/CMakeLists.txt new/kwallet-5.20.0/src/runtime/kwallet-query/src/CMakeLists.txt --- old/kwallet-5.19.0/src/runtime/kwallet-query/src/CMakeLists.txt 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/src/runtime/kwallet-query/src/CMakeLists.txt 2016-03-05 20:10:45.000000000 +0100 @@ -1,14 +1,3 @@ -if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) -endif () -set(KF5Wallet_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../api/KWallet) -FIND_PACKAGE(KF5 ${KF5_VERSION} REQUIRED - CoreAddons - I18n) - -include_directories(${CMAKE_SOURCE_DIR}/src/api/KWallet) -include_directories(${CMAKE_BINARY_DIR}/src/api/KWallet) - remove_definitions(-DQT_NO_CAST_FROM_ASCII) set(kwallet-query_SRCS main.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-5.19.0/src/runtime/kwallet-query/src/main.cpp new/kwallet-5.20.0/src/runtime/kwallet-query/src/main.cpp --- old/kwallet-5.19.0/src/runtime/kwallet-query/src/main.cpp 2016-02-06 14:58:54.000000000 +0100 +++ new/kwallet-5.20.0/src/runtime/kwallet-query/src/main.cpp 2016-03-05 20:10:45.000000000 +0100 @@ -34,7 +34,7 @@ KLocalizedString::setApplicationDomain("kwallet-query"); KAboutData aboutData( - I18N_NOOP("kwallet-query"), + QStringLiteral("kwallet-query"), i18n("KWallet query interface"), QStringLiteral("0.1"), i18n("KWallet query interface"),
