summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-03-26 10:20:40 +0100
committerWerner Koch <wk@gnupg.org>2008-03-26 10:20:40 +0100
commita2ede07293ea99fd9c8a211694ee5abd457c3e25 (patch)
treea18f2641548800bf867a630efb13086ba6cde4b3
parentChanged the way i18n files are located under Windows. The setting of the (diff)
downloadgnupg2-a2ede07293ea99fd9c8a211694ee5abd457c3e25.tar.xz
gnupg2-a2ede07293ea99fd9c8a211694ee5abd457c3e25.zip
Preparing a release.
-rw-r--r--NEWS4
-rw-r--r--TODO6
-rw-r--r--configure.ac2
-rw-r--r--po/ChangeLog4
-rw-r--r--po/be.po124
-rw-r--r--po/ca.po124
-rw-r--r--po/cs.po124
-rw-r--r--po/da.po124
-rw-r--r--po/de.po125
-rw-r--r--po/el.po124
-rw-r--r--po/eo.po124
-rw-r--r--po/es.po124
-rw-r--r--po/et.po124
-rw-r--r--po/fi.po124
-rw-r--r--po/fr.po124
-rw-r--r--po/gl.po124
-rw-r--r--po/hu.po124
-rw-r--r--po/id.po124
-rw-r--r--po/it.po124
-rw-r--r--po/ja.po124
-rw-r--r--po/nb.po124
-rw-r--r--po/pl.po125
-rw-r--r--po/pt.po124
-rw-r--r--po/pt_BR.po124
-rw-r--r--po/ro.po124
-rw-r--r--po/ru.po124
-rw-r--r--po/sk.po124
-rw-r--r--po/sv.po124
-rw-r--r--po/tr.po124
-rw-r--r--po/zh_CN.po124
-rw-r--r--po/zh_TW.po124
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/app-openpgp.c90
33 files changed, 1919 insertions, 1541 deletions
diff --git a/NEWS b/NEWS
index 95e00e5f5..08752e435 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.9 (unreleased)
+Noteworthy changes in version 2.0.9 (2008-03-26)
------------------------------------------------
* Gpgsm always tries to locate missing certificates from a running
@@ -6,6 +6,8 @@ Noteworthy changes in version 2.0.9 (unreleased)
* Tweaks for Windows.
+ * The Admin PIN for OpenPGP cards may now be entered with the pinpad.
+
* Improved certificate chain construction.
* Extended the PKITS framework.
diff --git a/TODO b/TODO
index 95a89dba3..c1392db74 100644
--- a/TODO
+++ b/TODO
@@ -68,7 +68,7 @@
not a real problem because application will get a card removed
status and should the send a reset to try solving the problem.
-** Add a test to check the extkeyusage.
+** Add a regression test to check the extkeyusage.
* Windows port (W32)
** No card status notifications.
@@ -124,10 +124,6 @@
* Howtos
** Migrate OpenPGP keys to another system
-* Duplicate certificates
- This may happen and lead to an Ambiguous Name error. Solution is to
- check the certs for identity before throwing this error.
-
* Gpg-Agent Locale
Although we pass LC_MESSAGE from gpgsm et al. to Pinentry, this has
only an effect on the stock GTK strings (e.g. "OK") and not on any
diff --git a/configure.ac b/configure.ac
index 34b726b1f..2fe53f2a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.10"
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
m4_define([my_version], [2.0.9])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/po/ChangeLog b/po/ChangeLog
index d7a56bc65..f3e903d67 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-26 Werner Koch <wk@g10code.com>
+
+ * de.po: Translate two new strings.
+
2008-02-15 Werner Koch <wk@g10code.com>
* de.po: Translate 3 new strings.
diff --git a/po/be.po b/po/be.po
index 4a0793d37..7a5638776 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -1399,7 +1399,7 @@ msgstr "немагчыма адкрыць \"%s\"\n"
msgid "key \"%s\" not found: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2691,7 +2691,7 @@ msgid "writing to `%s'\n"
msgstr ""
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr ""
@@ -2781,7 +2781,7 @@ msgstr ""
msgid "importing secret keys not allowed\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr ""
@@ -2901,40 +2901,40 @@ msgstr ""
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr ""
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%s: тэчка створана\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr ""
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr ""
@@ -6253,7 +6253,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6277,15 +6277,15 @@ msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
msgid "reading public key failed: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6299,13 +6299,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "збой падпісаньня: %s\n"
@@ -6314,127 +6314,139 @@ msgstr "збой падпісаньня: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "Паўтарыце пароль\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr ""
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr ""
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@ -6837,36 +6849,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index d56942ac3..8319b7335 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -1477,7 +1477,7 @@ msgstr "no s'ha pogut obrir «%s»\n"
msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2834,7 +2834,7 @@ msgid "writing to `%s'\n"
msgstr "s'està escrivint en «%s»\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@ -2924,7 +2924,7 @@ msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no hi ha anell secret predeterminat: %s\n"
@@ -3057,46 +3057,46 @@ msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
"08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
"present.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "la clau pública no coincideix amb la clau secreta!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "es descarta: la clau secreta ja és present\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "es descarta: la clau secreta ja és present\n"
@@ -6725,7 +6725,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6749,15 +6749,15 @@ msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
msgid "reading public key failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6771,13 +6771,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
@@ -6786,128 +6786,140 @@ msgstr "l'enviament al servidor de claus ha fallat: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "canvia la contrasenya"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "error en crear «%s»: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "error: l'empremta digital és invàlida\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "«%s» ja està comprimida\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "genera un nou parell de claus"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
@@ -7338,36 +7350,36 @@ msgstr ""
"«%2$.*1$s»\n"
"clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index e4f44ce16..351868d43 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp@tns.cz>\n"
"Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -1404,7 +1404,7 @@ msgstr "nelze otevt `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "kl \"%s\" nenalezen: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2741,7 +2741,7 @@ msgid "writing to `%s'\n"
msgstr "zapisuji do '%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "chyba pi zpisu souboru kl (keyring) `%s': %s\n"
@@ -2830,7 +2830,7 @@ msgstr "kl %s: tajn kl s neplatnou ifrou %d - peskoeno\n"
msgid "importing secret keys not allowed\n"
msgstr "import tajnch kl nen povolen\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nen nastaven implicitn soubor tajnch kl %s\n"
@@ -2952,41 +2952,41 @@ msgstr "kl %s: podpis podkle na patnm mst - peskoeno \n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kl %s: neoekvan podpisov tda (0x%02X) - peskoeno\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kl %s: objeven duplikovan identifiktor uivatele - slouen\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVN: kl %s me bt revokovn: zkoum zskat revokan kl %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VAROVN: kl %s me bt revokovn: revokan kl %s nenalezen.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kl %s: \"%s\" pidn revokan certifikt\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "kl %s: podpis kle jm samm (direct key signature) pidn\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "POZNMKA: S/N kle neodpovd S/N karty\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "POZNMKA: primrn kl je online a je uloen na kart\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "POZNMKA: sekundrn kl je online a je uloen na kart\n"
@@ -6424,7 +6424,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "funkce PIN callback zkonila chybou: %s\n"
@@ -6448,15 +6448,15 @@ msgstr "uloen datumu vytvoen se nezdailo: %s\n"
msgid "reading public key failed: %s\n"
msgstr "ten veejnho kle se nezdailo: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "odpov neobsahuje veejn kl\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "odpov neobsahuje RSA modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "odpov neobsahuje veejn RSA exponent\n"
@@ -6470,13 +6470,13 @@ msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN pro CHV%d je pli krtk; minimln dlka je %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verifikace CHV%d se nezdaila: %s\n"
@@ -6485,126 +6485,138 @@ msgstr "verifikace CHV%d se nezdaila: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "pstup k administrtorskm pkazm nen nakonfigurovn\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "chyba pi zskn CHV z karty\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamena!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"Do trvalho uzamen karty zstv %d pokus o zadn PINu administrtora\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|PIN administrtora"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Nov PIN administrtora"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Nov PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba pi zskn novho PINu: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "chyba pi ten aplikanch dat\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "chyba pi ten fingerpritnu DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "kl ji existuje\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "existujc kl bude pepsn\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "generovn novho kle\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "chyb asov raztko vytvoen\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "schz RSA modulus nebo nem velikost %d bit\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "schz veejn RSA exponent nebo je del ne %d bit\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "schz RSA prime %s nebo nem velikost %d bit\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nelze uloit kl: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "prosm pokejte ne bude kl vygenerovn ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "henerovn kle se nezdailo\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generovn kle dokoneno (%d sekund)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "neplatn struktura OpenPGP kraty (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "podpis %s, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dosud vytvoen podpisy: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"oven administrtorskho PIN je nyn prostednictvm tohoto pkazu "
"zakzno\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "pstup na %s se nezdail - vadn OpenPGP karta?\n"
@@ -7009,36 +7021,36 @@ msgstr ""
"\"%.*s\"\n"
"Kl o dlce %u bit, typ %s, ID %s, vytvoen %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pi zskn informac o aktulnm kli: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/da.po b/po/da.po
index 0ad9cb6f5..5bf0629ae 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -1418,7 +1418,7 @@ msgstr "kan ikke bne `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -2738,7 +2738,7 @@ msgid "writing to `%s'\n"
msgstr "skriver til `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
@@ -2828,7 +2828,7 @@ msgstr "ngle %08lX: ikke en rfc2440 ngle - udeladt\n"
msgid "importing secret keys not allowed\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, fuzzy, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen standard offentlig nglering\n"
@@ -2948,41 +2948,41 @@ msgstr "ngle %08lX: ikke en rfc2440 ngle - udeladt\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ngle %08lX: ikke en rfc2440 ngle - udeladt\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: Denne ngle er blevet annulleret af dets ejer!\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ADVARSEL: Denne ngle er blevet annulleret af dets ejer!\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ngle %08lX: offentlig ngle importeret\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "ngle %08lX: offentlig ngle importeret\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "udelod: hemmelig ngle er allerede tilstede\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "udelod: hemmelig ngle er allerede tilstede\n"
@@ -6403,7 +6403,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6428,15 +6428,15 @@ msgstr "ingen standard offentlig nglering\n"
msgid "reading public key failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6450,13 +6450,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "pkldning af beskyttelse fejlede: %s\n"
@@ -6465,129 +6465,141 @@ msgstr "pkldning af beskyttelse fejlede: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "ndr kodestningen"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "fejl i trailerlinie\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "fjern ngle fra den hemmelige nglering"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "generr et nyt nglepar"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
# er det klogt at overstte TrustDB?
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signatur fra: %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -6995,36 +7007,36 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index b1d931e8e..ea5fdeaa8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.6\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
-"PO-Revision-Date: 2008-03-13 01:10+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
+"PO-Revision-Date: 2008-03-26 09:56+0100\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -1398,7 +1398,7 @@ msgstr "'%s' kann nicht geöffnet werden\n"
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2740,7 +2740,7 @@ msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
@@ -2831,7 +2831,7 @@ msgstr ""
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
@@ -2958,44 +2958,44 @@ msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"Schlüssel %s: unerwartete Unterschriftenklasse (0x%02x) - übersprungen\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
"vorhanden\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
"Hinweis: Eine Schlüsselseriennr stimmt nicht mit derjenigen der Karte "
"überein\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "Hinweis: Hauptschlüssel ist online und auf der Karte gespeichert\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "Hinweis: Zweitschlüssel ist online und auf der Karte gespeichert\n"
@@ -6493,7 +6493,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6517,15 +6517,15 @@ msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
msgid "reading public key failed: %s\n"
msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
@@ -6541,13 +6541,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
@@ -6556,125 +6556,136 @@ msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "Karte ist dauerhaft gesperrt!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben%%0A[Verbliebene Versuche: %d]"
+
+#: scd/app-openpgp.c:1506
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Admin-PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Neue Admin-PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Neue PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "Fehler beim Lesen der Anwendungsdaten\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "Schlüssel existiert bereits\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "Existierender Schlüssel wird ersetzt werden\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "neue Schlüssel werden erzeugt\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "Erzeugungsdatum fehlt\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "Schlüsselerzeugung fehlgeschlagen\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
"worden\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -7074,39 +7085,39 @@ msgstr ""
"gültig von %s bis %s\\n \n"
"zu entsperren.\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
"Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
"Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
"sollen\n"
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
diff --git a/po/el.po b/po/el.po
index 4f17d54a0..35472e69a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1430,7 +1430,7 @@ msgstr " `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr " '%s' : %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2774,7 +2774,7 @@ msgid "writing to `%s'\n"
msgstr " `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr " `%s': %s\n"
@@ -2864,7 +2864,7 @@ msgstr " %08lX: . %d - \n"
msgid "importing secret keys not allowed\n"
msgstr " `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr " : %s\n"
@@ -2990,46 +2990,46 @@ msgstr ""
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr " %08lX: (0x%02x) - \n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr " %08lX: user ID - \n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
": %08lX : %"
"08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
": %08lX : %08lX\n"
" .\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr " %08lX: \"%s\" \n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr " %08lX: \n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr " !\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr ": \n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr ": \n"
@@ -6597,7 +6597,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6621,15 +6621,15 @@ msgstr " cache : %s\n"
msgid "reading public key failed: %s\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6643,13 +6643,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "keyserver : %s\n"
@@ -6658,128 +6658,140 @@ msgstr "keyserver : %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr " "
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: free : %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' \n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr " "
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr " TrustDB: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s , %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr " OpenPGP .\n"
@@ -7188,36 +7200,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s , ID %08lX, %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr " `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 97eeda391..15b833282 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -1437,7 +1437,7 @@ msgstr "ne povas malfermi '%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "losilo '%s' ne trovita: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2759,7 +2759,7 @@ msgid "writing to `%s'\n"
msgstr "skribas al '%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eraro dum skribado de losilaro '%s': %s\n"
@@ -2849,7 +2849,7 @@ msgstr "losilo %08lX: sekreta losilo sen publika losilo - ignorita\n"
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "mankas implicita sekreta losilaro: %s\n"
@@ -2970,41 +2970,41 @@ msgstr "losilo %08lX: revokatestilo en malusta loko - ignorita\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTO: i tiu losilo estas revokita de sia posedanto!\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVERTO: i tiu losilo estas revokita de sia posedanto!\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "losilo %08lX: revokatestilo aldonita\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "losilo %08lX: rekta losilsubskribo aldonita\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorita: sekreta losilo jam eestas\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorita: sekreta losilo jam eestas\n"
@@ -6551,7 +6551,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6575,15 +6575,15 @@ msgstr "malsukcesis rekonstrui losilaran staplon: %s\n"
msgid "reading public key failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6597,13 +6597,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
@@ -6612,128 +6612,140 @@ msgstr "Kreado de losiloj malsukcesis: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "ani la pasfrazon"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "eraro dum legado de losilbloko: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "'%s' jam densigita\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "krei novan losilparon"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -7153,36 +7165,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bita %s losilo, ID %08lX, kreita je %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 05ceb008d..641d4f936 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator: Jaime Surez <jsuarez@ono.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -1440,7 +1440,7 @@ msgstr "no se puede abrir `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2771,7 +2771,7 @@ msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
@@ -2860,7 +2860,7 @@ msgstr "clave %s: clave secreta con cifrado invlido %d - omitida\n"
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no hay anillo secreto de claves por defecto: %s\n"
@@ -2982,42 +2982,42 @@ msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: recuperando clave de revocacin %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: falta clave de revocacin %s.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocacin aadido\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave aadida\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOTA: clave primaria en lnea y almacenada en la tarjeta\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOTA: clave secundaria en lnea y almacenada en la tarjeta\n"
@@ -6460,7 +6460,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "la funcin de manejo del PIN devolvi un error: %s\n"
@@ -6484,15 +6484,15 @@ msgstr "fallo guardando la fecha de creacin: %s\n"
msgid "reading public key failed: %s\n"
msgstr "fallo leyendo la clave\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "la respuesta no incluye la clave pblica\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "la respuesta no incluye el mdulo RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "la respuesta no incluye el exponente pblico RSA\n"
@@ -6506,13 +6506,13 @@ msgstr "PIN [firmas hechas: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "PIN [firmas hechas: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "El PIN para CHV%d es demasiado corto; longitud mnima %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la verificacin CHV%d fall: %s\n"
@@ -6521,125 +6521,137 @@ msgstr "la verificacin CHV%d fall: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "el acceso a rdenes de administrador no est configurado\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "error recuperando el estatus CHV de la tarjeta\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "la tarjeta est bloqueada permanentemente!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"%d intentos quedan para PIN de administrador antes de "
"bloquearpermanentemente la clave\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "PIN [firmas hechas: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|PIN Administrador"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Nuevo PIN Administrador"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Nuevo PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "error leyendo datos de la aplicacin\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "error leyendo huella digital DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "la clave ya existe\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "la clave existente ser reemplazada\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "generando nueva clave\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "exponente pblico demasiado grande (ms de 32 bits)\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "fallo al almacenar la clave: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "por favor, espere mientras se genera la clave ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "la generacin de la clave fall\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generacin de clave completada (%d segundos)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "estructura de la tarjeta OpenPGP invlida (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "firma %s, algoritmo de resumen %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - tarjeta OpenPGP invlida?\n"
@@ -7060,36 +7072,36 @@ msgstr ""
"del usuario: \"%.*s\"\n"
"%u bits, clave %s, ID %s, creada el %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "error obteniendo la informacin actual de la clave: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/et.po b/po/et.po
index 9eaeab3d8..3662e2bc5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -1428,7 +1428,7 @@ msgstr "`%s' ei nnestu avada\n"
msgid "key \"%s\" not found: %s\n"
msgstr "vtit '%s' ei leitud: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2755,7 +2755,7 @@ msgid "writing to `%s'\n"
msgstr "kirjutan faili `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "viga vtmehoidlasse `%s' kirjutamisel: %s\n"
@@ -2845,7 +2845,7 @@ msgstr "vti %08lX: salajane vti vigase ifriga %d - jtsin vahele\n"
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "puudub salajaste vtmete vaikimisi vtmehoidla: %s\n"
@@ -2966,44 +2966,44 @@ msgstr "vti %08lX: alamvtme allkiri on vales kohas - jtan vahele\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "vti %08lX: ootamatu allkirja klass (0x%02x) - jtan vahele\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "vti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"HOIATUS: vti %08lX vib olla thistatud: laen thistamise vtit %08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"HOIATUS: vti %08lX vib olla thistatud: thistamise vtit %08lX pole.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "vti %08lX: \"%s\" thistamise sertifikaat lisatud\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "vti %08lX: lisatud vahetu vtme allkiri\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "avalik vti ei sobi salajase vtmega!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "jtsin vahele: avalik vti on juba olemas\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "jtsin vahele: avalik vti on juba olemas\n"
@@ -6518,7 +6518,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6542,15 +6542,15 @@ msgstr "vtmehoidla vahemlu uuesti loomine ebannestus: %s\n"
msgid "reading public key failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6564,13 +6564,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "vtmeserverile saatmine ebannestus: %s\n"
@@ -6579,128 +6579,140 @@ msgstr "vtmeserverile saatmine ebannestus: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "muuda parooli"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "viga vtmebloki lugemisel: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' on juba pakitud\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "genereeri uus vtmepaar"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB initsialiseerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s allkiri, snumilhendi algoritm %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
@@ -7108,36 +7120,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bitti %s vti, ID %08lX, loodud %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9dd71aa94..98086bb36 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -1447,7 +1447,7 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2777,7 +2777,7 @@ msgid "writing to `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@ -2867,7 +2867,7 @@ msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
@@ -2989,45 +2989,45 @@ msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
"ei saatavilla.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -6583,7 +6583,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6607,15 +6607,15 @@ msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
msgid "reading public key failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6629,13 +6629,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -6644,129 +6644,141 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "muuta salasanaa"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" on jo pakattu\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "luo uusi avainpari"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -7174,36 +7186,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index af2b741c3..ebcafa7f0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -1429,7 +1429,7 @@ msgstr "impossible d'ouvrir `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "cl %s introuvable: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2801,7 +2801,7 @@ msgid "writing to `%s'\n"
msgstr "criture de `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls `%s': %s\n"
@@ -2892,7 +2892,7 @@ msgstr ""
msgid "importing secret keys not allowed\n"
msgstr "il est interdit d'importer les cl secrtes\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "pas de porte-cls par dfaut: %s\n"
@@ -3016,44 +3016,44 @@ msgstr "cl %s: signature de sous-cl au mauvais endroit - ignore\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cl %s: classe de signature non attendue (0x%02X) - ignore\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cl %s: nom d'utilisateur en double dtect - fusion accomplie\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVERTISSEMENT: la cl %s est peut-tre rvoque: recherche de\n"
"la cl de rvocation %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISSEMENT: la cl %s est peut-tre rvoque: la cl de\n"
"rvocation %s est absente.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cl %s: certificat de rvocation %s ajout\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cl %s: ajout de la signature de cl directe\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOTE: le numro de srie d'une cl n'est pas celui de la carte\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOTE: la cl primaire est en ligne et stocke sur la carte\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOTE: la cl secondaire est en ligne et stocke sur la carte\n"
@@ -6605,7 +6605,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "l'appel du PIN a retourn une erreur: %s\n"
@@ -6629,15 +6629,15 @@ msgstr "impossible de stocker la date de cration: %s\n"
msgid "reading public key failed: %s\n"
msgstr "la lecture de la cl publique a chou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "la rponse ne contient pas les donnes de cl publique\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "la rponse ne contient pas le modulo RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "la rponse ne contient pas l'exposant public RSA\n"
@@ -6651,15 +6651,15 @@ msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
"Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
"est %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la vrification CHV%d a chou: %s\n"
@@ -6668,129 +6668,141 @@ msgstr "la vrification CHV%d a chou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "l'accs aux commandes d'administration n'est pas configur\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "erreur pendant la rcupration de l'tat CHV de la carte\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "la carte est irrmdiablement bloque !\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"%d tentatives de PIN admin restent jusqu' ce que la carte\n"
"soit irrmdiablement bloque\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|code PIN d'administration"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Nouveau code PIN d'administration"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Nouveau code PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "erreur pendant la lecture de donnes d'application\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "erreur pendant la lecture de l'empreinte DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "la cl existe dj\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "la cl existante sera remplace\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "gnrer une nouvelle cl\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "l'horodatage de cration est manquant\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "l'exposant public RSA est manquant ou trop lev (plus de %d bits)\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
"le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
"%d bits\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "le stockage de la cl a chou: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "attendez que la cl se gnre...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "la gnration de la cl a chou\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "la gnration de cl a t effectue (%d secondes)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signature %s, algorithme de hachage %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signatures cres jusqu'ici: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"la vrification du code PIN d'administration est actuellement interdite\n"
"au travers de cette commande\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "impossible d'accder %s - carte OpenPGP invalide ?\n"
@@ -7196,38 +7208,38 @@ msgstr ""
"\"%.*s\"\n"
"cl %u bits %s, ID %s, cre %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr ""
"erreur durant la lecture des informations contenues actuellement\n"
"dans la cl: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 10fca65ed..7a12a4c73 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -1438,7 +1438,7 @@ msgstr "non se puido abrir `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2771,7 +2771,7 @@ msgid "writing to `%s'\n"
msgstr "escribindo a `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
@@ -2865,7 +2865,7 @@ msgstr "chave %08lX: chave secreta cunha cifra %d non vlida - omitida\n"
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "non hai un chaveiro privado por defecto: %s\n"
@@ -2992,46 +2992,46 @@ msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocacin %"
"08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocacin %08lX "
"ausente.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocacin engadido\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "a chave pblica con coincide coa chave secreta!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "omtese: a chave secreta xa est presente\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "omtese: a chave secreta xa est presente\n"
@@ -6592,7 +6592,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6616,15 +6616,15 @@ msgstr "fallo ao reconstru-la cach de chaveiros: %s\n"
msgid "reading public key failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6638,13 +6638,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "o envo ao servidor de chaves fallou: %s\n"
@@ -6653,128 +6653,140 @@ msgstr "o envo ao servidor de chaves fallou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "cambia-lo contrasinal"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' xa est comprimido\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "xerar un novo par de chaves"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP vlidos.\n"
@@ -7194,36 +7206,36 @@ msgstr ""
"\"%.*s\"\n"
"Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index d5ac630a7..746932458 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc Lszl <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -1428,7 +1428,7 @@ msgstr "Nem tudom megnyitni %s-t!\n"
msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem tallhat: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2752,7 +2752,7 @@ msgid "writing to `%s'\n"
msgstr "rok a \"%s\" llomnyba.\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika rsakor: %s\n"
@@ -2843,7 +2843,7 @@ msgstr ""
msgid "importing secret keys not allowed\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "Nincs alaprtelmezett titkoskulcs-karika: %s\n"
@@ -2965,46 +2965,46 @@ msgstr "%08lX kulcs: Alkulcsalrs rossz helyen - kihagytam.\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "%08lX kulcs: Vratlan alrsosztly (0x%02X) - kihagytam.\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "%08lX kulcs: Duplzott felh. azonostt talltam - sszefztem.\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhattk:\n"
"lehvom a %08lX visszavon kulcsot.\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhattk:\n"
"visszavon kulcs (%08lX) nincs jelen.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon igazolst hozzadtam.\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsalrst hozzadtam.\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "A nyilvnos kulcs nem passzol a titkos kulcshoz!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "Kihagytam: titkos kulcs mr jelen van.\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "Kihagytam: titkos kulcs mr jelen van.\n"
@@ -6550,7 +6550,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6574,15 +6574,15 @@ msgstr "Nem tudtam jrapteni a kulcskarika cache-t: %s\n"
msgid "reading public key failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6596,13 +6596,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Klds a kulcsszerverre sikertelen: %s\n"
@@ -6611,128 +6611,140 @@ msgstr "Klds a kulcsszerverre sikertelen: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "jelszvltoztats"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "Hiba a kulcsblokk olvassakor: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: Hiba szabad rekord olvassakor: %s.\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" mr tmrtett.\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "j kulcspr ltrehozsa"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "Bizalmi adatbzis (%s) inicializlsa sikertelen!\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s alrs, %s kivonatol algoritmus.\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem talltam rvnyes OpenPGP adatot.\n"
@@ -7141,36 +7153,36 @@ msgstr ""
"\"%.*s\"\n"
"%u bites %s key, azonost: %08lX, ltrehozva: %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/id.po b/po/id.po
index 0866ba693..7f101c057 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -1431,7 +1431,7 @@ msgstr "tidak dapat membuka `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2762,7 +2762,7 @@ msgid "writing to `%s'\n"
msgstr "menulis ke `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -2852,7 +2852,7 @@ msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "tidak ada keyring rahasia baku: %s\n"
@@ -2974,44 +2974,44 @@ msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "dilewati: kunci pribadi telah ada\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "dilewati: kunci pribadi telah ada\n"
@@ -6544,7 +6544,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6568,15 +6568,15 @@ msgstr "gagal membuat kembali cache keyring: %s\n"
msgid "reading public key failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6590,13 +6590,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
@@ -6605,128 +6605,140 @@ msgstr "Pengiriman keyserver gagal: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "ubah passphrase"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "gagal membaca keyblock: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' sudah dikompresi\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "buat sepasang kunci baru"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -7134,36 +7146,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, tercipta %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 64614fa53..94c2f6d3c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1430,7 +1430,7 @@ msgstr "impossibile aprire `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2766,7 +2766,7 @@ msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@ -2856,7 +2856,7 @@ msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nessun portachiavi segreto predefinito: %s\n"
@@ -2979,46 +2979,46 @@ msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu essere stata revocata: scarico la chiave\n"
"di revoca %08lX.\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu essere stata revocata: la chiave di\n"
"revoca %08lX non presente.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "saltata: chiave pubblica gi presente\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "saltata: chiave pubblica gi presente\n"
@@ -6588,7 +6588,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6612,15 +6612,15 @@ msgstr "rebuild della cache del portachiavi fallito: %s\n"
msgid "reading public key failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6634,13 +6634,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
@@ -6649,128 +6649,140 @@ msgstr "invio al keyserver fallito: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "cambia la passphrase"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "errore leggendo il keyblock: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' gi compresso\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "genera una nuova coppia di chiavi"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -7178,36 +7190,36 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 75c5426c6..760aef99d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -1404,7 +1404,7 @@ msgstr "%sפޤ\n"
msgid "key \"%s\" not found: %s\n"
msgstr "%sɤĤޤ: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2709,7 +2709,7 @@ msgid "writing to `%s'\n"
msgstr "%sפؤν\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "ء%sפνߥ顼: %s\n"
@@ -2798,7 +2798,7 @@ msgstr "%s: ̵ʰŹˡ%d̩Ǥ - ȤФޤ\n"
msgid "importing secret keys not allowed\n"
msgstr "̩ɹߤ϶ػߤǤ\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "̩ؤޤ: %s\n"
@@ -2918,42 +2918,42 @@ msgstr "%s: ̾ξ꤬äƤޤ - ȤФޤ\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "%s: ͽ̽̾饹 (0x%02X) - ȤФޤ\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "%s: ʣ桼IDθ - ʻ\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ٹ: %sϼ줿褦Ǥ: %sΰФ\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ٹ: %sϼ줿褦Ǥ: %sԺߡ\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%s:%sɼɲ\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "%s: ľܸ̾ɲ\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "̩ȹ礷ޤ!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "̩Ϥ⤦ɤݴɤƤޤ\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "̩Ϥ⤦ɤݴɤƤޤ\n"
@@ -6367,7 +6367,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PINХå顼ᤷޤ: %s\n"
@@ -6391,15 +6391,15 @@ msgstr "ݴɤ˼Ԥޤ: %s\n"
msgid "reading public key failed: %s\n"
msgstr "ɽФ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "˸ǡޤޤƤޤ\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "RSAˡ(modulus)ޤޤƤޤ\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "RSAؿޤޤƤޤ\n"
@@ -6413,13 +6413,13 @@ msgstr "PIN [̾: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "PIN [̾: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%dPINûޤû%d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%dθڤ˼Ԥޤ: %s\n"
@@ -6428,125 +6428,137 @@ msgstr "CHV%dθڤ˼Ԥޤ: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "ޥɤؤΥꤵƤޤ\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "ɤCHV֤θǥ顼\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "ɤʵפ˥åޤ!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "ɤαʵץå%dAdmin PINƤޤ\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "PIN [̾: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "PIN [̾: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Admin PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
#, fuzzy
msgid "|AN|New Admin PIN"
msgstr "|A|Admin PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
#, fuzzy
msgid "|N|New PIN"
msgstr "PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "PINμ顼: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "ץꥱ󡦥ǡɽФ顼\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "ǡ֥ȤɽФ顼\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "Ϥ⤦ޤ\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "¸θϸ򴹤ޤ\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "ؿ礭ޤ (32ӥåȤ)\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "δ֡Ԥ ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "˼Ԥޤ\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "λޤ (%d)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGPɤ̵ʹ¤ (ǡ֥ 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s̾󥢥르ꥺ %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "ޤǤ˺줿̾: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s˥Ǥޤ - ̵OpenPGP?\n"
@@ -6953,36 +6965,36 @@ msgstr ""
"\"%.*s\"\n"
"%uӥå%s, ID %sդ%s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Ըμ顼: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 2d3646d65..6eec233e0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrestl <Trond.Endrestol@fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.uio.no>\n"
@@ -1392,7 +1392,7 @@ msgstr "kan ikke pne %s\n"
msgid "key \"%s\" not found: %s\n"
msgstr "nkkelen %s ble ikke funnet: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2695,7 +2695,7 @@ msgid "writing to `%s'\n"
msgstr "skriver til %s\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "feil ved skriving av nkkelknippet %s: %s\n"
@@ -2784,7 +2784,7 @@ msgstr "nkkel %s: hemmelig nkkel med ugyldig cipher %d - hoppet over\n"
msgid "importing secret keys not allowed\n"
msgstr "import av hemmelig nkkel er ikke tillatt\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen standard hemmelig nkkelknippe: %s\n"
@@ -2905,41 +2905,41 @@ msgstr "nkkel %s: undernkkelsignatur p feil plass - hoppet over\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "nkkel %s: duplikert brukerid oppdaget - flettet sammen\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: nkkel %s kan vre opphevet: henter opphevingsnkkel %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: nkkel %s kan vre opphevet: opphevingsnkkel %s ikke tilstede.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nkkel %s: %s opphevingssertifikat lagt til\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nkkel %s: direkte nkkelsignatur lagt til\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr ""
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr ""
@@ -6305,7 +6305,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6329,15 +6329,15 @@ msgstr "klarte ikke lagre opprettelsesdatoen: %s\n"
msgid "reading public key failed: %s\n"
msgstr "lesing av offentlig nkkel mislyktes: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "respons inneholder ikke data om offentlig nkkel\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "respons inneholder ikke RSA-modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
@@ -6351,13 +6351,13 @@ msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %s\n"
@@ -6366,123 +6366,135 @@ msgstr "bekreftelse av CHV%d mislyktes: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "feil ved henting av CHV-status fra kort\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "kort er permanent lst!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "%d Admin PIN-forsk fr kortet blir lst permanent\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Admin PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Ny PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "feil ved lesing av applikasjonsdata\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "feil ved lesing av fingeravtrykk DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "nkkel finnes allerede\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "eksisterende nkkel vil bli erstattet\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "generere en ny nkkel\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "tidsstempel for opprettelse mangler\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA-modulus mangler eller har ikke en strrelse p %d bits\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "offentlig RSA-eksponent mangler eller er strre enn %d bits\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtall %s mangler eller har ikke en strrelse p %d bits\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "klarte ikke lagre nkkelen: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "vennligst vent mens nkkel blir generert ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "nkkelgenerering mislyktes\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nkkelgenerering fullfrt (%d sekunder)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet sttter ikke digestalgoritme %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer opprettet s langt: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "bekrefting av Admin PIN er forelpig nektet gjennom denne kommandoen\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6885,36 +6897,36 @@ msgstr ""
"%.*s\n"
"%u-bit %s nkkel, ID %s, opprettet %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "feil ved henting av nvrende nkkelinfo: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a928ac28f..42f39ce9b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.7\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2007-11-26 19:01+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -1405,7 +1405,7 @@ msgstr "nie mona otworzy ,,%s''\n"
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta odnaleziony: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2726,7 +2726,7 @@ msgid "writing to `%s'\n"
msgstr "zapis do ,,%s''\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "bd zapisu zbioru kluczy ,,%s'': %s\n"
@@ -2815,7 +2815,7 @@ msgstr "klucz %s: klucz tajny z bdnym szyfrem %d - pominity\n"
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "brak domylnego zbioru kluczy tajnych: %s\n"
@@ -2939,44 +2939,44 @@ msgstr "klucz %s: pominito - podpis na podkluczu w niewaciwym miejscu\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klucz %s: pominito - nieoczekiwana klasa podpisu (0x%02X)\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "key %s: doczono powtrzony identyfikator uytkownika\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"OSTRZEENIE: klucz %s mg zosta uniewaniony:\n"
" zapytanie o uniewaniajcy klucz %s w serwerze kluczy\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"OSTRZEENIE: klucz %s mg zosta uniewaniony:\n"
" brak uniewaniajcego klucza %s.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat uniewanienia\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezporedni podpis\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "UWAGA: numer seryjny klucza nie zgadza si z numerem karty\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "UWAGA: klucz gwny jest aktywny i zapisany na karcie\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "UWAGA: klucz dodatkowy jest aktywny i zapisany na karcie\n"
@@ -6440,7 +6440,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Zapytanie zwrotne o PIN zwrcio bd: %s\n"
@@ -6464,15 +6464,15 @@ msgstr "nie powid si zapis daty utworzenia: %s\n"
msgid "reading public key failed: %s\n"
msgstr "odczyt klucza publicznego nie powid si: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "odpowied nie zawiera danych klucza publicznego\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "odpowied nie zawiera wspczynnika RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "odpowied nie zawiera publicznego wykadnika RSA\n"
@@ -6487,13 +6487,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Prosz wpisa PIN%%0A[podpisw wykonanych: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN dla CHV%d jest zbyt krtki; minimalna dugo to %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "weryfikacja CHV%d nie powioda si: %s\n"
@@ -6502,124 +6502,137 @@ msgstr "weryfikacja CHV%d nie powioda si: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "dostp do polece administratora nie zosta skonfigurowany\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "bd podczas odczytu stanu CHV z karty\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "karta zostaa trwale zablokowana!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "Zostao %d prb PIN-u administratora do trwaego zablokowania karty\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+"||Prosz wprowadzi PIN na klawiaturze czytnika%%0A[podpisw wykonanych: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|PIN administratora"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Nowy PIN administratora"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Nowy PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "bd podczas odczytu nowego PIN-u: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "bd podczas odczytu danych aplikacji\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "bd podczas odczytu odcisku DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "klucz ju istnieje\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "istniejcy klucz zostanie zastpiony\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "generowanie nowego klucza\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "brak datownika utworzenia\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "reszta RSA brakujca lub o rozmiarze innym ni %d bity\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "publiczny wykadnik RSA brakujcy lub wikszy ni %d bity\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "liczba pierwsza %s RSA brakujca lub o rozmiarze innym ni %d bitw\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nie powid si zapis klucza: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "prosz czeka na wygenerowanie klucza...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "generowanie klucza nie powiodo si\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generowanie klucza zakoczone (%d sekund)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr "odcisk na karcie nie zgadza si z danym\n"
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "karta nie obsuguje algorytmu skrtu %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dotychczas stworzono podpisw: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"weryfikacja PIN-u administratora tym poleceniem jest aktualnie zabroniona\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie mona dosta si do %s - niepoprawna karta OpenPGP?\n"
@@ -7000,37 +7013,37 @@ msgstr ""
",,%s''\n"
"S/N %s, ID 0x%08lX, stworzony %s"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
"nie okrelono sposobu wykorzystania klucza - przyjto wszystkie sposoby\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "bd podczas pobierania informacji o wykorzystaniu klucza: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "certyfikat nie powinien by uywany do powiadczania\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr "certyfikat nie powinien by uywany do podpisywania odpowiedzi OCSP\n"
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "certyfikat nie powinien by uywany do szyfrowania\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "certyfikat nie powinien by uywany do podpisywania\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "certyfikat nie nadaje si do szyfrowania\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "certyfikat nie nadaje si do podpisywania\n"
diff --git a/po/pt.po b/po/pt.po
index 91e0d6d0d..44d101ac5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@@ -1434,7 +1434,7 @@ msgstr "impossvel abrir `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' no encontrada: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2763,7 +2763,7 @@ msgid "writing to `%s'\n"
msgstr "a escrever para `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@ -2853,7 +2853,7 @@ msgstr "chave %08lX: chave secreta com cifra invlida %d - ignorada\n"
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "sem porta-chaves pblico por omisso: %s\n"
@@ -2976,45 +2976,45 @@ msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocao %"
"08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocao %08lX no "
"presente.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revogao \"%s\" adicionado\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j est presente\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j est presente\n"
@@ -6558,7 +6558,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6582,15 +6582,15 @@ msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
msgid "reading public key failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6604,13 +6604,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
@@ -6619,128 +6619,140 @@ msgstr "A gerao de chaves falhou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "muda a frase secreta"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura do bloco de chave: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler registo livre: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "%s' j comprimido\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "falha ao inicializar a base de dados de confiana: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\n"
@@ -7150,36 +7162,36 @@ msgstr ""
"\"%.*s\"\n"
"chave %u bits %s, ID %08lx, criada %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 590fc52c1..ac0f4c20e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -1442,7 +1442,7 @@ msgstr "impossvel abrir `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "usurio `%s' no encontrado: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -2785,7 +2785,7 @@ msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -2875,7 +2875,7 @@ msgstr "chave %08lX: chave secreta sem chave pblica - ignorada\n"
msgid "importing secret keys not allowed\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, fuzzy, c-format
msgid "no default secret keyring: %s\n"
msgstr "impossvel bloquear chaveiro secreto: %s\n"
@@ -2997,42 +2997,42 @@ msgstr "chave %08lX: certificado de revogao no local errado - ignorada\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura no exportvel (classe %02x) - ignorada\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de usurio duplicado - unido\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revogao adicionado\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "lid %lu no tem chave\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j est presente\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j est presente\n"
@@ -6565,7 +6565,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6589,15 +6589,15 @@ msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
msgid "reading public key failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6611,13 +6611,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
@@ -6626,128 +6626,140 @@ msgstr "A gerao de chaves falhou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "muda a frase secreta"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura de `%s': %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro lendo registro livre: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "%lu chaves processadas\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\n"
@@ -7167,36 +7179,36 @@ msgstr ""
"usurio: \"%.*s\"\n"
"%u-bit %s chave, ID %08lX, criada %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 7f2688687..c17613caa 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -1411,7 +1411,7 @@ msgstr "nu pot deschide `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost gsit: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2745,7 +2745,7 @@ msgid "writing to `%s'\n"
msgstr "scriu n `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@ -2834,7 +2834,7 @@ msgstr "cheia %s: cheie secret cu cifru invalid %d - srit\n"
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nici un inel de chei secrete implicit: %s\n"
@@ -2957,42 +2957,42 @@ msgstr "cheia %s: semntur subcheie ntr-un loc greit - srit\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cheia %s: clas de semntur neateptat (0x%02X) - srit\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTISMENT: cheia %s poate fi revocat: aduc revocarea cheii %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISMENT: cheia %s poate fi revocat: cheia de revocare %s nu este "
"prezent.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am adugat certificatul de revocare \"%s\"\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am adugat semntura de cheie direct\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOT: S/N-ul unei chei nu se potrivete cu cel al cardului\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOT: cheia primar este online i stocat pe card\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOT: cheia secundar este online i stocat pe card\n"
@@ -6449,7 +6449,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6473,15 +6473,15 @@ msgstr "am euat s stochez data crerii: %s\n"
msgid "reading public key failed: %s\n"
msgstr "citirea cheii publice a euat: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "rspunsul nu conine datele cheii publice\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "rspunsul nu conine modulul RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "rspunsul nu conine exponentul public RSA\n"
@@ -6495,13 +6495,13 @@ msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim este %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verificarea CHV%d a euat: %s\n"
@@ -6510,124 +6510,136 @@ msgstr "verificarea CHV%d a euat: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "accesul la comenzile de administrare nu este configurat\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "eroare la recuperarea strii CHV de pe card\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "cardul este ncuiat permanent!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "%d ncercri PIN Admin rmase nainte de a ncuia cardul permanent\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|PIN Admin"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|PIN Admin Nou"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|PIN Nou"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "eroare la obinere noului PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "eroare la citirea datelor aplicaiei\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "eroare la citirea amprentei DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "cheia exist deja\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "cheia existent va fi nlocuit\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "generez o nou cheie\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "timestamp-ul de creare lipsete\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "modulus-ul RSA lipsete sau nu are %d bii\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "exponentul public RSA lipsete sau are mai mult de %d bii\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "prime-ul RSA %s lipsete sau nu are %d bii\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "am euat s stochez cheia: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "v rugm ateptai ct vreme este creat noua cheie ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "generarea cheii a euat\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generarea cheii este complet (%d secunde)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structur invalid a cardului OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "semntur %s, algoritm rezumat %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "semnturi create pn acum: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"verificarea PIN-ului Admin este deocamdat interzis prin aceast comand\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -7037,36 +7049,36 @@ msgstr ""
"\"%.*s\"\n"
"cheia %u-bit %s, ID %s, creat %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eroare la obinerea informaiei pentru cheia curent: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c432def9b..92f544c1d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -1384,7 +1384,7 @@ msgstr "не могу открыть `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2693,7 +2693,7 @@ msgid "writing to `%s'\n"
msgstr "сохраняю в `%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "ошибка записи таблицы ключей `%s': %s\n"
@@ -2782,7 +2782,7 @@ msgstr "ключ %s: секретный ключ с недопустимым ш
msgid "importing secret keys not allowed\n"
msgstr "импортирование секретного ключа не позволено\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "нет основной таблицы секретных ключей: %s\n"
@@ -2903,40 +2903,40 @@ msgstr "ключ %s: подпись подключа в неправильном
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: direct key signature добавлена\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
@@ -6349,7 +6349,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6373,15 +6373,15 @@ msgstr "сбой сохранения даты создания: %s\n"
msgid "reading public key failed: %s\n"
msgstr "сбой чтения открытого ключа: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "ответ не содержит данных открытого ключа\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "в ответе отсутствует модуль RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "в ответе отсутствует открытая экспонента RSA\n"
@@ -6395,13 +6395,13 @@ msgstr "||Введите PIN%%0A[подписей: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Введите PIN%%0A[подписей: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "при проверке CHV%d сбой: %s\n"
@@ -6410,125 +6410,137 @@ msgstr "при проверке CHV%d сбой: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "доступ к командам управления не настроен\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "ошибка получения статуса CHV с карты\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "карта заблокирована!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"осталось %d попыток ввода административного PIN перед блокировкой карты\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Административный PID"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Новый административный PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Новый PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "ошибка при получении нового PIN: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "ошибка чтения данных приложения\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "ошибка чтения отпечатка DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "ключ уже существует\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "существующий ключ будет заменен\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "генерация нового ключа\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "пропущен штамп создания создания\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "сбой сохранения ключа: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "сбой при генерации ключа\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "ключ сгенерирован (%d секунд)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "карта не поддерживает функцию хеширования %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "подписей создано: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"проверка административного PIN в данный момент запрещена этой командой\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6922,36 +6934,36 @@ msgstr ""
"\"%s\"\n"
"S/N %s, ID %08lX, создан %s"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr "не задана применимость ключа - подразумеваем все\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "ошибка получения информации применимости ключа: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "сертификат не следует использовать для сертификации\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "сертификат не следует использовать для шифрования\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "сертификат не следует использовать для подписывания\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "сертификат не применим для шифрования\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "сертификат не применим для подписи\n"
diff --git a/po/sk.po b/po/sk.po
index 380cb2977..9ffe494fc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1430,7 +1430,7 @@ msgstr "nemono otvori `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "k `%s' nebol njden: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2771,7 +2771,7 @@ msgid "writing to `%s'\n"
msgstr "zapisujem do '%s'\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "chyba pri zpise sboru kov (keyring) `%s': %s\n"
@@ -2861,7 +2861,7 @@ msgstr "k %08lX: tajn k bez verejnho ka %d - preskoen\n"
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nie je nastaven implicitn sbor tajnch kov %s\n"
@@ -2985,45 +2985,45 @@ msgstr "k %08lX: podpis subka na zlom mieste - preskoen \n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "k %08lX: neoakvan podpisov trieda (0x%02X) - preskoen\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "k %08lX: zisten duplikovan identifiktor uvatea - zlen\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVANIE: k %08lX me by revokovan: skam zska revokan k %"
"08lX\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROVANIE: k %08lX me by revokovan: revokan k %08lX nenjden.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k %08lX: pridan revokan certifikt \"%s\"\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "k %08lX: podpis ka nm samm (direct key signature)\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "verejn k neshlas s tajnm!\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "preskoen: tajn k je u v databze\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "preskoen: tajn k je u v databze\n"
@@ -6566,7 +6566,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
@@ -6590,15 +6590,15 @@ msgstr "zlyhalo obnovenie vyrovnvacej pamti kov: %s\n"
msgid "reading public key failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6612,13 +6612,13 @@ msgstr ""
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "nepodarilo posla k na server: %s\n"
@@ -6627,128 +6627,140 @@ msgstr "nepodarilo posla k na server: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr ""
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "zmeni heslo"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr ""
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
#, fuzzy
msgid "error reading application data\n"
msgstr "chyba pri tan bloku ka: %s\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: chyba pri tan vonho zznamu: %s\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' je u skomprimovan\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
#, fuzzy
msgid "generating new key\n"
msgstr "vytvori nov pr kov"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "nemem inicializova databzu dvery: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
#, fuzzy
msgid "generating key failed\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s podpis, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenjden iadne platn dta vo formte OpenPGP.\n"
@@ -7156,36 +7168,36 @@ msgstr ""
"\"%.*s\"\n"
"k s dkou %u bitov, typ %s, ID %08lX, vytvoren %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1a97ac5fc..dc7542bd3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2007-11-12 16:08+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1434,7 +1434,7 @@ msgstr "kan inte öppna \"%s\"\n"
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2770,7 +2770,7 @@ msgid "writing to `%s'\n"
msgstr "skriver till \"%s\"\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
@@ -2860,7 +2860,7 @@ msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
@@ -2985,42 +2985,42 @@ msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "nyckel %s: oväntad signaturklass (0x%02X) - hoppade över\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
"nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
"OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
@@ -6522,7 +6522,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr "||Knappa in din PIN-kod på läsarens knappsats"
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -6546,15 +6546,15 @@ msgstr "misslyckades med att lagra datum för skapandet: %s\n"
msgid "reading public key failed: %s\n"
msgstr "läsning av publik nyckel misslyckades: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "svaret innehåller inte publikt nyckeldata\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "svaret innehåller inte en RSA-modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "svaret innehåller inte den publika RSA-exponenten\n"
@@ -6568,13 +6568,13 @@ msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "validering av CHV%d misslyckades: %s\n"
@@ -6583,125 +6583,137 @@ msgstr "validering av CHV%d misslyckades: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "fel vid hämtning av CHV-status från kort\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "kortet är låst permanent!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||Knappa in din PIN-kod på läsarens knappsats"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Admin PIN-kod"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN-kod"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Ny PIN-kod"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "fel vid läsning av programdata\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "fel vid läsning av fingeravtryckets DO\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "nyckeln finns redan\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "befintlig nyckel kommer att ersättas\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "genererar ny nyckel\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "tidsstämpel för skapandet saknas\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "misslyckades med att lagra nyckeln: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "var god vänta under tiden nyckeln genereras ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "nyckelgenereringen misslyckades\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr "avtrycket på kortet stämmer inte med den begärda\n"
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer skapade hittills: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
"kommando\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -7084,36 +7096,36 @@ msgstr ""
"\"%s\"\n"
"Serienummer %s, id 0x%08lX, skapad %s"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "certifikatet skulle inte använts för certifiering\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "certifikatet skulle inte använts för kryptering\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "certifikatet skulle inte använts för signering\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "certifikatet är inte användbart för kryptering\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "certifikatet är inte användbart för signering\n"
diff --git a/po/tr.po b/po/tr.po
index 6ea3f252d..98cdb89ee 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.9.94\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -1389,7 +1389,7 @@ msgstr "`%s' açılamadı\n"
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2703,7 +2703,7 @@ msgid "writing to `%s'\n"
msgstr "\"%s\"e yazıyor\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
@@ -2792,7 +2792,7 @@ msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "öntanımlı gizli anahtarlık yok: %s\n"
@@ -2918,44 +2918,44 @@ msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
"anahtarı %s alınıyor\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
"anahtarı %s mevcut değil.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
@@ -6441,7 +6441,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr "bir okuyucu tuştakımı kullanılmaz"
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6465,15 +6465,15 @@ msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
msgid "reading public key failed: %s\n"
msgstr "genel anahtar okuması başarısız: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "yanıt genel anahtar verisi içermiyor\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "yanıt RSA modülü içermiyor\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "yanıt RSA genel bileşenini içermiyor\n"
@@ -6487,13 +6487,13 @@ msgstr "bir okuyucu tuştakımı kullanılmaz"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
@@ -6502,124 +6502,136 @@ msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "karttan CHV durumu alınırken hata\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "kart kalıcı olarak kilitli!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
"kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "bir okuyucu tuştakımı kullanılmaz"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "bir okuyucu tuştakımı kullanılmaz"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|Yönetici PIN'i"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|Yeni Yönetici PIN'i"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|Yeni PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "uygulama verisi okunurken hata\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "parmakizi DO okunurken hata\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "anahtar zaten mevcut\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "mevcut anahtar konulacak\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "yeni anahtar üretiliyor\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "oluşturum zaman damgası kayıp\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "anahtarın saklanması başarısız: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "anahtar üretimi başarısızlığa uğradı\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kart %s özet algoritmasını desteklemiyor\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -7015,36 +7027,36 @@ msgstr ""
"\"%s\"\n"
"S/N: %s, Kimlik: %08lX, oluşturuluşu: %s"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "sertifika onaylama için kullanılmamalıydı\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "sertifika şifreleme için kullanılmamalıydı\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "sertifika imzalama için kullanılmamalıydı\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "sertifika şifreleme için elverişli değil\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "sertifika imzalama için elverişli değil\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bcc17669a..8cf1c0ae4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -1404,7 +1404,7 @@ msgstr "无法打开‘%s’\n"
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2687,7 +2687,7 @@ msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
@@ -2776,7 +2776,7 @@ msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环: %s\n"
@@ -2900,40 +2900,40 @@ msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意:密钥的序列号与卡的不符\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意:主钥在线,存储在卡上\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意:子钥在线,存储在卡上\n"
@@ -6290,7 +6290,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
@@ -6314,15 +6314,15 @@ msgstr "无法存储创建日期:%s\n"
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
@@ -6336,13 +6336,13 @@ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
@@ -6351,123 +6351,135 @@ msgstr "验证 CHV%d 失败:%s\n"
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|管理员 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6872,36 +6884,36 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 040520453..9ab4127b3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.8\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-03-17 10:57+0100\n"
+"POT-Creation-Date: 2008-03-26 09:52+0100\n"
"PO-Revision-Date: 2008-01-31 23:09+0800\n"
"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -1358,7 +1358,7 @@ msgstr "無法開啟 `%s'\n"
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2638,7 +2638,7 @@ msgid "writing to `%s'\n"
msgstr "寫入 `%s' 中\n"
#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2382 g10/import.c:2404
+#: g10/import.c:2399 g10/import.c:2421
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
@@ -2727,7 +2727,7 @@ msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
-#: g10/import.c:1158 g10/import.c:2397
+#: g10/import.c:1158 g10/import.c:2414
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -2851,40 +2851,40 @@ msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
-#: g10/import.c:1744
+#: g10/import.c:1761
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
-#: g10/import.c:1806
+#: g10/import.c:1823
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
-#: g10/import.c:1820
+#: g10/import.c:1837
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
-#: g10/import.c:1879
+#: g10/import.c:1896
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
-#: g10/import.c:1913
+#: g10/import.c:1930
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
-#: g10/import.c:2302
+#: g10/import.c:2319
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "請注意: 金鑰的序號 (S/N) 與卡片上的並不一致\n"
-#: g10/import.c:2310
+#: g10/import.c:2327
msgid "NOTE: primary key is online and stored on card\n"
msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
-#: g10/import.c:2312
+#: g10/import.c:2329
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "請注意: 子鑰在線上且已存放於卡片上了\n"
@@ -6241,7 +6241,7 @@ msgid "||Please enter your PIN at the reader's keypad"
msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
+#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "收回 PIN 時傳回錯誤: %s\n"
@@ -6265,15 +6265,15 @@ msgstr "存放創生日期失敗: %s\n"
msgid "reading public key failed: %s\n"
msgstr "讀取公鑰時失敗: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2047
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
msgid "response does not contain the public key data\n"
msgstr "回應中未包含公鑰資料\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2055
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
msgid "response does not contain the RSA modulus\n"
msgstr "回應中未包含 RSA 系數\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2065
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
msgid "response does not contain the RSA public exponent\n"
msgstr "回應中未包含 RSA 公用指數\n"
@@ -6287,13 +6287,13 @@ msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1499
-#: scd/app-openpgp.c:2318
+#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
+#: scd/app-openpgp.c:2366
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "驗證 CHV%d 失敗: %s\n"
@@ -6302,123 +6302,135 @@ msgstr "驗證 CHV%d 失敗: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "管理者指令存取權限尚未組態\n"
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
msgid "error retrieving CHV status from card\n"
msgstr "從卡片取回 CHV 狀態時出錯\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
msgid "card is permanently locked!\n"
msgstr "卡片永久鎖定了!!\n"
-#: scd/app-openpgp.c:1473
+#: scd/app-openpgp.c:1481
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
-#. TRANSLATORS: Do not translate the "|A|" prefix but
-#. keep it at the start of the string. We need this elsewhere
-#. to get some infos on the string.
-#: scd/app-openpgp.c:1480
+#: scd/app-openpgp.c:1491
+#, fuzzy, c-format
+msgid ""
+"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
+"%d]"
+msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
+
+#: scd/app-openpgp.c:1506
+#, fuzzy
+msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. We need this elsewhere to
+#. get some infos on the string.
+#: scd/app-openpgp.c:1526
msgid "|A|Admin PIN"
msgstr "|A|管理者 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|AN|New Admin PIN"
msgstr "|AN|新增管理者 PIN"
-#: scd/app-openpgp.c:1629
+#: scd/app-openpgp.c:1677
msgid "|N|New PIN"
msgstr "|N|新增 PIN"
-#: scd/app-openpgp.c:1633
+#: scd/app-openpgp.c:1681
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "取得新的 PIN 時出錯: %s\n"
-#: scd/app-openpgp.c:1683 scd/app-openpgp.c:2133
+#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
msgid "error reading application data\n"
msgstr "讀取應用程式資料時出錯\n"
-#: scd/app-openpgp.c:1689 scd/app-openpgp.c:2140
+#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
msgid "error reading fingerprint DO\n"
msgstr "讀取指紋 DO 時出錯\n"
-#: scd/app-openpgp.c:1699
+#: scd/app-openpgp.c:1747
msgid "key already exists\n"
msgstr "金鑰已存在\n"
-#: scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:1751
msgid "existing key will be replaced\n"
msgstr "既有的金鑰將被取代\n"
-#: scd/app-openpgp.c:1705
+#: scd/app-openpgp.c:1753
msgid "generating new key\n"
msgstr "正在產生新的金鑰\n"
-#: scd/app-openpgp.c:1872
+#: scd/app-openpgp.c:1920
msgid "creation timestamp missing\n"
msgstr "缺漏創生時間戳印\n"
-#: scd/app-openpgp.c:1879
+#: scd/app-openpgp.c:1927
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:1886
+#: scd/app-openpgp.c:1934
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
-#: scd/app-openpgp.c:1894 scd/app-openpgp.c:1901
+#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:1964
+#: scd/app-openpgp.c:2012
#, c-format
msgid "failed to store the key: %s\n"
msgstr "存放金鑰失敗: %s\n"
-#: scd/app-openpgp.c:2024
+#: scd/app-openpgp.c:2072
msgid "please wait while key is being generated ...\n"
msgstr "正在產生金鑰中, 請稍候 ...\n"
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2086
msgid "generating key failed\n"
msgstr "產生金鑰時失敗\n"
-#: scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:2089
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "金鑰產生完畢 (%d 秒)\n"
-#: scd/app-openpgp.c:2098
+#: scd/app-openpgp.c:2146
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
-#: scd/app-openpgp.c:2148
+#: scd/app-openpgp.c:2196
msgid "fingerprint on card does not match requested one\n"
msgstr "卡片上的指紋與所要求的那個並不吻合\n"
-#: scd/app-openpgp.c:2236
+#: scd/app-openpgp.c:2284
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡片不支援 %s 摘要演算法\n"
-#: scd/app-openpgp.c:2297
+#: scd/app-openpgp.c:2345
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前建立的簽章: %lu\n"
-#: scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2631
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
-#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
+#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6799,36 +6811,36 @@ msgstr ""
"\"%s\"\n"
"S/N %s, ID 0x%08lX, 建立於 %s"
-#: sm/certlist.c:121
+#: sm/certlist.c:122
msgid "no key usage specified - assuming all usages\n"
msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
-#: sm/certlist.c:131 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:258
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得金鑰用途資訊時出錯: %s\n"
-#: sm/certlist.c:141
+#: sm/certlist.c:142
msgid "certificate should have not been used for certification\n"
msgstr "憑證應該還未被用於憑證\n"
-#: sm/certlist.c:153
+#: sm/certlist.c:154
msgid "certificate should have not been used for OCSP response signing\n"
msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
-#: sm/certlist.c:164
+#: sm/certlist.c:165
msgid "certificate should have not been used for encryption\n"
msgstr "憑證應該還未被用於加密\n"
-#: sm/certlist.c:165
+#: sm/certlist.c:166
msgid "certificate should have not been used for signing\n"
msgstr "憑證應該還未被用於簽署\n"
-#: sm/certlist.c:166
+#: sm/certlist.c:167
msgid "certificate is not usable for encryption\n"
msgstr "憑證無法用於加密\n"
-#: sm/certlist.c:167
+#: sm/certlist.c:168
msgid "certificate is not usable for signing\n"
msgstr "憑證無法用於簽署\n"
diff --git a/scd/ChangeLog b/scd/ChangeLog
index ad3b211f6..79802a879 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-26 Werner Koch <wk@g10code.com>
+
+ * app-openpgp.c (verify_chv3): Support the keypad.
+
2008-02-09 Marcus Brinkmann <marcus@g10code.de>
* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index e26a31e8d..94dff6058 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1,5 +1,5 @@
/* app-openpgp.c - The OpenPGP card application.
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -1278,7 +1278,7 @@ do_readkey (app_t app, const char *keyid, unsigned char **pk, size_t *pklen)
/* Verify a CHV either using using the pinentry or if possibile by
using a keypad. PINCB and PINCB_ARG describe the usual callback
for the pinentry. CHVNO must be either 1 or 2. SIGCOUNT is only
- ised with CHV1. PINVALUE is the address of a pointer which will
+ used with CHV1. PINVALUE is the address of a pointer which will
receive a newly allocated block with the actual PIN (this is useful
in case that PIN shall be used for another verifiy operation). The
caller needs to free this value. If the function returns with
@@ -1451,10 +1451,16 @@ verify_chv3 (app_t app,
if (!app->did_chv3)
{
- char *pinvalue;
void *relptr;
unsigned char *value;
size_t valuelen;
+ iso7816_pininfo_t pininfo;
+ int minlen = 8;
+ int remaining;
+
+ memset (&pininfo, 0, sizeof pininfo);
+ pininfo.mode = 1;
+ pininfo.minlen = minlen;
relptr = get_one_do (app, 0x00C4, &value, &valuelen, NULL);
if (!relptr || valuelen < 7)
@@ -1469,38 +1475,80 @@ verify_chv3 (app_t app,
xfree (relptr);
return gpg_error (GPG_ERR_BAD_PIN);
}
+ remaining = value[6];
+ xfree (relptr);
log_info(_("%d Admin PIN attempts remaining before card"
- " is permanently locked\n"), value[6]);
- xfree (relptr);
+ " is permanently locked\n"), remaining);
- /* TRANSLATORS: Do not translate the "|A|" prefix but
- keep it at the start of the string. We need this elsewhere
- to get some infos on the string. */
- rc = pincb (pincb_arg, _("|A|Admin PIN"), &pinvalue);
- if (rc)
+ if (!opt.disable_keypad
+ && !iso7816_check_keypad (app->slot, ISO7816_VERIFY, &pininfo) )
{
- log_info (_("PIN callback returned error: %s\n"), gpg_strerror (rc));
- return rc;
- }
+ /* The reader supports the verify command through the keypad. */
+
+ if (remaining < 3)
+ {
+#define PROMPTSTRING _("|A|Please enter the Admin PIN" \
+ " at the reader's keypad%%0A" \
+ "[remaining attempts: %d]")
+ size_t promptsize = strlen (PROMPTSTRING) + 50;
+ char *prompt;
+
+ prompt = xmalloc (promptsize);
+ if (!prompt)
+ return gpg_error_from_syserror ();
+ snprintf (prompt, promptsize-1, PROMPTSTRING, remaining);
+ rc = pincb (pincb_arg, prompt, NULL);
+ xfree (prompt);
+#undef PROMPTSTRING
+ }
+ else
+ rc = pincb (pincb_arg, _("|A|Please enter the Admin PIN"
+ " at the reader's keypad"), NULL);
- if (strlen (pinvalue) < 8)
+ if (rc)
+ {
+ log_info (_("PIN callback returned error: %s\n"),
+ gpg_strerror (rc));
+ return rc;
+ }
+ rc = iso7816_verify_kp (app->slot, 0x83, "", 0, &pininfo);
+ /* Dismiss the prompt. */
+ pincb (pincb_arg, NULL, NULL);
+ }
+ else
{
- log_error (_("PIN for CHV%d is too short;"
- " minimum length is %d\n"), 3, 8);
+ char *pinvalue;
+
+ /* TRANSLATORS: Do not translate the "|A|" prefix but keep
+ it at the start of the string. We need this elsewhere to
+ get some infos on the string. */
+ rc = pincb (pincb_arg, _("|A|Admin PIN"), &pinvalue);
+ if (rc)
+ {
+ log_info (_("PIN callback returned error: %s\n"),
+ gpg_strerror (rc));
+ return rc;
+ }
+
+ if (strlen (pinvalue) < minlen)
+ {
+ log_error (_("PIN for CHV%d is too short;"
+ " minimum length is %d\n"), 3, minlen);
+ xfree (pinvalue);
+ return gpg_error (GPG_ERR_BAD_PIN);
+ }
+
+ rc = iso7816_verify (app->slot, 0x83, pinvalue, strlen (pinvalue));
xfree (pinvalue);
- return gpg_error (GPG_ERR_BAD_PIN);
}
-
- rc = iso7816_verify (app->slot, 0x83, pinvalue, strlen (pinvalue));
- xfree (pinvalue);
+
if (rc)
{
log_error (_("verify CHV%d failed: %s\n"), 3, gpg_strerror (rc));
flush_cache_after_error (app);
return rc;
}
- app->did_chv3 = 1;
}
return rc;
}