diff -Nru kgpg-17.12.3/CMakeLists.txt kgpg-18.04.1/CMakeLists.txt --- kgpg-17.12.3/CMakeLists.txt 2018-03-06 00:16:07.000000000 +0000 +++ kgpg-18.04.1/CMakeLists.txt 2018-05-08 00:12:16.000000000 +0000 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) # KDE Application Version, managed by release script -set (KDE_APPLICATIONS_VERSION_MAJOR "17") -set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MAJOR "18") +set (KDE_APPLICATIONS_VERSION_MINOR "04") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(kgpg VERSION ${KDE_APPLICATIONS_VERSION}) -set(QT_MIN_VERSION "5.3.0") +set(QT_MIN_VERSION "5.5.0") find_package(ECM 5.21 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") diff -Nru kgpg-17.12.3/core/KGpgExpandableNode.h kgpg-18.04.1/core/KGpgExpandableNode.h --- kgpg-17.12.3/core/KGpgExpandableNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgExpandableNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -62,7 +62,7 @@ * In contrast wasExpanded() will only return true if the child nodes * are actually present in memory. */ - bool hasChildren() const Q_DECL_OVERRIDE; + bool hasChildren() const override; /** * check if there are any child nodes present in memory * @@ -73,10 +73,10 @@ * objects are not present in memory. */ virtual bool wasExpanded() const; - int getChildCount() Q_DECL_OVERRIDE; + int getChildCount() override; virtual const KGpgNode::List &getChildren() const; - KGpgNode *getChild(const int index) const Q_DECL_OVERRIDE; - int getChildIndex(KGpgNode *node) const Q_DECL_OVERRIDE; + KGpgNode *getChild(const int index) const override; + int getChildIndex(KGpgNode *node) const override; virtual void deleteChild(KGpgNode *child); }; diff -Nru kgpg-17.12.3/core/KGpgGroupMemberNode.h kgpg-18.04.1/core/KGpgGroupMemberNode.h --- kgpg-17.12.3/core/KGpgGroupMemberNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgGroupMemberNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -38,11 +38,11 @@ explicit KGpgGroupMemberNode(KGpgGroupNode *parent, KGpgKeyNode *k); virtual ~KGpgGroupMemberNode(); - KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE; - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - QString getSize() const Q_DECL_OVERRIDE; - QDateTime getExpiration() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; + KgpgCore::KgpgKeyTrust getTrust() const override; + KgpgCore::KgpgItemType getType() const override; + QString getSize() const override; + QDateTime getExpiration() const override; + QDateTime getCreation() const override; virtual KGpgGroupNode *getParentKeyNode() const; /** diff -Nru kgpg-17.12.3/core/KGpgNode.h kgpg-18.04.1/core/KGpgNode.h --- kgpg-17.12.3/core/KGpgNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -44,7 +44,7 @@ friend class KGpgItemModel; - KGpgNode() Q_DECL_EQ_DELETE; + KGpgNode() = delete; protected: KGpgExpandableNode * const m_parent; KGpgItemModel *m_model; diff -Nru kgpg-17.12.3/core/KGpgOrphanNode.h kgpg-18.04.1/core/KGpgOrphanNode.h --- kgpg-17.12.3/core/KGpgOrphanNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgOrphanNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -39,15 +39,15 @@ explicit KGpgOrphanNode(KGpgExpandableNode *parent, const KgpgKey &k); virtual ~KGpgOrphanNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; + KgpgCore::KgpgKeyTrust getTrust() const override; const QString &getFingerprint() const; - QString getSize() const Q_DECL_OVERRIDE; - QString getName() const Q_DECL_OVERRIDE; - QString getEmail() const Q_DECL_OVERRIDE; - QDateTime getExpiration() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; - QString getId() const Q_DECL_OVERRIDE; + QString getSize() const override; + QString getName() const override; + QString getEmail() const override; + QDateTime getExpiration() const override; + QDateTime getCreation() const override; + QString getId() const override; }; #endif /* KGPGORPHANNODE_H */ diff -Nru kgpg-17.12.3/core/KGpgRootNode.h kgpg-18.04.1/core/KGpgRootNode.h --- kgpg-17.12.3/core/KGpgRootNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgRootNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -46,13 +46,13 @@ int m_groups; protected: - void readChildren() Q_DECL_OVERRIDE; + void readChildren() override; public: explicit KGpgRootNode(KGpgItemModel *model); virtual ~KGpgRootNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; /** * Create new group nodes diff -Nru kgpg-17.12.3/core/KGpgSignNode.h kgpg-18.04.1/core/KGpgSignNode.h --- kgpg-17.12.3/core/KGpgSignNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgSignNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -45,10 +45,10 @@ explicit KGpgSignNode(KGpgSignableNode *parent, const QStringList &s); virtual ~KGpgSignNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - QDateTime getExpiration() const Q_DECL_OVERRIDE; - QString getName() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; + QDateTime getExpiration() const override; + QString getName() const override; + QDateTime getCreation() const override; }; #endif /* KGPGSIGNNODE_H */ diff -Nru kgpg-17.12.3/core/KGpgSubkeyNode.h kgpg-18.04.1/core/KGpgSubkeyNode.h --- kgpg-17.12.3/core/KGpgSubkeyNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgSubkeyNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -35,21 +35,21 @@ QString m_fingerprint; protected: - void readChildren() Q_DECL_OVERRIDE; + void readChildren() override; public: explicit KGpgSubkeyNode(KGpgKeyNode *parent, const KgpgCore::KgpgKeySub &k); virtual ~KGpgSubkeyNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE; - QString getSize() const Q_DECL_OVERRIDE; - QString getName() const Q_DECL_OVERRIDE; - QDateTime getExpiration() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; - QString getId() const Q_DECL_OVERRIDE; - KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE; - const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; + KgpgCore::KgpgKeyTrust getTrust() const override; + QString getSize() const override; + QString getName() const override; + QDateTime getExpiration() const override; + QDateTime getCreation() const override; + QString getId() const override; + KGpgKeyNode *getKeyNode(void) override; + const KGpgKeyNode *getKeyNode(void) const override; virtual KGpgKeyNode *getParentKeyNode() const; void setFingerprint(const QString &fpr); diff -Nru kgpg-17.12.3/core/KGpgUatNode.h kgpg-18.04.1/core/KGpgUatNode.h --- kgpg-17.12.3/core/KGpgUatNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgUatNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -39,22 +39,22 @@ Q_DECLARE_PRIVATE(KGpgUatNode) protected: - void readChildren() Q_DECL_OVERRIDE; + void readChildren() override; public: explicit KGpgUatNode(KGpgKeyNode *parent, const unsigned int index, const QStringList &sl); virtual ~KGpgUatNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; + KgpgCore::KgpgKeyTrust getTrust() const override; const QPixmap &getPixmap() const; - QString getId() const Q_DECL_OVERRIDE; - QString getSize() const Q_DECL_OVERRIDE; - QString getName() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; + QString getId() const override; + QString getSize() const override; + QString getName() const override; + QDateTime getCreation() const override; virtual KGpgKeyNode *getParentKeyNode() const; - KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE; - const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE; + KGpgKeyNode *getKeyNode(void) override; + const KGpgKeyNode *getKeyNode(void) const override; }; #endif /* KGPGUATNODE_H */ diff -Nru kgpg-17.12.3/core/KGpgUidNode.h kgpg-18.04.1/core/KGpgUidNode.h --- kgpg-17.12.3/core/KGpgUidNode.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/core/KGpgUidNode.h 2018-05-07 19:45:01.000000000 +0000 @@ -37,22 +37,22 @@ Q_DECLARE_PRIVATE(KGpgUidNode) protected: - void readChildren() Q_DECL_OVERRIDE; + void readChildren() override; public: explicit KGpgUidNode(KGpgKeyNode *parent, const unsigned int index, const QStringList &sl); virtual ~KGpgUidNode(); - KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE; - KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE; - QString getName() const Q_DECL_OVERRIDE; - QString getEmail() const Q_DECL_OVERRIDE; - QString getId() const Q_DECL_OVERRIDE; - QDateTime getCreation() const Q_DECL_OVERRIDE; - KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE; - const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE; + KgpgCore::KgpgItemType getType() const override; + KgpgCore::KgpgKeyTrust getTrust() const override; + QString getName() const override; + QString getEmail() const override; + QString getId() const override; + QDateTime getCreation() const override; + KGpgKeyNode *getKeyNode(void) override; + const KGpgKeyNode *getKeyNode(void) const override; virtual KGpgKeyNode *getParentKeyNode() const; - QString getComment() const Q_DECL_OVERRIDE; + QString getComment() const override; }; #endif /* KGPGUIDNODE_H */ diff -Nru kgpg-17.12.3/debian/changelog kgpg-18.04.1/debian/changelog --- kgpg-17.12.3/debian/changelog 2018-03-12 21:23:02.000000000 +0000 +++ kgpg-18.04.1/debian/changelog 2018-05-08 12:19:42.000000000 +0000 @@ -1,8 +1,16 @@ -kgpg (4:17.12.3-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium +kgpg (4:18.04.1-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium + + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + + -- Rik Mills Tue, 08 May 2018 13:19:42 +0100 + +kgpg (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) - -- Rik Mills Mon, 12 Mar 2018 21:23:02 +0000 + -- Rik Mills Fri, 16 Mar 2018 13:27:03 +0000 kgpg (4:17.12.2-0ubuntu1) bionic; urgency=medium diff -Nru kgpg-17.12.3/debian/control kgpg-18.04.1/debian/control --- kgpg-17.12.3/debian/control 2018-03-12 21:23:02.000000000 +0000 +++ kgpg-18.04.1/debian/control 2018-05-08 12:19:42.000000000 +0000 @@ -13,11 +13,11 @@ extra-cmake-modules (>= 5.31.0~), libboost-dev, libgpgme11-dev, - libkf5akonadicontact-dev (>= 4:17.12.3~), + libkf5akonadicontact-dev (>= 4:18.04.1~), libkf5archive-dev (>= 5.31.0~), libkf5codecs-dev (>= 5.31.0~), - libkf5contacteditor-dev (>= 4:17.12.3~), - libkf5contacts-dev (>= 4:17.12.3~), + libkf5contacteditor-dev (>= 4:18.04.1~), + libkf5contacts-dev (>= 4:18.04.1~), libkf5coreaddons-dev (>= 5.31.0~), libkf5crash-dev (>= 5.31.0~), libkf5dbusaddons-dev (>= 5.31.0~), diff -Nru kgpg-17.12.3/editor/kgpgeditor.h kgpg-18.04.1/editor/kgpgeditor.h --- kgpg-17.12.3/editor/kgpgeditor.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/editor/kgpgeditor.h 2018-05-07 19:45:01.000000000 +0000 @@ -35,7 +35,7 @@ Q_OBJECT friend class KgpgView; - KgpgEditor() Q_DECL_EQ_DELETE; + KgpgEditor() = delete; public: KgpgEditor(KeysManager *parent, KGpgItemModel *model, Qt::WindowFlags f); ~KgpgEditor(); diff -Nru kgpg-17.12.3/encryptfile.desktop kgpg-18.04.1/encryptfile.desktop --- kgpg-17.12.3/encryptfile.desktop 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/encryptfile.desktop 2018-05-07 19:45:01.000000000 +0000 @@ -32,7 +32,7 @@ Name[hr]=Kriptiraj datoteku Name[hu]=Fájl titkosítása Name[ia]=Crypta file -Name[id]=Enkripsi Berkas +Name[id]=Enkripsi File Name[is]=Dulrita skrá Name[it]=Cifratura file Name[ja]=ファイルを暗号化 diff -Nru kgpg-17.12.3/foldercompressjob.h kgpg-18.04.1/foldercompressjob.h --- kgpg-17.12.3/foldercompressjob.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/foldercompressjob.h 2018-05-07 19:45:01.000000000 +0000 @@ -34,7 +34,7 @@ Q_OBJECT Q_DISABLE_COPY(FolderCompressJob) - FolderCompressJob() Q_DECL_EQ_DELETE; + FolderCompressJob() = delete; FolderCompressJobPrivate * const d_ptr; Q_DECLARE_PRIVATE(FolderCompressJob) diff -Nru kgpg-17.12.3/keyinfodialog.h kgpg-18.04.1/keyinfodialog.h --- kgpg-17.12.3/keyinfodialog.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/keyinfodialog.h 2018-05-07 19:45:01.000000000 +0000 @@ -57,7 +57,7 @@ { Q_OBJECT - KgpgKeyInfo() Q_DECL_EQ_DELETE; + KgpgKeyInfo() = delete; Q_DISABLE_COPY(KgpgKeyInfo) public: KgpgKeyInfo(KGpgKeyNode *node, KGpgItemModel *model, QWidget *parent); diff -Nru kgpg-17.12.3/kgpgrevokewidget.h kgpg-18.04.1/kgpgrevokewidget.h --- kgpg-17.12.3/kgpgrevokewidget.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/kgpgrevokewidget.h 2018-05-07 19:45:01.000000000 +0000 @@ -41,7 +41,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgRevokeDialog) - KGpgRevokeDialog() Q_DECL_EQ_DELETE; + KGpgRevokeDialog() = delete; public: KGpgRevokeDialog(QWidget* parent, const KGpgKeyNode* node); diff -Nru kgpg-17.12.3/model/kgpgsearchresultmodel.h kgpg-18.04.1/model/kgpgsearchresultmodel.h --- kgpg-17.12.3/model/kgpgsearchresultmodel.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/model/kgpgsearchresultmodel.h 2018-05-07 19:45:01.000000000 +0000 @@ -43,12 +43,12 @@ explicit KGpgSearchResultBackingModel(QObject *parent = nullptr); ~KGpgSearchResultBackingModel(); - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; /** * @brief get the key fingerprint for the given index @@ -115,7 +115,7 @@ ~KGpgSearchResultModel(); bool filterByValidity() const; - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE; + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; /** * @brief get the key fingerprint for the given index @@ -134,7 +134,7 @@ * internally. Use `resetSourceModel()` if you want to clear the * source model, and `slotAddKey()` to populate it. */ - void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; + void setSourceModel(QAbstractItemModel *sourceModel) override; public slots: /** diff -Nru kgpg-17.12.3/po/ca/kgpg.po kgpg-18.04.1/po/ca/kgpg.po --- kgpg-17.12.3/po/ca/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/ca/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -4777,3 +4777,92 @@ msgctxt "@info" msgid "The signature is valid, and the key is ultimately trusted" msgstr "La signatura és vàlida i la clau és de confiança absoluta" + +#~ msgid "Do not Know" +#~ msgstr "No es coneix" + +#~ msgid "Do NOT Trust" +#~ msgstr "NO és de confiança" + +#~ msgctxt "Export a key via email" +#~ msgid "Email" +#~ msgstr "Correu electrònic" + +#~ msgctxt "" +#~ "Name of the action that is a search line, shown for example in the " +#~ "toolbar configuration dialog" +#~ msgid "Search Line" +#~ msgstr "Línia de cerca" + +#~ msgid "" +#~ "KGpg - simple gui for gpg\n" +#~ "\n" +#~ "KGpg was designed to make gpg very easy to use.\n" +#~ "I tried to make it as secure as possible.\n" +#~ "Hope you enjoy it." +#~ msgstr "" +#~ "KGpg - un entorn gràfic simple per al gpg\n" +#~ "\n" +#~ "El KGpg ha estat dissenyat per a fer que el gpg sigui més senzill " +#~ "d'usar.\n" +#~ "Hem intentat fer-lo el més segur possible.\n" +#~ "Esperem que el gaudiu." + +#~ msgctxt "ID: Name " +#~ msgid "%1: %2 <%3>" +#~ msgstr "%1: %2 <%3>" + +#~ msgctxt "Name : ID" +#~ msgid "%1 <%2>: %3" +#~ msgstr "%1 <%2>: %3" + +#~ msgid "Keys" +#~ msgstr "Claus" + +#~ msgid "
One key imported:" +#~ msgid_plural "
%1 keys imported:" +#~ msgstr[0] "
S'ha importat una clau:" +#~ msgstr[1] "
S'han importat %1 claus:" + +#~ msgid "
One secret key imported." +#~ msgid_plural "
%1 secret keys imported." +#~ msgstr[0] "
S'ha importat una clau secreta." +#~ msgstr[1] "
S'han importat %1 claus secretes." + +#~ msgctxt "Good signature from: NAME , Key ID: HEXID" +#~ msgid "" +#~ "Good signature from:
%1 <%2>
Key ID: %3
" +#~ msgstr "" +#~ "Signatura correcta de:
%1 <%2>
Identificador " +#~ "de la clau: %3
" + +#~ msgid "" +#~ "BAD signature from:
%1
Key id: %2

The " +#~ "file is corrupted
" +#~ msgstr "" +#~ "Signatura INCORRECTA de:
%1
Identificador de la " +#~ "clau: %2

El fitxer és corrupte.
" + +#~ msgid "Edit Key Server" +#~ msgstr "Edició del servidor de claus" + +#~ msgctxt "Mark default keyserver in GUI" +#~ msgid "(Default)" +#~ msgstr "(per omissió)" + +#~ msgctxt "Remove default marker from GUI if it is there" +#~ msgid "(Default)" +#~ msgstr "(per omissió)" + +#~ msgid "Authentification" +#~ msgstr "Autenticació" + +#~ msgctxt "no key comment" +#~ msgid "none" +#~ msgstr "cap" + +#~ msgid "Unable to contact the address book. Please check your installation." +#~ msgstr "" +#~ "No es pot contactar amb la Llibreta d'adreces. Si us plau, comproveu la " +#~ "vostra instal·lació." diff -Nru kgpg-17.12.3/po/ca@valencia/kgpg.po kgpg-18.04.1/po/ca@valencia/kgpg.po --- kgpg-17.12.3/po/ca@valencia/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/ca@valencia/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -58,8 +58,8 @@ "This function is not available on this system. The symbolic link to the " "private GnuPG keys cannot be created." msgstr "" -"Esta funció no està disponible en este sistema. No s'ha pogut crear l'enllaç " -"simbòlic a les claus privades del GnuPG." +"Aquesta funció no està disponible en aquest sistema. No s'ha pogut crear " +"l'enllaç simbòlic a les claus privades del GnuPG." #: caff.cpp:168 caff.cpp:186 #, kde-format @@ -128,16 +128,16 @@ "GPG when decryption occurs. (This is recommended for advanced users only)." msgstr "" -"Orde a mida per a desencriptar:
\n" -"

Esta opció permet a l'usurari especificar una orde a mida a executar pel " -"GPG quan es faça el desencriptatge (només es recomana a usuaris avançats)." +"Ordre a mida per a desencriptar:
\n" +"

Aquesta opció permet a l'usurari especificar una ordre a mida a executar " +"pel GPG quan es faça el desencriptatge (només es recomana a usuaris " +"avançats).

" #. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2) #: conf_decryption.ui:55 #, kde-format msgid "Custom decryption command:" -msgstr "Orde a mida per al desencriptatge:" +msgstr "Ordre a mida per al desencriptatge:" #. i18n: ectx: property (text), widget (QCheckBox, capEncrypt) #. i18n: ectx: property (windowTitle), widget (QWidget, Encryption) @@ -156,9 +156,9 @@ "the body of an e-mail message.

" msgstr "" "Encriptatge en armadura ASCII
\n" -"

Marcant esta opció s'encripten tots els fitxers en un format que es pot " -"obrir en un editor de text, i per tant, l'eixida és vàlida per posar-la en " -"el cos d'un missatge de correu electrònic.

" +"

Marcant aquesta opció s'encripten tots els fitxers en un format que es " +"pot obrir en un editor de text, i per tant, l'eixida és vàlida per posar-la " +"en el cos d'un missatge de correu electrònic.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AsciiArmor) #: conf_encryption.ui:34 selectpublickeydialog.cpp:115 @@ -176,8 +176,8 @@ "users of PGP (Pretty Good Privacy) software.

" msgstr "" "Usa l'extensió *.pgp per als fitxers encriptats:
\n" -"

Marcant esta opció afegirà una extensió .pgp a tots els fitxers " -"encriptats en comptes d'una extensió .gpg. Esta opció mantindrà la " +"

Marcant aquesta opció afegirà una extensió .pgp a tots els fitxers " +"encriptats en comptes d'una extensió .gpg. Aquesta opció mantindrà la " "compatibilitat amb els usuaris del programari PGP (Pretty Good Privacy)." @@ -196,16 +196,16 @@ "enabling you to enter a custom command for encryption. This option is " "recommended for experienced users only.

" msgstr "" -"Orde a mida per encriptar:
\n" +"Ordre a mida per encriptar:
\n" "

Quan estiga activat, es mostrarà un camp d'entrada en el diàleg de " -"selecció de claus que vos permetrà introduir una orde a mida per a " +"selecció de claus que vos permetrà introduir una ordre a mida per a " "l'encriptatge. Sols es recomana als usuaris amb experiència.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AllowCustomEncryptionOptions) #: conf_encryption.ui:72 #, kde-format msgid "Custom encryption command:" -msgstr "Orde a mida per a l'encriptatge:" +msgstr "Ordre a mida per a l'encriptatge:" #. i18n: ectx: property (whatsThis), widget (QCheckBox, encrypt_to_always) #: conf_encryption.ui:113 @@ -238,8 +238,8 @@ "the default key will be bypassed.

" msgstr "" "Encripta fitxers amb:
\n" -"

En marcar esta opció i seleccionar una clau, es forçarà que qualsevol " -"operació d'encriptatge de fitxers usi esta clau. El KGpg no demanarà un " +"

En marcar aquesta opció i seleccionar una clau, es forçarà que qualsevol " +"operació d'encriptatge de fitxers usi aquesta clau. El KGpg no demanarà un " "destinatari i la clau per omissió serà omesa.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EncryptFilesTo) @@ -261,8 +261,8 @@ "Permet l'encriptatge amb claus que no siguen de confiança:
\n" "

Quan s'importa una clau pública es marca com que no és de confiança i no " "podreu usar-la a menys que la signeu amb la clau per omissió (per fer-la «de " -"confiança»). Si marqueu esta casella, podreu emprar qualsevol clau, encara " -"que no siga de confiança.

" +"confiança»). Si marqueu aquesta casella, podreu emprar qualsevol clau, " +"encara que no siga de confiança.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AllowUntrustedKeys) #: conf_encryption.ui:138 selectpublickeydialog.cpp:121 @@ -282,7 +282,7 @@ "Permet les claus sense confiança com a membres de grups de claus:

Un grup de claus permet l'encriptació simple de múltiples " "destinataris a la vegada. És similar a l'opció Permet l'encriptatge amb " -"claus que no siguen de confiança, esta permet que les claus sense " +"claus que no siguen de confiança, aquesta permet que les claus sense " "confiança esdevinguin membres d'un grup de claus.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AllowUntrustedGroupMembers) @@ -304,13 +304,13 @@ "process depending on the number of secret keys the receiver holds.

" msgstr "" "Oculta l'identificador d'usuari:
\n" -"

Marcant esta opció s'eliminarà l'identificador de la clau del destinatari " -"de tots els paquets encriptats. L'avantatge és que l'anàlisi del trànsit " -"dels paquets encriptats no es pot realitzar fàcilment perquè el destinatari " -"és desconegut. El desavantatge és que el destinatari dels paquets encriptats " -"està obligat a provar totes les claus secretes abans de poder desencriptar " -"els paquets. Això pot ser un procés molt llarg depenent del nombre de claus " -"secretes que tinga el destinatari.

" +"

Marcant aquesta opció s'eliminarà l'identificador de la clau del " +"destinatari de tots els paquets encriptats. L'avantatge és que l'anàlisi del " +"trànsit dels paquets encriptats no es pot realitzar fàcilment perquè el " +"destinatari és desconegut. El desavantatge és que el destinatari dels " +"paquets encriptats està obligat a provar totes les claus secretes abans de " +"poder desencriptar els paquets. Això pot ser un procés molt llarg depenent " +"del nombre de claus secretes que tinga el destinatari.

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_HideUserID) #: conf_encryption.ui:159 selectpublickeydialog.cpp:130 @@ -328,8 +328,8 @@ "allowing GnuPG users to inter operate with PGP 6 users.

" msgstr "" "Compatibilitat PGP 6:
\n" -"

Marcant esta opció es força que el GnuPG retorne paquets encriptats que " -"són tan compatibles com siga possible amb l'estàndard PGP (Pretty Good " +"

Marcant aquesta opció es força que el GnuPG retorne paquets encriptats " +"que són tan compatibles com siga possible amb l'estàndard PGP (Pretty Good " "Privacy) 6 i per tant, permet als usuaris del GnuPG interoperar amb els del " "PGP 6.

" @@ -365,7 +365,7 @@ "configuration and the keyrings. If you have not changed it this is usually " "~/.gnupg/

" msgstr "" -"Ubicació inicial

Este és el directori on el GnuPG guarda la seua " +"Ubicació inicial

Aquest és el directori on el GnuPG guarda la seua " "configuració i els anells de claus. Si no l'heu canviat, normalment és " "~/.gnupg/

" @@ -383,8 +383,8 @@ "the directory specified above. The default is gnupg.conf while " "older versions of GnuPG used options.

" msgstr "" -"Fitxer de configuració

Este és el nom del fitxer de configuració en " -"el directori especificat més amunt. Per omissió és gnupg.conf " +"Fitxer de configuració

Aquest és el nom del fitxer de configuració " +"en el directori especificat més amunt. Per omissió és gnupg.conf " "mentre que les versions més antigues usaven options.

" #. i18n: ectx: property (text), widget (QLabel, textLabel1_5_2_2) @@ -412,9 +412,9 @@ "Program path

This is the program that will be called for all GnuPG " "operations. The default of gpg will work on most systems.

" msgstr "" -"Camí al programa

Este és el programa que s'invocarà per a totes les " -"operacions del GnuPG. Per defecte, gpg funcionarà a la majoria dels " -"sistemes.

" +"Camí al programa

Aquest és el programa que s'invocarà per a totes " +"les operacions del GnuPG. Per defecte, gpg funcionarà a la majoria " +"dels sistemes.

" #. i18n: ectx: property (text), widget (QLabel, textLabel1_6_2) #: conf_gpg.ui:117 @@ -481,8 +481,8 @@ "

Si està marcada, les operacions del porta-retalls al KGpg usaran la " "selecció del porta-retalls, és a dir, es ressaltarà el text a copiar i amb " "el botó del mig del ratolí (o els botons dret+esquerre a la vegada) per a " -"enganxar. Si esta opció no està marcada, el porta-retalls funcionarà amb les " -"dreceres (Ctrl+c, Ctrl+v).

" +"enganxar. Si aquesta opció no està marcada, el porta-retalls funcionarà amb " +"les dreceres (Ctrl+c, Ctrl+v).

" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseMouseSelection) #: conf_misc.ui:56 @@ -685,7 +685,7 @@ "The placeholders surrounded by the percent signs (like %KEYID%) will be " "replaced with the corresponding text for every single mail." msgstr "" -"Este és el text del correu enviat per l'acció «Signa i envia l'ID " +"Aquest és el text del correu enviat per l'acció «Signa i envia l'ID " "d'usuari».\n" "\n" "Les variables de substitució envoltades per signes de percentatge (com " @@ -1204,7 +1204,7 @@ "import this key from a keyserver?" msgstr "" "Falta la signatura:
Identificador de la clau: %1

Voleu importar esta clau des d'un servidor de claus?" +">Voleu importar aquesta clau des d'un servidor de claus?" #. i18n: ectx: attribute (title), widget (QWidget, tab_import) #: editor/kgpgeditor.cpp:712 keyserver.ui:33 keytreeview.cpp:171 @@ -1273,7 +1273,7 @@ "deleted after operation." msgstr "" "S'ha deixat anar un fitxer remot.
El fitxer remot ara es " -"copiarà en un fitxer temporal per a realitzar l'operació requerida. Este " +"copiarà en un fitxer temporal per a realitzar l'operació requerida. Aquest " "fitxer temporal se suprimirà després de l'operació." #: editor/kgpgtextedit.cpp:106 @@ -1287,7 +1287,7 @@ "This file is a public key.
Do you want to import it instead " "of opening it in editor?" msgstr "" -"Este fitxer és una clau pública.
Voleu importar-la en lloc " +"Aquest fitxer és una clau pública.
Voleu importar-la en lloc " "d'obrir-la amb un editor?" #: editor/kgpgtextedit.cpp:145 @@ -1296,7 +1296,7 @@ "This file is a private key.
Do you want to import it instead " "of opening it in editor?" msgstr "" -"Este fitxer és una clau privada.
Voleu importar-la en lloc " +"Aquest fitxer és una clau privada.
Voleu importar-la en lloc " "d'obrir-la amb un editor?" #: editor/kgpgtextedit.cpp:150 @@ -1349,7 +1349,7 @@ #: editor/kgpgtextedit.cpp:348 #, kde-format msgid "Will not import this key in your list" -msgstr "No importarà esta clau a la vostra llista" +msgstr "No importarà aquesta clau a la vostra llista" #: editor/kgpgtextedit.cpp:350 #, kde-format @@ -1431,7 +1431,7 @@ #: groupedit.ui:38 keysmanager.cpp:429 searchres.ui:29 #, kde-format msgid "Search:" -msgstr "Busca:" +msgstr "Cerca:" #. i18n: ectx: property (text), widget (QLabel, kActiveLabel1) #: groupedit.ui:84 @@ -1636,19 +1636,19 @@ "a key (example: searching for 0xED7585F4 would bring up the key associated " "with that ID).

" msgstr "" -"Text a buscar o identificador de la clau a importar:
\n" -"

Hi ha múltiples maneres de buscar una clau, podeu usar una busca de text " +"Text a cercar o identificador de la clau a importar:
\n" +"

Hi ha múltiples maneres de buscar una clau, podeu usar una cerca de text " "o de text parcial (exemple: en introduir Ernest o Montllor apareixeran les " "claus en què isca Ernest o Montllor) o podeu buscar per l'identificador de " "la clau. Els identificadors de la clau són cadenes de lletres i nombres que " -"identifiquen unívocament una clau (exemple: en buscar 0xED7585F4 es mostrà " -"la clau associada amb este identificador).

" +"identifiquen unívocament una clau (exemple: en cercar 0xED7585F4 es mostrà " +"la clau associada amb aquest identificador).

" #. i18n: ectx: property (text), widget (QLabel, textLabel2) #: keyserver.ui:70 #, kde-format msgid "Text to search or ID of the key to import:" -msgstr "Text a buscar o identificador de la clau a importar:" +msgstr "Text a cercar o identificador de la clau a importar:" #. i18n: ectx: property (text), widget (QCheckBox, cBproxyI) #. i18n: ectx: property (text), widget (QCheckBox, cBproxyE) @@ -1702,7 +1702,8 @@ "

" msgstr "" "Exporta:
\n" -"

En prémer este botó la clau s'exportarà al servidor especificat.

" +"

En prémer aquest botó la clau s'exportarà al servidor especificat.

" #. i18n: ectx: property (text), widget (QPushButton, Buttonexport) #: keyserver.ui:269 @@ -1718,7 +1719,7 @@ #: keyservers.cpp:101 keyservers.cpp:191 #, kde-format msgid "You must enter a search string." -msgstr "Heu d'introduir una cadena a buscar." +msgstr "Heu d'introduir una cadena a cercar." #: keyservers.cpp:113 #, kde-format @@ -2018,7 +2019,7 @@ #, kde-format msgctxt "Name of the action that gives the focus to the search line" msgid "Focus Search Line" -msgstr "Estableix el focus a la línia de busca" +msgstr "Estableix el focus a la línia de cerca" #: keysmanager.cpp:493 #, kde-format @@ -2027,7 +2028,7 @@ "Please wait a moment until this operation is complete." msgstr "" "Ja hi ha una altra operació de generació de clau en curs.\n" -"Espereu fins que acabe esta operació." +"Espereu fins que acabe aquesta operació." #: keysmanager.cpp:494 keysmanager.cpp:530 keysmanager.cpp:578 #, kde-format @@ -2099,7 +2100,7 @@ "Please wait a moment until this operation is complete." msgstr "" "Ja hi ha una altra operació en curs.\n" -"Espereu fins que acabe esta operació." +"Espereu fins que acabe aquesta operació." #: keysmanager.cpp:879 keysmanager.cpp:884 #, kde-format @@ -2255,7 +2256,7 @@ "compromised.
Continue key export?" msgstr "" "Les claus secretes no s'han de guardar en un lloc insegur.
Si " -"algú aconsegueix accedir-hi, l'encriptatge amb esta clau estarà compromés." +"algú aconsegueix accedir-hi, l'encriptatge amb aquesta clau estarà compromés." "
Continuo amb l'exportació de la clau?" #: keysmanager.cpp:1390 @@ -2322,8 +2323,8 @@ "

This key is an orphaned secret key (secret key without public key.) It is " "currently not usable.

Would you like to regenerate the public key?

" msgstr "" -"

Esta clau és una clau secreta òrfena (clau secreta sense clau pública). " -"Actualment no és usable.

Voleu regenerar la clau pública?

" +"

Aquesta clau és una clau secreta òrfena (clau secreta sense clau " +"pública). Actualment no és usable.

Voleu regenerar la clau pública?

" #: keysmanager.cpp:1667 #, kde-format @@ -2522,8 +2523,8 @@ #, kde-format msgid "All signatures for this key are already in your keyring" msgid_plural "All signatures for this keys are already in your keyring" -msgstr[0] "Totes les signatures per esta clau ja estan a l'anell de claus" -msgstr[1] "Totes les signatures per estes claus ja estan a l'anell de claus" +msgstr[0] "Totes les signatures per aquesta clau ja estan a l'anell de claus" +msgstr[1] "Totes les signatures per aquestes claus ja estan a l'anell de claus" #: keysmanager.cpp:2219 #, kde-format @@ -2556,10 +2557,10 @@ "want to remove it from these groups?" msgstr[0] "" "La clau que esteu suprimint és membre del grup de claus següent. Voleu " -"suprimir-la d'este grup?" +"suprimir-la d'aquest grup?" msgstr[1] "" "La clau que esteu suprimint és membre dels grups de claus següents. " -"Voleu suprimir-la d'estos grups?" +"Voleu suprimir-la d'aquests grups?" #: keysmanager.cpp:2333 keysmanager.cpp:2347 keysmanager.cpp:2382 #: keysmanager.cpp:2397 keysmanager.cpp:2400 keysmanager.cpp:2411 @@ -2584,8 +2585,8 @@ "you will never be able to decrypt files encrypted with this key again." msgstr "" "

Suprimeixo la parella de claus secreta %1?

Si suprimiu " -"esta parella de claus, no podreu tornar a desencriptar fitxers encriptats " -"amb esta clau." +"aquesta parella de claus, no podreu tornar a desencriptar fitxers encriptats " +"amb aquesta clau." #: keysmanager.cpp:2381 keysmanager.cpp:2410 #, kde-format @@ -2594,7 +2595,7 @@ "Please wait a moment until this operation is complete." msgstr "" "Ja hi ha una altra operació de supressió de clau en curs.\n" -"Espereu fins que acabe esta operació." +"Espereu fins que acabe aquesta operació." #: keysmanager.cpp:2397 #, kde-format @@ -2617,7 +2618,7 @@ "You have selected items that are not keys. They can not be deleted with this " "menu entry." msgstr "" -"Heu seleccionat elements que no són claus. No es poden suprimir amb esta " +"Heu seleccionat elements que no són claus. No es poden suprimir amb aquesta " "entrada del menú." #: keysmanager.cpp:2497 @@ -2652,7 +2653,7 @@ "The text in the clipboard does not look like a key, but like encrypted " "text.
Do you want to decrypt it first and then try importing it?" msgstr "" -"El text del porta-retalls no pareix cap clau, sinó text encriptat.
El text del porta-retalls no sembla cap clau, sinó text encriptat.
Primer el voleu desencriptar, i després intentar-lo importar?" #: keysmanager.cpp:2581 @@ -2753,7 +2754,7 @@ "KGpg settings, or fix the agent." msgstr "" "L'ús de l'Agent GnuPG està activat en el fitxer de configuració " -"del GnuPG (%1).
Però, pareix que l'agent no està funcionant. Això " +"del GnuPG (%1).
Però, sembla que l'agent no està funcionant. Això " "podria donar problemes en signar/desencriptar.
Per favor, desactiveu " "l'agent GnuPG a l'arranjament del KGpg o esmeneu l'agent." @@ -2852,8 +2853,8 @@ "Hola,\n" "\n" "adjunt trobareu l'ID de l'usuari «%NUM_UID%» de la vostra clau %ID_CLAU% " -"signada per mi. Este correu està encriptat amb esta clau per assegurar que " -"controleu tant l'adreça de correu com la clau.\n" +"signada per mi. Aquest correu està encriptat amb aquesta clau per assegurar " +"que controleu tant l'adreça de correu com la clau.\n" "\n" "Si teniu diversos ID d'usuari, he enviat la signatura separada per a cada " "usuari a l'adreça de correu associada a l'ID d'usuari. Podeu importar les " @@ -2864,9 +2865,9 @@ "seleccionar «Importa una clau...» des del menú «Claus» i obrir el fitxer.\n" "\n" "Tingueu en compte que no he actualitzat la clau a cap servidor de claus. Si " -"voleu que esta signatura nova estiga disponible per a tercers, pugueu-la vós " -"mateix. Podeu fer-ho amb el GnuPG usant gpg --keyserver subkeys.pgp.net --" -"send-key %ID_CLAU%.\n" +"voleu que aquesta signatura nova estiga disponible per a tercers, pugueu-la " +"vós mateix. Podeu fer-ho amb el GnuPG usant gpg --keyserver subkeys.pgp.net " +"--send-key %ID_CLAU%.\n" "\n" "Amb el KGpg podeu fer clic dret sobre la clau després d'haver importat tots " "els ID d'usuari i seleccionar «Exporta la clau pública...».\n" @@ -2877,7 +2878,7 @@ #: kgpg.kcfg:13 #, kde-format msgid "Custom decryption command." -msgstr "Orde a mida per al desencriptatge." +msgstr "Ordre a mida per al desencriptatge." #. i18n: ectx: label, entry (CustomEncryptionOptions), group (Encryption) #: kgpg.kcfg:19 @@ -3005,7 +3006,7 @@ #, kde-format msgid "Show only keys with at least that trust level in key manager." msgstr "" -"Mostra només les claus amb este valor mínim de confiança en el gestor de " +"Mostra només les claus amb aquest valor mínim de confiança en el gestor de " "claus." #. i18n: ectx: label, entry (UseMouseSelection), group (User Interface) @@ -3158,7 +3159,8 @@ msgid "" "This is the text of the email sent by the \"Sign and Mail User ID\" action." msgstr "" -"Este és el text del correu enviat per l'acció «Signa i envia l'ID d'usuari»." +"Aquest és el text del correu enviat per l'acció «Signa i envia l'ID " +"d'usuari»." #: kgpgexternalactions.cpp:134 #, kde-format @@ -3190,8 +3192,8 @@ #, kde-format msgid "Decryption of this file failed:" msgid_plural "Decryption of these files failed:" -msgstr[0] "El desencriptatge d'este fitxer ha fallat:" -msgstr[1] "El desencriptatge d'estos fitxers ha fallat:" +msgstr[0] "El desencriptatge d'aquest fitxer ha fallat:" +msgstr[1] "El desencriptatge d'aquests fitxers ha fallat:" #: kgpgexternalactions.cpp:434 #, kde-format @@ -3202,7 +3204,7 @@ msgstr "" "No heu indicat cap camí al fitxer de configuració del GnuPG.
Això " "pot donar resultats inesperats en executar el KGpg.
Voleu iniciar " -"l'assistent del KGpg per a solucionar este problema?" +"l'assistent del KGpg per a solucionar aquest problema?" #: kgpgexternalactions.cpp:436 #, kde-format @@ -3226,7 +3228,7 @@ "for KGpg to work properly. Next, it will allow you to create your own key " "pair, enabling you to encrypt your files and emails." msgstr "" -"Este assistent en primer lloc configurarà algunes opcions bàsiques " +"Aquest assistent en primer lloc configurarà algunes opcions bàsiques " "requerides perquè el KGpg funcione correctament. Després, vos permetrà crear " "la vostra pròpia parella de claus, capacitant-vos per encriptar els vostres " "fitxers i missatges de correu electrònic." @@ -3342,7 +3344,7 @@ "Your GnuPG version (%1) seems to be too old.
Compatibility with " "versions before 1.4.0 is no longer guaranteed." msgstr "" -"Pareix que la versió del GnuPG (%1) és massa antiga.
La compatibilitat " +"Sembla que la versió del GnuPG (%1) és massa antiga.
La compatibilitat " "amb les versions anteriors a la 1.4.0 no està garantida." #: kgpginterface.cpp:280 @@ -3365,7 +3367,7 @@ msgid "" "If you go to expert mode, you will use the command line to create your key." msgstr "" -"Si aneu al mode expert, usareu la línia d'ordes per a crear la vostra clau." +"Si aneu al mode expert, usareu la línia d'ordres per a crear la vostra clau." #: kgpgkeygenerate.cpp:66 #, kde-format @@ -3980,8 +3982,8 @@ "pair.

" msgstr "" "Estableix com a clau per omissió:
\n" -"

Marcant esta opció s'establirà la nova parella de claus com a parella de " -"claus per omissió.

" +"

Marcant aquesta opció s'establirà la nova parella de claus com a parella " +"de claus per omissió.

" #. i18n: ectx: property (text), widget (QCheckBox, CBdefault) #: newkey.ui:140 @@ -4094,7 +4096,7 @@ msgstr "" "Permet l'encriptatge amb claus que no siguen de confiança: quan " "s'importa una clau pública es marca com que no és de confiança i no podreu " -"usar-la a menys que la signeu per fer-la «de confiança». Si marqueu esta " +"usar-la a menys que la signeu per fer-la «de confiança». Si marqueu aquesta " "casella, podreu emprar qualsevol clau, encara que no haja estat signada." #: selectpublickeydialog.cpp:133 @@ -4106,9 +4108,10 @@ "available secret keys are tried." msgstr "" "Oculta l'identificador d'usuari: No posa l'identificador de la clau " -"en els paquets encriptats. Esta opció oculta el destinatari del missatge i " -"és una contramesura per l'anàlisi de trànsit. Això pot endarrerir el procés " -"de desencriptatge perquè es provaran totes les claus secretes disponibles." +"en els paquets encriptats. Aquesta opció oculta el destinatari del missatge " +"i és una contramesura per l'anàlisi de trànsit. Això pot endarrerir el " +"procés de desencriptatge perquè es provaran totes les claus secretes " +"disponibles." #: selectpublickeydialog.cpp:137 #, kde-format @@ -4136,7 +4139,7 @@ "command line option, like: '--armor'" msgstr "" "Opció a mida: sols per a usuaris experimentats, vos permet introduir " -"una opció a la línia d'ordes del gpg, com: «--armor»" +"una opció a la línia d'ordres del gpg, com: «--armor»" #: selectsecretkey.cpp:38 #, kde-format @@ -4262,7 +4265,7 @@ "your friend's key and click "encrypt" again. The message will be " "encrypted, ready to be sent by email.

\n" msgstr "" -"

Cal ser un expert en encriptatge per usar esta eina?Cal ser un expert en encriptatge per usar aquesta eina?
\n" "Només vos cal crear una parella de claus a la finestra de gestió de claus. " "Després, exporteu la vostra clau pública i envieu-la als vostres amics.
\n" @@ -4304,7 +4307,7 @@ "The editor can be reached by: 

kgpg -d

\n" msgstr "" "

Si sols voleu obrir el gestor de claus, teclegeu 

kgpg -k
a " -"l'indicatiu de la línia d'ordes.\n" +"l'indicatiu de la línia d'ordres.\n" "L'editor s'arribarà amb: 
kgpg -d

\n" #. i18n: ectx: @info:tipoftheday @@ -4402,7 +4405,7 @@ "

Enter passphrase for %1 <%2>:
Passphrase should include " "non alphanumeric characters and random sequences.

" msgstr "" -"

Introduïu la frase de pas per a %1 <%2>:
Esta ha " +"

Introduïu la frase de pas per a %1 <%2>:
Aquesta ha " "d'incloure caràcters no alfanumèrics i seqüències aleatòries.

" #: transactions/kgpggeneratekey.cpp:139 @@ -4411,7 +4414,7 @@ "

Enter passphrase for %1:
Passphrase should include non " "alphanumeric characters and random sequences.

" msgstr "" -"

Introduïu la frase de pas per a %1:
Esta ha d'incloure " +"

Introduïu la frase de pas per a %1:
Aquesta ha d'incloure " "caràcters no alfanumèrics i seqüències aleatòries.

" #: transactions/kgpggeneratekey.cpp:150 @@ -4603,7 +4606,7 @@ msgstr "" "Heu importat una clau secreta.Tingueu en compte que per omissió les claus secretes importades no són de " -"confiança.Per usar esta clau per signar i encriptar, heu d'editar la " +"confiança.Per usar aquesta clau per signar i encriptar, heu d'editar la " "clau (fent-hi doble clic) o establir la seua confiança a completa o absoluta." "" @@ -4774,3 +4777,92 @@ msgctxt "@info" msgid "The signature is valid, and the key is ultimately trusted" msgstr "La signatura és vàlida i la clau és de confiança absoluta" + +#~ msgid "Do not Know" +#~ msgstr "No es coneix" + +#~ msgid "Do NOT Trust" +#~ msgstr "NO és de confiança" + +#~ msgctxt "Export a key via email" +#~ msgid "Email" +#~ msgstr "Correu electrònic" + +#~ msgctxt "" +#~ "Name of the action that is a search line, shown for example in the " +#~ "toolbar configuration dialog" +#~ msgid "Search Line" +#~ msgstr "Línia de cerca" + +#~ msgid "" +#~ "KGpg - simple gui for gpg\n" +#~ "\n" +#~ "KGpg was designed to make gpg very easy to use.\n" +#~ "I tried to make it as secure as possible.\n" +#~ "Hope you enjoy it." +#~ msgstr "" +#~ "KGpg - un entorn gràfic simple per al gpg\n" +#~ "\n" +#~ "El KGpg ha estat dissenyat per a fer que el gpg sigui més senzill " +#~ "d'usar.\n" +#~ "Hem intentat fer-lo el més segur possible.\n" +#~ "Esperem que el gaudiu." + +#~ msgctxt "ID: Name " +#~ msgid "%1: %2 <%3>" +#~ msgstr "%1: %2 <%3>" + +#~ msgctxt "Name : ID" +#~ msgid "%1 <%2>: %3" +#~ msgstr "%1 <%2>: %3" + +#~ msgid "Keys" +#~ msgstr "Claus" + +#~ msgid "
One key imported:" +#~ msgid_plural "
%1 keys imported:" +#~ msgstr[0] "
S'ha importat una clau:" +#~ msgstr[1] "
S'han importat %1 claus:" + +#~ msgid "
One secret key imported." +#~ msgid_plural "
%1 secret keys imported." +#~ msgstr[0] "
S'ha importat una clau secreta." +#~ msgstr[1] "
S'han importat %1 claus secretes." + +#~ msgctxt "Good signature from: NAME , Key ID: HEXID" +#~ msgid "" +#~ "Good signature from:
%1 <%2>
Key ID: %3
" +#~ msgstr "" +#~ "Signatura correcta de:
%1 <%2>
Identificador " +#~ "de la clau: %3
" + +#~ msgid "" +#~ "BAD signature from:
%1
Key id: %2

The " +#~ "file is corrupted
" +#~ msgstr "" +#~ "Signatura INCORRECTA de:
%1
Identificador de la " +#~ "clau: %2

El fitxer és corrupte.
" + +#~ msgid "Edit Key Server" +#~ msgstr "Edició del servidor de claus" + +#~ msgctxt "Mark default keyserver in GUI" +#~ msgid "(Default)" +#~ msgstr "(per omissió)" + +#~ msgctxt "Remove default marker from GUI if it is there" +#~ msgid "(Default)" +#~ msgstr "(per omissió)" + +#~ msgid "Authentification" +#~ msgstr "Autenticació" + +#~ msgctxt "no key comment" +#~ msgid "none" +#~ msgstr "cap" + +#~ msgid "Unable to contact the address book. Please check your installation." +#~ msgstr "" +#~ "No es pot contactar amb la Llibreta d'adreces. Si us plau, comproveu la " +#~ "vostra instal·lació." diff -Nru kgpg-17.12.3/po/en_GB/kgpg.po kgpg-18.04.1/po/en_GB/kgpg.po --- kgpg-17.12.3/po/en_GB/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/en_GB/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kgpg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2017-12-30 13:22+0000\n" +"PO-Revision-Date: 2017-12-30 19:56+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" "Language: en_GB\n" diff -Nru kgpg-17.12.3/po/gl/kgpg.po kgpg-18.04.1/po/gl/kgpg.po --- kgpg-17.12.3/po/gl/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/gl/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: kgpg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2018-02-01 20:49+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) \n" +"PO-Revision-Date: 2018-04-28 20:49+0100\n" +"Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -1120,7 +1120,7 @@ "The document \"%1\" has changed.\n" "Do you want to save it?" msgstr "" -"O documento «%1» foi cambiado.\n" +"O documento «%1» cambiouse.\n" "Quere gardalo?" #: editor/kgpgeditor.cpp:245 @@ -1133,7 +1133,7 @@ msgid "" "The document could not been saved, as the selected codec is not supported." msgstr "" -"Non foi posíbel gardar o documento, xa que a codificación escollida non está " +"Non se puido gardar o documento, xa que a codificación escollida non está " "admitida." #: editor/kgpgeditor.cpp:297 @@ -1142,7 +1142,7 @@ "The document could not been saved, as the selected encoding cannot encode " "every unicode character in it." msgstr "" -"Non foi posíbel gardar o documento, xa que a codificación escollida non pode " +"Non se puido gardar o documento, xa que a codificación escollida non pode " "codificar todos os caracteres unicode que contén." #: editor/kgpgeditor.cpp:306 editor/kgpgeditor.cpp:322 @@ -1151,7 +1151,7 @@ "The document could not be saved, please check your permissions and disk " "space." msgstr "" -"Non foi posíbel gardar o documento, comprobe os seus permisos e o espazo " +"Non se puido gardar o documento, comprobe os seus permisos e o espazo " "dispoñíbel no disco." #: editor/kgpgeditor.cpp:348 editor/kgpgeditor.cpp:359 keyexport.cpp:45 @@ -1284,7 +1284,7 @@ #: editor/kgpgtextedit.cpp:106 #, kde-format msgid "Could not download file." -msgstr "Non foi posíbel descargar o ficheiro." +msgstr "Non se puido descargar o ficheiro." #: editor/kgpgtextedit.cpp:142 #, kde-format @@ -1382,7 +1382,7 @@ #: foldercompressjob.cpp:105 #, kde-format msgid "Unable to create temporary file" -msgstr "Non foi posíbel crear o ficheiro temporal" +msgstr "Non se pode crear o ficheiro temporal" #: foldercompressjob.cpp:124 transactions/kgpgencrypt.cpp:104 #, kde-format @@ -1572,7 +1572,7 @@ #: keyinfodialog.cpp:322 #, kde-format msgid "Could not change passphrase" -msgstr "Non foi posíbel cambiar a frase de paso" +msgstr "Non se puido cambiar a frase de paso" #: keyinfodialog.cpp:327 #, kde-format @@ -2042,7 +2042,7 @@ #: keysmanager.cpp:531 #, kde-format msgid "Can not start \"konsole\" application for expert mode." -msgstr "Non é posíbel iniciar o aplicativo «konsole» para o modo experto." +msgstr "Non se pode iniciar o aplicativo «konsole» para o modo experto." #: keysmanager.cpp:570 keysmanager.cpp:2629 keysmanager.cpp:2631 #, kde-format @@ -2053,25 +2053,25 @@ #: keysmanager.cpp:582 transactions/kgpggeneratekey.cpp:205 #, kde-format msgid "Bad passphrase. Cannot generate a new key pair." -msgstr "Frase de paso incorrecta. Non foi posíbel xerar o novo par de chaves." +msgstr "Frase de paso incorrecta. Non se pode xerar o novo par de chaves." #: keysmanager.cpp:585 transactions/kgpggeneratekey.cpp:208 #, kde-format msgid "Aborted by the user. Cannot generate a new key pair." -msgstr "Interrompido polo usuario. Non foi posíbel xerar o novo par de chaves." +msgstr "Interrompido polo usuario. Non se pode xerar o novo par de chaves." #: keysmanager.cpp:588 transactions/kgpggeneratekey.cpp:211 #, kde-format msgid "The email address is not valid. Cannot generate a new key pair." msgstr "" -"O enderezo de correo electrónico non é correcto. Non foi posíbel xerar o " -"novo par de chaves." +"O enderezo de correo electrónico non é correcto. Non se pode xerar o novo " +"par de chaves." #: keysmanager.cpp:591 transactions/kgpggeneratekey.cpp:214 #, kde-format msgid "The name is not accepted by gpg. Cannot generate a new key pair." msgstr "" -"O nome non é aceptado por gpg. Non foi posíbel xerar un novo par de chaves." +"O nome non é aceptado por gpg. Non se pode xerar un novo par de chaves." #. i18n: ectx: property (windowTitle), widget (QWidget, newKey) #: keysmanager.cpp:597 newkey.ui:14 @@ -2087,8 +2087,7 @@ #: keysmanager.cpp:650 transactions/kgpggeneratekey.cpp:226 #, kde-format msgid "gpg process did not finish. Cannot generate a new key pair." -msgstr "" -"O proceso de gpg no rematou. Non foi posíbel xerar un novo par de chaves." +msgstr "O proceso de gpg no rematou. Non se pode xerar un novo par de chaves." #: keysmanager.cpp:754 #, kde-format @@ -2277,8 +2276,8 @@ "Your private key \"%1\" was successfully exported to
%2.
Do not leave it in an insecure place." msgstr "" -"A chave privada «%1» foi exportada para
%2.
Non debe deixala nun lugar inseguro." +"A chave privada «%1» exportouse a
%2.
Non debe " +"deixala nun lugar inseguro." #: keysmanager.cpp:1411 #, kde-format @@ -2286,15 +2285,15 @@ "Your secret key could not be exported.\n" "Check the key." msgstr "" -"Non foi posíbel exportar a súa chave privada.\n" +"Non se puido exportar a súa chave privada.\n" "Comprobe a chave." #: keysmanager.cpp:1514 #, kde-format msgid "The public key was successfully exported to
%2" msgid_plural "The %1 public keys were successfully exported to
%2" -msgstr[0] "A chave pública foi exportada para
%2" -msgstr[1] "As %1 chaves públicas foron exportadas para
%2" +msgstr[0] "A chave pública exportouse a
%2" +msgstr[1] "As %1 chaves públicas exportáronse a
%2" #: keysmanager.cpp:1518 keysmanager.cpp:1533 keysmanager.cpp:1547 #, kde-format @@ -2302,7 +2301,7 @@ "Your public key could not be exported\n" "Check the key." msgstr "" -"Non foi posíbel exportar a súa chave pública\n" +"Non se puido exportar a súa chave pública\n" "Comprobe a chave." #: keysmanager.cpp:1567 @@ -2605,7 +2604,7 @@ #, kde-format msgid "Can not delete key %1 while it is edited in terminal." msgstr "" -"Non é posíbel eliminar a chave %1 mentres está a ser editada na " +"Non se pode eliminar a chave %1 mentres está a ser editada na " "terminal." #: keysmanager.cpp:2472 @@ -2762,17 +2761,17 @@ #: kgpg.cpp:143 #, kde-format msgid "Cannot decrypt and show folder." -msgstr "Non é posíbel descifrar e mostrar o cartafol." +msgstr "Non se pode descifrar e mostrar o cartafol." #: kgpg.cpp:150 #, kde-format msgid "Cannot sign folder." -msgstr "Non foi posíbel asinar o cartafol." +msgstr "Non se pode asinar o cartafol." #: kgpg.cpp:157 #, kde-format msgid "Cannot verify folder." -msgstr "Non foi posíbel verificar o cartafol." +msgstr "Non se pode verificar o cartafol." #: kgpg.cpp:160 #, kde-format @@ -2781,7 +2780,7 @@ "Please select only one folder, or several files, but do not mix files and " "folders." msgstr "" -"Non foi posíbel realizar a operación pedida.\n" +"Non se pode realizar a operación pedida.\n" "Por favor, escolla só un cartafol ou varios ficheiros, pero non mesture " "ficheiros e cartafoles." @@ -3163,8 +3162,7 @@ #: kgpgexternalactions.cpp:134 #, kde-format msgid "Cannot create temporary file for folder compression." -msgstr "" -"Non foi posíbel crear o ficheiro temporal para a compresión do cartafol." +msgstr "Non se pode crear o ficheiro temporal para a compresión do cartafol." #: kgpgexternalactions.cpp:134 kgpgexternalactions.cpp:141 #, kde-format @@ -3693,7 +3691,7 @@ "Cannot create configuration file. Please check if destination media is " "mounted and if you have write access." msgstr "" -"Non foi posíbel crear o ficheiro de configuración. Comprobe que o medio de " +"Non se pode crear o ficheiro de configuración. Comprobe que o medio de " "destino está montado e que ten permiso de escritura." #: kgpgoptions.cpp:206 @@ -3760,13 +3758,13 @@ #: kgpgrevokewidget.ui:61 #, kde-format msgid "Key Has Been Compromised" -msgstr "A chave foi comprometida" +msgstr "A chave púxose en perigo" #. i18n: ectx: property (text), item, widget (QComboBox, comboBox1) #: kgpgrevokewidget.ui:66 #, kde-format msgid "Key is Superseded" -msgstr "A chave foi suplantada" +msgstr "A chave suplantouse" #. i18n: ectx: property (text), item, widget (QComboBox, comboBox1) #: kgpgrevokewidget.ui:71 @@ -4479,8 +4477,8 @@ msgctxt "@info" msgid "%1 key processed." msgid_plural "%1 keys processed." -msgstr[0] "%1 chave foi procesada." -msgstr[1] "%1 chaves foron procesadas." +msgstr[0] "Procesouse %1 chave." +msgstr[1] "Procesáronse %1 chaves." #: transactions/kgpgimport.cpp:138 #, kde-kuit-format diff -Nru kgpg-17.12.3/po/ia/kgpg.po kgpg-18.04.1/po/ia/kgpg.po --- kgpg-17.12.3/po/ia/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/ia/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Giovanni Sora , 2012, 2013, 2014, 2016. +# Giovanni Sora , 2012, 2013, 2014, 2016, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2016-06-27 13:23+0200\n" -"Last-Translator: Giovanni Sora \n" +"PO-Revision-Date: 2018-02-19 23:17+0100\n" +"Last-Translator: giovanni \n" "Language-Team: Interlingua \n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -858,25 +858,25 @@ #, kde-format msgctxt "Encryption algorithm" msgid "ECC" -msgstr "" +msgstr "ECC" #: core/convert.cpp:73 #, kde-format msgctxt "Signing algorithm" msgid "ECDSA" -msgstr "" +msgstr "ECDSA" #: core/convert.cpp:75 #, kde-format msgctxt "Encryption algorithm" msgid "ECDH" -msgstr "" +msgstr "ECDH" #: core/convert.cpp:77 #, kde-format msgctxt "Signing algorithm" msgid "EdDSA" -msgstr "" +msgstr "EdDSA" #: core/convert.cpp:80 #, kde-format @@ -1448,19 +1448,16 @@ #. i18n: ectx: property (text), widget (QRadioButton, checkMail) #: keyexport.ui:41 -#, fuzzy, kde-format -#| msgctxt "Email address of key owner" -#| msgid "E&mail:" +#, kde-format msgctxt "Export a key via email" msgid "E&mail" -msgstr "E-&posta:" +msgstr "E-&posta" #. i18n: ectx: property (text), widget (QRadioButton, checkClipboard) #: keyexport.ui:48 sourceselect.ui:35 -#, fuzzy, kde-format -#| msgid "Clipboard" +#, kde-format msgid "C&lipboard" -msgstr "Area de transferentia" +msgstr "Area de &transferentia" #. i18n: ectx: property (toolTip), widget (QRadioButton, checkServer) #: keyexport.ui:58 @@ -1474,10 +1471,9 @@ #. i18n: ectx: property (text), widget (QRadioButton, checkServer) #: keyexport.ui:61 -#, fuzzy, kde-format -#| msgid "Key server:" +#, kde-format msgid "&Key server:" -msgstr "Servitor de clave:" +msgstr "Servitor de &clave:" #. i18n: ectx: property (text), widget (QRadioButton, checkFile) #: keyexport.ui:75 sourceselect.ui:44 @@ -1493,17 +1489,15 @@ #. i18n: ectx: property (text), widget (QRadioButton, checkAttrAll) #: keyexport.ui:101 -#, fuzzy, kde-format -#| msgid "Export everything" +#, kde-format msgid "E&xport everything" -msgstr "Exporta toto" +msgstr "E&xporta toto" #. i18n: ectx: property (text), widget (QRadioButton, checkAttrPhoto) #: keyexport.ui:111 -#, fuzzy, kde-format -#| msgid "Do not export attributes (photo ids)" +#, kde-format msgid "Do ¬ export attributes (photo ids)" -msgstr "Non exporta attributos (ids de photo)" +msgstr "No&n exporta attributos (ids de photo)" #. i18n: ectx: property (text), widget (QRadioButton, checkAttrClean) #: keyexport.ui:118 @@ -1789,18 +1783,14 @@ msgstr[1] "Trovate %1 claves correspondente " #: keyservers.cpp:388 -#, fuzzy, kde-format -#| msgid "Found 1 matching key" -#| msgid_plural "Found %1 matching keys" +#, kde-format msgid "Found 1 matching key (not shown)" -msgstr "Trovate 1 clave correspondente " +msgstr "Trovate 1 clave correspondente (non monstrate)" #: keyservers.cpp:390 -#, fuzzy, kde-format -#| msgid "Found 1 matching key" -#| msgid_plural "Found %1 matching keys" +#, kde-format msgid "Found %1 matching keys (%2 shown)" -msgstr "Trovate 1 clave correspondente " +msgstr "Trovate %1 claves correspondente (%2 monstrate) " #: keysmanager.cpp:130 #, kde-format @@ -3826,51 +3816,46 @@ #, kde-kuit-format msgctxt "@title" msgid "KGpg" -msgstr "" +msgstr "KGpg" #: main.cpp:47 #, kde-kuit-format msgctxt "@title" msgid "KGpg - simple gui for GnuPG" -msgstr "" +msgstr "KGpg - interfacie de usator gui simple per GnuPG" #: main.cpp:49 #, kde-kuit-format msgctxt "@info:credit" msgid "© 2003-2016, The KGpg Developers" -msgstr "" +msgstr "© 2003-2016, Le disveloppatores de KGpg" #: main.cpp:51 -#, fuzzy, kde-kuit-format -#| msgid "Rolf Eike Beer" +#, kde-kuit-format msgctxt "@info:credit" msgid "Rolf Eike Beer" msgstr "Rolf Eike Beer" #: main.cpp:51 -#, fuzzy, kde-format -#| msgid "Maintainer" +#, kde-format msgctxt "@info:credit" msgid "Maintainer" msgstr "Mantenitor" #: main.cpp:52 -#, fuzzy, kde-kuit-format -#| msgid "Jean-Baptiste Mardelle" +#, kde-kuit-format msgctxt "@info:credit" msgid "Jean-Baptiste Mardelle" msgstr "Jean-Baptiste Mardelle" #: main.cpp:52 -#, fuzzy, kde-format -#| msgid "Author and former maintainer" +#, kde-format msgctxt "@info:credit" msgid "Author and former maintainer" msgstr "Autor e mantenitor precedente" #: main.cpp:53 -#, fuzzy, kde-kuit-format -#| msgid "Jimmy Gilles" +#, kde-kuit-format msgctxt "@info:credit" msgid "Jimmy Gilles" msgstr "Jimmy Gilles" @@ -3879,14 +3864,13 @@ #, kde-kuit-format msgctxt "@info:credit" msgid "Andrius Štikonas" -msgstr "" +msgstr "Andrius Štikonas" #: main.cpp:54 -#, fuzzy, kde-format -#| msgid "Key Import" +#, kde-format msgctxt "@info:credit" msgid "KF5 port" -msgstr "Importation de clave" +msgstr "KF5 port" #: model/gpgservermodel.cpp:90 #, kde-format @@ -3901,31 +3885,26 @@ msgstr "%1: %2" #: model/keylistproxymodel.cpp:193 -#, fuzzy, kde-format -#| msgctxt "%1 is the key id, %2 is the name and comment of the key or uid" -#| msgid "%1: %2" +#, kde-format msgctxt "ID: Name " msgid "%1: %2 <%3>" -msgstr "%1: %2" +msgstr "%1: %2 <%3>" #: model/keylistproxymodel.cpp:198 -#, fuzzy, kde-format -#| msgctxt "Name (Email): ID" -#| msgid "%1 (%2): %3" +#, kde-format msgctxt "Name : ID" msgid "%1 <%2>: %3" -msgstr "%1 (%2): %3" +msgstr "%1 <%2>: %3" #: model/kgpgitemmodel.cpp:192 #, kde-format msgid "Trust: %1
Owner Trust: %2" -msgstr "" +msgstr "Fiducia: %1
Fiducia de proproetario: %2" #: model/kgpgitemmodel.cpp:196 -#, fuzzy, kde-format -#| msgid "Trust:" +#, kde-format msgid "Trust: %1" -msgstr "Fiducia:" +msgstr "Fide: %1" #: model/kgpgitemmodel.cpp:293 model/kgpgitemmodel.cpp:296 #, kde-format @@ -4054,10 +4033,9 @@ #. i18n: ectx: property (text), widget (QCheckBox, validFilterCheckbox) #: searchres.ui:48 -#, fuzzy, kde-format -#| msgid "&Show Only Secret Keys" +#, kde-format msgid "Show only valid keys" -msgstr "Mon&stra solmente claves secrete" +msgstr "Monstra solmente claves valide" #. i18n: ectx: property (text), widget (QLabel, textLabel1) #: searchres.ui:73 @@ -4077,10 +4055,9 @@ msgstr "sin limite" #: selectpublickeydialog.cpp:59 selectpublickeydialog.cpp:277 -#, fuzzy, kde-format -#| msgid "O&ptions" +#, kde-format msgid "&Options" -msgstr "O&ptiones" +msgstr "&Optiones" #: selectpublickeydialog.cpp:72 #, kde-format @@ -4234,10 +4211,9 @@ #. i18n: ectx: property (text), widget (QRadioButton, checkServer) #: sourceselect.ui:68 -#, fuzzy, kde-format -#| msgid "Keyserver:" +#, kde-format msgid "&Keyserver:" -msgstr "Servitor de clave:" +msgstr "&Servitor de clave:" #. i18n: ectx: property (toolTip), widget (QLineEdit, keyIds) #: sourceselect.ui:81 @@ -4501,17 +4477,14 @@ msgstr "Generante certificato de revocation per clave %1" #: transactions/kgpgimport.cpp:129 -#, fuzzy, kde-kuit-format -#| msgid "" -#| "The import result string has an unsupported format in line %1.
Please see the detailed log for more information." +#, kde-kuit-format msgctxt "@info" msgid "" "The import result string has an unsupported format in line %1.Please " "see the detailed log for more information." msgstr "" -"Le catena exito de importation ua un formato non supportate al linea %1.
Pro favor tu vide le registration detaliate pro ulterior information." +"Le catena exito de importation ha un formato non supportate al linea %1. Pro favor tu vide le registration detaliate pro ulterior information." #: transactions/kgpgimport.cpp:133 #, kde-format @@ -4521,24 +4494,20 @@ "ulterior information." #: transactions/kgpgimport.cpp:135 -#, fuzzy, kde-kuit-format -#| msgid "%1 key processed." -#| msgid_plural "%1 keys processed." +#, kde-kuit-format msgctxt "@info" msgid "%1 key processed." msgid_plural "%1 keys processed." -msgstr[0] "%1 clave processate." -msgstr[1] "%1 claves processate." +msgstr[0] "%1 clave processate." +msgstr[1] "%1 claves processate." #: transactions/kgpgimport.cpp:138 -#, fuzzy, kde-kuit-format -#| msgid "
One key without ID." -#| msgid_plural "
%1 keys without ID." +#, kde-kuit-format msgctxt "@info" msgid "One key without ID." msgid_plural "%1 keys without ID." -msgstr[0] "
Un clave sin ID." -msgstr[1] "
%1 claves sin ID." +msgstr[0] "Un clave sin ID." +msgstr[1] "%1 claves sin ID." #: transactions/kgpgimport.cpp:140 #, kde-kuit-format @@ -4546,78 +4515,65 @@ msgid "One key imported:" msgid_plural "" "%1 keys imported:" -msgstr[0] "" +msgstr[0] "Un clave importate:" msgstr[1] "" +"%1 claves importate:" #: transactions/kgpgimport.cpp:142 -#, fuzzy, kde-kuit-format -#| msgid "
One RSA key imported." -#| msgid_plural "
%1 RSA keys imported." +#, kde-kuit-format msgctxt "@info" msgid "One RSA key imported." msgid_plural "%1 RSA keys imported." -msgstr[0] "
Un clave RSA importate." -msgstr[1] "
%1 claves RSA importate." +msgstr[0] "Un clave RSA importate." +msgstr[1] "%1 claves RSA importate." #: transactions/kgpgimport.cpp:144 -#, fuzzy, kde-kuit-format -#| msgid "
One key unchanged." -#| msgid_plural "
%1 keys unchanged." +#, kde-kuit-format msgctxt "@info" msgid "One key unchanged." msgid_plural "%1 keys unchanged." -msgstr[0] "
Un clave non modificate." -msgstr[1] "
%1 claves non modificate." +msgstr[0] "Un clave non modificate." +msgstr[1] "%1 claves non modificate." #: transactions/kgpgimport.cpp:146 -#, fuzzy, kde-kuit-format -#| msgid "
One user ID imported." -#| msgid_plural "
%1 user IDs imported." +#, kde-kuit-format msgctxt "@info" msgid "One user ID imported." msgid_plural "%1 user IDs imported." -msgstr[0] "
Un ID de usator importate." -msgstr[1] "
%1 IDs de usator importate." +msgstr[0] "Un ID de usator importate." +msgstr[1] "%1 IDs de usator importate." #: transactions/kgpgimport.cpp:148 -#, fuzzy, kde-kuit-format -#| msgid "
One subkey imported." -#| msgid_plural "
%1 subkeys imported." +#, kde-kuit-format msgctxt "@info" msgid "One subkey imported." msgid_plural "%1 subkeys imported." -msgstr[0] "
Un sub-clave importate." -msgstr[1] "
%1 sub-claves importate." +msgstr[0] "Un sub-clave importate." +msgstr[1] "%1 sub-claves importate." #: transactions/kgpgimport.cpp:150 -#, fuzzy, kde-kuit-format -#| msgid "
One signature imported." -#| msgid_plural "
%1 signatures imported." +#, kde-kuit-format msgctxt "@info" msgid "One signature imported." msgid_plural "%1 signatures imported." -msgstr[0] "
Un signatura importate." -msgstr[1] "
%1 signaturas importate." +msgstr[0] "Un signatura importate." +msgstr[1] "%1 signaturas importate." #: transactions/kgpgimport.cpp:152 -#, fuzzy, kde-kuit-format -#| msgid "
One revocation certificate imported." -#| msgid_plural "
%1 revocation certificates imported." +#, kde-kuit-format msgctxt "@info" msgid "One revocation certificate imported." msgid_plural "%1 revocation certificates imported." -msgstr[0] "
Un certificato de revocation importate." -msgstr[1] "
%1 certificatos de revocation importate." +msgstr[0] "Un certificato de revocation importate." +msgstr[1] "%1 certificatos de revocation importate." #: transactions/kgpgimport.cpp:154 -#, fuzzy, kde-kuit-format -#| msgid "
One secret key processed." -#| msgid_plural "
%1 secret keys processed." +#, kde-kuit-format msgctxt "@info" msgid "One secret key processed." msgid_plural "%1 secret keys processed." -msgstr[0] "
Un cvlave secreta processate." -msgstr[1] "
%1 claves secrete processate." +msgstr[0] "Un clave secreta processate." +msgstr[1] "%1 claves secrete processate." #: transactions/kgpgimport.cpp:156 #, kde-kuit-format @@ -4627,35 +4583,28 @@ msgid_plural "" "%1 secret keys imported." msgstr[0] "" +"Un clave secrete importate." msgstr[1] "" +"%1 claves secrete importate." #: transactions/kgpgimport.cpp:158 -#, fuzzy, kde-kuit-format -#| msgid "
One secret key unchanged." -#| msgid_plural "
%1 secret keys unchanged." +#, kde-kuit-format msgctxt "@info" msgid "One secret key unchanged." msgid_plural "%1 secret keys unchanged." -msgstr[0] "
Un clave secrete non modificate." -msgstr[1] "
%1 claves secrete non modificate" +msgstr[0] "Un clave secrete non modificate." +msgstr[1] "%1 claves secrete non modificate" #: transactions/kgpgimport.cpp:160 -#, fuzzy, kde-kuit-format -#| msgid "
One secret key not imported." -#| msgid_plural "
%1 secret keys not imported." +#, kde-kuit-format msgctxt "@info" msgid "One secret key not imported." msgid_plural "%1 secret keys not imported." -msgstr[0] "
Un clave secrete non importate." -msgstr[1] "
%1 claves secrete non importate." +msgstr[0] "Un clave secrete non importate." +msgstr[1] "%1 claves secrete non importate." #: transactions/kgpgimport.cpp:163 -#, fuzzy, kde-kuit-format -#| msgid "" -#| "
You have imported a secret key.
Please note that " -#| "imported secret keys are not trusted by default.
To fully use this " -#| "secret key for signing and encryption, you must edit the key (double " -#| "click on it) and set its trust to Full or Ultimate." +#, kde-kuit-format msgctxt "@info" msgid "" "You have imported a secret key." msgstr "" -"
Tu ha importate un clave secrete.
Per favor tu nota " -"que claves secrete importate non es digne de fide per definition.
Per " -"usar plenemente iste clave secrete per signar e cryptar, tu debe modificar " -"le clave (face duple click super illo) e fixar su fiducia a Plen o Ultimate." -"" +"Tu ha importate un clave secrete. " +"Per favor tu nota que claves secrete importate non es digne de fide per " +"definition.Per usar plenemente iste clave secrete per signar e cryptar, " +"tu debe modificar le clave (face duple click super illo) e fixar su fiducia " +"a Plen o Ultimate." #: transactions/kgpgimport.cpp:187 -#, fuzzy, kde-kuit-format -#| msgctxt "%1 is the key id, %2 is the name and comment of the key or uid" -#| msgid "%1: %2" +#, kde-kuit-format msgctxt "@item ID: Name" msgid "%1: %2" msgstr "%1: %2" @@ -4681,7 +4628,7 @@ #, kde-kuit-format msgctxt "@item ID: Name " msgid "%1: %2 %3" -msgstr "" +msgstr "%1: %2 %3" #: transactions/kgpgimport.cpp:233 #, kde-format @@ -4763,23 +4710,21 @@ msgstr "Obtenite phrase de contrasigno" #: transactions/kgpgverify.cpp:97 -#, fuzzy, kde-kuit-format -#| msgctxt "" -#| "first argument is formatted date, second argument is formatted time" -#| msgid "The signature was created at %1 %2" +#, kde-kuit-format msgctxt "" "@info first argument is formatted date, second argument is formatted time" msgid "The signature was created at %1 %2" -msgstr "Le signatura esseva create a %1 %2" +msgstr "Le signatura esseva create a %1 %2 " #: transactions/kgpgverify.cpp:133 -#, fuzzy, kde-kuit-format -#| msgid "Good signature from:
%1
Key ID: %2
" +#, kde-kuit-format msgctxt "@info Good signature from: NAME , Key ID: HEXID" msgid "" "Good signature from:%1Key " "ID: %2" -msgstr "Bon signatura ex:
%1
ID de clave: %2
" +msgstr "" +"Bon signatura ex:%1 ID de " +"clave: %2" #: transactions/kgpgverify.cpp:137 #, kde-kuit-format @@ -4788,22 +4733,24 @@ "Good signature from:%1 %2Key ID: %3" msgstr "" +"Bon signatura ex:%1 %2ID de clave: %3" #: transactions/kgpgverify.cpp:150 -#, fuzzy, kde-kuit-format -#| msgid "No signature found." +#, kde-kuit-format msgctxt "@info" msgid "No signature found." msgstr "Necun signatura trovate." #: transactions/kgpgverify.cpp:167 -#, fuzzy, kde-kuit-format -#| msgid "Good signature from:
%1
Key ID: %2
" +#, kde-kuit-format msgctxt "@info" msgid "" "Good signature from:%1Key " "ID: %2" -msgstr "Bon signatura ex:
%1
ID de clave: %2
" +msgstr "" +"Bon signatura ex:%1ID de " +"clave: %2" #: transactions/kgpgverify.cpp:171 #, kde-kuit-format @@ -4812,6 +4759,8 @@ "Good signature from:%1 %2Key ID: %3" msgstr "" +"Bon signatura ex:%1 %2ID de clave: %3" #: transactions/kgpgverify.cpp:183 #, kde-kuit-format @@ -4821,21 +4770,21 @@ "ID: %2The file is corrupted" msgstr "" +"MAL signatura ex: %1 ID " +"de clave: %2Le file es corrupte" #: transactions/kgpgverify.cpp:186 -#, fuzzy, kde-kuit-format -#| msgid "The signature is valid, but the key is untrusted
" +#, kde-kuit-format msgctxt "@info" msgid "The signature is valid, but the key is untrusted" -msgstr "Le signatura es valide, ma le clave non es credibile
" +msgstr "Le signatura es valide, ma le clave non es credibile" #: transactions/kgpgverify.cpp:188 -#, fuzzy, kde-kuit-format -#| msgid "" -#| "The signature is valid, and the key is ultimately trusted
" +#, kde-kuit-format msgctxt "@info" msgid "The signature is valid, and the key is ultimately trusted" -msgstr "Le signatura es valide e le clave es in fin credibile
" +msgstr "Le signatura es valide e le clave es in fin credibile" #~ msgid "Passphrase for the key was changed" #~ msgstr "Phrase de contrasigno pro le clave esseva cambiate" diff -Nru kgpg-17.12.3/po/id/kgpg.po kgpg-18.04.1/po/id/kgpg.po --- kgpg-17.12.3/po/id/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/id/kgpg.po 2018-05-08 00:12:15.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kgpg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2018-02-10 08:16+0700\n" +"PO-Revision-Date: 2018-04-07 07:42+0700\n" "Last-Translator: Wantoyo \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -212,7 +212,7 @@ #: conf_encryption.ui:127 #, kde-format msgid "Encrypt files with:" -msgstr "Enkripsi berkas dengan:" +msgstr "Enkripsi file dengan:" #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AllowUntrustedKeys) #: conf_encryption.ui:135 @@ -330,7 +330,7 @@ #: conf_gpg.ui:46 #, kde-format msgid "Configuration file:" -msgstr "Berkas konfigurasi:" +msgstr "File konfigurasi:" #. i18n: ectx: property (text), widget (QPushButton, changeHome) #: conf_gpg.ui:96 @@ -553,14 +553,14 @@ #: conf_misc.ui:240 #, kde-format msgid "Key Manager" -msgstr "Manajer Kunci" +msgstr "Pengelola Kunci" #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_LeftClick) #. i18n: ectx: attribute (title), widget (QWidget, tabEditor) #: conf_misc.ui:245 conf_misc.ui:272 editor/kgpgeditor.cpp:507 #, kde-format msgid "Editor" -msgstr "Penyunting" +msgstr "Pengedit" #. i18n: ectx: property (text), widget (QLabel, label) #: conf_misc.ui:280 @@ -662,7 +662,7 @@ #: conf_servers.ui:73 #, kde-format msgid "&Edit..." -msgstr "&Sunting..." +msgstr "&Edit..." #. i18n: ectx: attribute (title), widget (QWidget, tab) #: conf_ui2.ui:32 @@ -1002,17 +1002,17 @@ #: editor/kgpgeditor.cpp:186 #, kde-format msgid "&Encrypt File..." -msgstr "&Enkripsi Berkas..." +msgstr "&Enkripsi File..." #: editor/kgpgeditor.cpp:190 #, kde-format msgid "&Decrypt File..." -msgstr "&Dekripsi Berkas..." +msgstr "&Dekripsi File..." #: editor/kgpgeditor.cpp:194 #, kde-format msgid "&Open Key Manager" -msgstr "&Buka Manajer Kunci" +msgstr "&Buka Pengelola Kunci" #: editor/kgpgeditor.cpp:197 #, kde-format @@ -1096,7 +1096,7 @@ #: editor/kgpgeditor.cpp:698 #, kde-format msgid "*|All Files" -msgstr "*|Semua Berkas" +msgstr "*|Semua File" #: editor/kgpgeditor.cpp:480 #, kde-format @@ -1117,7 +1117,7 @@ #: kgpgexternalactions.cpp:372 transactions/kgpgtransactionprivate.cpp:115 #, kde-format msgid "File Already Exists" -msgstr "Berkas Sudah Ada" +msgstr "File Sudah Ada" #: editor/kgpgeditor.cpp:622 #, kde-format @@ -1300,7 +1300,7 @@ #: foldercompressjob.cpp:105 #, kde-format msgid "Unable to create temporary file" -msgstr "Tidak dapat menciptakan berkas temporer" +msgstr "Tidak dapat menciptakan file temporer" #: foldercompressjob.cpp:124 transactions/kgpgencrypt.cpp:104 #, fuzzy, kde-format @@ -1408,7 +1408,7 @@ #: keyexport.ui:75 sourceselect.ui:44 #, kde-format msgid "File:" -msgstr "Berkas:" +msgstr "File:" #. i18n: ectx: property (title), widget (QGroupBox, buttonGroup3) #: keyexport.ui:95 @@ -1697,7 +1697,7 @@ #: keysmanager.cpp:137 #, kde-format msgid "&Open Editor" -msgstr "Buka &Penyunting" +msgstr "Buka &Pengedit" #: keysmanager.cpp:140 #, kde-format @@ -2482,7 +2482,7 @@ #: keysmanager.cpp:2687 #, kde-format msgid "Ke&y Manager" -msgstr "Manajer &Kunci" +msgstr "Pengelola &Kunci" #: keysmanager.cpp:2690 #, kde-format @@ -3020,8 +3020,8 @@ "gpg|GnuPG binary\n" "*|All files" msgstr "" -"gpg|berkas biner GnuPG\n" -"*|Semua berkas" +"gpg|File biner GnuPG\n" +"*|Semua file" #: kgpgfirstassistant.cpp:143 #, kde-format @@ -3036,7 +3036,7 @@ #: kgpgfirstassistant.cpp:172 #, kde-format msgid "Configuration File" -msgstr "Berkas Konfigurasi" +msgstr "File Konfigurasi" #: kgpgfirstassistant.cpp:183 #, kde-format diff -Nru kgpg-17.12.3/po/ru/kgpg.po kgpg-18.04.1/po/ru/kgpg.po --- kgpg-17.12.3/po/ru/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/ru/kgpg.po 2018-05-08 00:12:16.000000000 +0000 @@ -2,29 +2,29 @@ # translation of kgpg.po into Russian # KDE3 - kdeutils/kgpg.po Russian translation. # Copyright (c) 2005 KDE RUssian translation team. +# # Nickolai Shaforostoff , 2004. # Gregory Mokhin , 2004, 2005. # Andrey Cherepanov , 2005. # Andrey Cherepanov , 2009, 2011. # Nick Shaforostoff , 2009. # Artem Sereda , 2009, 2010. -# Alexander Potashev , 2010, 2012, 2014. +# Alexander Potashev , 2010, 2012, 2014, 2018. # Yuri Efremov , 2013. # Alexander Lakhin , 2013, 2014. -# msgid "" msgstr "" "Project-Id-Version: kgpg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2014-08-14 02:07+0400\n" +"PO-Revision-Date: 2018-04-25 17:38+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Environment: kde\n" @@ -858,25 +858,25 @@ #, kde-format msgctxt "Encryption algorithm" msgid "ECC" -msgstr "" +msgstr "ECC" #: core/convert.cpp:73 #, kde-format msgctxt "Signing algorithm" msgid "ECDSA" -msgstr "" +msgstr "ECDSA" #: core/convert.cpp:75 #, kde-format msgctxt "Encryption algorithm" msgid "ECDH" -msgstr "" +msgstr "ECDH" #: core/convert.cpp:77 #, kde-format msgctxt "Signing algorithm" msgid "EdDSA" -msgstr "" +msgstr "EdDSA" #: core/convert.cpp:80 #, kde-format @@ -3850,7 +3850,7 @@ #, kde-kuit-format msgctxt "@title" msgid "KGpg" -msgstr "" +msgstr "KGpg" #: main.cpp:47 #, kde-kuit-format @@ -3862,39 +3862,34 @@ #, kde-kuit-format msgctxt "@info:credit" msgid "© 2003-2016, The KGpg Developers" -msgstr "" +msgstr "© Разработчики KGpg, 2003-2016" #: main.cpp:51 -#, fuzzy, kde-kuit-format -#| msgid "Rolf Eike Beer" +#, kde-kuit-format msgctxt "@info:credit" msgid "Rolf Eike Beer" msgstr "Rolf Eike Beer" #: main.cpp:51 -#, fuzzy, kde-format -#| msgid "Maintainer" +#, kde-format msgctxt "@info:credit" msgid "Maintainer" msgstr "Сопровождающий" #: main.cpp:52 -#, fuzzy, kde-kuit-format -#| msgid "Jean-Baptiste Mardelle" +#, kde-kuit-format msgctxt "@info:credit" msgid "Jean-Baptiste Mardelle" msgstr "Jean-Baptiste Mardelle" #: main.cpp:52 -#, fuzzy, kde-format -#| msgid "Author and former maintainer" +#, kde-format msgctxt "@info:credit" msgid "Author and former maintainer" -msgstr "Автор и бывший координатор" +msgstr "Автор и прежний сопровождающий" #: main.cpp:53 -#, fuzzy, kde-kuit-format -#| msgid "Jimmy Gilles" +#, kde-kuit-format msgctxt "@info:credit" msgid "Jimmy Gilles" msgstr "Jimmy Gilles" @@ -3903,7 +3898,7 @@ #, kde-kuit-format msgctxt "@info:credit" msgid "Andrius Štikonas" -msgstr "" +msgstr "Andrius Štikonas" #: main.cpp:54 #, fuzzy, kde-format diff -Nru kgpg-17.12.3/po/zh_CN/kgpg.po kgpg-18.04.1/po/zh_CN/kgpg.po --- kgpg-17.12.3/po/zh_CN/kgpg.po 2018-03-06 00:16:06.000000000 +0000 +++ kgpg-18.04.1/po/zh_CN/kgpg.po 2018-05-08 00:12:16.000000000 +0000 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-10-19 03:07+0200\n" -"PO-Revision-Date: 2018-02-28 02:30-0500\n" +"PO-Revision-Date: 2018-04-26 06:12-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kgpg-17.12.3/transactions/kgpgaddphoto.h kgpg-18.04.1/transactions/kgpgaddphoto.h --- kgpg-17.12.3/transactions/kgpgaddphoto.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgaddphoto.h 2018-05-07 19:45:01.000000000 +0000 @@ -31,7 +31,7 @@ void setImagePath(const QString &imagepath); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; private: QString m_photourl; diff -Nru kgpg-17.12.3/transactions/kgpgadduid.h kgpg-18.04.1/transactions/kgpgadduid.h --- kgpg-17.12.3/transactions/kgpgadduid.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgadduid.h 2018-05-07 19:45:01.000000000 +0000 @@ -36,8 +36,8 @@ void setComment(const QString &comment); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; private: QString m_name; diff -Nru kgpg-17.12.3/transactions/kgpgchangedisable.cpp kgpg-18.04.1/transactions/kgpgchangedisable.cpp --- kgpg-17.12.3/transactions/kgpgchangedisable.cpp 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgchangedisable.cpp 2018-05-07 19:45:01.000000000 +0000 @@ -45,12 +45,3 @@ return true; } - -bool -KGpgChangeDisable::nextLine(const QString &line) -{ - if(keyConsidered(line, QStringList(getKeyid()))) - return false; - - return KGpgEditKeyTransaction::nextLine(line); -} diff -Nru kgpg-17.12.3/transactions/kgpgchangedisable.h kgpg-18.04.1/transactions/kgpgchangedisable.h --- kgpg-17.12.3/transactions/kgpgchangedisable.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgchangedisable.h 2018-05-07 19:45:01.000000000 +0000 @@ -25,7 +25,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgChangeDisable) - KGpgChangeDisable() Q_DECL_EQ_DELETE; + KGpgChangeDisable() = delete; public: KGpgChangeDisable(QObject *parent, const QString &keyid, const bool disable); @@ -34,8 +34,7 @@ void setDisable(bool disable); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; }; #endif // KGPGCHANGEDISABLE_H diff -Nru kgpg-17.12.3/transactions/kgpgchangeexpire.h kgpg-18.04.1/transactions/kgpgchangeexpire.h --- kgpg-17.12.3/transactions/kgpgchangeexpire.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgchangeexpire.h 2018-05-07 19:45:01.000000000 +0000 @@ -33,7 +33,7 @@ void setDate(const QDateTime &date); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; private: QDateTime m_date; diff -Nru kgpg-17.12.3/transactions/kgpgchangepass.h kgpg-18.04.1/transactions/kgpgchangepass.h --- kgpg-17.12.3/transactions/kgpgchangepass.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgchangepass.h 2018-05-07 19:45:01.000000000 +0000 @@ -30,11 +30,11 @@ virtual ~KGpgChangePass(); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - bool preStart() Q_DECL_OVERRIDE; - bool passphraseRequested() Q_DECL_OVERRIDE; - bool passphraseReceived() Q_DECL_OVERRIDE; - bool hintLine(const KGpgTransaction::ts_hintType hint, const QString & args) Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + bool preStart() override; + bool passphraseRequested() override; + bool passphraseReceived() override; + bool hintLine(const KGpgTransaction::ts_hintType hint, const QString & args) override; private: bool m_seenold; ///< old password correctly entered diff -Nru kgpg-17.12.3/transactions/kgpgchangetrust.h kgpg-18.04.1/transactions/kgpgchangetrust.h --- kgpg-17.12.3/transactions/kgpgchangetrust.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgchangetrust.h 2018-05-07 19:45:01.000000000 +0000 @@ -35,9 +35,9 @@ void setTrust(const gpgme_validity_t trust); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - bool preStart() Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + bool preStart() override; private: gpgme_validity_t m_trust; diff -Nru kgpg-17.12.3/transactions/kgpgdecrypt.h kgpg-18.04.1/transactions/kgpgdecrypt.h --- kgpg-17.12.3/transactions/kgpgdecrypt.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgdecrypt.h 2018-05-07 19:45:01.000000000 +0000 @@ -29,7 +29,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgDecrypt) - KGpgDecrypt() Q_DECL_EQ_DELETE; + KGpgDecrypt() = delete; public: /** * @brief decrypt given text @@ -73,8 +73,8 @@ static bool isEncryptedText(const QString &text, int *startPos = nullptr, int *endPos = nullptr); protected: - QStringList command() const Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + QStringList command() const override; + bool nextLine(const QString &line) override; private: int m_fileIndex; diff -Nru kgpg-17.12.3/transactions/kgpgdelkey.cpp kgpg-18.04.1/transactions/kgpgdelkey.cpp --- kgpg-17.12.3/transactions/kgpgdelkey.cpp 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgdelkey.cpp 2018-05-07 19:45:01.000000000 +0000 @@ -52,9 +52,7 @@ bool KGpgDelKey::nextLine(const QString &line) { - if (keyConsidered(line, fingerprints)) { - // nothing - } else if (!line.startsWith(QLatin1String("[GNUPG:] GOT_IT"))) + if (!line.startsWith(QLatin1String("[GNUPG:] GOT_IT"))) setSuccess(KGpgTransaction::TS_MSG_SEQUENCE); return false; diff -Nru kgpg-17.12.3/transactions/kgpgdelkey.h kgpg-18.04.1/transactions/kgpgdelkey.h --- kgpg-17.12.3/transactions/kgpgdelkey.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgdelkey.h 2018-05-07 19:45:01.000000000 +0000 @@ -27,7 +27,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgDelKey) - KGpgDelKey() Q_DECL_EQ_DELETE; + KGpgDelKey() = delete; public: KGpgDelKey(QObject *parent, KGpgKeyNode *key); KGpgDelKey(QObject *parent, const KGpgKeyNode::List &keys); @@ -44,9 +44,9 @@ const QStringList fingerprints; protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - bool preStart() Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + bool preStart() override; private: int m_argscount; diff -Nru kgpg-17.12.3/transactions/kgpgdelsign.h kgpg-18.04.1/transactions/kgpgdelsign.h --- kgpg-17.12.3/transactions/kgpgdelsign.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgdelsign.h 2018-05-07 19:45:01.000000000 +0000 @@ -28,7 +28,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgDelSign) - KGpgDelSign() Q_DECL_EQ_DELETE; + KGpgDelSign() = delete; public: /** * @brief construct a new transaction to delete signatures @@ -69,8 +69,8 @@ KGpgSignNode::List getSignIds(void) const; protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; private: KGpgSignNode::List m_signids; ///< the list of ids to delete diff -Nru kgpg-17.12.3/transactions/kgpgdeluid.h kgpg-18.04.1/transactions/kgpgdeluid.h --- kgpg-17.12.3/transactions/kgpgdeluid.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgdeluid.h 2018-05-07 19:45:01.000000000 +0000 @@ -27,7 +27,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgDelUid) - KGpgDelUid() Q_DECL_EQ_DELETE; + KGpgDelUid() = delete; public: enum ts_deluid { TS_NO_SUCH_UID = KGpgTransaction::TS_COMMON_END + 1 ///< user id does not exist @@ -88,10 +88,10 @@ void setUids(const KGpgSignableNode::const_List &uids); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + void finish() override; private: int m_fixargs; diff -Nru kgpg-17.12.3/transactions/kgpgeditkeytransaction.h kgpg-18.04.1/transactions/kgpgeditkeytransaction.h --- kgpg-17.12.3/transactions/kgpgeditkeytransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgeditkeytransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -25,7 +25,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgEditKeyTransaction) - KGpgEditKeyTransaction() Q_DECL_EQ_DELETE; + KGpgEditKeyTransaction() = delete; protected: /** @@ -56,7 +56,7 @@ * If you inherit from this class make sure this method is called * from your inherited method before you do anything else there. */ - bool preStart() Q_DECL_OVERRIDE; + bool preStart() override; /** * @brief handle standard GnuPG prompts @@ -71,9 +71,9 @@ * Every line sent here by GnuPG not recognised as command handled * here will set a sequence error so be sure to handle your stuff first! */ - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; + ts_boolanswer boolQuestion(const QString &line) override; /** * @brief replace the argument of the edit command diff -Nru kgpg-17.12.3/transactions/kgpgencrypt.h kgpg-18.04.1/transactions/kgpgencrypt.h --- kgpg-17.12.3/transactions/kgpgencrypt.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgencrypt.h 2018-05-07 19:45:01.000000000 +0000 @@ -29,7 +29,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgEncrypt) - KGpgEncrypt() Q_DECL_EQ_DELETE; + KGpgEncrypt() = delete; public: enum EncryptOption { DefaultEncryption = 0, ///< use whatever GnuPGs defaults are @@ -76,9 +76,9 @@ static QString encryptExtension(const bool ascii); protected: - QStringList command() const Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer confirmOverwrite (QUrl ¤tFile) Q_DECL_OVERRIDE; + QStringList command() const override; + bool nextLine(const QString &line) override; + ts_boolanswer confirmOverwrite (QUrl ¤tFile) override; private: int m_fileIndex; diff -Nru kgpg-17.12.3/transactions/kgpgexport.h kgpg-18.04.1/transactions/kgpgexport.h --- kgpg-17.12.3/transactions/kgpgexport.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgexport.h 2018-05-07 19:45:01.000000000 +0000 @@ -122,8 +122,8 @@ const QByteArray &getOutputData() const; protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; private: QStringList m_keyids; diff -Nru kgpg-17.12.3/transactions/kgpggeneratekey.h kgpg-18.04.1/transactions/kgpggeneratekey.h --- kgpg-17.12.3/transactions/kgpggeneratekey.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpggeneratekey.h 2018-05-07 19:45:01.000000000 +0000 @@ -29,7 +29,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgGenerateKey) - KGpgGenerateKey() Q_DECL_EQ_DELETE; + KGpgGenerateKey() = delete; public: enum ts_generatekey { TS_INVALID_NAME = TS_COMMON_END + 1 ///< the owners name is not accepted by GnuPG @@ -69,11 +69,11 @@ QString gpgErrorMessage() const; protected: - bool preStart() Q_DECL_OVERRIDE; - void postStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; - void newPassphraseEntered() Q_DECL_OVERRIDE; + bool preStart() override; + void postStart() override; + bool nextLine(const QString &line) override; + void finish() override; + void newPassphraseEntered() override; private: const QString m_name; diff -Nru kgpg-17.12.3/transactions/kgpggeneraterevoke.h kgpg-18.04.1/transactions/kgpggeneraterevoke.h --- kgpg-17.12.3/transactions/kgpggeneraterevoke.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpggeneraterevoke.h 2018-05-07 19:45:01.000000000 +0000 @@ -30,7 +30,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgGenerateRevoke) - KGpgGenerateRevoke() Q_DECL_EQ_DELETE; + KGpgGenerateRevoke() = delete; public: /** * @brief KGpgGenerateRevoke's constructor @@ -52,12 +52,12 @@ void revokeCertificate(const QString &cert); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; - bool passphraseReceived() Q_DECL_OVERRIDE; - ts_boolanswer confirmOverwrite (QUrl ¤tFile) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + void finish() override; + bool passphraseReceived() override; + ts_boolanswer confirmOverwrite (QUrl ¤tFile) override; private: QString m_keyid; diff -Nru kgpg-17.12.3/transactions/kgpgimport.h kgpg-18.04.1/transactions/kgpgimport.h --- kgpg-17.12.3/transactions/kgpgimport.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgimport.h 2018-05-07 19:45:01.000000000 +0000 @@ -122,7 +122,7 @@ static int isKey(const QString &text, const bool incomplete = false); protected: - QStringList command() const Q_DECL_OVERRIDE; + QStringList command() const override; }; #endif // KGPGIMPORT_H diff -Nru kgpg-17.12.3/transactions/kgpgkeyservergettransaction.h kgpg-18.04.1/transactions/kgpgkeyservergettransaction.h --- kgpg-17.12.3/transactions/kgpgkeyservergettransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgkeyservergettransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -30,7 +30,7 @@ /** * @brief forbidden */ - KGpgKeyserverGetTransaction() Q_DECL_EQ_DELETE; + KGpgKeyserverGetTransaction() = delete; public: /** @@ -53,8 +53,8 @@ protected: virtual QString getGpgCommand() const = 0; - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; private: int m_cmdpos; @@ -81,7 +81,7 @@ virtual ~KGpgReceiveKeys(); protected: - QString getGpgCommand() const Q_DECL_OVERRIDE; + QString getGpgCommand() const override; }; /** @@ -103,7 +103,7 @@ virtual ~KGpgRefreshKeys(); protected: - QString getGpgCommand() const Q_DECL_OVERRIDE; + QString getGpgCommand() const override; }; #endif // KGPGUIDTRANSACTION_H diff -Nru kgpg-17.12.3/transactions/kgpgkeyserversearchtransaction.h kgpg-18.04.1/transactions/kgpgkeyserversearchtransaction.h --- kgpg-17.12.3/transactions/kgpgkeyserversearchtransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgkeyserversearchtransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -30,7 +30,7 @@ /** * @brief forbidden */ - KGpgKeyserverSearchTransaction() Q_DECL_EQ_DELETE; + KGpgKeyserverSearchTransaction() = delete; public: /** @@ -57,12 +57,12 @@ void newKey(QStringList lines); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; /** * @brief needed to submit the last search result */ - void finish() Q_DECL_OVERRIDE; + void finish() override; private: QStringList m_keyLines; ///< the lines belonging to one key diff -Nru kgpg-17.12.3/transactions/kgpgkeyservertransaction.h kgpg-18.04.1/transactions/kgpgkeyservertransaction.h --- kgpg-17.12.3/transactions/kgpgkeyservertransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgkeyservertransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -31,7 +31,7 @@ /** * @brief forbidden */ - KGpgKeyserverTransaction() Q_DECL_EQ_DELETE; + KGpgKeyserverTransaction() = delete; protected: /** * @brief construct a new transaction for the given keyserver @@ -69,8 +69,8 @@ void setProgressEnable(const bool b); protected: - void finish() Q_DECL_OVERRIDE; - bool preStart() Q_DECL_OVERRIDE; + void finish() override; + bool preStart() override; private slots: /** diff -Nru kgpg-17.12.3/transactions/kgpgprimaryuid.h kgpg-18.04.1/transactions/kgpgprimaryuid.h --- kgpg-17.12.3/transactions/kgpgprimaryuid.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgprimaryuid.h 2018-05-07 19:45:01.000000000 +0000 @@ -27,7 +27,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgPrimaryUid) - KGpgPrimaryUid() Q_DECL_EQ_DELETE; + KGpgPrimaryUid() = delete; public: /** @@ -42,8 +42,8 @@ virtual ~KGpgPrimaryUid(); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - bool passphraseReceived() Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + bool passphraseReceived() override; private: int m_fixargs; diff -Nru kgpg-17.12.3/transactions/kgpgsendkeys.h kgpg-18.04.1/transactions/kgpgsendkeys.h --- kgpg-17.12.3/transactions/kgpgsendkeys.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsendkeys.h 2018-05-07 19:45:01.000000000 +0000 @@ -30,7 +30,7 @@ /** * @brief forbidden */ - KGpgSendKeys() Q_DECL_EQ_DELETE; + KGpgSendKeys() = delete; public: /** * @brief construct a new transaction for the given keyserver @@ -59,8 +59,8 @@ const QStringList &getLog() const; protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; private: int m_attrpos; diff -Nru kgpg-17.12.3/transactions/kgpgsignkey.cpp kgpg-18.04.1/transactions/kgpgsignkey.cpp --- kgpg-17.12.3/transactions/kgpgsignkey.cpp 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsignkey.cpp 2018-05-07 19:45:01.000000000 +0000 @@ -38,10 +38,6 @@ bool KGpgSignKey::nextLine(const QString &line) { - if (keyConsidered(line, QStringList())) - // could be any private key, so just ignore them - return false; - switch (KGpgSignTransactionHelper::nextLine(line)) { case KGpgSignTransactionHelper::handledFalse: return false; diff -Nru kgpg-17.12.3/transactions/kgpgsignkey.h kgpg-18.04.1/transactions/kgpgsignkey.h --- kgpg-17.12.3/transactions/kgpgsignkey.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsignkey.h 2018-05-07 19:45:01.000000000 +0000 @@ -28,7 +28,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgSignKey) - KGpgSignKey() Q_DECL_EQ_DELETE; + KGpgSignKey() = delete; public: /** @@ -48,12 +48,12 @@ virtual ~KGpgSignKey(); protected: - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - bool passphraseReceived() Q_DECL_OVERRIDE; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + bool passphraseReceived() override; - KGpgTransaction *asTransaction() Q_DECL_OVERRIDE; - void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE; + KGpgTransaction *asTransaction() override; + void replaceCmd(const QString &cmd) override; }; #endif // KGPGSIGNKEY_H diff -Nru kgpg-17.12.3/transactions/kgpgsigntext.h kgpg-18.04.1/transactions/kgpgsigntext.h --- kgpg-17.12.3/transactions/kgpgsigntext.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsigntext.h 2018-05-07 19:45:01.000000000 +0000 @@ -28,7 +28,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgSignText) - KGpgSignText() Q_DECL_EQ_DELETE; + KGpgSignText() = delete; public: enum SignOption { DefaultSignature = 0, ///< use whatever GnuPGs defaults are @@ -70,7 +70,7 @@ QStringList signedText() const; protected: - QStringList command() const Q_DECL_OVERRIDE; + QStringList command() const override; private: int m_fileIndex; diff -Nru kgpg-17.12.3/transactions/kgpgsigntransactionhelper.h kgpg-18.04.1/transactions/kgpgsigntransactionhelper.h --- kgpg-17.12.3/transactions/kgpgsigntransactionhelper.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsigntransactionhelper.h 2018-05-07 19:45:01.000000000 +0000 @@ -24,7 +24,7 @@ */ class KGpgSignTransactionHelper { Q_DISABLE_COPY(KGpgSignTransactionHelper) - KGpgSignTransactionHelper() Q_DECL_EQ_DELETE; + KGpgSignTransactionHelper() = delete; public: /** * @brief the outcomes of nextLine() diff -Nru kgpg-17.12.3/transactions/kgpgsignuid.h kgpg-18.04.1/transactions/kgpgsignuid.h --- kgpg-17.12.3/transactions/kgpgsignuid.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgsignuid.h 2018-05-07 19:45:01.000000000 +0000 @@ -29,7 +29,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgSignUid) - KGpgSignUid() Q_DECL_EQ_DELETE; + KGpgSignUid() = delete; public: /** @@ -60,13 +60,13 @@ void setUid(const KGpgSignableNode *uid); protected: - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE; - bool passphraseReceived() Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; + ts_boolanswer boolQuestion(const QString &line) override; + bool passphraseReceived() override; - KGpgTransaction *asTransaction() Q_DECL_OVERRIDE; - void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE; + KGpgTransaction *asTransaction() override; + void replaceCmd(const QString &cmd) override; private: int m_cmdPos; ///< position of the command in GnuPG command line diff -Nru kgpg-17.12.3/transactions/kgpgtextorfiletransaction.h kgpg-18.04.1/transactions/kgpgtextorfiletransaction.h --- kgpg-17.12.3/transactions/kgpgtextorfiletransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgtextorfiletransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -80,12 +80,12 @@ /** * @brief construct the command line of the process */ - bool preStart() Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; + bool preStart() override; + bool nextLine(const QString &line) override; /** * @brief implement special handling for GnuPG return codes */ - void finish() Q_DECL_OVERRIDE; + void finish() override; virtual QStringList command() const = 0; @@ -102,7 +102,7 @@ void cleanUrls(); private slots: - void postStart() Q_DECL_OVERRIDE; + void postStart() override; }; #endif // KGPGTEXTORFILETRANSACTION_H diff -Nru kgpg-17.12.3/transactions/kgpgtransactionjob.h kgpg-18.04.1/transactions/kgpgtransactionjob.h --- kgpg-17.12.3/transactions/kgpgtransactionjob.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgtransactionjob.h 2018-05-07 19:45:01.000000000 +0000 @@ -29,7 +29,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgTransactionJob) - KGpgTransactionJob() Q_DECL_EQ_DELETE; + KGpgTransactionJob() = delete; public: /** @@ -48,7 +48,7 @@ /** * @brief starts the transaction */ - void start() Q_DECL_OVERRIDE; + void start() override; /** * @brief get the transaction this job is handling @@ -61,7 +61,7 @@ int getResultCode() const; protected: - bool doKill() Q_DECL_OVERRIDE; + bool doKill() override; private slots: void slotTransactionDone(int result); diff -Nru kgpg-17.12.3/transactions/kgpgtransactionprivate.cpp kgpg-18.04.1/transactions/kgpgtransactionprivate.cpp --- kgpg-17.12.3/transactions/kgpgtransactionprivate.cpp 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgtransactionprivate.cpp 2018-05-07 19:45:01.000000000 +0000 @@ -70,8 +70,9 @@ #endif /* KGPG_DEBUG_TRANSACTIONS */ static const QString getBool = QLatin1String("[GNUPG:] GET_BOOL "); - - if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { + if (m_parent->keyConsidered(line, QStringList())) { + // already handled by keyConsidered - skip the line + } else if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { m_parent->addIdHint(line); } else if (line.startsWith(QLatin1String("[GNUPG:] BAD_PASSPHRASE "))) { // the MISSING_PASSPHRASE line comes first, in that case ignore a diff -Nru kgpg-17.12.3/transactions/kgpguidtransaction.h kgpg-18.04.1/transactions/kgpguidtransaction.h --- kgpg-17.12.3/transactions/kgpguidtransaction.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpguidtransaction.h 2018-05-07 19:45:01.000000000 +0000 @@ -62,7 +62,7 @@ void setUid(const unsigned int uid); protected: - bool preStart() Q_DECL_OVERRIDE; + bool preStart() override; /** * @brief handle common GnuPG messages for uid transactions diff -Nru kgpg-17.12.3/transactions/kgpgverify.h kgpg-18.04.1/transactions/kgpgverify.h --- kgpg-17.12.3/transactions/kgpgverify.h 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/transactions/kgpgverify.h 2018-05-07 19:45:01.000000000 +0000 @@ -31,7 +31,7 @@ Q_OBJECT Q_DISABLE_COPY(KGpgVerify) - KGpgVerify() Q_DECL_EQ_DELETE; + KGpgVerify() = delete; public: enum ts_verify { TS_MISSING_KEY = KGpgTransaction::TS_COMMON_END + 1, ///< signing key not in keyring @@ -75,9 +75,9 @@ QString missingId() const; protected: - QStringList command() const Q_DECL_OVERRIDE; - bool nextLine(const QString &line) Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + QStringList command() const override; + bool nextLine(const QString &line) override; + void finish() override; private: int m_fileIndex; diff -Nru kgpg-17.12.3/viewdecrypted.desktop kgpg-18.04.1/viewdecrypted.desktop --- kgpg-17.12.3/viewdecrypted.desktop 2018-03-01 22:56:16.000000000 +0000 +++ kgpg-18.04.1/viewdecrypted.desktop 2018-05-07 19:45:01.000000000 +0000 @@ -26,7 +26,7 @@ Name[hr]=Pogledaj datoteku dešifrirano Name[hu]=Visszafejtett fájl megjelenítése Name[ia]=Vide file decryptate -Name[id]=Menampilkan berkas yang dienkripsi +Name[id]=Menampilkan file yang dienkripsi Name[it]=Visualizza file decifrato Name[ja]=復号されたファイルを表示 Name[kk]=Шифры шешілгенді көру