[git] GPA - branch, master, updated. gpa-0.9.7-1-g9febd01
by Werner Koch
cvs at cvs.gnupg.org
Fri Dec 12 11:12:41 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".
The branch, master has been updated
via 9febd013fa1e6ad56204304b0193001f6b5fc0be (commit)
via 8ce94803460b165f1291075bf9560010d790bb18 (commit)
via 566c0641018ac60102a66abc2201815c0d994a4f (commit)
via 69525610df82a88becf11d3952506075815ec98d (commit)
from 404f5d7396ac83d78fade4cfadd3df96ae44c5fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9febd013fa1e6ad56204304b0193001f6b5fc0be
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 12 11:13:07 2014 +0100
Post release updates
--
diff --git a/NEWS b/NEWS
index cd99a9a..6d05352 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Noteworthy changes in version 0.9.8 (unreleased)
+------------------------------------------------
+
Noteworthy changes in version 0.9.7 (2014-12-12)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 4c35e71..afd8f17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.10"
# (git tag -s gpa-1.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [0.9.7])
+m4_define([mym4_version], [0.9.8])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 8ce94803460b165f1291075bf9560010d790bb18
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 12 08:47:48 2014 +0100
Release 0.9.7
diff --git a/NEWS b/NEWS
index a66d0cc..cd99a9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Noteworthy changes in version 0.9.7 (unreleased)
+Noteworthy changes in version 0.9.7 (2014-12-12)
------------------------------------------------
+ * Support sending keys for GnuPG 2.1.
+
Noteworthy changes in version 0.9.6 (2014-11-21)
------------------------------------------------
commit 566c0641018ac60102a66abc2201815c0d994a4f
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 12 08:45:47 2014 +0100
po: Auto update.
--
diff --git a/po/ar.po b/po/ar.po
index f6f85c4..bd80f9c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -157,6 +157,21 @@ msgstr "متقدّم"
msgid "Expert"
msgstr "خبير"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_نعم"
+
+msgid "_No"
+msgstr "_لا"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "أيّام"
@@ -336,14 +351,14 @@ msgstr "/تØرير/تÙضيلات ال_خلÙية..."
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"ØÙÙظت نسخة من Ù…ÙتاØÙƒ السري ÙÙŠ الملÙ:\n"
"\n"
@@ -378,21 +393,22 @@ msgstr "تم تصدير المÙØ§ØªÙŠØ Ø¥Ù„Ù‰ %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"ستÙرسَل المÙØªØ§Ø Ø§Ù„Ù…Øدد إلى\n"
"خادوم Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠ (\"%s\").\n"
"أمتأكد أنك تريد توزيع هذا المÙتاØØŸ"
-msgid "_Yes"
-msgstr "_نعم"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "أمتأكد أنك تريد Øذ٠هذا المÙتاØØŸ"
-msgid "_No"
-msgstr "_لا"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/أر_سÙÙ„ المÙØ§ØªÙŠØ Ù„Ù„Ø®Ø§Ø¯ÙˆÙ…..."
msgid "The keys have been sent to the server."
msgstr "Ø£Ùرسلت المÙØ§ØªÙŠØ Ø¥Ù„Ù‰ الخادوم."
@@ -2010,7 +2026,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/cs.po b/po/cs.po
index fd6cade..86eb916 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -146,6 +146,23 @@ msgstr "PokroÄilý"
msgid "Expert"
msgstr "Expert"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Nastavit programy backednu"
+
+msgid "_Yes"
+msgstr "_Ano"
+
+msgid "_No"
+msgstr "_Ne"
+
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Nastavit programy backednu"
+
msgid "days"
msgstr "dny"
@@ -311,14 +328,14 @@ msgstr "Na_stavenà backendu"
msgid "Configure the backend programs"
msgstr "Nastavit programy backednu"
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Kopie vaÅ¡eho soukromého klÃÄe byla uložena v souboru:\n"
"\n"
@@ -353,21 +370,22 @@ msgstr "KlÃÄe byly exportovány do %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr "Pouze klÃÄe stejného protokolu smÄ›jà být exportovány jako kolekce."
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Vybraný klÃÄ bude odeslán na server klÃÄů\n"
"(\"%s\").\n"
"UrÄitÄ› chcete Å¡ÃÅ™it tento klÃÄ?"
-msgid "_Yes"
-msgstr "_Ano"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Jste si jistý, že chcete smazat tento klÃÄ?"
-msgid "_No"
-msgstr "_Ne"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Odeslat klÃÄe na server..."
msgid "The keys have been sent to the server."
msgstr "KlÃÄe byly odeslány na server."
@@ -2007,6 +2025,7 @@ msgstr ""
"Pokud budete pokraÄovat, budete vyzvánÃ, abyste vložili souÄasnou hodnotu "
"PIN, poté novou hodnotu Reset kódu a tu na dalÅ¡Ãm řádku zopakovali."
+#, fuzzy
msgid ""
"<b>Reseting the PIN or the Reset Code</b>\n"
"\n"
@@ -2016,7 +2035,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/es.po b/po/es.po
index 1dacda5..450643a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -160,6 +160,21 @@ msgstr "Avanzado"
msgid "Expert"
msgstr "Experto"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_SÃ"
+
+msgid "_No"
+msgstr "_No"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "dÃas"
@@ -339,14 +354,14 @@ msgstr "/Editar/Pr_eferencias del motor..."
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Se ha copiado su clave secreta al archivo:\n"
"\n"
@@ -381,21 +396,22 @@ msgstr "Las claves se han exportado a %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"La clave seleccionada se enviará a un servidor de\n"
"claves público (\"%s\").\n"
"¿Está seguro de que quiere distribuir esta clave?"
-msgid "_Yes"
-msgstr "_SÃ"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Seguro que desea borrar esta clave?"
-msgid "_No"
-msgstr "_No"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "E_nviar claves al servidor"
msgid "The keys have been sent to the server."
msgstr "Las claves se han enviado al servidor."
@@ -2047,7 +2063,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/ja.po b/po/ja.po
index c83a838..e638474 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -166,6 +166,22 @@ msgstr ""
msgid "Expert"
msgstr "¥¨¥¯¥¹¥Ý¡¼¥È"
+#, fuzzy
+msgid "A keyserver has not been configured."
+msgstr "¸°¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "¤Ï¤¤ (_Y)"
+
+msgid "_No"
+msgstr "¤¤¤¤¤¨ (_N)"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "Æü"
@@ -356,14 +372,14 @@ msgstr "/
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"ÈëÌ©¸°¤Î¥³¥Ô¡¼¤¬\n"
"\n"
@@ -398,21 +414,22 @@ msgstr "
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"ÁªÂò¤µ¤ì¤¿¸°¤Ï¡¢¸ø³«¸°¥µ¡¼¥Ð¤ØÁ÷¿®¤µ¤ì¤Þ¤¹¡£\n"
"(¥µ¡¼¥Ð: \"%s\")\n"
"ËÜÅö¤Ë¤³¤Î¸°¤ò¹¤¯ÇÛÉÛ¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
-msgid "_Yes"
-msgstr "¤Ï¤¤ (_Y)"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "ËÜÅö¤Ë¤³¤Î¸°¤òºï½ü¤·¤Þ¤¹¤«?"
-msgid "_No"
-msgstr "¤¤¤¤¤¨ (_N)"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/¸°¤ò¥µ¡¼¥Ð¤ØÁ÷¿®... (_N)"
msgid "The keys have been sent to the server."
msgstr "¸°¤ò¥µ¡¼¥Ð¤ØÁ÷¿®¤·¤Þ¤·¤¿¡£"
@@ -2044,7 +2061,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
@@ -3249,9 +3266,6 @@ msgstr ""
#~ msgid "No valid public key specified"
#~ msgstr "ŬÀڤʸø³«¸°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#~ msgid "Keyserver not specified"
-#~ msgstr "¸°¥µ¡¼¥Ð¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
#~ msgid "No valid secret key specified"
#~ msgstr "ŬÀÚ¤ÊÈëÌ©¸°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
diff --git a/po/nl.po b/po/nl.po
index 641498d..9e4ef5b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -163,6 +163,21 @@ msgstr ""
msgid "Expert"
msgstr "Exporteer"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_Ja"
+
+msgid "_No"
+msgstr "_Nee"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "dagen"
@@ -353,14 +368,14 @@ msgstr "/Bewerk/Voork_euren..."
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Een kopie van uw geheime sleutel is gemaakt naar het bestand:\n"
"\n"
@@ -395,21 +410,22 @@ msgstr "De sleutels werden naar %s ge
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"De geselecteerde sleutel zal naar een publieke\n"
"keyserver gestuurd worden (\"%s\").\n"
"Bent u zeker dat u deze sleutel wilt verspreiden?"
-msgid "_Yes"
-msgstr "_Ja"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Weet u zeker dat je deze sleutel wilt verwijderen?"
-msgid "_No"
-msgstr "_Nee"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Stel keyserver in"
msgid "The keys have been sent to the server."
msgstr "De sleutels werden naar de server gestuurd."
@@ -2051,7 +2067,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/pl.po b/po/pl.po
index 09a5859..fe3a4cf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -160,6 +160,21 @@ msgstr ""
msgid "Expert"
msgstr "Eksport"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_Tak"
+
+msgid "_No"
+msgstr "_Nie"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "dni"
@@ -349,14 +364,14 @@ msgstr "/Edycja/_Ustawienia..."
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"SporzÄ…dzono kopiÄ™ twojego tajnego klucza do pliku:\n"
"\n"
@@ -392,21 +407,22 @@ msgstr "Klucze zostały wyeksportowane do %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Wybrany klucz zostanie wysłany do publicznego\n"
"serwera kluczy (\"%s\").\n"
"Na pewno chcesz rozpowszechnić ten klucz?"
-msgid "_Yes"
-msgstr "_Tak"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Jesteś pewna/pewien że chcesz usunąć ten klucz?"
-msgid "_No"
-msgstr "_Nie"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/W_yślij klucze na serwer..."
msgid "The keys have been sent to the server."
msgstr "Klucze zostały wysłane na serwer."
@@ -2046,7 +2062,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 334fc1e..4dad738 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -162,6 +162,21 @@ msgstr ""
msgid "Expert"
msgstr "Exportar"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_Sim"
+
+msgid "_No"
+msgstr "_Não"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "dias"
@@ -352,14 +367,14 @@ msgstr "/Editar/Pr_efer
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Uma cópia de sua chave secreta foi feita para o arquivo:\n"
"\n"
@@ -398,16 +413,17 @@ msgstr ""
#, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
-msgid "_Yes"
-msgstr "_Sim"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Você está certo que deseja apagar esta chave?"
-msgid "_No"
-msgstr "_Não"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "_Servidor de chave:"
msgid "The keys have been sent to the server."
msgstr ""
@@ -2057,7 +2073,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/ru.po b/po/ru.po
index d65db09..67515f4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -158,6 +158,21 @@ msgstr "РаÑширенный"
msgid "Expert"
msgstr "ÐкÑпертный"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "Да"
+
+msgid "_No"
+msgstr "Ðет"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "дней"
@@ -337,14 +352,14 @@ msgstr "/Правка/ÐаÑтройки _шифр. программы..."
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"ÐšÐ¾Ð¿Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ закрытого ключа Ñохранена в файл:\n"
"\n"
@@ -379,21 +394,22 @@ msgstr "Ключи ÑкÑпортированы в %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Выбранный ключ будет отправлен на открытый Ñервер открытых ключей\n"
"(\"%s\").\n"
"ДейÑтвительно хотите раÑпроÑтранить данный ключ?"
-msgid "_Yes"
-msgstr "Да"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот ключ?"
-msgid "_No"
-msgstr "Ðет"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/Отправить на Ñервер..."
msgid "The keys have been sent to the server."
msgstr "Ключи уÑпешно отправлены на Ñервер."
@@ -2029,7 +2045,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/sv.po b/po/sv.po
index c355482..ac6e140 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -148,6 +148,23 @@ msgstr "Avancerat"
msgid "Expert"
msgstr "Expert"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Konfigurera bakändesprogram"
+
+msgid "_Yes"
+msgstr "_Ja"
+
+msgid "_No"
+msgstr "_Nej"
+
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Konfigurera bakändesprogram"
+
msgid "days"
msgstr "dagar"
@@ -317,14 +334,14 @@ msgstr "Inställningar för bakände"
msgid "Configure the backend programs"
msgstr "Konfigurera bakändesprogram"
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"En kopia av din hemliga nyckel har skapats i filen:\n"
"\n"
@@ -359,21 +376,22 @@ msgstr "Nycklarna har exporterats till %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Den valda nyckeln kommer att skickas till en\n"
"publik nyckelserver (\"%s\").\n"
"Är du säker på att du vill distribuera nyckeln?"
-msgid "_Yes"
-msgstr "_Ja"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Är du säker på att du vill ta bort denna nyckel?"
-msgid "_No"
-msgstr "_Nej"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Skicka nycklar till server"
msgid "The keys have been sent to the server."
msgstr "Nycklarna har skickats till servern."
@@ -2002,7 +2020,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/tr.po b/po/tr.po
index 615292c..08097c3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -160,6 +160,21 @@ msgstr ""
msgid "Expert"
msgstr "Dýþarý Yaz"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "_Evet"
+
+msgid "_No"
+msgstr "_Hayýr"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "gün"
@@ -349,14 +364,14 @@ msgstr "/D
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Gizli anahtarýnýzýn bir kopyasý þu dosyaya yazýldý:\n"
"\n"
@@ -391,21 +406,22 @@ msgstr "Anahtarlar %s isimli dosyaya aktar
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"Seçili anahtar \"%s\" genel anahtar\n"
"sunucusuna gönderilecektir.\n"
"Bu anahtarý daðýtmak istediðinizden emin misiniz?"
-msgid "_Yes"
-msgstr "_Evet"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Bu anahtarý silmek istediðinize emin misiniz?"
-msgid "_No"
-msgstr "_Hayýr"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "/Anahtarlarý Sunucuya _Gönder..."
msgid "The keys have been sent to the server."
msgstr "Anahtarlar sunucuya yollandý."
@@ -2039,7 +2055,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4d86b05..695a955 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -159,6 +159,21 @@ msgstr ""
msgid "Expert"
msgstr "¿é¥X"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+msgid "Configure backend to use a keyserver?"
+msgstr ""
+
+msgid "_Yes"
+msgstr "¬O (&Y)"
+
+msgid "_No"
+msgstr "§_ (&N)"
+
+msgid "Configuring the backend to use a keyserver failed"
+msgstr ""
+
msgid "days"
msgstr "¤é"
@@ -348,14 +363,14 @@ msgstr "/
msgid "Configure the backend programs"
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
"A copy of your secret key has been made to the file:\n"
"\n"
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"±KÆ_¤w¸g³Q½Æ»s¨ì·sÀÉ®× :\n"
"\n"
@@ -390,21 +405,22 @@ msgstr "
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"³Q¿ï¾Üªº¤½Æ_·|±H¨ì¤½Æ_§FªA¾¹ :\n"
"(\"%s\")¤¤.\n"
"n½T©wµo©ñ³o¨Ç¤½Æ_¶Ü ?"
-msgid "_Yes"
-msgstr "¬O (&Y)"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "±z½T©wn§R°£³o±KÆ_?"
-msgid "_No"
-msgstr "§_ (&N)"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "±H¥X¤½Æ_¨ì¦øªA¾¹... (&N)"
msgid "The keys have been sent to the server."
msgstr "¤½Æ_¤w³Q¶Ç¨ì¤½Æ_§FªA¾¹."
@@ -2007,7 +2023,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
commit 69525610df82a88becf11d3952506075815ec98d
Author: Werner Koch <wk at gnupg.org>
Date: Thu Dec 11 09:59:33 2014 +0100
Replace deprecated gpgme API for card access.
* src/cardman.c: Use gpgme_op_assuan_transact_ext.
* src/cm-dinsig.c: Ditto.
* src/cm-geldkarte.c: Ditto.
* src/cm-netkey.c: Ditto.
* src/cm-openpgp.c: Ditto.
* src/cm-unknown.c: Ditto.
diff --git a/src/cardman.c b/src/cardman.c
index 844a44a..382284a 100644
--- a/src/cardman.c
+++ b/src/cardman.c
@@ -289,7 +289,7 @@ card_reload_finish_idle_cb (void *user_data)
static void
card_reload (GpaCardManager *cardman)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
const char *application;
char *command_buf = NULL;
const char *command;
@@ -327,14 +327,14 @@ card_reload (GpaCardManager *cardman)
}
else
auto_app = 1;
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman, &operr);
if (!err)
{
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
if (!auto_app
&& gpg_err_source (err) == GPG_ERR_SOURCE_SCD
&& gpg_err_code (err) == GPG_ERR_CONFLICT)
@@ -344,19 +344,20 @@ card_reload (GpaCardManager *cardman)
again to display an application selection conflict
error only if it is not due to our own connection to
the scdaemon. */
- if (!gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD RESTART",
- NULL, NULL, NULL, NULL,
- NULL, NULL)
- && !gpgme_op_assuan_result (cardman->gpgagent)->err)
+ if (!gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD RESTART",
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, &operr)
+ && !operr)
{
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
}
}
}
@@ -388,9 +389,10 @@ card_reload (GpaCardManager *cardman)
{
g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
- if (!gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD SERIALNO undefined",
- NULL, NULL, NULL, NULL, NULL, NULL))
+ if (!gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD SERIALNO undefined",
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, &operr) && !operr)
err = 0;
else
{
@@ -405,22 +407,22 @@ card_reload (GpaCardManager *cardman)
{
/* Get the event counter to avoid a duplicate reload due to
the ticker. */
- gpgme_op_assuan_transact (cardman->gpgagent,
- "GETEVENTCOUNTER",
- NULL, NULL,
- NULL, NULL,
- scd_status_cb, cardman);
+ gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "GETEVENTCOUNTER",
+ NULL, NULL,
+ NULL, NULL,
+ scd_status_cb, cardman, NULL);
/* Now we need to get the APPTYPE of the card so that the
correct GpaCM* object can can act on the data. */
command = "SCD GETATTR APPTYPE";
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- command,
- scd_data_cb, NULL,
- scd_inq_cb, NULL,
- scd_status_cb, cardman);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ command,
+ scd_data_cb, NULL,
+ scd_inq_cb, NULL,
+ scd_status_cb, cardman, &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
if (gpg_err_code (err) == GPG_ERR_CARD_NOT_PRESENT
|| gpg_err_code (err) == GPG_ERR_CARD_REMOVED)
@@ -522,11 +524,11 @@ ticker_cb (gpointer user_data)
/* Note that we are single threaded and thus there is no need to
lock the assuan context. */
- gpgme_op_assuan_transact (cardman->gpgagent,
- "GETEVENTCOUNTER",
- NULL, NULL,
- NULL, NULL,
- geteventcounter_status_cb, cardman);
+ gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "GETEVENTCOUNTER",
+ NULL, NULL,
+ NULL, NULL,
+ geteventcounter_status_cb, cardman, NULL);
return TRUE; /* Keep on ticking. */
}
@@ -564,8 +566,8 @@ card_genkey_completed (GpaCardManager *cardman, gpg_error_t err)
static void
card_genkey (GpaCardManager *cardman)
{
+ gpg_error_t err, operr;
GpaGenKeyCardOperation *op;
- gpg_error_t err;
char *keyattr;
if (cardman->cardtype != GPA_CM_OPENPGP_TYPE)
@@ -578,11 +580,13 @@ card_genkey (GpaCardManager *cardman)
/* Note: This test works only with GnuPG > 2.0.10 but that version
is anyway required for the card manager to work correctly. */
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD GETINFO deny_admin",
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD GETINFO deny_admin",
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (cardman->gpgagent)->err;
+ err = operr;
+
if (!err)
{
gpa_window_error ("Admin commands are disabled in scdamon.\n"
@@ -844,7 +848,7 @@ setup_app_selector_data_cb (void *opaque, const void *data, size_t datalen)
static void
setup_app_selector (GpaCardManager *cardman)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
membuf_t mb;
char *string;
char *p, *p0, *p1;
@@ -854,11 +858,11 @@ setup_app_selector (GpaCardManager *cardman)
init_membuf (&mb, 256);
- err = gpgme_op_assuan_transact (cardman->gpgagent,
- "SCD GETINFO app_list",
- setup_app_selector_data_cb, &mb,
- NULL, NULL, NULL, NULL);
- if (err || gpgme_op_assuan_result (cardman->gpgagent)->err)
+ err = gpgme_op_assuan_transact_ext (cardman->gpgagent,
+ "SCD GETINFO app_list",
+ setup_app_selector_data_cb, &mb,
+ NULL, NULL, NULL, NULL, &operr);
+ if (err || operr)
{
g_free (get_membuf (&mb, NULL));
return;
diff --git a/src/cm-dinsig.c b/src/cm-dinsig.c
index 0a4a866..a8d1e14 100644
--- a/src/cm-dinsig.c
+++ b/src/cm-dinsig.c
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/* DINSIG is the old and still used standard for smartcards to create
@@ -32,7 +32,7 @@
#include <string.h>
#include <assert.h>
-#include "gpa.h"
+#include "gpa.h"
#include "gtktools.h"
#include "convert.h"
@@ -48,12 +48,12 @@ enum
ENTRY_SERIALNO,
ENTRY_LAST
- };
+ };
/* Object's class definition. */
-struct _GpaCMDinsigClass
+struct _GpaCMDinsigClass
{
GpaCMObjectClass parent_class;
};
@@ -81,7 +81,7 @@ static void gpa_cm_dinsig_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
@@ -126,17 +126,17 @@ scd_getattr_cb (void *opaque, const char *status, const char *args)
if (parm->updfnc)
parm->updfnc (parm->card, entry_id, tmp);
else if (GTK_IS_LABEL (parm->card->entries[entry_id]))
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (parm->card->entries[entry_id]), tmp);
else
- gtk_entry_set_text
+ gtk_entry_set_text
(GTK_ENTRY (parm->card->entries[entry_id]), tmp);
xfree (tmp);
}
}
return 0;
-}
+}
/* Use the assuan machinery to load the bulk of the OpenPGP card data. */
@@ -152,7 +152,7 @@ reload_data (GpaCMDinsig *card)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -168,13 +168,13 @@ reload_data (GpaCMDinsig *card)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -182,7 +182,7 @@ reload_data (GpaCMDinsig *card)
; /* Lost the card. */
else
{
- g_debug ("assuan command `%s' failed: %s <%s>\n",
+ g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
}
clear_card_data (card);
@@ -206,12 +206,12 @@ add_table_row (GtkWidget *table, int *rowidx,
label = gtk_label_new (labelstr);
gtk_label_set_width_chars (GTK_LABEL (label), 22);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1,
- *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1,
+ *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
if (is_label)
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-
+
if (readonly)
{
if (!is_label && GTK_IS_ENTRY (widget))
@@ -225,7 +225,7 @@ add_table_row (GtkWidget *table, int *rowidx,
if (is_label)
gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
}
-
+
gtk_table_attach (GTK_TABLE (table), widget, 1, 2,
*rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
if (widget2)
@@ -259,18 +259,18 @@ construct_data_widget (GpaCMDinsig *card)
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);
rowidx = 0;
-
+
card->entries[ENTRY_SERIALNO] = gtk_label_new (NULL);
add_table_row (table, &rowidx, _("Serial number:"),
card->entries[ENTRY_SERIALNO], NULL, 0);
gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
-
+
/* Info frame. */
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
vbox = gtk_vbox_new (FALSE, 5);
- text = g_strdup_printf
+ text = g_strdup_printf
(_("There is not much information to display for a %s card. "
"You may want to use the application selector button to "
"switch to another application available on this card."), "DINSIG");
@@ -281,12 +281,12 @@ construct_data_widget (GpaCMDinsig *card)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (card), frame, FALSE, TRUE, 0);
-
+
}
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -296,7 +296,7 @@ gpa_cm_dinsig_class_init (void *class_ptr, void *class_data)
GpaCMDinsigClass *klass = class_ptr;
parent_class = g_type_class_peek_parent (klass);
-
+
G_OBJECT_CLASS (klass)->finalize = gpa_cm_dinsig_finalize;
}
@@ -313,7 +313,7 @@ gpa_cm_dinsig_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_cm_dinsig_finalize (GObject *object)
-{
+{
/* GpaCMDinsig *card = GPA_CM_DINSIG (object); */
parent_class->finalize (object);
@@ -325,7 +325,7 @@ GType
gpa_cm_dinsig_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -340,23 +340,23 @@ gpa_cm_dinsig_get_type (void)
0, /* n_preallocs */
gpa_cm_dinsig_init
};
-
+
this_type = g_type_register_static (GPA_CM_OBJECT_TYPE,
"GpaCMDinsig",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
GtkWidget *
gpa_cm_dinsig_new ()
{
- return GTK_WIDGET (g_object_new (GPA_CM_DINSIG_TYPE, NULL));
+ return GTK_WIDGET (g_object_new (GPA_CM_DINSIG_TYPE, NULL));
}
diff --git a/src/cm-geldkarte.c b/src/cm-geldkarte.c
index aebfb7c..577b4c8 100644
--- a/src/cm-geldkarte.c
+++ b/src/cm-geldkarte.c
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +26,7 @@
#include <string.h>
#include <assert.h>
-#include "gpa.h"
+#include "gpa.h"
#include "convert.h"
#include "cm-object.h"
@@ -52,12 +52,12 @@ enum
ENTRY_MAXAMOUNT1,
ENTRY_LAST
- };
+ };
/* Object's class definition. */
-struct _GpaCMGeldkarteClass
+struct _GpaCMGeldkarteClass
{
GpaCMObjectClass parent_class;
};
@@ -84,7 +84,7 @@ static void gpa_cm_geldkarte_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
@@ -125,13 +125,13 @@ scd_getattr_cb (void *opaque, const char *status, const char *args)
if (parm->updfnc)
parm->updfnc (parm->card, entry_id, args);
else
- gtk_label_set_text
+ gtk_label_set_text
(GTK_LABEL (parm->card->entries[entry_id]), args);
}
}
return 0;
-}
+}
/* Use the assuan machinery to load the bulk of the OpenPGP card data. */
@@ -158,7 +158,7 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
@@ -169,13 +169,13 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -183,7 +183,7 @@ reload_data (GpaCMGeldkarte *card, gpgme_ctx_t gpgagent)
; /* Lost the card. */
else
{
- g_debug ("assuan command `%s' failed: %s <%s>\n",
+ g_debug ("assuan command `%s' failed: %s <%s>\n",
command, gpg_strerror (err), gpg_strsource (err));
}
clear_card_data (card);
@@ -206,8 +206,8 @@ add_table_row (GtkWidget *table, int *rowidx, const char *labelstr)
label = gtk_label_new (labelstr);
gtk_label_set_width_chars (GTK_LABEL (label), 22);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1,
- *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1,
+ *rowidx, *rowidx + 1, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
gtk_label_set_selectable (GTK_LABEL (widget), TRUE);
@@ -253,35 +253,35 @@ construct_data_widget (GpaCMGeldkarte *card)
amount_table = gtk_table_new (3, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (amount_table), 10);
-
+
/* General frame. */
rowidx = 0;
- card->entries[ENTRY_CARDNO] = add_table_row
+ card->entries[ENTRY_CARDNO] = add_table_row
(general_table, &rowidx, _("Card number: "));
- card->entries[ENTRY_KBLZ] = add_table_row
+ card->entries[ENTRY_KBLZ] = add_table_row
(general_table, &rowidx, _("Short Bank Code number: "));
- card->entries[ENTRY_BANKTYPE] = add_table_row
+ card->entries[ENTRY_BANKTYPE] = add_table_row
(general_table, &rowidx, _("Bank type: "));
- card->entries[ENTRY_VALIDFROM] = add_table_row
+ card->entries[ENTRY_VALIDFROM] = add_table_row
(general_table, &rowidx, _("Card valid from: "));
- card->entries[ENTRY_EXPIRES] = add_table_row
+ card->entries[ENTRY_EXPIRES] = add_table_row
(general_table, &rowidx, _("Card expires: "));
- card->entries[ENTRY_COUNTRY] = add_table_row
+ card->entries[ENTRY_COUNTRY] = add_table_row
(general_table, &rowidx, _("Issuing country: "));
- card->entries[ENTRY_CURRENCY] = add_table_row
+ card->entries[ENTRY_CURRENCY] = add_table_row
(general_table, &rowidx, _("Currency: "));
- card->entries[ENTRY_ZKACHIPID] = add_table_row
+ card->entries[ENTRY_ZKACHIPID] = add_table_row
(general_table, &rowidx, _("ZKA chip Id: "));
- card->entries[ENTRY_OSVERSION] = add_table_row
+ card->entries[ENTRY_OSVERSION] = add_table_row
(general_table, &rowidx, _("Chip OS version: "));
gtk_container_add (GTK_CONTAINER (general_frame), general_table);
@@ -290,13 +290,13 @@ construct_data_widget (GpaCMGeldkarte *card)
/* Amount frame. */
rowidx = 0;
- card->entries[ENTRY_BALANCE] = add_table_row
+ card->entries[ENTRY_BALANCE] = add_table_row
(amount_table, &rowidx, _("Balance: "));
- card->entries[ENTRY_MAXAMOUNT] = add_table_row
+ card->entries[ENTRY_MAXAMOUNT] = add_table_row
(amount_table, &rowidx, _("General limit: "));
- card->entries[ENTRY_MAXAMOUNT1] = add_table_row
+ card->entries[ENTRY_MAXAMOUNT1] = add_table_row
(amount_table, &rowidx, _("Transaction limit: "));
gtk_container_add (GTK_CONTAINER (amount_frame), amount_table);
@@ -309,7 +309,7 @@ construct_data_widget (GpaCMGeldkarte *card)
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -319,7 +319,7 @@ gpa_cm_geldkarte_class_init (void *class_ptr, void *class_data)
GpaCMGeldkarteClass *klass = class_ptr;
parent_class = g_type_class_peek_parent (klass);
-
+
G_OBJECT_CLASS (klass)->finalize = gpa_cm_geldkarte_finalize;
}
@@ -336,7 +336,7 @@ gpa_cm_geldkarte_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_cm_geldkarte_finalize (GObject *object)
-{
+{
/* GpaCMGeldkarte *card = GPA_CM_GELDKARTE (object); */
parent_class->finalize (object);
@@ -348,7 +348,7 @@ GType
gpa_cm_geldkarte_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -363,23 +363,23 @@ gpa_cm_geldkarte_get_type (void)
0, /* n_preallocs */
gpa_cm_geldkarte_init
};
-
+
this_type = g_type_register_static (GPA_CM_OBJECT_TYPE,
"GpaCMGeldkarte",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
GtkWidget *
gpa_cm_geldkarte_new ()
{
- return GTK_WIDGET (g_object_new (GPA_CM_GELDKARTE_TYPE, NULL));
+ return GTK_WIDGET (g_object_new (GPA_CM_GELDKARTE_TYPE, NULL));
}
diff --git a/src/cm-netkey.c b/src/cm-netkey.c
index 8ddbcb7..656010b 100644
--- a/src/cm-netkey.c
+++ b/src/cm-netkey.c
@@ -319,7 +319,7 @@ reload_more_data_cb (void *opaque, const char *status, const char *args)
static void
reload_more_data (GpaCMNetkey *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
gpgme_ctx_t gpgagent;
GtkWidget *vbox;
struct reload_more_data_parm parm;
@@ -355,13 +355,14 @@ reload_more_data (GpaCMNetkey *card)
g_debug (" parm.ctx=%p", parm.ctx);
- err = gpgme_op_assuan_transact (gpgagent,
- "SCD LEARN --keypairinfo",
- NULL, NULL, NULL, NULL,
- reload_more_data_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ "SCD LEARN --keypairinfo",
+ NULL, NULL, NULL, NULL,
+ reload_more_data_cb, &parm, &operr);
g_debug (" assuan ret=%d", err);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (err)
g_debug ("SCD LEARN failed: %s", gpg_strerror (err));
@@ -479,6 +480,7 @@ reload_data (GpaCMNetkey *card)
};
int attridx;
gpg_error_t err = 0;
+ gpg_error_t operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -497,13 +499,13 @@ reload_data (GpaCMNetkey *card)
parm.entry_id = attrtbl[attridx].entry_id;
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err && attrtbl[attridx].entry_id == ENTRY_NKS_VERSION)
{
@@ -616,7 +618,7 @@ learn_keys_clicked_cb (GtkButton *button, void *user_data)
static void
change_nullpin (GpaCMNetkey *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int is_sigg;
@@ -666,15 +668,16 @@ change_nullpin (GpaCMNetkey *card)
okay = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (okay)
{
- err = gpgme_op_assuan_transact (gpgagent,
- is_sigg
- ? "SCD PASSWD --nullpin PW1.CH.SIG"
- : "SCD PASSWD --nullpin PW1.CH",
- NULL, NULL,
- NULL, NULL,
- NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ is_sigg
+ ? "SCD PASSWD --nullpin PW1.CH.SIG"
+ : "SCD PASSWD --nullpin PW1.CH",
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
@@ -696,7 +699,7 @@ change_nullpin (GpaCMNetkey *card)
static void
change_or_reset_pin (GpaCMNetkey *card, int info_idx)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int reset_mode;
@@ -781,10 +784,12 @@ change_or_reset_pin (GpaCMNetkey *card, int info_idx)
snprintf (command, sizeof command, "SCD PASSWD%s %s",
reset_mode? " --reset":"", pwidstr);
- err = gpgme_op_assuan_transact (gpgagent, command,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent, command,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
diff --git a/src/cm-openpgp.c b/src/cm-openpgp.c
index cd901e0..55a3081 100644
--- a/src/cm-openpgp.c
+++ b/src/cm-openpgp.c
@@ -597,7 +597,7 @@ reload_data (GpaCMOpenpgp *card)
{ NULL }
};
int attridx;
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
struct scd_getattr_parm parm;
gpgme_ctx_t gpgagent;
@@ -616,13 +616,13 @@ reload_data (GpaCMOpenpgp *card)
parm.updfnc = attrtbl[attridx].updfnc;
snprintf (command, sizeof command, "SCD GETATTR %s", parm.name);
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- scd_getattr_cb, &parm);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ scd_getattr_cb, &parm, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err)
{
@@ -648,7 +648,7 @@ static gpg_error_t
save_attr (GpaCMOpenpgp *card, const char *name,
const char *value, int is_escaped)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
char *command;
gpgme_ctx_t gpgagent;
@@ -670,13 +670,13 @@ save_attr (GpaCMOpenpgp *card, const char *name,
command = g_strdup_printf ("SCD SETATTR %s %s", name, p);
xfree (p);
}
- err = gpgme_op_assuan_transact (gpgagent,
- command,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ command,
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (err && !(gpg_err_code (err) == GPG_ERR_CANCELED
&& gpg_err_source (err) == GPG_ERR_SOURCE_PINENTRY))
@@ -1050,7 +1050,7 @@ edit_focus_cb (GtkWidget *widget, GtkDirectionType direction, void *opaque)
static void
change_pin (GpaCMOpenpgp *card, int pinno)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
GtkWidget *dialog;
gpgme_ctx_t gpgagent;
int reset_mode = 0;
@@ -1171,10 +1171,12 @@ change_pin (GpaCMOpenpgp *card, int pinno)
snprintf (command, sizeof command, "SCD PASSWD%s %d",
reset_mode? " --reset":"", pinno+1);
- err = gpgme_op_assuan_transact (gpgagent, command,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent, command,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
+
if (gpg_err_code (err) == GPG_ERR_CANCELED)
okay = 0; /* No need to reload the data. */
else if (err)
diff --git a/src/cm-unknown.c b/src/cm-unknown.c
index 70ac99e..db27058 100644
--- a/src/cm-unknown.c
+++ b/src/cm-unknown.c
@@ -86,7 +86,7 @@ scd_atr_data_cb (void *opaque, const void *data, size_t datalen)
static void
reload_data (GpaCMUnknown *card)
{
- gpg_error_t err;
+ gpg_error_t err, operr;
char command[100];
gpgme_ctx_t gpgagent;
membuf_t mb;
@@ -99,12 +99,12 @@ reload_data (GpaCMUnknown *card)
init_membuf (&mb, 512);
- err = gpgme_op_assuan_transact (gpgagent,
- "SCD APDU --dump-atr",
- scd_atr_data_cb, &mb,
- NULL, NULL, NULL, NULL);
+ err = gpgme_op_assuan_transact_ext (gpgagent,
+ "SCD APDU --dump-atr",
+ scd_atr_data_cb, &mb,
+ NULL, NULL, NULL, NULL, &operr);
if (!err)
- err = gpgme_op_assuan_result (gpgagent)->err;
+ err = operr;
if (!err)
{
-----------------------------------------------------------------------
Summary of changes:
NEWS | 7 +++-
configure.ac | 2 +-
po/ar.po | 38 ++++++++++++++------
po/cs.po | 41 +++++++++++++++------
po/es.po | 38 ++++++++++++++------
po/ja.po | 42 ++++++++++++++--------
po/nl.po | 38 ++++++++++++++------
po/pl.po | 38 ++++++++++++++------
po/pt_BR.po | 36 +++++++++++++------
po/ru.po | 38 ++++++++++++++------
po/sv.po | 40 +++++++++++++++------
po/tr.po | 38 ++++++++++++++------
po/zh_TW.po | 38 ++++++++++++++------
src/cardman.c | 100 +++++++++++++++++++++++++++-------------------------
src/cm-dinsig.c | 64 ++++++++++++++++-----------------
src/cm-geldkarte.c | 76 +++++++++++++++++++--------------------
src/cm-netkey.c | 55 ++++++++++++++++-------------
src/cm-openpgp.c | 38 ++++++++++----------
src/cm-unknown.c | 12 +++----
19 files changed, 487 insertions(+), 292 deletions(-)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list