Hello community, here is the log from the commit of package libkleo for openSUSE:Factory checked in at 2018-03-20 21:41:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkleo (Old) and /work/SRC/openSUSE:Factory/.libkleo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkleo" Tue Mar 20 21:41:22 2018 rev:25 rq:585648 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libkleo/libkleo.changes 2018-02-12 10:04:54.591788340 +0100 +++ /work/SRC/openSUSE:Factory/.libkleo.new/libkleo.changes 2018-03-20 21:41:24.746612606 +0100 @@ -1,0 +2,10 @@ +Thu Mar 08 23:52:22 CET 2018 - lbeltr...@kde.org + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * None + +------------------------------------------------------------------- Old: ---- libkleo-17.12.2.tar.xz New: ---- libkleo-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkleo.spec ++++++ --- /var/tmp/diff_new_pack.Wummuf/_old 2018-03-20 21:41:25.478586261 +0100 +++ /var/tmp/diff_new_pack.Wummuf/_new 2018-03-20 21:41:25.478586261 +0100 @@ -19,13 +19,13 @@ %bcond_without lang Name: libkleo -Version: 17.12.2 +Version: 17.12.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Base package of Kleopatra, a KDE key manager -License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/KDE Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz @@ -59,7 +59,7 @@ %package -n libKF5Libkleo5 Summary: LibKleo library for kdepim -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: libkleo = %{version} @@ -68,7 +68,7 @@ %package devel Summary: Development package for libkleo -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: libKF5Libkleo5 = %{version} Requires: libgpgmepp-devel ++++++ libkleo-17.12.2.tar.xz -> libkleo-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.2/CMakeLists.txt new/libkleo-17.12.3/CMakeLists.txt --- old/libkleo-17.12.2/CMakeLists.txt 2018-02-06 01:43:59.000000000 +0100 +++ new/libkleo-17.12.3/CMakeLists.txt 2018-03-06 01:32:06.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.2") +set(PIM_VERSION "5.7.3") project(libkleo VERSION ${PIM_VERSION}) @@ -25,7 +25,7 @@ set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) set(QT_REQUIRED_VERSION "5.8.0") -set(KDEPIMTEXTEDIT_VERSION "5.7.2") +set(KDEPIMTEXTEDIT_VERSION "5.7.3") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.2/po/nb/libkleopatra.po new/libkleo-17.12.3/po/nb/libkleopatra.po --- old/libkleo-17.12.2/po/nb/libkleopatra.po 2018-02-06 01:43:58.000000000 +0100 +++ new/libkleo-17.12.3/po/nb/libkleopatra.po 2018-03-06 01:32:06.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libkleopatra\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-08-16 07:05+0200\n" +"POT-Creation-Date: 2017-10-12 03:26+0200\n" "PO-Revision-Date: 2010-08-30 22:07+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -180,7 +180,7 @@ msgid "OpenPGP/MIME" msgstr "OpenPGP/MIME" -#: kleo/enum.cpp:67 ui/keyselectioncombo.cpp:198 +#: kleo/enum.cpp:67 ui/keyselectioncombo.cpp:196 #, kde-format msgid "S/MIME" msgstr "S/MIME" @@ -247,47 +247,47 @@ msgid "<none>" msgstr "<ingen>" -#: kleo/keyfiltermanager.cpp:85 +#: kleo/keyfiltermanager.cpp:84 #, kde-format msgid "All Certificates" msgstr "Alle sertifikat" -#: kleo/keyfiltermanager.cpp:100 +#: kleo/keyfiltermanager.cpp:99 #, kde-format msgid "My Certificates" msgstr "Mine sertifikat" -#: kleo/keyfiltermanager.cpp:118 +#: kleo/keyfiltermanager.cpp:117 #, kde-format msgid "Trusted Certificates" msgstr "Tiltrodde sertifikat" -#: kleo/keyfiltermanager.cpp:135 +#: kleo/keyfiltermanager.cpp:134 #, kde-format msgid "Fully Trusted Certificates" msgstr "" -#: kleo/keyfiltermanager.cpp:152 +#: kleo/keyfiltermanager.cpp:151 #, kde-format msgid "Other Certificates" msgstr "Andre sertifikat" -#: kleo/keyfiltermanager.cpp:166 +#: kleo/keyfiltermanager.cpp:165 #, kde-format msgid "VS-NfD-compliant Certificates" msgstr "" -#: kleo/keyfiltermanager.cpp:184 +#: kleo/keyfiltermanager.cpp:183 #, kde-format msgid "Not validated Certificates" msgstr "" -#: models/keylistmodel.cpp:196 models/useridlistmodel.cpp:77 +#: models/keylistmodel.cpp:196 models/useridlistmodel.cpp:76 #, kde-format msgid "Name" msgstr "Navn" -#: models/keylistmodel.cpp:197 models/useridlistmodel.cpp:78 +#: models/keylistmodel.cpp:197 models/useridlistmodel.cpp:77 #, kde-format msgid "E-Mail" msgstr "" @@ -298,13 +298,13 @@ msgstr "Bruker-ID-er" #: models/keylistmodel.cpp:199 models/subkeylistmodel.cpp:169 -#: models/useridlistmodel.cpp:79 +#: models/useridlistmodel.cpp:78 #, kde-format msgid "Valid From" msgstr "Gyldig fra" #: models/keylistmodel.cpp:200 models/subkeylistmodel.cpp:170 -#: models/useridlistmodel.cpp:80 +#: models/useridlistmodel.cpp:79 #, kde-format msgid "Valid Until" msgstr "" @@ -319,7 +319,7 @@ msgid "Key-ID" msgstr "Nøkkel-ID" -#: models/subkeylistmodel.cpp:167 models/useridlistmodel.cpp:76 +#: models/subkeylistmodel.cpp:167 models/useridlistmodel.cpp:75 #, kde-format msgid "ID" msgstr "" @@ -329,7 +329,7 @@ msgid "Type" msgstr "" -#: models/subkeylistmodel.cpp:171 models/useridlistmodel.cpp:81 +#: models/subkeylistmodel.cpp:171 models/useridlistmodel.cpp:80 #, kde-format msgid "Status" msgstr "" @@ -359,17 +359,17 @@ msgid "&Save to Disk..." msgstr "&Lagre til disk …" -#: ui/auditlogviewer.cpp:95 +#: ui/auditlogviewer.cpp:94 #, kde-format msgid "Choose File to Save GnuPG Audit Log to" msgstr "Angi fila for lagring av GnuPG kontroll-logg" -#: ui/auditlogviewer.cpp:118 +#: ui/auditlogviewer.cpp:117 #, kde-format msgid "Could not save to file \"%1\": %2" msgstr "Kunne ikke lagre til fila «%1»: %2" -#: ui/auditlogviewer.cpp:120 +#: ui/auditlogviewer.cpp:119 #, kde-format msgid "File Save Error" msgstr "Feil ved lagring av fil" @@ -442,128 +442,128 @@ msgid "Set the debugging level to" msgstr "Sett feilsøkings-nivået til" -#: ui/cryptoconfigmodule.cpp:787 +#: ui/cryptoconfigmodule.cpp:779 #, kde-format msgid "Show..." msgstr "Vis …" -#: ui/cryptoconfigmodule.cpp:787 ui/cryptoconfigmodule.cpp:876 +#: ui/cryptoconfigmodule.cpp:779 ui/cryptoconfigmodule.cpp:868 #, kde-format msgid "Edit..." msgstr "Rediger …" -#: ui/cryptoconfigmodule.cpp:841 +#: ui/cryptoconfigmodule.cpp:833 #, kde-format msgid "Configure LDAP Servers" msgstr "Sett opp LDAP-tjenere" -#: ui/cryptoconfigmodule.cpp:862 +#: ui/cryptoconfigmodule.cpp:854 #, kde-format msgid "None configured" msgstr "" -#: ui/cryptoconfigmodule.cpp:864 +#: ui/cryptoconfigmodule.cpp:856 #, kde-format msgid "1 server configured" msgid_plural "%1 servers configured" msgstr[0] "1 tjener satt opp" msgstr[1] "%1 tjenere satt opp" -#: ui/cryptoconfigmodule.cpp:879 +#: ui/cryptoconfigmodule.cpp:871 #, kde-format msgid "Use keyserver at" msgstr "Bruk nøkkeltjeneren hos" -#: ui/cryptoconfigmodule.cpp:968 +#: ui/cryptoconfigmodule.cpp:960 #, kde-format msgid "Configure Keyservers" msgstr "Sett opp nøkkeltjenere" -#: ui/directoryserviceswidget.cpp:67 +#: ui/directoryserviceswidget.cpp:64 #, kde-format msgctxt "default server name, keep it a valid domain name, ie. no spaces" msgid "server" msgstr "tjener" -#: ui/directoryserviceswidget.cpp:95 +#: ui/directoryserviceswidget.cpp:92 #, kde-format msgid "hkp" msgstr "hkp" -#: ui/directoryserviceswidget.cpp:96 +#: ui/directoryserviceswidget.cpp:93 #, kde-format msgid "http" msgstr "http" -#: ui/directoryserviceswidget.cpp:97 +#: ui/directoryserviceswidget.cpp:94 #, kde-format msgid "https" msgstr "https" -#: ui/directoryserviceswidget.cpp:98 +#: ui/directoryserviceswidget.cpp:95 #, kde-format msgid "ftp" msgstr "ftp" -#: ui/directoryserviceswidget.cpp:99 +#: ui/directoryserviceswidget.cpp:96 #, kde-format msgid "ftps" msgstr "ftps" -#: ui/directoryserviceswidget.cpp:100 +#: ui/directoryserviceswidget.cpp:97 #, kde-format msgid "ldap" msgstr "ldap" -#: ui/directoryserviceswidget.cpp:101 +#: ui/directoryserviceswidget.cpp:98 #, kde-format msgid "ldaps" msgstr "ldaps" -#: ui/directoryserviceswidget.cpp:588 +#: ui/directoryserviceswidget.cpp:585 #, kde-format msgid "Server Name" msgstr "Tjenernavn" -#: ui/directoryserviceswidget.cpp:589 +#: ui/directoryserviceswidget.cpp:586 #, kde-format msgid "Server Port" msgstr "Tjenerport" -#: ui/directoryserviceswidget.cpp:590 +#: ui/directoryserviceswidget.cpp:587 #, kde-format msgid "Base DN" msgstr "Base-DN" -#: ui/directoryserviceswidget.cpp:591 +#: ui/directoryserviceswidget.cpp:588 #, kde-format msgid "User Name" msgstr "Brukernavn" -#: ui/directoryserviceswidget.cpp:592 +#: ui/directoryserviceswidget.cpp:589 #, kde-format msgid "Password" msgstr "Passord" -#: ui/directoryserviceswidget.cpp:614 +#: ui/directoryserviceswidget.cpp:611 #, kde-format msgid "(read-only)" msgstr "(skrivebeskyttet)" -#: ui/directoryserviceswidget.cpp:616 +#: ui/directoryserviceswidget.cpp:613 #, kde-format msgctxt "amended tooltip; %1: original tooltip" msgid "%1 (read-only)" msgstr "%1 (skrivebeskyttet)" -#: ui/directoryserviceswidget.cpp:739 +#: ui/directoryserviceswidget.cpp:736 #, kde-format msgid "" "Enter the name or IP address of the server hosting the directory service." msgstr "" "Skriv inn navn eller IP-adresse til tjeneren som huser katalogtjenesten." -#: ui/directoryserviceswidget.cpp:741 +#: ui/directoryserviceswidget.cpp:738 #, kde-format msgid "" "<b>(Optional, the default is fine in most cases)</b> Pick the port number " @@ -572,7 +572,7 @@ "<b>(Valgfritt, standard oppsett er nok i de fleste tilfeller)</b> Angi " "porten som katalogtjenesten lytter på." -#: ui/directoryserviceswidget.cpp:744 +#: ui/directoryserviceswidget.cpp:741 #, kde-format msgid "" "<b>(Only for LDAP)</b> Enter the base DN for this LDAP server to limit " @@ -581,12 +581,12 @@ "<b>(Bare for LDAP)</b> Angi utgangspunkt (Base DN) for denne LDAP tjeneren " "for å begrense antall søk til en underkatalog i mappen." -#: ui/directoryserviceswidget.cpp:747 +#: ui/directoryserviceswidget.cpp:744 #, kde-format msgid "<b>(Optional)</b> Enter your user name here, if needed." msgstr "<b>(Valgfritt)</b> Angi brukernavn her, om nødvendig." -#: ui/directoryserviceswidget.cpp:749 +#: ui/directoryserviceswidget.cpp:746 #, kde-format msgid "" "<b>(Optional, not recommended)</b> Enter your password here, if needed. Note " @@ -807,12 +807,12 @@ msgid "Change..." msgstr "Endre …" -#: ui/keyrequester.cpp:232 ui/keyselectiondialog.cpp:256 +#: ui/keyrequester.cpp:232 ui/keyselectiondialog.cpp:255 #, kde-kuit-format msgid "<placeholder>unknown</placeholder>" msgstr "<placeholder>ukjent</placeholder>" -#: ui/keyrequester.cpp:246 ui/keyselectiondialog.cpp:657 +#: ui/keyrequester.cpp:246 ui/keyselectiondialog.cpp:655 #, kde-format msgid "" "<qt><p>An error occurred while fetching the keys from the backend:</p><p><b>" @@ -822,7 +822,7 @@ "b></p></qt>" #: ui/keyrequester.cpp:251 ui/keyrequester.cpp:283 ui/keyrequester.cpp:306 -#: ui/keyselectiondialog.cpp:630 ui/keyselectiondialog.cpp:662 +#: ui/keyselectiondialog.cpp:628 ui/keyselectiondialog.cpp:660 #, kde-format msgid "Key Listing Failed" msgstr "Nøkkelopplisting mislyktes" @@ -869,160 +869,160 @@ msgid "Please select an (OpenPGP or S/MIME) key to use." msgstr "Velg en (OpenPGP eller S/MIME) nøkkel som skal brukes." -#: ui/keyselectioncombo.cpp:195 +#: ui/keyselectioncombo.cpp:193 #, kde-format msgctxt "Name <email> (validity, type, created: date)" msgid "%1 (%2, %3, created: %4)" msgstr "" -#: ui/keyselectioncombo.cpp:196 +#: ui/keyselectioncombo.cpp:194 #, kde-format msgctxt "Name <email>" msgid "%1 <%2>" msgstr "" -#: ui/keyselectioncombo.cpp:198 utils/formatting.cpp:509 +#: ui/keyselectioncombo.cpp:196 utils/formatting.cpp:509 #, kde-format msgid "OpenPGP" msgstr "OpenPGP" -#: ui/keyselectioncombo.cpp:356 +#: ui/keyselectioncombo.cpp:352 #, kde-format msgid "Loading keys ..." msgstr "" -#: ui/keyselectiondialog.cpp:98 +#: ui/keyselectiondialog.cpp:97 #, kde-format msgid "The key is not valid." msgstr "" -#: ui/keyselectiondialog.cpp:106 +#: ui/keyselectiondialog.cpp:105 #, kde-format msgid "The key is expired." msgstr "Nøkkelen er utløpt." -#: ui/keyselectiondialog.cpp:110 +#: ui/keyselectiondialog.cpp:109 #, kde-format msgid "The key is revoked." msgstr "" -#: ui/keyselectiondialog.cpp:114 +#: ui/keyselectiondialog.cpp:113 #, kde-format msgid "The key is disabled." msgstr "Nøkkelen er slått av." -#: ui/keyselectiondialog.cpp:122 +#: ui/keyselectiondialog.cpp:121 #, kde-format msgid "The key is not designated for encryption." msgstr "" -#: ui/keyselectiondialog.cpp:128 +#: ui/keyselectiondialog.cpp:127 #, kde-format msgid "The key is not designated for signing." msgstr "" -#: ui/keyselectiondialog.cpp:134 +#: ui/keyselectiondialog.cpp:133 #, kde-format msgid "The key is not designated for certifying." msgstr "" -#: ui/keyselectiondialog.cpp:140 +#: ui/keyselectiondialog.cpp:139 #, kde-format msgid "The key is not designated for authentication." msgstr "" -#: ui/keyselectiondialog.cpp:148 +#: ui/keyselectiondialog.cpp:147 #, kde-format msgid "The key is not secret." msgstr "" -#: ui/keyselectiondialog.cpp:163 +#: ui/keyselectiondialog.cpp:162 #, kde-format msgid "The key is not trusted enough." msgstr "" -#: ui/keyselectiondialog.cpp:169 +#: ui/keyselectiondialog.cpp:168 #, kde-format msgid "The key can be used." msgstr "" -#: ui/keyselectiondialog.cpp:230 +#: ui/keyselectiondialog.cpp:229 #, kde-format msgid "Key ID" msgstr "Nøkkel-ID" -#: ui/keyselectiondialog.cpp:231 +#: ui/keyselectiondialog.cpp:230 #, kde-format msgid "User ID" msgstr "Bruker-ID" -#: ui/keyselectiondialog.cpp:279 +#: ui/keyselectiondialog.cpp:278 #, kde-format msgid "never" msgstr "aldri" -#: ui/keyselectiondialog.cpp:289 ui/keyselectiondialog.cpp:291 -#: ui/keyselectiondialog.cpp:300 ui/keyselectiondialog.cpp:302 +#: ui/keyselectiondialog.cpp:288 ui/keyselectiondialog.cpp:290 +#: ui/keyselectiondialog.cpp:299 ui/keyselectiondialog.cpp:301 #, kde-format msgid "unknown" msgstr "ukjent" -#: ui/keyselectiondialog.cpp:289 +#: ui/keyselectiondialog.cpp:288 #, kde-format msgid "OpenPGP key for <b>%1</b>" msgstr "" -#: ui/keyselectiondialog.cpp:291 +#: ui/keyselectiondialog.cpp:290 #, kde-format msgid "S/MIME key for <b>%1</b>" msgstr "" -#: ui/keyselectiondialog.cpp:298 +#: ui/keyselectiondialog.cpp:297 #, kde-format msgctxt "Key creation date" msgid "Created" msgstr "" -#: ui/keyselectiondialog.cpp:299 +#: ui/keyselectiondialog.cpp:298 #, kde-format msgctxt "Key Expiration date" msgid "Expiry" msgstr "" -#: ui/keyselectiondialog.cpp:300 +#: ui/keyselectiondialog.cpp:299 #, kde-format msgctxt "Key fingerprint" msgid "Fingerprint" msgstr "" -#: ui/keyselectiondialog.cpp:302 +#: ui/keyselectiondialog.cpp:301 #, kde-format msgctxt "Key issuer" msgid "Issuer" msgstr "" -#: ui/keyselectiondialog.cpp:304 +#: ui/keyselectiondialog.cpp:303 #, kde-format msgctxt "Key status" msgid "Status" msgstr "" -#: ui/keyselectiondialog.cpp:456 +#: ui/keyselectiondialog.cpp:454 #, kde-format msgid "Search for &External Certificates" msgstr "Søk etter &eksterne sertifikater" -#: ui/keyselectiondialog.cpp:470 +#: ui/keyselectiondialog.cpp:468 #, kde-format msgid "&Search for:" msgstr "&Søk etter:" -#: ui/keyselectiondialog.cpp:494 +#: ui/keyselectiondialog.cpp:492 #, kde-format msgid "&Remember choice" msgstr "&Husk valget" -#: ui/keyselectiondialog.cpp:497 +#: ui/keyselectiondialog.cpp:495 #, kde-format msgid "" "<qt><p>If you check this box your choice will be stored and you will not be " @@ -1031,42 +1031,42 @@ "<qt><p>Dersom du krysser av her, blir valget lagret slik at du ikke blir " "spurt igjen.</p></qt>" -#: ui/keyselectiondialog.cpp:509 +#: ui/keyselectiondialog.cpp:507 #, kde-format msgid "&Reread Keys" msgstr "&Les nøkler om igjen" -#: ui/keyselectiondialog.cpp:510 +#: ui/keyselectiondialog.cpp:508 #, kde-format msgid "&Start Certificate Manager" msgstr "&Start sertifikathåndterer" -#: ui/keyselectiondialog.cpp:628 +#: ui/keyselectiondialog.cpp:626 #, kde-format msgid "No backends found for listing keys. Check your installation." msgstr "Fant ingen motor for nøkkelliste. Sjekk installasjonen." -#: ui/keyselectiondialog.cpp:644 +#: ui/keyselectiondialog.cpp:642 #, kde-format msgid "Could not start certificate manager; please check your installation." msgstr "Klarte ikke starte sertifikathåndteringa. Kontroller installasjonen." -#: ui/keyselectiondialog.cpp:646 +#: ui/keyselectiondialog.cpp:644 #, kde-format msgid "Certificate Manager Error" msgstr "Feil i sertifikathåndteringa" -#: ui/keyselectiondialog.cpp:700 +#: ui/keyselectiondialog.cpp:698 #, kde-format msgid "Checking selected keys..." msgstr "Undersøker valgte nøkler …" -#: ui/keyselectiondialog.cpp:700 +#: ui/keyselectiondialog.cpp:698 #, kde-format msgid "Fetching keys..." msgstr "Henter nøkler …" -#: ui/keyselectiondialog.cpp:731 +#: ui/keyselectiondialog.cpp:729 #, kde-format msgid "" "<qt>One backend returned truncated output.<p>Not all available keys are " @@ -1081,27 +1081,27 @@ "<qt>%1 motorer ga avkuttet utdata.<p>Ikke alle tilgjengelige nøkler er vist</" "p></qt>" -#: ui/keyselectiondialog.cpp:736 +#: ui/keyselectiondialog.cpp:734 #, kde-format msgid "Key List Result" msgstr "Nøkkelliste-resultat" -#: ui/keyselectiondialog.cpp:856 +#: ui/keyselectiondialog.cpp:854 #, kde-format msgid "Recheck Key" msgstr "Sjekk nøkkel om igjen" -#: ui/messagebox.cpp:71 +#: ui/messagebox.cpp:68 #, kde-format msgid "Your system does not have support for GnuPG Audit Logs" msgstr "Ditt system støtter ikke GnuPG kontroll-logger" -#: ui/messagebox.cpp:72 +#: ui/messagebox.cpp:69 #, kde-format msgid "System Error" msgstr "Systemfeil" -#: ui/messagebox.cpp:79 +#: ui/messagebox.cpp:76 #, kde-format msgid "" "An error occurred while trying to retrieve the GnuPG Audit Log:\n" @@ -1110,72 +1110,72 @@ "Det oppsto en feil under forsøk på å hente GnuPG kontroll-loggen:\n" "%1" -#: ui/messagebox.cpp:81 +#: ui/messagebox.cpp:78 #, kde-format msgid "GnuPG Audit Log Error" msgstr "Feil ved GnuPG kontroll-logg" -#: ui/messagebox.cpp:88 +#: ui/messagebox.cpp:85 #, kde-format msgid "No GnuPG Audit Log available for this operation." msgstr "Ingen GnuPG kontroll-logg er tilgjengelig for denne handlinga." -#: ui/messagebox.cpp:89 +#: ui/messagebox.cpp:86 #, kde-format msgid "No GnuPG Audit Log" msgstr "Ingen GnuPG kontroll-logg" -#: ui/messagebox.cpp:109 ui/messagebox.cpp:115 +#: ui/messagebox.cpp:106 ui/messagebox.cpp:112 #, kde-format msgid "GnuPG Audit Log Viewer" msgstr "Loggviser for GnuPG kontroll-logg" -#: ui/messagebox.cpp:121 +#: ui/messagebox.cpp:118 #, kde-format msgid "Signing failed: %1" msgstr "Signering mislyktes: %1" -#: ui/messagebox.cpp:122 +#: ui/messagebox.cpp:119 #, kde-format msgid "Signing successful" msgstr "Signering var vellykket" -#: ui/messagebox.cpp:133 +#: ui/messagebox.cpp:130 #, kde-format msgid "Encryption failed: %1" msgstr "Kryptering mislyktes: %1" -#: ui/messagebox.cpp:134 +#: ui/messagebox.cpp:131 #, kde-format msgid "Encryption successful" msgstr "Kryptering var vellykket" -#: ui/messagebox.cpp:155 +#: ui/messagebox.cpp:152 #, kde-format msgid "Signing Result" msgstr "Signeringsresultat" -#: ui/messagebox.cpp:167 +#: ui/messagebox.cpp:164 #, kde-format msgid "Signing Error" msgstr "Signeringsfeil" -#: ui/messagebox.cpp:179 ui/messagebox.cpp:203 +#: ui/messagebox.cpp:176 ui/messagebox.cpp:200 #, kde-format msgid "Encryption Result" msgstr "Krypteringsresultat" -#: ui/messagebox.cpp:191 ui/messagebox.cpp:215 +#: ui/messagebox.cpp:188 ui/messagebox.cpp:212 #, kde-format msgid "Encryption Error" msgstr "Krypteringsfeil" -#: ui/messagebox.cpp:263 +#: ui/messagebox.cpp:260 #, kde-format msgid "&Show Audit Log" msgstr "Vi&s kontroll-logg" -#: ui/progressdialog.cpp:91 +#: ui/progressdialog.cpp:90 #, kde-format msgid "%1: %2" msgstr "%1: %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkleo-17.12.2/po/zh_CN/libkleopatra.po new/libkleo-17.12.3/po/zh_CN/libkleopatra.po --- old/libkleo-17.12.2/po/zh_CN/libkleopatra.po 2018-02-06 01:43:59.000000000 +0100 +++ new/libkleo-17.12.3/po/zh_CN/libkleopatra.po 2018-03-06 01:32:06.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-12 03:26+0200\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:28-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"