summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-03-24 19:52:24 +0100
committerWerner Koch <wk@gnupg.org>2009-03-24 19:52:24 +0100
commit458cd4a976101806ffbdca1645c643a08e6a7255 (patch)
tree35029597340c605bd624e103d2df616c979123b7 /po
parentBetter syncronization of several smartcard sessions. (diff)
downloadgnupg2-458cd4a976101806ffbdca1645c643a08e6a7255.tar.xz
gnupg2-458cd4a976101806ffbdca1645c643a08e6a7255.zip
Preparing a snapshot.
Diffstat (limited to 'po')
-rw-r--r--po/be.po483
-rw-r--r--po/ca.po485
-rw-r--r--po/cs.po490
-rw-r--r--po/da.po486
-rw-r--r--po/de.po511
-rw-r--r--po/el.po485
-rw-r--r--po/eo.po484
-rw-r--r--po/es.po497
-rw-r--r--po/et.po485
-rw-r--r--po/fi.po485
-rw-r--r--po/fr.po490
-rw-r--r--po/gl.po485
-rw-r--r--po/hu.po485
-rw-r--r--po/id.po485
-rw-r--r--po/it.po485
-rw-r--r--po/ja.po490
-rw-r--r--po/nb.po490
-rw-r--r--po/pl.po496
-rw-r--r--po/pt.po484
-rw-r--r--po/pt_BR.po486
-rw-r--r--po/ro.po490
-rw-r--r--po/ru.po496
-rw-r--r--po/sk.po485
-rw-r--r--po/sv.po497
-rw-r--r--po/tr.po498
-rw-r--r--po/zh_CN.po490
-rw-r--r--po/zh_TW.po492
27 files changed, 7314 insertions, 5901 deletions
diff --git a/po/be.po b/po/be.po
index 15dd1131f..cc33cadfc 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -171,44 +171,64 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Паўтарыце пароль: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Паўтарыце пароль: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Паўтарыце пароль: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr ""
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+msgid "PUK not correctly repeated; try again"
+msgstr ""
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr ""
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
@@ -280,7 +300,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "Паўтарыце пароль\n"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -291,257 +311,257 @@ msgstr ""
"Выбары:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "шматслоўнасьць"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "працаваць менш шматслоўна"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr ""
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr ""
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr ""
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Паўтарыце пароль\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "запіс у stdout\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: тэчка створана\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr ""
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -604,42 +624,42 @@ msgstr ""
msgid "cancelled\n"
msgstr "скасавана карыстальнікам\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "сакрэтны ключ недаступны"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "памылка чытаньня файла"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -649,115 +669,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "yes [так]"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "дрэнны пароль"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
@@ -1140,7 +1163,7 @@ msgstr ""
msgid "This command is only available for version 2 cards\n"
msgstr ""
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr ""
@@ -2544,7 +2567,7 @@ msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для
#: g10/gpgv.c:119
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
@@ -5125,12 +5148,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr ""
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5143,24 +5166,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Паўтарыце пароль\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Увядзіце пароль\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "скасавана карыстальнікам\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5170,12 +5189,12 @@ msgstr ""
"Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
"карыстальніка: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6371,243 +6390,269 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "Паўтарыце пароль\n"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "Паўтарыце пароль\n"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr ""
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "Паўтарыце пароль\n"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "Паўтарыце пароль\n"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr ""
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr ""
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -6981,30 +7026,25 @@ msgstr ""
msgid "none"
msgstr "no [не]"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "невядомая вэрсыя"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7208,27 +7248,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr ""
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr ""
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "збой падпісаньня: %s\n"
@@ -7517,7 +7557,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
msgid "error storing flags: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8097,6 +8137,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Паўтарыце пароль\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "невядомая вэрсыя"
+
#~ msgid "|[file]|make a signature"
#~ msgstr "|[файл]|зрабіць подпіс"
diff --git a/po/ca.po b/po/ca.po
index 1a1bec287..f1e87b20f 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -193,47 +193,68 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "Introduïu el nom d'usuari: "
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repetiu la contrasenya: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repetiu la contrasenya: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetiu la contrasenya: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
@@ -306,7 +327,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "canvia la contrasenya"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -317,264 +338,264 @@ msgstr ""
"Opcions:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detall"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca claus en un servidor de claus"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr ""
"Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualitza la base de dades de confiança"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "error en la creació de la contrasenya: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "error en crear «%s»: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Certificat de revocació vàlid"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: s'ha creat el directori\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: no s'ha pogut crear el directori: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "ha fallat l'actualització de la clau secreta: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -640,43 +661,43 @@ msgstr "error en la creació de la contrasenya: %s\n"
msgid "cancelled\n"
msgstr "Cancel·la"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
# Parts? Peces? ivb
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "parts de la clau secreta no estan disponbles\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "error de lectura: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -686,115 +707,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "sí|si"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "canvia la contrasenya"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "no es pot obrir el fitxer: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "error en crear «%s»: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "%s: no s'ha trobat l'usuari\n"
@@ -1214,7 +1238,7 @@ msgid "This command is only available for version 2 cards\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
# Parts? Peces? ivb
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "parts de la clau secreta no estan disponbles\n"
@@ -2689,8 +2713,9 @@ msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
# Werner FIXME: should it use «Usage»?
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintaxi: gpg [opcions] [fitxers]\n"
@@ -5494,7 +5519,7 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d té el bit crític activat\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID de la clau principal %08lX)"
@@ -5510,7 +5535,7 @@ msgstr " (ID de la clau principal %08lX)"
# Se't passava l'argument «*». printf(3), hieroglyph(7). ivb
# Ah! Prova-ho, no casque alguna cosa :P ivb
# Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5523,24 +5548,20 @@ msgstr ""
"«%2$.*1$s»\n"
"clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repetiu la contrasenya\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Introduïu la contrasenya\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5550,12 +5571,12 @@ msgstr ""
"Necessiteu la contrasenya per desblocar la clau secreta de\n"
"l'usuari: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6859,244 +6880,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "canvia la contrasenya"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "canvia la contrasenya"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Seleccioneu la raó de la revocació:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Seleccioneu la raó de la revocació:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "error en crear «%s»: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "canvia la contrasenya"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "canvia la contrasenya"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Seleccioneu la raó de la revocació:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, 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:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "error: l'empremta digital és invàlida\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "«%s» ja està comprimida\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "genera un nou parell de claus"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, 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:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "Introduïu el nom d'usuari: "
@@ -7488,25 +7535,20 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[no establert]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "error: l'empremta digital és invàlida\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "error: l'empremta digital és invàlida\n"
@@ -7522,7 +7564,7 @@ msgstr "error: l'empremta digital és invàlida\n"
# Se't passava l'argument «*». printf(3), hieroglyph(7). ivb
# Ah! Prova-ho, no casque alguna cosa :P ivb
# Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7734,27 +7776,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "certificat duplicat: esborrat"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "certificat duplicat: esborrat"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -8047,7 +8089,7 @@ msgstr "error en crear «%s»: %s\n"
msgid "error storing flags: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8633,6 +8675,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repetiu la contrasenya\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[no establert]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "s'estan llegint opcions de «%s»\n"
diff --git a/po/cs.po b/po/cs.po
index 44aa670a3..94ef96240 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -172,46 +172,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodailo se vytvoit hashovac tabulku: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN administrtora"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Opakujte tento PIN: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Opakujte tento PIN: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Opakujte tento PIN: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN nen zopakovn sprvn; zkuste to znovu"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN nen zopakovn sprvn; zkuste to znovu"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN nen zopakovn sprvn; zkuste to znovu"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "chyba pi vytven hesla: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: chyba pi zpisu adresovho zznamu: %s\n"
@@ -284,7 +305,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "zmnit heslo"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -295,104 +316,104 @@ msgstr ""
"Monosti:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodatenmi informacemi"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "bt o trochu vc tich"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "tu monosti z `%s'\n"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "vyhledat kle na serveru kl"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "nastavit sadu preferenc pro vybran uivatelsk ID"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizovat databzi dvry"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pi vytven hesla: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -401,158 +422,158 @@ msgstr ""
"Chyby oznamte, prosm, na adresu <gnupg-bugs@gnu.org>.\n"
"Pipomnky k pekladu <rp@tns.cz>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pouit: gpg [monosti] [soubory] (-h pro pomoc)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn soubor s monostmi `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s monostmi `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "tu monosti z `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pi vytven `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemohu vytvoit adres `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nemohu vytvoit `%s': %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nen v tomto sezen dostupn\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pi zskn novho PINu: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "chyba pi hledn zznamu dvryhodnosti v `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "adres `%s' vytvoen\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) selhal v %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "nemohu vytvoit adres `%s': %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualizace tajnho kle selhala: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: peskoeno: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nen v tomto sezen dostupn\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "patn formt promnn prosted GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -618,42 +639,42 @@ msgstr "chyba pi vytven hesla: %s\n"
msgid "cancelled\n"
msgstr "zrueno"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "chyba v `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "soubor s monostmi `%s': %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "tajn sti kle nejsou dostupn\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "chyba pi ten v `%s': %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -663,115 +684,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "zmnit heslo"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pi vytven hesla: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "nemohu otevt podepsan data '%s'\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "chyba pi zskn informac o aktulnm kli: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "chyba pi ten `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "chyba pi ten `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "chyba pi vytven `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[ID uivatele nenalezeno]"
@@ -1164,7 +1188,7 @@ msgstr "nelze provst v dvkovm mdu\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Tento pkaz nen v md %s dovolen.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "tajn sti kle nejsou dostupn\n"
@@ -2592,8 +2616,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pouit: gpg [monosti] [soubory] (-h pro pomoc)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Syntaxe: gpg [volby] [souboru]\n"
@@ -5250,12 +5275,12 @@ msgstr "VAROVN: potencionln nebezpen symetricky zaifrovn kl sezen\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m nastaven kritick bit\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr "(hlavn ID kle %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5268,24 +5293,20 @@ msgstr ""
"\"%.*s\"\n"
"Kl o dlce %u bit, typ %s, ID %s, vytvoen %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Opakovat heslo\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Vloit heslo\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "zrueno uivatelem\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problm s agentem - pouvn agenta vypnuto\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5294,12 +5315,12 @@ msgstr ""
"Muste znt heslo, abyste odemknul(a) tajn kl pro\n"
"uivatele: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "dlka %u bit, typ %s, kl %s, vytvoen %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (podkl na hlavnm kli ID %s)"
@@ -6549,242 +6570,268 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "funkce PIN callback zkonila chybou: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Nov PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba pi zskn novho PINu: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "uloen fingerprintu se nezdailo: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "uloen datumu vytvoen se nezdailo: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "ten veejnho kle se nezdailo: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "odpov neobsahuje veejn kl\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "odpov neobsahuje RSA modulus\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "odpov neobsahuje veejn RSA exponent\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verifikace CHV%d se nezdaila: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "pstup k administrtorskm pkazm nen nakonfigurovn\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "chyba pi zskn CHV z karty\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamena!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|PIN administrtora"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Nov PIN administrtora"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Nov PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "chyba pi ten aplikanch dat\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "chyba pi ten fingerpritnu DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "kl ji existuje\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "existujc kl bude pepsn\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "generovn novho kle\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "chyb asov raztko vytvoen\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nelze uloit kl: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "prosm pokejte ne bude kl vygenerovn ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "henerovn kle se nezdailo\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generovn kle dokoneno (%d sekund)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "neplatn struktura OpenPGP kraty (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "podpis %s, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dosud vytvoen podpisy: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "pstup na %s se nezdail - vadn OpenPGP karta?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|Nov PIN"
@@ -7161,30 +7208,25 @@ msgstr ""
msgid "none"
msgstr "ne"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[nen nastaven]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Chyba: neplatn odpov.\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Chyba: neplatn odpov.\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7395,27 +7437,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "tajn kl \"%s\" nenalezen: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba pi ten bloku kle: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Revokan certifikt vytvoen.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "duplicita pedvolby `%s'\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "smazn bloku kle se nezdailo: %s\n"
@@ -7707,7 +7749,7 @@ msgstr "chyba pi zskn novho PINu: %s\n"
msgid "error storing flags: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8292,6 +8334,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Opakovat heslo\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN administrtora"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[nen nastaven]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "tu monosti z `%s'\n"
diff --git a/po/da.po b/po/da.po
index d326b4586..afdfeed6b 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -171,47 +171,68 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "Indtast bruger-id: "
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Gentag kodestning: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Gentag kodestning: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Gentag kodestning: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "skriver til `%s'\n"
@@ -284,7 +305,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ndr kodestningen"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -295,260 +316,260 @@ msgstr ""
"Indstillinger:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "meddelsom"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "vr mere stille"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|indls udvidelsesmodul FILE"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "eksportr ngler til en ngletjener"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Generr en annullrbar certifikat"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "opdatr tillidsdatabasen"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Rapportr venligst fejl til <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjlp)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "lser indstillinger fra `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "certifikatlseproblem: %s\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: mappe oprettet\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "kan ikke bne %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: udelod: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -610,42 +631,42 @@ msgstr "fejl ved oprettelse af kodestning: %s\n"
msgid "cancelled\n"
msgstr ""
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "panser: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -655,115 +676,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "ndr kodestningen"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "kan ikke bne %s: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "%s: bruger ikke fundet\n"
@@ -1151,7 +1175,7 @@ msgstr ""
msgid "This command is only available for version 2 cards\n"
msgstr ""
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "hemmelig ngle ikke tilgngelig"
@@ -2594,7 +2618,7 @@ msgstr "Brug: gpg [flag] [filer] (-h for hjlp)"
#: g10/gpgv.c:119
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
@@ -5248,12 +5272,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hovedngle-ID %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5265,26 +5289,21 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/passphrase.c:335
-#, fuzzy
-msgid "Repeat passphrase\n"
-msgstr "Gentag kodestning: "
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Indtast kodestning: "
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5293,12 +5312,12 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr ""
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6526,246 +6545,272 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "ndr kodestningen"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "ndr kodestningen"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "rev- forkert ngletilbagekald\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "rev- forkert ngletilbagekald\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
# er det klogt at overstte TrustDB?
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "ingen standard offentlig nglering\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "ndr kodestningen"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "pkldning af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "ndr kodestningen"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "rev- forkert ngletilbagekald\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "fejl i trailerlinie\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "fjern ngle fra den hemmelige nglering"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "generr et nyt nglepar"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signatur fra: %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ingen gyldig OpenPGP data fundet.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "Indtast bruger-id: "
@@ -7146,30 +7191,25 @@ msgstr ""
msgid "none"
msgstr "n"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "ukendt version"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "fejl i trailerlinie\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "fejl i trailerlinie\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7374,27 +7414,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "ngle %08lX: offentlig ngle importeret\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "vis prferencer"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -7688,7 +7728,7 @@ msgstr "fejl ved oprettelse af kodestning: %s\n"
msgid "error storing flags: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8272,6 +8312,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Gentag kodestning: "
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "ukendt version"
+
+#, fuzzy
#~ msgid "read options from file"
#~ msgstr "lser indstillinger fra `%s'\n"
diff --git a/po/de.po b/po/de.po
index 072ce9a9f..38beff522 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.10\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-03 09:09+0100\n"
-"PO-Revision-Date: 2009-01-28 14:12+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
+"PO-Revision-Date: 2009-03-24 18:54+0100\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -175,42 +175,61 @@ msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstrom aus dem Socket schlug fehl: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "Admin-PIN"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr "Rückstellcode"
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr "%s%%0A%%0AZur Eingabe die Tastatur des Kartenlesers verwenden."
+
+#: agent/divert-scd.c:286
msgid "Repeat this Reset Code"
msgstr "Rückstellcode bitte wiederholen"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+msgid "Repeat this PUK"
+msgstr "PUK bitte wiederholen"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "PIN bitte wiederholen"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
@@ -295,7 +314,7 @@ msgstr "Bitte geben Sie die Passphrase ein%0Aum Ihren Schlüssel zu schützen"
msgid "Please enter the new passphrase"
msgstr "Bitte geben Sie die Passphrase ein:"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -304,109 +323,109 @@ msgstr ""
"@Optionen:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "Ausgabe für /bin/sh"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "Im Vordergrund laufen lassen"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "Tastatur und Maus nicht \"grabben\""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "Logausgaben in eine Datei umlenken"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "Benutze einen Standardnamen für den Socket"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|benutze PGM as PIN-Entry"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|benutze PGM as SCdaemon"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "Ignoriere Anfragen, das TTY zu wechseln"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "benutze PINs im Cache nicht bem Signieren"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "erlaube ein \"preset\" von Passphrases"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "Die ssh-agent-Emulation anschalten"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Fehlerberichte bitte an <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -414,144 +433,144 @@ msgstr ""
"Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für GnuPG\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "Der Name des Sockets ist zu lang\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -619,45 +638,45 @@ msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
msgid "cancelled\n"
msgstr "Vom Benutzer abgebrochen\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "Datei `%s', Zeile %d: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
"Anweisung \"%s\" in `%s', Zeile %d\n"
" ignoriert\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr ""
"Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
@@ -667,34 +686,9 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Bitte prüfen Sie, daß das Zertifikat mit dem Namen:%%0A \"%s\"%%0Afolgenden "
-"Fingerabdruck hat:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Korrekt"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -703,22 +697,50 @@ msgstr ""
"Wenn Sie vollständiges Vertrauen haben, daß%%0A \"%s\"%%"
"0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\"."
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "Nein"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Bitte prüfen Sie, daß das Zertifikat mit dem Namen:%%0A \"%s\"%%0Afolgenden "
+"Fingerabdruck hat:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Korrekt"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr "Falsch"
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
"jetzt."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -727,61 +749,61 @@ msgstr ""
"Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
"mehr geändert. Bitte ändern Sie sie jetzt."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "Die Passphrase ändern"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "Fehler bei Ausführung von `%s': beendet\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "Fehler beim Erstellen des Sockets: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "Host nicht gefunden"
@@ -1151,7 +1173,7 @@ msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr "Der Rückstellcode ist nicht vorhanden\n"
@@ -2579,9 +2601,11 @@ msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
#: g10/gpgv.c:119
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
-msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
+msgstr ""
+"Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
+"Prüfe Signaturen gegen eine Liste bekannter Schlüssel\n"
#: g10/helptext.c:72
msgid "No help available"
@@ -5279,12 +5303,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (Hauptschlüssel-ID %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5298,24 +5322,20 @@ msgstr ""
"Benutzer: \"%.*s\"\n"
"%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Geben Sie die Passphrase nochmal ein\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Geben Sie die Passphrase ein\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "Problem mit dem Agenten: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5324,12 +5344,12 @@ msgstr ""
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
"Benutzer: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -6606,244 +6626,273 @@ msgstr ""
"Syntax: kbxutil [Optionen] [Dateien]\n"
"Anlistem exportieren und Importieren von KeyBox Dateien\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-Callback meldete Fehler: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "Die Nullpin wurde noch nicht geändert\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Neue PIN"
+#: scd/app-nks.c:848
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|N|Bitte eine neue PIN für den Standard-Schlüssel eingeben."
+
+#: scd/app-nks.c:849
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
+
+#: scd/app-nks.c:855
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Standard-"
+"Schlüssel ein."
+
+#: scd/app-nks.c:857
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|P|Bitte geben Sie den PIN Entsperrcode (PUK) für den Standard-Schlüssel ein."
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+"|N|Bitte geben Sie eine neue PIN für den Schlüssel zur Erstellung "
+"qualifizierter Signaturen ein."
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+"||Bitte geben Sie die PIN für den Schlüssel zur Erstellung qualifizierter "
+"Signaturen ein."
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
+"Erstellung qualifizierter Signaturen ein."
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
+"Erstellung qualifizierter Signaturen ein."
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
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:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr "Die Standard PIN wird für %s benutzt\n"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
"wird nicht weiter benutzt\n"
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-"||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs erzeugt: %"
-"lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
msgid "||Please enter the PIN"
msgstr "||Bitte die PIN eingeben"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "Karte ist dauerhaft gesperrt!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, 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:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
-#. 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Admin-PIN"
+#: scd/app-openpgp.c:1654
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Bitte die Admin-PIN eingeben."
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
msgid "||Please enter the Reset Code for the card"
msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr "|RN|Neuer Rückstellcode"
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Neue Admin-PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Neue PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "Fehler beim Lesen der Anwendungsdaten\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "Schlüssel existiert bereits\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "Existierender Schlüssel wird ersetzt werden\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "neue Schlüssel werden erzeugt\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "Erzeugungsdatum fehlt\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "Schlüsselerzeugung fehlgeschlagen\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
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:2768
+#: scd/app-openpgp.c:2794
#, 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:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
+
#. 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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|Erstmalige neue PIN"
@@ -7214,27 +7263,23 @@ msgstr "(Dies ist der MD2 Algorithmus)\n"
msgid "none"
msgstr "keine"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[keine]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Fehler - Ungültige Kodierung]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[Fehler - Nicht genügend Speicher]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Fehler - Kein Name]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Fehler - Ungültiger DN]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7446,27 +7491,27 @@ msgstr "(Dies ist der RC-2 Algorithmus)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(dies is wahrscheinlich keine verschlüsselte Nachricht)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "Zertifikat `%s' nicht gefunden: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "Fehler beim Sperren der Keybox: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Doppeltes Zertifikat `%s' gelöscht\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "Zertifikat `%s' gelöscht\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
@@ -7738,7 +7783,7 @@ msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
msgid "error storing flags: %s\n"
msgstr "Fehler beim Speichern der Flags: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "Fehler - "
@@ -8326,6 +8371,20 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Geben Sie die Passphrase nochmal ein\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr ""
+#~ "||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs "
+#~ "erzeugt: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin-PIN"
+
+#~ msgid "[none]"
+#~ msgstr "[keine]"
+
#~ msgid "read options from file"
#~ msgstr "Konfigurationsoptionen aus Datei lesen"
diff --git a/po/el.po b/po/el.po
index d28a6ad44..30d06b272 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -170,46 +170,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hashtable: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr " : "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr " : "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr " : "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr " . "
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr " . "
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr " . "
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr " : %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr " `%s'\n"
@@ -282,7 +303,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr " "
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -293,263 +314,263 @@ msgstr ""
":\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr ""
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr " "
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|| "
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr " "
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr ""
" user ID; "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr " "
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr " : %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr " <gnupg-bugs@gnu.org>\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr ": gpg [] [] (-h )"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr " `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr " %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr " gpg-agent \n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr " `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: \n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: : %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: : %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr " gpg-agent \n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr " GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -615,42 +636,42 @@ msgstr " : %s\n"
msgid "cancelled\n"
msgstr ""
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr " '%s' : %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr " \n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr " : %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr " `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -660,115 +681,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "|"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr " "
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr " : %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr " : %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr " `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr " `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr " `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr " `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr " `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[User id ]"
@@ -1165,7 +1189,7 @@ msgstr " (batchmode)\n"
msgid "This command is only available for version 2 cards\n"
msgstr " %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr " \n"
@@ -2628,8 +2652,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr ": gpgv [] [] (-h )"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
": gpg [] []\n"
@@ -5392,12 +5417,12 @@ msgstr ": \n"
msgid "subpacket of type %d has critical bit set\n"
msgstr " %d bit\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " ( , ID %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5411,24 +5436,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s , ID %08lX, %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr " \n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr " \n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr " \n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr " agent: agent 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5438,12 +5459,12 @@ msgstr ""
" \n"
" : \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s , ID %08lX, %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6722,244 +6743,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr " "
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr " "
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr " :\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr " :\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr " TrustDB: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr " cache : %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr " "
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "keyserver : %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr " "
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr " :\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: free : %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' \n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr " "
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr " TrustDB: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s , %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr " OpenPGP .\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7338,30 +7385,25 @@ msgstr ""
msgid "none"
msgstr "|"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr ""
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr ": \n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr ": \n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7572,27 +7614,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr " '%s' : %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr " : %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr " .\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr " %c%lu \n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr " block : %s\n"
@@ -7883,7 +7925,7 @@ msgstr " : %s\n"
msgid "error storing flags: %s\n"
msgstr " `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8469,6 +8511,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr " \n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr ""
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr " `%s'\n"
diff --git a/po/eo.po b/po/eo.po
index ae22add26..298da7b37 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -170,47 +170,68 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "Donu la uzantidentigilon: "
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ripetu pasfrazon: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Ripetu pasfrazon: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripetu pasfrazon: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "la pasfrazo ne estis uste ripetita; provu denove"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "skribas al '%s'\n"
@@ -283,7 +304,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ani la pasfrazon"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -294,262 +315,262 @@ msgstr ""
"Opcioj:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detala eligo"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "seri losilojn e losilservilo"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualigi la fido-datenaron"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Valida atestilrevoko"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ne estas disponata en i tiu sesio\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: dosierujo kreita\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu losiloj ignoritaj\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en i tiu sesio\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -615,42 +636,42 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
msgid "cancelled\n"
msgstr "nuligita de uzanto\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "losilo '%s' ne trovita: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "sekretaj losilpartoj ne estas disponataj\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "kiraso: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -660,115 +681,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "jes"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "ani la pasfrazon"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "%s: uzanto ne trovita\n"
@@ -1172,7 +1196,7 @@ msgstr "ne povas fari tion en neinteraga reimo\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Tiu komando ne eblas en la reimo %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "sekretaj losilpartoj ne estas disponataj\n"
@@ -2616,7 +2640,7 @@ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
#: g10/gpgv.c:119
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
@@ -5368,12 +5392,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas altitan \"critical bit\"\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (eflosilo %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5386,24 +5410,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bita %s losilo, ID %08lX, kreita je %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Ripetu pasfrazon\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Donu pasfrazon\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "nuligita de uzanto\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5413,12 +5433,12 @@ msgstr ""
"Vi bezonas pasfrazon por mallosi la sekretan losilon\n"
"por la uzanto: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bita %s-losilo, %08lX, kreita je %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6675,244 +6695,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "ani la pasfrazon"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "ani la pasfrazon"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Kialo por revoko: "
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Kialo por revoko: "
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "malsukcesis rekonstrui losilaran staplon: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "ani la pasfrazon"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "ani la pasfrazon"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Kialo por revoko: "
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "eraro dum legado de losilbloko: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "'%s' jam densigita\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "krei novan losilparon"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, 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:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "Donu la uzantidentigilon: "
@@ -7304,30 +7350,25 @@ msgstr ""
msgid "none"
msgstr "ne"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "nekonata versio"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "%s: nevalida dosiero-versio %d\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "%s: nevalida dosiero-versio %d\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7539,27 +7580,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "losilo '%s' ne trovita: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eraro dum legado de losilbloko: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "ripetita atestilo - forviita"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "ripetita atestilo - forviita"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
@@ -7850,7 +7891,7 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
msgid "error storing flags: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8433,6 +8474,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Ripetu pasfrazon\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "nekonata versio"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "legas opciojn el '%s'\n"
diff --git a/po/es.po b/po/es.po
index 2ad123b31..4ef58ffa1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-12-14 19:34+0100\n"
"Last-Translator: Jaime Surez <jaime@mundocripto.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -193,42 +193,63 @@ msgstr "no coincide - reintntelo"
msgid "failed to create stream from socket: %s\n"
msgstr "fallo al crear un flujo desde el socket: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "PIN del Administrador"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr "Cdigo de Reinicio"
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
msgid "Repeat this Reset Code"
msgstr "Repita este Cdigo de Reinicio"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repita este PIN"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "Repita este PIN"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr "Cdigo de Reinicio repetido incorrectamente; intntelo de nuevo"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN repetido incorrectamente; intntelo de nuevo"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN repetido incorrectamente; intntelo de nuevo"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "error creando fichero temporal: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "error escribiendo en el fichero temporal: %s\n"
@@ -310,7 +331,7 @@ msgstr "Por favor introduzca frase contrasea para%0Aproteger su nueva clave"
msgid "Please enter the new passphrase"
msgstr "Por favor escriba la nueva frase contrasea"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -319,109 +340,109 @@ msgstr ""
"@Opciones:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "prolijo"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "algo ms discreto"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "salida de datos estilo sh"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "no independizarse de la consola"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "no acaparar teclado y ratn"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "usar un fichero log para el servidor"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "usar una localizacin estndar para el socket"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|usar PGM como el programa para entrada de PIN"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|usar PCM como programa SCdaemon"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "no usar SCdaemon"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "ignorar peticiones de cambiar el TTY"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "ignorar peticiones de cambiar el display X"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|los PINs en la cach expiran en N segundos"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "no usar el cach de PINs al firmar"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "permitir que los clientes marquen claves como \"fiables\""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "permitir preestablecer frase contrasea"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "permitir emulacin de ssh-agent"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|FICHERO|escribir variables de entorno tambin en FICHERO"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Por favor, informe de posibles \"bugs\" a <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg-agent [opciones] (-h para ayuda)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -429,145 +450,145 @@ msgstr ""
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "el nivel de depuracin `%s` no es vlido\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "error creando `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "no se puede crear el directorio `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "nombre de socket demasiado largo\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "el nombre de socket `%s' es demasiado largo\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "ya hay un agente gpg ejecutndose - no se inicia otro\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor nico para el socket\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "error enlazando el socket con `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fall: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "escuchando el socket `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "directorio `%s' creado\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() fall para `%s': %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "no puede usar `%s' como directorio personal\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error leyendo valor nico en el descriptor %d: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "manejador 0x%lx para descriptor %d iniciado\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select fall: %s - espero 1s\n"
# msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "no hay un agente gpg ejecutndose en esta sesin\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -642,42 +663,42 @@ msgstr "error pidiendo la frase contrasea: %s\n"
msgid "cancelled\n"
msgstr "cancelado\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "error abriendo `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "fichero `%s', lnea %d: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr "declaracin \"%s\" ignorada en `%s', lnea %d\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "la lista de confianza `%s' del sistema no est disponible\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "huella digital incorrecta en `%s', lnea %d\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "opcin de clave invlida en `%s', lnea %d\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "error leyendo `%s', lnea %d: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "error leyendo la lista de certificados raz fiables\n"
@@ -687,34 +708,9 @@ msgstr "error leyendo la lista de certificados raz fiables\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Por favor verifique que el certificado identificado como:%%0A \"%s\"%%"
-"0Atiene la huella digital:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Correcto"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -723,21 +719,49 @@ msgstr ""
"Confa absolutamente en%%0A \"%s\"%%0A para certificar correctamentelos "
"certificados de otros usuarios?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "S"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "No"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Por favor verifique que el certificado identificado como:%%0A \"%s\"%%"
+"0Atiene la huella digital:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Correcto"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Nota: Esta frase contrasea nunca ha sido cambiada.%0APor favor hgalo ahora."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -746,61 +770,61 @@ msgstr ""
"Esta frase contrasea no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
"cmbiela ahora."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "Cambia la frase contrasea"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "La cambiar ms tarde"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "error creando tubera: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "no puede abrirse tubera para leer: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "error obteniendo cdigo de finalizacin del proceso: %d %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "error ejecutando `%s': cdigo de finalizacin %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "error ejecutando `%s': probablemente no est instalado\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "error ejecutando `%s': terminado\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "error creando socket: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "host no encontrado"
@@ -1170,7 +1194,7 @@ msgstr "imposible hacer esto en modo de proceso por lotes\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Esta orden solo est disponible en tarjetas versin 2\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr "No hay Cdigo de Reinicio o ya no est disponible\n"
@@ -2572,8 +2596,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintaxis: gpg [opciones] [ficheros]\n"
@@ -5222,12 +5247,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit crtico activado\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr "(ID de clave primaria %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5242,24 +5267,20 @@ msgstr ""
"con %u bits clave %s, ID %s,\n"
"creada el %s%s.\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repita frase contrasea\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Introduzca frase contrasea\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "cancelado por el usuario\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con el agente: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5268,12 +5289,12 @@ msgstr ""
"Necesita una frase contrasea para desbloquear la clave secreta\n"
"del usuario: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subclave en clave principal ID %s)"
@@ -6522,241 +6543,268 @@ msgstr ""
"Sintaxis: kbxutil [opciones] [ficheros]\n"
"listar, exportar, importar datos Keybox\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "la funcin de manejo del PIN devolvi un error: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "el PIN-Nulo no ha sido cambiado\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Nuevo PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Introduzca PIN de Administrador en el teclado del lector"
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Por favor introduzca Cdigo de Reinicio de la tarjeta"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Por favor introduzca Cdigo de Reinicio de la tarjeta"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "error obteniendo nuevo PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "fallo al almacenar la huella digital: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "fallo guardando la fecha de creacin: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "fallo leyendo clave pblica: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "la respuesta no incluye la clave pblica\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "la respuesta no incluye el mdulo RSA\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "la respuesta no incluye el exponente pblico RSA\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr "usando PIN por defecto %s\n"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Introduzca su PIN en el teclado del lector%%OA[firmas hechas: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
msgid "||Please enter the PIN"
msgstr "||Por favor introduzca PIN"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la verificacin CHV%d fall: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "el acceso a rdenes de administrador no est configurado\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "error recuperando el estatus CHV de la tarjeta\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "la tarjeta est bloqueada permanentemente!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr ""
"|A|Introduzca PIN de Administrador en el teclado del lector%%0A[intentos "
"restantes %d]"
-#: scd/app-openpgp.c:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|Introduzca PIN de Administrador en el teclado del lector"
-
-#. 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Administrador"
+#: scd/app-openpgp.c:1654
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Por favor introduzca PIN"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
msgid "||Please enter the Reset Code for the card"
msgstr "||Por favor introduzca Cdigo de Reinicio de la tarjeta"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Cdigo de Reinicio demasiado corto; longitud mnima %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr "|CR|Nuevo Cdigo de Reinicio"
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Nuevo PIN Administrador"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Nuevo PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "error leyendo datos de la aplicacin\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "error leyendo huella digital DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "la clave ya existe\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "la clave existente ser reemplazada\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "generando nueva clave\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "falta fecha de creacin\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "falta el mdulo RSA o no es de %d bits\n"
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "falta el exponente pblico RSA o es mayor de %d bits\n"
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "el primo RSA %s falta o no es de %d bits\n"
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "fallo al almacenar la clave: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "por favor, espere mientras se genera la clave ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "la generacin de la clave fall\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generacin de clave completada (%d segundos)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "estructura de la tarjeta OpenPGP invlida (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - tarjeta OpenPGP invlida?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
+
#. 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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|Nuevo PIN Inicial"
@@ -7112,27 +7160,23 @@ msgstr "(es el algoritmo MD2)\n"
msgid "none"
msgstr "ninguno"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[ninguno]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Error - codificacin invlida]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[Error - core]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Error - Sin nombre]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Error - DN invlido]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7339,27 +7383,27 @@ msgstr "(el algoritmo RC2)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(no parece un mensaje cifrado)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "certificado `%s' no encontrado: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "error bloqueando keybox: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "certificado duplicado `%s' borrado\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "certificado `%s' borrado\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
@@ -7638,7 +7682,7 @@ msgstr "error obteniendo parmetros almacenados: %s\n"
msgid "error storing flags: %s\n"
msgstr "error almacenando parmetros: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "Error - "
@@ -8222,6 +8266,19 @@ msgstr ""
"Compara frase contrasea dada en entrada estndar con un fichero de "
"patrones\n"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repita frase contrasea\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr ""
+#~ "||Introduzca su PIN en el teclado del lector%%OA[firmas hechas: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN Administrador"
+
+#~ msgid "[none]"
+#~ msgstr "[ninguno]"
+
#~ msgid "read options from file"
#~ msgstr "leyendo opciones desde fichero"
diff --git a/po/et.po b/po/et.po
index 693929270..464548e39 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -170,46 +170,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: paisktabeli loomine ebannestus: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Korrake parooli: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Korrake parooli: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Korrake parooli: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "parooli ei korratud ieti; proovige uuesti"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "kirjutan faili `%s'\n"
@@ -282,7 +303,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muuda parooli"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -293,262 +314,262 @@ msgstr ""
"Vtmed:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ole jutukas"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ole mnevrra vaiksem"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "otsi vtmeid vtmeserverist"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Kas uuendan testi kik kasutaja ID-de seaded? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "uuenda usalduse andmebaasi"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "viga parooli loomisel: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Kasuta: gpg [vtmed] [failid] (-h nitab abiinfot)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MRKUS: vaikimisi vtmete fail `%s' puudub\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "vtmete fail `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen vtmeid failist `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kataloogi `%s' ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine ebannestus: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: kataloog on loodud\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: lugemine ebannestus (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kataloogi ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salajase vtme uuendamine ebannestus: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jtsin vahele: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -614,42 +635,42 @@ msgstr "viga parooli loomisel: %s\n"
msgid "cancelled\n"
msgstr "Katkesta"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "vtit '%s' ei leitud: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "salajase vtme komponendid ei ole kttesaadavad\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "viga lugemisel: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -659,115 +680,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "jah"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "muuda parooli"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "faili ei nnestu avada: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "viga `%s' loomisel: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[Kasutaja id puudub]"
@@ -1163,7 +1187,7 @@ msgstr "seda ei saa teha pakettmoodis\n"
msgid "This command is only available for version 2 cards\n"
msgstr "See ksklus ei ole %s moodis lubatud.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "salajase vtme komponendid ei ole kttesaadavad\n"
@@ -2608,8 +2632,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kasuta: gpgv [vtmed] [failid] (-h nitab abiinfot)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sntaks: gpg [vtmed] [failid]\n"
@@ -5336,12 +5361,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil tbiga %d on kriitiline bitt seatud\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (peamise vtme ID %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5354,24 +5379,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bitti %s vti, ID %08lX, loodud %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Korrake parooli\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Sisestage parool\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5381,12 +5402,12 @@ msgstr ""
"Te vajate kasutaja salajase vtme lahtilukustamiseks\n"
"parooli: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bitine %s vti, ID %08lX, loodud %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6643,244 +6664,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "muuda parooli"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muuda parooli"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Palun valige thistamise phjus:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Palun valige thistamise phjus:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "TrustDB initsialiseerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "vtmehoidla vahemlu uuesti loomine ebannestus: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muuda parooli"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "vtmeserverile saatmine ebannestus: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "muuda parooli"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Palun valige thistamise phjus:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "viga vtmebloki lugemisel: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' on juba pakitud\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "genereeri uus vtmepaar"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB initsialiseerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s allkiri, snumilhendi algoritm %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7259,30 +7306,25 @@ msgstr ""
msgid "none"
msgstr "ei"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "tundmatu"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "viga: vigane srmejlg\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "viga: vigane srmejlg\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7492,27 +7534,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "vtit '%s' ei leitud: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "viga vtmebloki lugemisel: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Thistamise sertifikaat on loodud.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "eelistus %c%lu on duplikaat\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
@@ -7803,7 +7845,7 @@ msgstr "viga parooli loomisel: %s\n"
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8389,6 +8431,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Korrake parooli\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "tundmatu"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "loen vtmeid failist `%s'\n"
diff --git a/po/fi.po b/po/fi.po
index edfef85cd..ca711b926 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -186,46 +186,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Toista salasana: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Toista salasana: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Toista salasana: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -298,7 +319,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muuta salasanaa"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -309,104 +330,104 @@ msgstr ""
"Valitsimet:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "monisanainen"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "etsi avaimia avainpalvelimelta"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "päivitä luottamustietokanta"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -414,158 +435,158 @@ msgid "Please report bugs to <"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: hakemisto luotu\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -631,42 +652,42 @@ msgstr "virhe luotaessa salasanaa: %s\n"
msgid "cancelled\n"
msgstr "Peru"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "lukuvirhe: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -676,115 +697,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "kyllä|kylla|joo"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "muuta salasanaa"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[Käyttäjätunnusta ei löytynyt]"
@@ -1182,7 +1206,7 @@ msgstr "tätä ei voi tehdä eräajossa\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
@@ -2629,8 +2653,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Käyttö: gpg [valitsimet] [tiedostot]\n"
@@ -5382,12 +5407,12 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (pääavaimen tunnus %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5400,24 +5425,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Toista salasana\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Syötä salasana\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "käyttäjän peruma\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5426,12 +5447,12 @@ msgstr ""
"\n"
"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6708,245 +6729,271 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "muuta salasanaa"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muuta salasanaa"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Valitse mitätöinnin syy:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Valitse mitätöinnin syy:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muuta salasanaa"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "muuta salasanaa"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Valitse mitätöinnin syy:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" on jo pakattu\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "luo uusi avainpari"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
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:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7325,30 +7372,25 @@ msgstr ""
msgid "none"
msgstr "ei"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "tuntematon "
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "virhe: sormenjälki on väärä\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "virhe: sormenjälki on väärä\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7558,27 +7600,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Mitätöintivarmenne luotu.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "valinta %c%lu on kopio\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -7869,7 +7911,7 @@ msgstr "virhe luotaessa salasanaa: %s\n"
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8455,6 +8497,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Toista salasana\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "tuntematon "
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "luetaan asetukset tiedostosta \"%s\"\n"
diff --git a/po/fr.po b/po/fr.po
index f8fe92a9f..49d912477 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-09-30 19:38+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -179,46 +179,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: la cration de la table de hachage a chou: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|code PIN d'administration"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Rptez ce code PIN: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Rptez ce code PIN: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Rptez ce code PIN: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "le code PIN n'a pas t correctement rpt ; recommencez"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "le code PIN n'a pas t correctement rpt ; recommencez"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "le code PIN n'a pas t correctement rpt ; recommencez"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr ""
@@ -294,7 +315,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "changer la phrase de passe"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -305,106 +326,106 @@ msgstr ""
"Options:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "bavard"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "lire les options de `%s'\n"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "chercher les cls avec un serveur de cls"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr ""
"indiquer la liste des prfrences pour le nom d'utilisateur\n"
"slectionn"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "mettre la base de confiance jour"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -413,160 +434,160 @@ msgstr ""
"Signaler toutes anomalies <gnupg-bugs@gnu.org> (en anglais)\n"
"et tout problme de traduction <traduc@traduc.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par dfaut `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erreur pendant la cration de `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "impossible de crer le rpertoire `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de crer `%s': %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
"erreur pendant la recherche de l'enregistrement de confiance\n"
"dans `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "la mise jour a chou: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "rpertoire `%s' cr\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) chou dans %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "impossible de crer le rpertoire `%s': %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "la mise jour de la cl secrte a chou: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignor: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'environnement GPG_AGENT_INFO est mal dfinie\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -632,42 +653,42 @@ msgstr "erreur pendant la cration de la phrase de passe: %s\n"
msgid "cancelled\n"
msgstr "annul"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "erreur dans `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "les parties secrtes ne sont pas disponibles\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "erreur de lecture dans `%s': %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -677,117 +698,120 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "oui"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "changer la phrase de passe"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "impossible d'ouvir les donnes signes `%s'\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr ""
"erreur durant la lecture des informations contenues actuellement\n"
"dans la cl: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erreur pendant la cration de `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[Nom utilisateur introuvable]"
@@ -1183,7 +1207,7 @@ msgstr "impossible de faire cela en mode automatique\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Cette commande n'est pas admise en mode %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "les parties secrtes ne sont pas disponibles\n"
@@ -2651,8 +2675,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Syntaxe: gpg [options] [fichiers]\n"
@@ -5388,12 +5413,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possde un bit critique\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (ID cl principale %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5407,24 +5432,20 @@ msgstr ""
"\"%.*s\"\n"
"cl %u bits %s, ID %s, cre %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Rptez la phrase de passe\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Entrez la phrase de passe\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "annul par l'utilisateur\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problme avec l'agent - arrt d'utilisation de l'agent\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5433,12 +5454,12 @@ msgstr ""
"Vous avez besoin d'une phrase de passe pour dverrouiller la\n"
"cl secrte pour l'utilisateur: %s \n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "cl de %u bits %s, ID %s, cre le %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (sous-cl de la cl principale ID %s)"
@@ -6730,249 +6751,275 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "l'appel du PIN a retourn une erreur: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Nouveau code PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "impossible de stocker l'empreinte: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "impossible de stocker la date de cration: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "la lecture de la cl publique a chou: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
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:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "la rponse ne contient pas le modulo RSA\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "la rponse ne contient pas l'exposant public RSA\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la vrification CHV%d a chou: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
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:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
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:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "la carte est irrmdiablement bloque !\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|code PIN d'administration"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Nouveau code PIN d'administration"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Nouveau code PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "erreur pendant la lecture de donnes d'application\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "erreur pendant la lecture de l'empreinte DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "la cl existe dj\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "la cl existante sera remplace\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "gnrer une nouvelle cl\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "l'horodatage de cration est manquant\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "le stockage de la cl a chou: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "attendez que la cl se gnre...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "la gnration de la cl a chou\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "la gnration de cl a t effectue (%d secondes)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signature %s, algorithme de hachage %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signatures cres jusqu'ici: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "impossible d'accder %s - carte OpenPGP invalide ?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|Nouveau code PIN"
@@ -7349,30 +7396,25 @@ msgstr ""
msgid "none"
msgstr "non"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[non positionn]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Erreur: rponse invalide.\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Erreur: rponse invalide.\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7586,27 +7628,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "la cl secrte %s n'a pas t trouve: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erreur pendant la lecture du bloc de cl : %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Certificat de rvocation cr.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "prfrence `%s' duplique\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "la suppression du bloc de cls a chou : %s\n"
@@ -7902,7 +7944,7 @@ msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
msgid "error storing flags: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8489,6 +8531,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Rptez la phrase de passe\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|code PIN d'administration"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[non positionn]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "lire les options de `%s'\n"
diff --git a/po/gl.po b/po/gl.po
index 8a838ae77..3ddd79ffa 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -170,47 +170,68 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: fallo ao crear unha tboa hash: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "Introduza o ID de usuario: "
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repita o contrasinal: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repita o contrasinal: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita o contrasinal: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "escribindo a `%s'\n"
@@ -283,7 +304,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "cambia-lo contrasinal"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -294,106 +315,106 @@ msgstr ""
"Opcins:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "lareto"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser un pouquio mis calado"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carga-lo mdulo de extensin FICHEIRO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "buscar chaves nun servidor de chaves"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr ""
"Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualiza-la base de datos de confianza"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -402,158 +423,158 @@ msgstr ""
"Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
"e dos erros na traduccin a <proxecto@trasno.net>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opcins] [ficheiros] (-h para ve-la axuda)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opcins por defecto `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opcins `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opcins de `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Revocacin de certificado vlida"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non est dispoible nesta sesin\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualizacin fallou: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directorio creado\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: non foi posible crear un directorio: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "o segredo da actualizacin fallou: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non est dispoible nesta sesin\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -619,42 +640,42 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
msgid "cancelled\n"
msgstr "Cancelar"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "erro lendo `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "hai partes da chave secreta non dispoibles\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "erro de lectura: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -664,115 +685,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "si|sim"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "cambia-lo contrasinal"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "non se puido abrir un ficheiro: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "erro lendo `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "erro lendo `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro ao crear `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "%s: usuario non atopado\n"
@@ -1173,7 +1197,7 @@ msgstr "non se pode facer iso no modo por lotes\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Non se admite este comando no modo %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "hai partes da chave secreta non dispoibles\n"
@@ -2625,8 +2649,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opcins] [ficheiros] (-h para ve-la axuda)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintaxe: gpg [opcins] [ficheiros]\n"
@@ -5390,12 +5415,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit crtico posto\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5408,24 +5433,20 @@ msgstr ""
"\"%.*s\"\n"
"Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repita o contrasinal\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Introduza o contrasinal\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "cancelado polo usuario\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5435,12 +5456,12 @@ msgstr ""
"Necesita un contrasinal para desbloquea-la chave secreta para\n"
"o usuario \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bits, chave %s, ID %08lX, creada %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6717,244 +6738,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "cambia-lo contrasinal"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "cambia-lo contrasinal"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Por favor, escolla o motivo da revocacin:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Por favor, escolla o motivo da revocacin:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "fallo ao reconstru-la cach de chaveiros: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "cambia-lo contrasinal"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "o envo ao servidor de chaves fallou: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "cambia-lo contrasinal"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Por favor, escolla o motivo da revocacin:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' xa est comprimido\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "xerar un novo par de chaves"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, 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:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP vlidos.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "Introduza o ID de usuario: "
@@ -7346,30 +7393,25 @@ msgstr ""
msgid "none"
msgstr "non|nom"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "descoecido"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "erro: pegada dactilar non vlida\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "erro: pegada dactilar non vlida\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7580,27 +7622,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "certificado duplicado - borrado"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "certificado duplicado - borrado"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -7891,7 +7933,7 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8480,6 +8522,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repita o contrasinal\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "descoecido"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "lendo as opcins de `%s'\n"
diff --git a/po/hu.po b/po/hu.po
index acd941519..07a9fe4da 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -170,46 +170,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: Hashtbla ltrehozsa sikertelen: %s.\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ismtelje meg a jelszt: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Ismtelje meg a jelszt: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ismtelje meg a jelszt: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "rok a \"%s\" llomnyba.\n"
@@ -282,7 +303,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "jelszvltoztats"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -293,262 +314,262 @@ msgstr ""
"Opcik:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "bbeszd md"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "mg szkszavbb md"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|fjl|bvt modul betltse"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "kulcsok keresse kulcsszerveren"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Valban frissti a kijellt felhasznlazonostk preferenciit? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "bizalmi adatbzis frisstse"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "A hibkat (angolul) a <gnupg-bugs@gnu.org> cmre rja meg!\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Hasznlat: gpg [opcik] [fjlok] (-h a sghoz)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZS: Nincs alaprtelmezett opcis fjl (%s).\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opcis fjl: %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opcikat a \"%s\" llomnybl olvasom.\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Hiba \"%s\" ltrehozsakor: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Nem tudom a \"%s\" knyvtrat ltrehozni: %s.\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozhat ltre: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "GPG gynk nem elrhet ebben a munkafolyamatban.\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Hiba %s-ra/-re kldskor: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Frissts sikertelen: %s.\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: Knyvtrat ltrehoztam.\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "Bizalmi adatbzis: olvass sikertelen (n=%d): %s.\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: Nem tudom a knyvtrat ltrehozni: %s.\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frisstse sikertelen: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG gynk nem elrhet ebben a munkafolyamatban.\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "Nem megfelel formj GPG_AGENT_INFO krnyezeti vltoz!\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -614,42 +635,42 @@ msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
msgid "cancelled\n"
msgstr "Mgsem"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "\"%s\" kulcs nem tallhat: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "Titkos kulcsrszek nem llnak rendelkezsre.\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "Olvassi hiba: %s.\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -659,115 +680,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "igen"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "jelszvltoztats"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "Nem tudom megnyitni az llomnyt: %s.\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "Hiba \"%s\" ltrehozsakor: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[ismeretlen kulcs]"
@@ -1163,7 +1187,7 @@ msgstr "Nem tudom ezt megcsinlni ktegelt mdban!\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Ez a parancs %s mdban nem engedlyezett.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "Titkos kulcsrszek nem llnak rendelkezsre.\n"
@@ -2606,8 +2630,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Hasznlat: gpgv [opcik] [fjlok] (-h a sghoz)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Szintaxis: gpg [opcik] [fjlok]\n"
@@ -5354,14 +5379,14 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d tpus alcsomag kritikus bitje belltott.\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr ""
" \n"
" (f kulcsazonost: %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5375,24 +5400,20 @@ msgstr ""
"\"%.*s\"\n"
"%u bites %s key, azonost: %08lX, ltrehozva: %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Ismtelje meg a jelszt!\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "rja be a jelszt!\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "A felhasznl megszaktotta a mveletet.\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "Problma az gynkkel: gynk vlasza: 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5403,12 +5424,12 @@ msgstr ""
"hasznlathoz:\n"
"\""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u bites %s kulcs, azonost: %08lX, ltrehozva: %s."
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6675,244 +6696,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "jelszvltoztats"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "jelszvltoztats"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Krem, vlassza ki a visszavons okt:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Krem, vlassza ki a visszavons okt:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "Bizalmi adatbzis (%s) inicializlsa sikertelen!\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "Nem tudtam jrapteni a kulcskarika cache-t: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "jelszvltoztats"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Klds a kulcsszerverre sikertelen: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "jelszvltoztats"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Krem, vlassza ki a visszavons okt:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "Hiba a kulcsblokk olvassakor: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: Hiba szabad rekord olvassakor: %s.\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" mr tmrtett.\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "j kulcspr ltrehozsa"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "Bizalmi adatbzis (%s) inicializlsa sikertelen!\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s alrs, %s kivonatol algoritmus.\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem talltam rvnyes OpenPGP adatot.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7291,30 +7338,25 @@ msgstr ""
msgid "none"
msgstr "nem"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "Ismeretlen md"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Hiba: rvnytelen ujjlenyomat.\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Hiba: rvnytelen ujjlenyomat.\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7525,27 +7567,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "\"%s\" kulcs nem tallhat: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "Hiba a kulcsblokk olvassakor: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Visszavon igazols ltrehozva.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "%c%lu preferencia ktszer szerepel!\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
@@ -7836,7 +7878,7 @@ msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8422,6 +8464,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Ismtelje meg a jelszt!\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "Ismeretlen md"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "Az opcikat a \"%s\" llomnybl olvasom.\n"
diff --git a/po/id.po b/po/id.po
index d8d973ac8..410a4a66d 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -172,46 +172,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ulangi passphrase: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Ulangi passphrase: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ulangi passphrase: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "passphrase tidak diulang dengan benar; coba lagi"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "menulis ke `%s'\n"
@@ -284,7 +305,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ubah passphrase"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -295,262 +316,262 @@ msgstr ""
"Pilihan:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detil"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "lebih diam"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "cari kunci di key server"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Perbarui preferensi untuk user ID terpilih?"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "perbarui database trust"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: direktori tercipta\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -616,42 +637,42 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
msgid "cancelled\n"
msgstr "Batal"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "bagian kunci rahasia tidak tersedia\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "kesalahan pembacaan: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -661,115 +682,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "y|ya"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "ubah passphrase"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "tidak dapat membuka file: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[User id tidak ditemukan]"
@@ -1166,7 +1190,7 @@ msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "bagian kunci rahasia tidak tersedia\n"
@@ -2616,8 +2640,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintaks: gpg [options] [files]\n"
@@ -5353,12 +5378,12 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID kunci utama %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5371,24 +5396,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, tercipta %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Ulangi passphrase\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Masukkan passphrase\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5398,12 +5419,12 @@ msgstr ""
"Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
"pemakai: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6669,244 +6690,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "ubah passphrase"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "ubah passphrase"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Silakan pilih alasan untuk pembatalan:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Silakan pilih alasan untuk pembatalan:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "ubah passphrase"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "ubah passphrase"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "gagal membaca keyblock: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' sudah dikompresi\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "buat sepasang kunci baru"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7285,30 +7332,25 @@ msgstr ""
msgid "none"
msgstr "n|t|tidak"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "tidak dikenal"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "kesalahan: fingerprint tidak valid\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "kesalahan: fingerprint tidak valid\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7519,27 +7561,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "gagal membaca keyblock: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Sertifikat pembatalan tercipta.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "preferensi %c%lu ganda \n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
@@ -7830,7 +7872,7 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8416,6 +8458,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Ulangi passphrase\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "tidak dikenal"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "membaca pilihan dari `%s'\n"
diff --git a/po/it.po b/po/it.po
index e3cffbff1..1c9434739 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -170,46 +170,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Ripeti la passphrase: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Ripeti la passphrase: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Ripeti la passphrase: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "passphrase non ripetuta correttamente; prova ancora"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "scrittura in `%s'\n"
@@ -282,7 +303,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "cambia la passphrase"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -293,262 +314,262 @@ msgstr ""
"Opzioni:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "prolisso"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "cerca delle chiavi su un key server"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aggiorna il database della fiducia"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "errore nella creazione della passhprase: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "errore creando `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non disponibile in questa sessione\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directory creata\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non disponibile in questa sessione\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -614,42 +635,42 @@ msgstr "errore nella creazione della passhprase: %s\n"
msgid "cancelled\n"
msgstr "Cancella"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "parti della chiave segreta non sono disponibili\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "errore di lettura: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -659,115 +680,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "si|s"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "cambia la passphrase"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "impossibile aprire il file: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "errore leggendo `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "errore leggendo `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "errore creando `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[User ID non trovato]"
@@ -1164,7 +1188,7 @@ msgstr "impossibile fare questo in modo batch\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Questo comando non permesso in modalit %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "parti della chiave segreta non sono disponibili\n"
@@ -2620,8 +2644,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintassi: gpg [opzioni] [file]\n"
@@ -5377,12 +5402,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (key ID principale %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5395,24 +5420,20 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Ripeti la passphrase\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Inserisci la passphrase\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5422,12 +5443,12 @@ msgstr ""
"Ti serve una passphrase per sbloccare la chiave segreta\n"
"dell'utente: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6715,244 +6736,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "cambia la passphrase"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "cambia la passphrase"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Per favore scegli il motivo della revoca:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Per favore scegli il motivo della revoca:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "cambia la passphrase"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "cambia la passphrase"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Per favore scegli il motivo della revoca:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "errore leggendo il keyblock: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' gi compresso\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "genera una nuova coppia di chiavi"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7331,30 +7378,25 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "sconosciuto"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "errore: impronta digitale non valida\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "errore: impronta digitale non valida\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7564,27 +7606,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "errore leggendo il keyblock: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Certificato di revoca creato.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "la preferenza %c%lu doppia\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
@@ -7875,7 +7917,7 @@ msgstr "errore nella creazione della passhprase: %s\n"
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8461,6 +8503,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Ripeti la passphrase\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "sconosciuto"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "lettura delle opzioni da `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index 9109467c9..58434e064 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -174,46 +174,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: ϥåɽκ˼Ԥޤ: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Admin PIN"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "PIN: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "PIN: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "PIN: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PINȷ֤Ƥޤ󡣺ϤƤ"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PINȷ֤Ƥޤ󡣺ϤƤ"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PINȷ֤Ƥޤ󡣺ϤƤ"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "PIN [̾: %lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "ѥե졼κ顼: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: ǥ쥯ȥ꡼쥳ɤνߥ顼: %s\n"
@@ -286,7 +307,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "ѥե졼ѹ"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -297,262 +318,262 @@ msgstr ""
"ץ:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "Ĺ"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "Ť"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "%sפ饪ץɤ߽Фޤ\n"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "Сθ򸡺"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "򤷤桼ID˹ޤ? (y/N) "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "ѥǡ١򹹿"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "ѥե졼κ顼: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Х򸫤Ĥ <gnupg-bugs@gnu.org> ޤǤ𤯤\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Ȥ: gpg [ץ] [ե] (إפ -h)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": Υץ󡦥ե%sפޤ\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "ץ󡦥ե%s: %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "%sפ饪ץɤ߽Фޤ\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "%sפκ顼: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Υågpg-agent̵Ǥ\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "PINμ顼: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "%sפǿѥ쥳ɤθ顼: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d)%sǼԤޤ: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "̩ι˼Ԥޤ: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: å: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "Υågpg-agent̵Ǥ\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFOĶѿν񼰤ޤ\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -618,42 +639,42 @@ msgstr "ѥե졼κ顼: %s\n"
msgid "cancelled\n"
msgstr "󥻥"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "%sפǥ顼: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "ץ󡦥ե%s: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "̩ʬޤ\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "%sפɽФ顼: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -663,115 +684,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "ѥե졼ѹ"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "ѥե졼κ顼: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "̾줿ǡ%sפޤ\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "Ըμ顼: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "%sפɽФ顼: %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "%sפɽФ顼: %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "%sפκ顼: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[桼IDĤޤ]"
@@ -1164,7 +1188,7 @@ msgstr "ϥХå⡼ɤǤϤǤޤ\n"
msgid "This command is only available for version 2 cards\n"
msgstr "%s⡼ɤǤΥޥɤ϶ػߤǤ\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "̩ʬޤ\n"
@@ -2562,8 +2586,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Ȥ: gpgv [ץ] [ե] (إפ -h)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"ʸ: gpg [ץ] [ե]\n"
@@ -5220,12 +5245,12 @@ msgstr "ٹ: Ū˷ݤоΰŹ沽å󸰤Ǥ\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%dβ̥ѥåȤ˥ƥ롦ӥåȤȯ\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (縰ID %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5238,24 +5263,20 @@ msgstr ""
"\"%.*s\"\n"
"%uӥå%s, ID %sդ%s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "ѥե졼\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "ѥե졼\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "桼ˤä\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "Ȥ˾㳲: Ȥ0x%lxֵ\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5264,12 +5285,12 @@ msgstr ""
"Υ桼̩Υåˤ\n"
"ѥե졼ޤ:%s\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%uӥå%s, ID %sդ%s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (縰ID %s )"
@@ -6492,241 +6513,267 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PINХå顼ᤷޤ: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
+#: scd/app-nks.c:848
#, fuzzy
-msgid "|N|New PIN"
-msgstr "PIN"
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "PIN [̾: %lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "PIN [̾: %lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "PIN [̾: %lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "PIN [̾: %lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "PINμ顼: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "ɽФ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "˸ǡޤޤƤޤ\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "RSAˡ(modulus)ޤޤƤޤ\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "RSAؿޤޤƤޤ\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "PIN [̾: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, fuzzy, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "PIN [̾: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "PIN [̾: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%dPINûޤû%d\n"
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%dθڤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "ޥɤؤΥꤵƤޤ\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "ɤCHV֤θǥ顼\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "ɤʵפ˥åޤ!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "ɤαʵץå%dAdmin PINƤޤ\n"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "PIN [̾: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "PIN [̾: %lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%dPINûޤû%d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
#, fuzzy
msgid "|AN|New Admin PIN"
msgstr "|A|Admin PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "ץꥱ󡦥ǡɽФ顼\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "ǡ֥ȤɽФ顼\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "Ϥ⤦ޤ\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "¸θϸ򴹤ޤ\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "ؿ礭ޤ (32ӥåȤ)\n"
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "δ֡Ԥ ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "˼Ԥޤ\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "λޤ (%d)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGPɤ̵ʹ¤ (ǡ֥ 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s̾󥢥르ꥺ %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "ޤǤ˺줿̾: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s˥Ǥޤ - ̵OpenPGP?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "PIN"
@@ -7105,30 +7152,25 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[̤]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "顼: ̵ʱ\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "顼: ̵ʱ\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7339,27 +7381,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "̩%sɤĤޤ: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "֥åɽФ顼: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "%sפνʣ\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "֥åκ˼Ԥޤ: %s\n"
@@ -7651,7 +7693,7 @@ msgstr "PINμ顼: %s\n"
msgid "error storing flags: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8234,6 +8276,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "ѥե졼\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "PIN [̾: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[̤]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "%sפ饪ץɤ߽Фޤ\n"
diff --git a/po/nb.po b/po/nb.po
index 206f48d94..aa990c8a9 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -174,46 +174,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "klarte ikke lagre nkkelen: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|Admin PIN"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Gjenta denne PIN: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Gjenta denne PIN: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Gjenta denne PIN: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt; prv igjen"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN ble ikke gjentatt korrekt; prv igjen"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt; prv igjen"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "feil ved skriving av nkkelknippet %s: %s\n"
@@ -286,7 +307,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "endre passfrasen"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -297,260 +318,260 @@ msgstr ""
"Valg:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "fyldig output"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "vre noenlunde stille"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "leser valg fra %s\n"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "ske etter nkler p en nkkelserver"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "sette en notasjon for de valgte brukeridene"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "ikke oppdatr tillitsdatabasen etter import"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Bruksmte: gpg [valg] [filer] (-h for hjelp)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil %s\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil %s: %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra %s\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kan ikke opprette katalogen %s: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke opprette %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "feil ved henting av ny PIN: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "feil ved sking etter tillitspost i %s: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmelig nkkel til %s\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen %s ble opprettet\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan ikke opprette katalogen %s: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "oppdatering av hemmelig mislyktes: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: hoppet over: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -613,42 +634,42 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
msgid "cancelled\n"
msgstr "cancel|cancel"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "feil med %s: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "valgfil %s: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "hemmelig nkkel er ikke tilgjengelig"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "lesefeil ved %s: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -658,115 +679,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "endre passfrasen"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "kan ikke pne nkkelknippet"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "feil ved henting av nvrende nkkelinfo: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "feil ved lesing av %s: %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "feil ved lesing av %s: %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "feil ved lesing av nkkelblokk: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[Brukerid ikke funnet]"
@@ -1152,7 +1176,7 @@ msgstr "kan ikke gjre dette i batchmodus\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr ""
@@ -2551,8 +2575,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Bruksmte: gpgv [valg] [filer] (-h for hjelp)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Bruksmte: gpgv [valg] [filer]\n"
@@ -5165,12 +5190,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (hovednkkelid %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5183,24 +5208,20 @@ msgstr ""
"%.*s\n"
"%u-bit %s nkkel, ID %s, opprettet %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Gjenta passfrase\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Tast inn passfrase\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5209,12 +5230,12 @@ msgstr ""
"Du trenger en passfrase for lse opp den hemmelige nkkelen for\n"
"brukeren: %s\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s-nkkel, ID %s, opprettet %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6429,239 +6450,265 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-callback returnerte en feil: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "feil ved henting av ny PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "klarte ikke lagre fingeravtrykket: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "klarte ikke lagre opprettelsesdatoen: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "lesing av offentlig nkkel mislyktes: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "respons inneholder ikke data om offentlig nkkel\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "respons inneholder ikke RSA-modulus\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "feil ved henting av CHV-status fra kort\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "kort er permanent lst!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "feil ved lesing av applikasjonsdata\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "feil ved lesing av fingeravtrykk DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "nkkel finnes allerede\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "eksisterende nkkel vil bli erstattet\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "generere en ny nkkel\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "tidsstempel for opprettelse mangler\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "klarte ikke lagre nkkelen: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "vennligst vent mens nkkel blir generert ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "nkkelgenerering mislyktes\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nkkelgenerering fullfrt (%d sekunder)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet sttter ikke digestalgoritme %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer opprettet s langt: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|Ny PIN"
@@ -7036,30 +7083,25 @@ msgstr ""
msgid "none"
msgstr "nei"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[ikke satt]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Feil: ugyldig respons.\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Feil: ugyldig respons.\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7271,27 +7313,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "hemmelig nkkel %s ble ikke funnet: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "feil ved lesing av nkkelblokk: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "nkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "preferansen %s er duplisert\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "sleting av nkkelblokk mislyktes: %s\n"
@@ -7582,7 +7624,7 @@ msgstr "feil ved henting av ny PIN: %s\n"
msgid "error storing flags: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8164,6 +8206,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Gjenta passfrase\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[ikke satt]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "leser valg fra %s\n"
diff --git a/po/pl.po b/po/pl.po
index a92c9a1a5..0a2d00341 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -171,44 +171,65 @@ msgstr "nie pasuj - prosz sprbowa jeszcze raz"
msgid "failed to create stream from socket: %s\n"
msgstr "nie udao si utworzy strumienia z gniazda: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "PIN administratora"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Powtrz ten PIN"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Powtrz ten PIN"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "Powtrz ten PIN"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN nie powtrzony poprawnie; sprbuj jeszcze raz"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN nie powtrzony poprawnie; sprbuj jeszcze raz"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN nie powtrzony poprawnie; sprbuj jeszcze raz"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Prosz wprowadzi PIN%s%s%s aby odblokowa kart"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "bd tworzenia pliku tymczasowego: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "bd zapisu do pliku tymczasowego: %s\n"
@@ -294,7 +315,7 @@ msgstr "Prosz wprowadzi haso do%0Azabezpieczenia swojego nowego klucza"
msgid "Please enter the new passphrase"
msgstr "Prosz wprowadzi nowe haso"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -303,109 +324,109 @@ msgstr ""
"@Opcje:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "uruchomienie w trybie demona (w tle)"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "z dodatkowymi informacjami"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "mniej komunikatw"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "wyjcie polece w stylu sh"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "wyjcie polece w stylu csh"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "nie odczepianie od konsoli"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "nie przechwytywanie klawiatury i myszy"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "uycie pliku loga dla serwera"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "uycie standardowego pooenia gniazda"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|uycie PGM jako programu do wprowadzania PIN-u"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|uycie PGM jako programu SCdaemon"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "nie uywanie SCdaemona"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "ignorowanie da zmiany TTY"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "ignorowanie da zmiany ekranu X"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|przedawnienie pamitanych PIN-w po N sekundach"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "nie uywanie pamici PIN-w przy podpisywaniu"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "zezwolenie na predefiniowane haso"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "wczenie emulacji ssh-agenta"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|PLIK|zapis ustawie rodowiska take do PLIKU"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Bdy prosimy zgasza na adres <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Wywoanie: gpg-agent [opcje] (-h podaje pomoc)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -413,145 +434,145 @@ msgstr ""
"Skadnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarzdzanie kluczem tajnym dla GnuPG\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "podano bdny poziom diagnostyki ,,%s''\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domylnego pliku opcji ,,%s''\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "bd tworzenia ,,%s'': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nie mona utworzy katalogu ,,%s'': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "nazwa gniazda zbyt duga\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie mona utworzy gniazda: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "nazwa gniazda zbyt duga\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ju dziaa - nie uruchamianie nowego\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "bd podczas odczytu nowego PIN-u: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "bd podczas przypisywania gniazda do ,,%s'': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiodo si: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "nasuchiwanie na gniedzie ,,%s''\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalog ,,%s'' utworzony\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() nie powiodo si dla ,,%s'': %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "nie mona uy ,,%s'' jako katalogu domowego\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "bd odczytu z %s: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obsuga 0x%lx dla fd %d uruchomiona\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsuga 0x%lx dla fd %d zakoczona\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "obsuga ssh 0x%lx dla fd %d uruchomiona\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "obsuga ssh 0x%lx dla fd %d zakoczona\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select nie powiodo si: %s - czekanie 1s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "brak dziaajcego gpg-agenta w tej sesji\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "zy format zmiennej rodowiskowej GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -618,42 +639,42 @@ msgstr "bd podczas pytania o haso: %s\n"
msgid "cancelled\n"
msgstr "anulowano\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "bd podczas otwierania ,,%s'': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "plik ,,%s'', linia %d: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "systemowa lista zaufania ,,%s'' niedostpna\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "bdny odcisk w ,,%s'', w linii %d\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "nieprawidowa flaga klucza w ,,%s'', w linii %d\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "bd odczytu ,,%s'', w linii %d: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "bd odczytu listy zaufanych certyfikatw gwnych\n"
@@ -663,34 +684,9 @@ msgstr "bd odczytu listy zaufanych certyfikatw gwnych\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Prosz sprawdzi, e certyfikat zidentyfikowany jako:%%0a ,,%s''%%0Ama "
-"odcisk:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Akceptuj"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -699,20 +695,48 @@ msgstr ""
"Czy absolutnie ufasz, e%%0A ,,%s''%%0Apoprawnie powiadcza certyfikaty "
"uytkownikw?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Tak"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "Nie"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Prosz sprawdzi, e certyfikat zidentyfikowany jako:%%0a ,,%s''%%0Ama "
+"odcisk:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Akceptuj"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "Uwaga: To haso nie byo nigdy zmieniane.%0AProsz zmieni je teraz."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -720,61 +744,61 @@ msgid ""
msgstr ""
"To haso nie zostao zmienione%%0Aod %.4s-%.2s-%.2s. Prosz zmieni je teraz."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "Zmiana hasa"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "Zmieni je pniej"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "bd tworzenia potoku: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "nie mona wykona fdopen do odczytu na potoku: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "bd podczas tworzenia procesu: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "oczekiwanie na zakoczenie procesu %d nie powiodo si: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "bd odczytu kodu zakoczenia procesu %d: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "bd uruchamiania ,,%s'': kod wyjcia %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "bd uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "bd uruchamiania ,,%s'': zakoczono\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "bd tworzenia gniazda: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "nie znaleziono hosta"
@@ -1165,7 +1189,7 @@ msgstr "nie dziaa w trybie wsadowym\n"
msgid "This command is only available for version 2 cards\n"
msgstr "To polecenie nie jest dostpne w trybie %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "tajne czci klucza s niedostpne\n"
@@ -2580,8 +2604,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Wywoanie: gpgv [opcje] [pliki] (-h podaje pomoc)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Skadnia: gpg [opcje] [pliki]\n"
@@ -5266,12 +5291,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (ID gwnego klucza %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5284,24 +5309,20 @@ msgstr ""
",,%.*s''.\n"
"Klucz o dugoci %u bitw, typ %s, ID %s, stworzony %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Powtrzone haso\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Haso\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "anulowano przez uytkownika\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem z agentem: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5310,12 +5331,12 @@ msgstr ""
"Musisz poda haso aby odbezpieczy klucz prywatny uytkownika:\n"
",,%s''\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "dugo %u bitw, typ %s, numer %s, stworzony %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (podklucz dla gwnego klucza o ID %s)"
@@ -6565,242 +6586,267 @@ msgstr ""
"Skadnia: kbxutil [opcje] [pliki]\n"
"wypisywanie, eksport, import danych Keybox\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "Zapytanie zwrotne o PIN zwrcio bd: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "NullPIN nie zosta jeszcze zmieniony\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Nowy PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Prosz wprowadzi PIN%s%s%s aby odblokowa kart"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Prosz wprowadzi PIN%s%s%s aby odblokowa kart"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "bd podczas odczytu nowego PIN-u: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "nie powid si zapis odcisku: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "nie powid si zapis daty utworzenia: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "odczyt klucza publicznego nie powid si: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "odpowied nie zawiera danych klucza publicznego\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "odpowied nie zawiera wspczynnika RSA\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "odpowied nie zawiera publicznego wykadnika RSA\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-"||Prosz wprowadzi PIN na klawiaturze czytnika%%0A[podpisw wykonanych: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Prosz wpisa PIN%%0A[podpisw wykonanych: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Prosz wpisa PIN%%0A[podpisw wykonanych: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "weryfikacja CHV%d nie powioda si: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "dostp do polece administratora nie zosta skonfigurowany\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "bd podczas odczytu stanu CHV z karty\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "karta zostaa trwale zablokowana!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr ""
"||Prosz wprowadzi PIN na klawiaturze czytnika%%0A[podpisw wykonanych: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|PIN administratora"
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Prosz wpisa PIN%%0A[podpisw wykonanych: %lu]"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Prosz wprowadzi PIN%s%s%s aby odblokowa kart"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Nowy PIN administratora"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Nowy PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "bd podczas odczytu danych aplikacji\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "bd podczas odczytu odcisku DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "klucz ju istnieje\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "istniejcy klucz zostanie zastpiony\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "generowanie nowego klucza\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "brak datownika utworzenia\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nie powid si zapis klucza: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "prosz czeka na wygenerowanie klucza...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "generowanie klucza nie powiodo si\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generowanie klucza zakoczone (%d sekund)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr "odcisk na karcie nie zgadza si z danym\n"
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "karta nie obsuguje algorytmu skrtu %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dotychczas stworzono podpisw: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie mona dosta si do %s - niepoprawna karta OpenPGP?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||Prosz wprowadzi PIN na klawiaturze czytnika"
+
#. 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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|Nowy PIN"
@@ -7158,27 +7204,23 @@ msgstr "(to jest algorytm MD2)\n"
msgid "none"
msgstr "brak"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[brak]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Bd - niewaciwe kodowanie]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[Bd - brak pamici]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Bd - Brak nazwy]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Bd - niewaciwe DN]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7390,27 +7432,27 @@ msgstr "(to jest algorytm RC2)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(to nie wyglda na zaszyfrowan wiadomo)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "bd blokowania keyboksa: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "powtrzony certyfikat ,,%s'' usunity\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "certyfikat ,,%s'' usunity\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "usunicie certyfikatu ,,%s'' nie powiodo si: %s\n"
@@ -7691,7 +7733,7 @@ msgstr "bd pobierania zapisanych flag: %s\n"
msgid "error storing flags: %s\n"
msgstr "bd zapisywania flag: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
#, fuzzy
msgid "Error - "
msgstr "[Bd - Brak nazwy]"
@@ -8276,6 +8318,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Powtrzone haso\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr ""
+#~ "||Prosz wprowadzi PIN na klawiaturze czytnika%%0A[podpisw wykonanych: %"
+#~ "lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN administratora"
+
+#~ msgid "[none]"
+#~ msgstr "[brak]"
+
#~ msgid "read options from file"
#~ msgstr "odczyt opcji z pliku"
diff --git a/po/pt.po b/po/pt.po
index 833fc34d8..51ba5be1d 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -173,46 +173,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de disperso: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repita a frase secreta: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "a escrever para `%s'\n"
@@ -285,7 +306,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -296,263 +317,263 @@ msgstr ""
"Opes:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar mdulo de extenso FICHEIRO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "procurar chaves num servidor de chaves"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr ""
"Realmente actualizar as preferncias para os utilizadores seleccionados?"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizar a base de dados de confiana"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opes] [ficheiros] (-h para ajuda)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de opes por omisso `%s' inexistente\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opes `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler opes de `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossvel criar directoria: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossvel criar %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "o gpg-agent no est disponvel nesta sesso\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizao falhou: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directoria criada\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de dados de confiana: leitura falhou (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossvel criar directoria: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualizao da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent no est disponvel nesta sesso\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "varivel de ambiente GPG_AGENT_INFO invlida\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -618,42 +639,42 @@ msgstr "erro na criao da frase secreta: %s\n"
msgid "cancelled\n"
msgstr "cancelado pelo utilizador\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "chave `%s' no encontrada: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "partes da chave secreta no disponveis\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "armadura: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -663,115 +684,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "muda a frase secreta"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "impossvel abrir %s: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro ao criar `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[Utilizador no encontrado]"
@@ -1169,7 +1193,7 @@ msgstr "impossvel fazer isso em modo no-interativo\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Este comando no permitido no modo %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "partes da chave secreta no disponveis\n"
@@ -2620,7 +2644,7 @@ msgstr "Uso: gpg [opes] [ficheiros] (-h para ajuda)"
#: g10/gpgv.c:119
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
@@ -5365,12 +5389,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crtico ligado\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5385,24 +5409,20 @@ msgstr ""
"\"%.*s\"\n"
"chave %u bits %s, ID %08lx, criada %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repita a frase secreta\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Insira a frase secreta\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5412,12 +5432,12 @@ msgstr ""
"Voc precisa de uma frase secreta para desbloquear a chave secreta do\n"
"utilizador: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6682,244 +6702,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "muda a frase secreta"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muda a frase secreta"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "motivo da revocao: "
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "motivo da revocao: "
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "falha ao inicializar a base de dados de confiana: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muda a frase secreta"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "muda a frase secreta"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "motivo da revocao: "
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura do bloco de chave: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler registo livre: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "%s' j comprimido\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, 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:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7298,30 +7344,25 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "verso desconhecida"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "%s: verso de ficheiro invlida %d\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "%s: verso de ficheiro invlida %d\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7534,27 +7575,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "chave `%s' no encontrada: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro na leitura do bloco de chave: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "chave %08lX: certificado de revogao \"%s\" adicionado\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "preferncia %c%lu duplicada\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
@@ -7847,7 +7888,7 @@ msgstr "erro na criao da frase secreta: %s\n"
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8434,6 +8475,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repita a frase secreta\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "verso desconhecida"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "a ler opes de `%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 30a945ebb..cf4b8ed1a 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -177,47 +177,68 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "Digite o identificador de usurio: "
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repita a frase secreta: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repita a frase secreta: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "erro na escrita do chaveiro `%': %s\n"
@@ -290,7 +311,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "muda a frase secreta"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -301,260 +322,260 @@ msgstr ""
"Opes:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ARQUIVO|carregar mdulo de extenso ARQUIVO"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "exportar chaves para um servidor"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Realmente remover todos os IDs de usurio selecionados? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "atualizar o banco de dados de confiabilidade"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opes] [arquivos] (-h para ajuda)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de opes padro `%s' inexistente\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de opes `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo opes de `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossvel criar diretrio: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossvel criar %s: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Certificado de revogao vlido"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "atualizao falhou: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: diretrio criado\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossvel criar diretrio: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "atualizao da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves ignoradas\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -619,42 +640,42 @@ msgstr "erro na criao da frase secreta: %s\n"
msgid "cancelled\n"
msgstr ""
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "usurio `%s' no encontrado: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "chave secreta no disponvel"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "erro de leitura: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -664,115 +685,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "muda a frase secreta"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "impossvel abrir arquivo: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "%s: usurio no encontrado\n"
@@ -1174,7 +1198,7 @@ msgstr "impossvel fazer isso em modo no-interativo\n"
msgid "This command is only available for version 2 cards\n"
msgstr ""
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "a chave pblica no est mais disponvel"
@@ -2638,7 +2662,7 @@ msgstr "Uso: gpg [opes] [arquivos] (-h para ajuda)"
#: g10/gpgv.c:119
#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintaxe: gpgm [opes] [arquivos]\n"
@@ -5372,12 +5396,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crtico ligado\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5391,26 +5415,21 @@ msgstr ""
"usurio: \"%.*s\"\n"
"%u-bit %s chave, ID %08lX, criada %s%s\n"
-#: g10/passphrase.c:335
-#, fuzzy
-msgid "Repeat passphrase\n"
-msgstr "Repita a frase secreta: "
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr ""
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5420,12 +5439,12 @@ msgstr ""
"Voc precisa de uma frase secreta para desbloquear a chave secreta do\n"
"usurio: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6688,244 +6707,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "muda a frase secreta"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "muda a frase secreta"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "rev- revogaes de chaves incorreta\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "rev- revogaes de chaves incorreta\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "muda a frase secreta"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "muda a frase secreta"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "rev- revogaes de chaves incorreta\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura de `%s': %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro lendo registro livre: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "%lu chaves processadas\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, 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:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "Digite o identificador de usurio: "
@@ -7316,30 +7361,25 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "verso desconhecida"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "erro: impresso digital invlida\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "erro: impresso digital invlida\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7548,27 +7588,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "usurio `%s' no encontrado: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "certificado duplicado - removido"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "certificado duplicado - removido"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
@@ -7859,7 +7899,7 @@ msgstr "erro na criao da frase secreta: %s\n"
msgid "error storing flags: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8447,6 +8487,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repita a frase secreta: "
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "verso desconhecida"
+
+#, fuzzy
#~ msgid "read options from file"
#~ msgstr "lendo opes de `%s'\n"
diff --git a/po/ro.po b/po/ro.po
index 113bc04b8..d78774c12 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -177,46 +177,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: am euat s creez hashtable: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|PIN Admin"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Repetai acest PIN: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Repetai acest PIN: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Repetai acest PIN: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai ncercai o dat"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN-ul nu a fost repetat corect; mai ncercai o dat"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai ncercai o dat"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "eroare la crearea frazei-parol: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s: eroare scriere nregistrare dir: %s\n"
@@ -289,7 +310,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "schimb fraza-parol"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -300,262 +321,262 @@ msgstr ""
"Opiuni:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "locvace"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "fii oarecum mai tcut"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FIIER|ncarc modulul extensie FIIER"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "caut pentru chei pe un server de chei"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "seteaz lista de preferine pentru ID-urile utilizator selectate"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "actualizeaz baza de date de ncredere"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "eroare la crearea frazei-parol: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Raportai bug-uri la <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Folosire: gpg [opiuni] [fiiere] (-h pentru ajutor)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT: nici un fiier opiuni implicit `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "fiier opiuni `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc opiuni din `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eroare la creearea `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nu este disponibil n aceast sesiune\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la obinere noului PIN: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a euat: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "director `%s' creat\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) a euat n %s: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a euat: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: srit: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil n aceast sesiune\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabila de mediu GPG_AGENT_INFO anormal\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -624,42 +645,42 @@ msgstr "eroare la crearea frazei-parol: %s\n"
msgid "cancelled\n"
msgstr "anulat"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "eroare n `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "fiier opiuni `%s': %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "pri ale cheii secrete nu sunt disponibile\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "eroare citire n `%s': %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -669,115 +690,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "da"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "schimb fraza-parol"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eroare la crearea frazei-parol: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "nu pot deschide fiierul: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "eroare la obinerea informaiei pentru cheia curent: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "eroare la citire `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "eroare la citire `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "eroare la creearea `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[ID utilizator nu a fost gsit]"
@@ -1171,7 +1195,7 @@ msgstr "nu pot face acest lucru n modul batch\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Aceast comand nu este permis n modul %s.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "pri ale cheii secrete nu sunt disponibile\n"
@@ -2596,8 +2620,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Folosire: gpgv [opiuni] [fiiere] (-h pentru ajutor)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Sintax: gpg [opiuni] [fiiere]\n"
@@ -5269,12 +5294,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (ID cheie principal %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5288,24 +5313,20 @@ msgstr ""
"\"%.*s\"\n"
"cheia %u-bit %s, ID %s, creat %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repetai fraza-parol\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Introducei fraza-parol\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "anulat de utilizator\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problem cu agentul: agentul returneaz 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5314,12 +5335,12 @@ msgstr ""
"Avei nevoie de o fraz-parol pentru a descuia cheia secret pentru\n"
"utilizator: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "cheia %u-bit %s, ID %s, creat %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subcheie pe cheia principal ID %s)"
@@ -6574,240 +6595,266 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "apelul PIN a returnat eroare: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|PIN Nou"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "eroare la obinere noului PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "am euat s stochez amprenta: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "am euat s stochez data crerii: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "citirea cheii publice a euat: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "rspunsul nu conine datele cheii publice\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "rspunsul nu conine modulul RSA\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "rspunsul nu conine exponentul public RSA\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verificarea CHV%d a euat: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "accesul la comenzile de administrare nu este configurat\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "eroare la recuperarea strii CHV de pe card\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "cardul este ncuiat permanent!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|PIN Admin"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|PIN Admin Nou"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|PIN Nou"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "eroare la citirea datelor aplicaiei\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "eroare la citirea amprentei DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "cheia exist deja\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "cheia existent va fi nlocuit\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "generez o nou cheie\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "timestamp-ul de creare lipsete\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "am euat s stochez cheia: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "v rugm ateptai ct vreme este creat noua cheie ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "generarea cheii a euat\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generarea cheii este complet (%d secunde)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structur invalid a cardului OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "semntur %s, algoritm rezumat %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "semnturi create pn acum: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|PIN Nou"
@@ -7188,30 +7235,25 @@ msgstr ""
msgid "none"
msgstr "nu"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[nesetat()]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "Eroare: rspuns invalid.\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "Eroare: rspuns invalid.\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7423,27 +7465,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "cheia secret \"%s\" nu a fost gsit: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "eroare la citire keyblock: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Certificat de revocare creat.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "preferina `%s' duplicat\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "stergere keyblock a euat: %s\n"
@@ -7736,7 +7778,7 @@ msgstr "eroare la obinere noului PIN: %s\n"
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8321,6 +8363,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repetai fraza-parol\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|PIN Admin"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[nesetat()]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "citesc opiuni din `%s'\n"
diff --git a/po/ru.po b/po/ru.po
index d8d53e4ce..56e4aa6d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.10\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-12-21 00:40+0200\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -169,42 +169,63 @@ msgstr "не совпало, попробуйте еще раз"
msgid "failed to create stream from socket: %s\n"
msgstr "сбой создания потока из сокета: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "Административный PID"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
msgid "Repeat this Reset Code"
msgstr "Повторить Reset Code"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Повторите ввод PIN"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "Повторите ввод PIN"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr "Reset Code не повторен корректно; попробуйте еще раз"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "повторный PIN не совпал; попробуйте еще раз"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "повторный PIN не совпал; попробуйте еще раз"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Введите PIN%s%s%s для доступа к карте"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "ошибка создания временного файла: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "ошибка записи во временный файл: %s\n"
@@ -290,7 +311,7 @@ msgstr "Введите фразу-пароль%0Aдля защиты новог
msgid "Please enter the new passphrase"
msgstr "Введите новую фразу-пароль"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -299,109 +320,109 @@ msgstr ""
"@Параметры:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (foreground)"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "запуск в режиме демона (background)"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "подробно"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "уменьшить количество выводимой информации"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "вывод результатов в sh-стиле"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "вывод результатов в csh-стиле"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из FILE"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "не отсоединяться от консоли"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "не перехватывать события мыши и клавиатуры"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "использовать файл журнала для сервера"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "стандартное расположение сокета"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|использовать PGM как PIN-Entry"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM| использовать PGM как SCdaemon"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "не использовать SCdaemon"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "игнорировать запросы смены TTY"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "игнорировать запросы смены X дисплея"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|кеш PIN просрочен после N секунд"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "не использовать кеш PIN при подписывании"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "позволить клиентам помечать ключи как \"доверяемые\""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "разрешить предустановленную фразу-пароль"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "разрешить эмуляцию ssh-агента"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|сохранить состояние окружения и в файл"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "О найденных ошибках сообщайте <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -409,144 +430,144 @@ msgstr ""
"Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
"Управление закрытыми ключами для GnuPG\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "запрошен недупустимый уровень отладки `%s'\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s слишком устарело (требуется %s, имеется %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации из файла `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "ошибка создания `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "не могу создать каталог `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "имя сокета слишком длинное\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "имя сокета `%s' слишком длинное\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent уже запущен - еще один, новый, запущен не будет\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr ""
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "ошибка связывния сокета с `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "слушаем сокет `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "создан каталог `%s'\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "невозможно использовать `%s' как домашний каталог\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s: остановлен\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "нет gpg-agent доступого для данной сессии\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -612,42 +633,42 @@ msgstr "ошибка запроса ввода фразы-пароля: %s\n"
msgid "cancelled\n"
msgstr "отменено\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "ошибка открытия `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "файл `%s', строка %d: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "системный список доверий `%s' не доступен\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "недопустимый отпечаток в `%s', строка %d\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "ошибка чтения `%s', строка %d: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
@@ -657,34 +678,9 @@ msgstr "ошибка чтения списка доверяемых корнев
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Проверьте, что сертификат идентифицированный как:%%0A \"%s\"%%0Aимеет "
-"отпечаток:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Подтверждаю"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -693,21 +689,49 @@ msgstr ""
"Действительно абсолютно доверять%%0A \"%s\"%%0Aкорректно подписанным "
"сертификатам пользователя?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Да"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "Нет"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Проверьте, что сертификат идентифицированный как:%%0A \"%s\"%%0Aимеет "
+"отпечаток:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Подтверждаю"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Замечание: Фразу-пароль ни разу не сменяли.%0AПожалуйста, смените ее сейчас."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -716,61 +740,61 @@ msgstr ""
"Фраза пароль не сменялась%%0Aс %.4s-%.2s-%.2s. Пожалуйста, смените ее "
"сейчас."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "Cменить фразу-пароль"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "Сменю позже"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr ""
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr ""
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr ""
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "ошибка получения кода возврата процесса %d: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "ошибка чтения `%s': статус завершения %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "ошибка запуска `%s': позможно не установлен\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "ошибка чтения `%s': прервано\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr ""
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "хост не найден"
@@ -1140,7 +1164,7 @@ msgstr "невозможно сделать это в пакетном режи
msgid "This command is only available for version 2 cards\n"
msgstr "Данная команда допустима только для карт версии 2\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr "Reset Code не задан или недоступен\n"
@@ -2528,8 +2552,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Синтаксис: gpg [параметры] [файлы]\n"
@@ -5169,12 +5194,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "подпакет типа %d имеет выставленный критический бит\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (главный ключ ID %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5188,24 +5213,20 @@ msgstr ""
"%u-бит %s ключ, ID %s,\n"
"создан %s%s.\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Повторите ввод фразы-пароля\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Введите фразу-пароль\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "прервано пользователем\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "проблема с агентом: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5213,12 +5234,12 @@ msgid ""
msgstr ""
"Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-бит %s ключ, ID %s, создан %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (подключ на главном ключе %s)"
@@ -6455,238 +6476,265 @@ msgstr ""
"Синтаксис: kbxutil [параметры] [файлы]\n"
"просморт, экспорт, импорт данных Keybox\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "NullPIN всё еще не изменен\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Новый PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|A|Введите Admin PIN на клавиатуре считывателя"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Введите Admin PIN на клавиатуре считывателя"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Введите Reset Code к карте"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Введите Reset Code к карте"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "ошибка при получении нового PIN: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "сбой сохранения отпечатка: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "сбой сохранения даты создания: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "сбой чтения открытого ключа: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "ответ не содержит данных открытого ключа\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "в ответе отсутствует модуль RSA\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "в ответе отсутствует открытая экспонента RSA\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Введите PIN на клавиатуре считывателя%%0A[подписей: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Введите PIN%%0A[подписей: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
msgid "||Please enter the PIN"
msgstr "||Введите PIN"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "при проверке CHV%d сбой: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "доступ к командам управления не настроен\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "ошибка получения статуса CHV с карты\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "карта заблокирована!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "осталось %d попыток ввода административного PIN до блокировки карты\n"
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr ""
"|A|Введите Admin PID на клавиатуре считывателя%%0A[осталось попыток: %d]"
-#: scd/app-openpgp.c:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|Введите Admin 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Административный PID"
+#: scd/app-openpgp.c:1654
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Введите PIN"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
msgid "||Please enter the Reset Code for the card"
msgstr "||Введите Reset Code к карте"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Reset Code слишком короток, минимальная длина %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr "|RN| Новый Reset Code"
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Новый административный PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Новый PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "ошибка чтения данных приложения\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "ошибка чтения отпечатка DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "ключ уже существует\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "существующий ключ будет заменен\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "генерация нового ключа\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "пропущен штамп создания создания\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "сбой сохранения ключа: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "сбой при генерации ключа\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "ключ сгенерирован (%d секунд)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "карта не поддерживает функцию хеширования %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "подписей создано: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"проверка административного PIN в данный момент запрещена этой командой\n"
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|Новый PIN"
@@ -7043,27 +7091,23 @@ msgstr "(это MD2 алгоритм)\n"
msgid "none"
msgstr "нет"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[нет]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Ошибка - недопустимая кодировка]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Ошибка - Нет имени]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Ошибка - недопустимый DN]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7268,27 +7312,27 @@ msgstr "(это RC2 алгоритм)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(это не похоже не зашифрованное сообщение)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "сертификат `%s' не найден: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "ошибка блокировки keybox: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "дупликат сертификата `%s' удален\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "сертификат `%s' удален\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "удаление сертификата \"%s\" неудачно: %s\n"
@@ -7562,7 +7606,7 @@ msgstr "ошибка получения сохраненных флагов: %s\
msgid "error storing flags: %s\n"
msgstr "ошибка сохранения флагов: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "Ошибка - "
@@ -8133,3 +8177,15 @@ msgid ""
"Syntax: gpg-check-pattern [options] patternfile\n"
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Повторите ввод фразы-пароля\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||Введите PIN на клавиатуре считывателя%%0A[подписей: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Административный PID"
+
+#~ msgid "[none]"
+#~ msgstr "[нет]"
diff --git a/po/sk.po b/po/sk.po
index 12937e366..cb3460f14 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -169,46 +169,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s: nepodarilo sa vytvori hashovaciu tabuku: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr ""
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Opakujte heslo: "
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Opakujte heslo: "
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "Opakujte heslo: "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "heslo nie je zopakovan sprvne; skste to znovu"
+
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PIN not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr ""
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "zapisujem do '%s'\n"
@@ -281,7 +302,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "zmeni heslo"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -292,104 +313,104 @@ msgstr ""
"Monosti:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodatonmi informciami"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "by o trochu tich"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|SBOR|nahra rozirujci modul SBOR"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "vyhada ke na serveri kov"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "Skutone aktualizova predvoby pre vybran id uvatea? "
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "aktualizova databzu dvery"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "chyba pri vytvran hesla: %s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -398,158 +419,158 @@ msgstr ""
"Chyby oznmte, prosm, na adresu <gnupg-bugs@gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pouitie: gpg [monosti] [sbory] (-h pre pomoc)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn sbor s monosami `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "sbor s monosami `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "tam monosti z `%s'\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pri vytvran `%s': %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemem vytvori adresr `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nemem vytvori: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nie je v tomto seden dostupn\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "chyba pri posielan na `%s': %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizcia zlyhala: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: adresr vytvoren\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "databza dvery: procedra read() (n=%d) zlyhala: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: nemem vytvori adresr: %s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualizcia tajnho ka zlyhala: %s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskoen: %s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto seden dostupn\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "zl formt premennej prostredia GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -615,42 +636,42 @@ msgstr "chyba pri vytvran hesla: %s\n"
msgid "cancelled\n"
msgstr "Zrui"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "k `%s' nebol njden: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "tajn asti ka nie s dostupn\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "chyba pri tan: %s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -660,115 +681,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "zmeni heslo"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "nemono otvori sbor: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "chyba pri tan `%s': %s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "chyba pri tan `%s': %s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "chyba pri vytvran `%s': %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[User id not found]"
@@ -1165,7 +1189,7 @@ msgstr "nemono previes v dvkovom mde\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Tento prkaz nie je v mdoch %s dovolen.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "tajn asti ka nie s dostupn\n"
@@ -2623,8 +2647,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pouitie: gpgv [monosti] [sbory] (-h pre pomoc)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Syntax: gpg [nastavenia] [sbory]\n"
@@ -5370,12 +5395,12 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m nastaven kritick bit\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hlavn ID ka %08lX)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5388,24 +5413,20 @@ msgstr ""
"\"%.*s\"\n"
"k s dkou %u bitov, typ %s, ID %08lX, vytvoren %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Opakova heslo\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Vloi heslo\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "zruen uvateom\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "problm s agentom: agent vracia 0x%lx\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5415,12 +5436,12 @@ msgstr ""
"Muste pozna heslo, aby ste odomkli tajn k pre\n"
"uvatea: \""
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "dka %u bitov, typ %s, ID %08lX, vytvoren %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
@@ -6691,244 +6712,270 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr ""
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "zmeni heslo"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "zmeni heslo"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Prosm vberte dvod na revokciu:\n"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Prosm vberte dvod na revokciu:\n"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, fuzzy, c-format
msgid "error getting new PIN: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "nemem inicializova databzu dvery: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, fuzzy, c-format
msgid "failed to store the creation date: %s\n"
msgstr "zlyhalo obnovenie vyrovnvacej pamti kov: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, fuzzy, c-format
msgid "reading public key failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr ""
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr ""
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "zmeni heslo"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "nepodarilo posla k na server: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr ""
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr ""
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
-msgstr ""
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "zmeni heslo"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Prosm vberte dvod na revokciu:\n"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
#, fuzzy
msgid "error reading application data\n"
msgstr "chyba pri tan bloku ka: %s\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: chyba pri tan vonho zznamu: %s\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' je u skomprimovan\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
#, fuzzy
msgid "generating new key\n"
msgstr "vytvori nov pr kov"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "nemem inicializova databzu dvery: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
#, fuzzy
msgid "generating key failed\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s podpis, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenjden iadne platn dta vo formte OpenPGP.\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr ""
@@ -7307,30 +7354,25 @@ msgstr ""
msgid "none"
msgstr "nie"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "neznme"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "chyba: neplatn odtlaok\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "chyba: neplatn odtlaok\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7540,27 +7582,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "k `%s' nebol njden: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "chyba pri tan bloku ka: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "Revokan certifikt bol vytvoren.\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "duplicita predvoby %c%lu\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
@@ -7855,7 +7897,7 @@ msgstr "chyba pri vytvran hesla: %s\n"
msgid "error storing flags: %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8441,6 +8483,13 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Opakova heslo\n"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "neznme"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "tam monosti z `%s'\n"
diff --git a/po/sv.po b/po/sv.po
index ff300828e..7929bce09 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-07-21 09:04+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -194,44 +194,65 @@ msgstr "stämmer inte överens - försök igen"
msgid "failed to create stream from socket: %s\n"
msgstr "misslyckades med att skapa flöde från uttag: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "Admin PIN-kod"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "Upprepa denna PIN-kod"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Upprepa denna PIN-kod"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "Upprepa denna PIN-kod"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN-kod repeterades inte korrekt; försök igen"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN-kod repeterades inte korrekt; försök igen"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN-kod repeterades inte korrekt; försök igen"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "fel när temporärfil skapades: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "fel vid skrivning till temporärfil: %s\n"
@@ -313,7 +334,7 @@ msgid "Please enter the new passphrase"
msgstr "Ange den nya lösenfrasen"
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -322,110 +343,110 @@ msgstr ""
"@Flaggor:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "kör i demonläge (bakgrund)"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "utförlig"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "var något tystare"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "sh-liknande kommandoutdata"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "frigör inte från konsollen"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "fånga inte tangentbord och mus"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "använd en loggfil för servern"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "använd en standardplats för uttaget"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PRG|använd PRG som SCdaemon-programmet"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "använd inte SCdaemon"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "ignorera begäran om att ändra TTY"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "ignorera begäran om att ändra X-display"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "använd inte mellanlagring av PIN-kod vid signering"
# Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "tillåt klienter att markera nycklar som \"trusted\""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "tillåt förinställning av lösenfras"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "aktivera ssh-agent-emulering"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|FIL|skriv miljöinställningar även till FIL"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -433,145 +454,145 @@ msgstr ""
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s är för gammal (behöver %s, har %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fel när \"%s\" skapades: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan inte skapa katalog: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "namnet på uttaget är för långt\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "namnet på uttaget \"%s\" är för långt\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent är redan igång - startar inte en till\n"
# Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fel när \"%s\" bands till uttag: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "lyssnar på uttaget \"%s\"\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen \"%s\" skapades\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() misslyckades för \"%s\": %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan inte använda \"%s\" som hemkatalog\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "hanteraren 0x%lx för fd %d startad\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "hanteraren 0x%lx för fd %d avslutad\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select misslyckades: %s - väntar 1 s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -639,42 +660,42 @@ msgstr "fel vid fråga efter lösenfrasen: %s\n"
msgid "cancelled\n"
msgstr "avbruten\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "fil \"%s\", rad %d: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -684,34 +705,9 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Validera att certifikatet identifierat som:%%0A \"%s\"%%0Ahar "
-"fingeravtrycket:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Korrekt"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -720,22 +716,50 @@ msgstr ""
"Litar du förbehållslöst på%%0A \"%s\"%%0Aatt korrekt certifiera "
"användarcertifikat?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "Nej"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Validera att certifikatet identifierat som:%%0A \"%s\"%%0Ahar "
+"fingeravtrycket:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Korrekt"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
"nu."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -744,62 +768,62 @@ msgstr ""
"Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s. Du bör ändra "
"den nu."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "ändra lösenfras"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
# se förra kommentaren
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "kan inte fdopen rör för läsning: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "fel vid körning av \"%s\": avslutades\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "fel när uttag skapades: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "värden hittades inte"
@@ -1176,7 +1200,7 @@ msgstr "kan inte göra detta i satsläge\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
@@ -2603,8 +2627,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Syntax: gpg [flaggor] [filer]\n"
@@ -5299,12 +5324,12 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (primära nyckelns id %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5319,24 +5344,20 @@ msgstr ""
"%u-bitars %s-nyckel, ID %s,\n"
"skapad %s%s.\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Repetera lösenfrasen\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Ange lösenfrasen\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "avbruten av användaren\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "problem med agenten: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5345,12 +5366,12 @@ msgstr ""
"Du behöver en lösenfras för att låsa upp den hemliga\n"
"nyckeln för användaren: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (undernyckel på primärt nyckel-id %s)"
@@ -6635,244 +6656,271 @@ msgstr ""
"Syntax: kbxutil [flaggor] [filer]\n"
"lista, exportera, importera nyckelskåpsdata\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||Knappa in din PIN-kod på läsarens knappsats"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN-återanrop returnerade fel: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "NullPIN har ännu inte ändrats\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN-kod"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Knappa in din PIN-kod på läsarens knappsats"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Ange administratörens PIN-kod på läsarens knappsats"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "fel vid hämtning av ny PIN-kod: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "misslyckades med att lagra datum för skapandet: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "läsning av publik nyckel misslyckades: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "svaret innehåller inte publikt nyckeldata\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "svaret innehåller inte en RSA-modulus\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "svaret innehåller inte den publika RSA-exponenten\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr "använder standard-PIN som %s\n"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
"ytterligare standardanvändning\n"
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "validering av CHV%d misslyckades: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "fel vid hämtning av CHV-status från kort\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "kortet är låst permanent!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr ""
"|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående "
"försök: %d]"
-#: scd/app-openpgp.c:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|Ange administratörens 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN-kod"
+#: scd/app-openpgp.c:1654
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code 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:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN-kod"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN-kod"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "fel vid läsning av programdata\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "fel vid läsning av fingeravtryckets DO\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "nyckeln finns redan\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "befintlig nyckel kommer att ersättas\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "genererar ny nyckel\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "tidsstämpel för skapandet saknas\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "misslyckades med att lagra nyckeln: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "var god vänta under tiden nyckeln genereras ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "nyckelgenereringen misslyckades\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
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:2768
+#: scd/app-openpgp.c:2794
#, 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:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer skapade hittills: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||Knappa in din PIN-kod på läsarens knappsats"
+
#. 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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|Initial PIN-kod"
@@ -7230,27 +7278,23 @@ msgstr "(det här är MD2-algoritmen)\n"
msgid "none"
msgstr "ingen"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[ingen]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Fel - ogiltig kodning]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[Fel - slut på kärna]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Fel - Inget namn]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Fel - ogiltigt DN]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7459,27 +7503,27 @@ msgstr "(det här är RC2-algoritmen)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "certifikatet \"%s\" hittades inte: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "fel vid låsning av nyckelskåp: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "dubblett av certifikatet \"%s\" borttaget\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "certifikatet \"%s\" togs bort\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
@@ -7755,7 +7799,7 @@ msgstr "fel vid hämtning av lagrade flaggor: %s\n"
msgid "error storing flags: %s\n"
msgstr "fel vid lagring av flaggor: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "Fel - "
@@ -8339,6 +8383,19 @@ msgstr ""
"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repetera lösenfrasen\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr ""
+#~ "||Ange din PIN-kod på läsarens knappsats%%0A[signaturer gjorda: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Admin PIN-kod"
+
+#~ msgid "[none]"
+#~ msgstr "[ingen]"
+
#~ msgid "read options from file"
#~ msgstr "läs inställningar från fil"
diff --git a/po/tr.po b/po/tr.po
index ba8856f83..fc745d47f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-12-14 23:25+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@ -171,42 +171,63 @@ msgstr "aynı değiller - tekrar deneyin"
msgid "failed to create stream from socket: %s\n"
msgstr "sokette akım oluşturulamadı: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "Yönetici PIN'i"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr "Sıfırlama Kodu"
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
msgid "Repeat this Reset Code"
msgstr "Bu Sıfırlama Kodu tekrarlansın"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "Bu PIN tekrarlansın "
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "Bu PIN tekrarlansın "
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "geçici dosya oluşturulurken hata: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "geçeci dosyaya yazma hatası: %s\n"
@@ -286,7 +307,7 @@ msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı girini
msgid "Please enter the new passphrase"
msgstr "Lütfen yeni anahtar parolasını girin"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -295,109 +316,109 @@ msgstr ""
"@Seçenekler:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "artalan süreci olarak çalışır"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ayrıntılı"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "sh tarzı komut çıktısı"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "konsoldan kopulmaz"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "klavye ve fare gaspedilmez"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "sunucu için bir günlük dosyası kullanılır"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "soket için standart bir yer kullanılır"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "Akıllı kart süreci kullanılmaz"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "TTY değiştirme istekleri yoksayılır"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "X birimi değiştirme istekleri yoksayılır"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "imzalarken PIN arabelleği kullanılmaz"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "ssh-agent öykünümü etkinleşir"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Yazılım hatalarını lütfen <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -405,144 +426,144 @@ msgstr ""
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s çok eski (gereken %s, sizinki %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "`%s' oluşturulurken hata: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "`%s' dizini oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "soketin ismi çok uzun\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "soketin ismi `%s' çok uzun\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "`%s' soketi dinlemede\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "dizin `%s' oluşturuldu\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "%s için stat() başarısız oldu: %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "`%s' ev dizini olarak kullanılamıyor\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select başarısız: %s - 1s bekliyor\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -611,42 +632,42 @@ msgstr "anahtar parolası sorulurken hata: %s\n"
msgid "cancelled\n"
msgstr "iptal edildi\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "'%s' açılırken hata: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "`%s' dosyası, %d. satır: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "sistem güvence listesi `%s' kullanım dışı\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "`%s', %d. satırda parmakizi hatalı\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "`%s' okunurken %d. satırda hata: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -656,34 +677,9 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-"Sertifikanın böyle tanındığını lütfen doğrulayın:%%0A \"%s\"%%0Abu "
-"parmakizine sahip:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "Doğru"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -692,21 +688,49 @@ msgstr ""
"Kullanıcı sertifikalarının%%0A \"%s\"%%0Aile doğru olarak onaylanacağından "
"son derece emin misiniz?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Evet"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "Hayır"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Sertifikanın böyle tanındığını lütfen doğrulayın:%%0A \"%s\"%%0Abu "
+"parmakizine sahip:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "Doğru"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
"Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
@@ -715,61 +739,61 @@ msgstr ""
"Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
"şimdi değiştirin."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "Anahtar parolasını değiştir"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "Sonra değiştireceğim"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "okumak için boruya fdopen yapılamadı: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "`%s' çalışırken hata: sonlandırıldı\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "soket oluşturulurken hata: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "konak yok"
@@ -1139,7 +1163,7 @@ msgstr "bu önceden betik kipinde yapılamaz\n"
msgid "This command is only available for version 2 cards\n"
msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
@@ -2532,8 +2556,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"Kullanımı: gpg [seçenekler] [dosyalar]\n"
@@ -5239,12 +5264,12 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (asıl anahtar kimliği %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5258,24 +5283,20 @@ msgstr ""
"%u bitlik %s anahtarı, kimlik %s,\n"
"oluşturma tarihi %s%s.\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "Parolayı tekrar yazınız\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "Anahtar parolasını giriniz\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "kullanıcı tarafından durduruldu\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "aracı ile sorun var: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5284,12 +5305,12 @@ msgstr ""
"Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
"Anahtarın sahibi: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -6540,242 +6561,268 @@ msgstr ""
"Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
"Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN eylemcisi hata döndürdü: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "BoşPIN henüz değişmedi\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|Yeni PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "yeni PIN alınırken hata: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "parmakizinin saklanması başarısız oldu: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "genel anahtar okuması başarısız: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "yanıt genel anahtar verisi içermiyor\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "yanıt RSA modülü içermiyor\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "yanıt RSA genel bileşenini içermiyor\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
"%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
"ediliyor\n"
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr ""
-"||Lütfen PIN'inizi okuyucu tuştakımından giriniz%%0A[yapılan imza: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
msgid "||Please enter the PIN"
msgstr "||Lütfen PIN'i giriniz"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
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:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "karttan CHV durumu alınırken hata\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "kart kalıcı olarak kilitli!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, 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"
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr ""
"|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0A[kalan deneme: %"
"d]"
-#: scd/app-openpgp.c:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
-
-#. 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|Yönetici PIN'i"
+#: scd/app-openpgp.c:1654
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||Lütfen PIN'i giriniz"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
msgid "||Please enter the Reset Code for the card"
msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr "|YSK|Yeni Sıfırlama Kodu"
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|YYP|Yeni Yönetici PIN'i"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|Yeni PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "uygulama verisi okunurken hata\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "parmakizi DO okunurken hata\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "anahtar zaten mevcut\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "mevcut anahtar konulacak\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "yeni anahtar üretiliyor\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "oluşturum zaman damgası kayıp\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, 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:2357
+#: scd/app-openpgp.c:2383
#, 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:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, 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:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "anahtarın saklanması başarısız: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "anahtar üretimi başarısızlığa uğradı\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
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:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kart %s özet algoritmasını desteklemiyor\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
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:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
+
#. 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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|İlk Yeni PIN"
@@ -7133,27 +7180,23 @@ msgstr "(bu, MD2 algoritmasıdır)\n"
msgid "none"
msgstr "yok"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[yok]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[Hata - kodlama geçersiz]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[Hata - nüve dışında]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[Hata - Adsız]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[Hata - DN geçersiz]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7360,27 +7403,27 @@ msgstr "(bu, RC2 algoritmasıdır)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "sertifika \"%s\" yok: %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "anahtar bloğu kilitlenirken hata: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "yinelenmiş sertifika `%s' silindi\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "sertifika `%s' silindi\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
@@ -7655,7 +7698,7 @@ msgstr "saklanmış bayraklar alınırken hata: %s\n"
msgid "error storing flags: %s\n"
msgstr "bayraklar saklanırken hata: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "Hata - "
@@ -8238,3 +8281,16 @@ msgstr ""
"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası\n"
"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
"karşılaştırır\n"
+
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Parolayı tekrar yazınız\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr ""
+#~ "||Lütfen PIN'inizi okuyucu tuştakımından giriniz%%0A[yapılan imza: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|Yönetici PIN'i"
+
+#~ msgid "[none]"
+#~ msgstr "[yok]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e32739d64..f2053e3c8 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: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+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"
@@ -176,46 +176,67 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s:建立散列表失败:%s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
#, fuzzy
msgid "Admin PIN"
msgstr "|A|管理员 PIN"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "再次输入此 PIN:"
+
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PIN"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "PIN 再次输入时与首次输入不符;请再试一次"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, fuzzy, c-format
msgid "error creating temporary file: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, fuzzy, c-format
msgid "error writing to temporary file: %s\n"
msgstr "%s:写入目录记录时出错:%s\n"
@@ -288,7 +309,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "更改密码"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -299,104 +320,104 @@ msgstr ""
"选项:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
#, fuzzy
msgid "use a standard location for the socket"
msgstr "为所选用户标识的设定注记"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误:%s\n"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
@@ -405,158 +426,158 @@ msgstr ""
"请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
"请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错:%s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -622,42 +643,42 @@ msgstr "生成密码的时候发生错误:%s\n"
msgid "cancelled\n"
msgstr "已取消"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, fuzzy, c-format
msgid "error opening `%s': %s\n"
msgstr "‘%s’中出错:%s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, fuzzy, c-format
msgid "file `%s', line %d: %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, fuzzy, c-format
msgid "system trustlist `%s' not available\n"
msgstr "私钥部分不可用\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, fuzzy, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "读取‘%s’错误:%s\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr ""
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, fuzzy, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr ""
@@ -667,115 +688,118 @@ msgstr ""
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr ""
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr ""
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr ""
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr ""
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
#, fuzzy
msgid "Change passphrase"
msgstr "更改密码"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: common/http.c:1680
+#: common/http.c:1690
#, fuzzy
msgid "host not found"
msgstr "[找不到用户标识]"
@@ -1164,7 +1188,7 @@ msgstr "在批处理模式中无法完成此操作\n"
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
@@ -2544,8 +2568,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法:gpgv [选项] [文件] (用 -h 求助)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"语法:gpg [选项] [文件]\n"
@@ -5154,12 +5179,12 @@ msgstr "警告:潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5172,36 +5197,32 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "请再输入一次密码\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
@@ -6415,239 +6436,265 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "新的 PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹:%s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期:%s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1443
-#, fuzzy, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
-#: scd/app-openpgp.c:1620
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
#, fuzzy, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1654
#, fuzzy
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
+msgid "|A|Please enter the Admin PIN"
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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|管理员 PIN"
-
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "新的 PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+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-dinsig.c:526
+#: scd/app-dinsig.c:528
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "新的 PIN"
@@ -7024,30 +7071,25 @@ msgstr ""
msgid "none"
msgstr "no"
-#: sm/certdump.c:154
-#, fuzzy
-msgid "[none]"
-msgstr "[未设定]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
#, fuzzy
msgid "[Error - invalid encoding]"
msgstr "错误:无效的响应。\n"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr ""
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr ""
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
#, fuzzy
msgid "[Error - invalid DN]"
msgstr "错误:无效的响应。\n"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7258,27 +7300,27 @@ msgstr ""
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, fuzzy, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "找不到私钥“%s”:%s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "读取密钥区块时发生错误:%s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, fuzzy, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "已建立吊销证书。\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, fuzzy, c-format
msgid "certificate `%s' deleted\n"
msgstr "首选项‘%s’重复\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, fuzzy, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "删除密钥区块时失败:%s\n"
@@ -7570,7 +7612,7 @@ msgstr "获取新 PIN 时出错:%s\n"
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr ""
@@ -8153,6 +8195,20 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "请再输入一次密码\n"
+
+#, fuzzy
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|管理员 PIN"
+
+#, fuzzy
+#~ msgid "[none]"
+#~ msgstr "[未设定]"
+
#, fuzzy
#~ msgid "read options from file"
#~ msgstr "从‘%s’读取选项\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b0faebc14..0734c30e6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-03 09:09+0100\n"
+"POT-Creation-Date: 2009-03-24 18:42+0100\n"
"PO-Revision-Date: 2008-12-10 22:48+0800\n"
"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -171,42 +171,63 @@ msgstr "前後不一致 - 請再試一次"
msgid "failed to create stream from socket: %s\n"
msgstr "從 socket 建立串流失敗: %s\n"
-#: agent/divert-scd.c:219
+#: agent/divert-scd.c:199
msgid "Admin PIN"
msgstr "管理者 PIN"
-#: agent/divert-scd.c:224
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:204
+msgid "PUK"
+msgstr ""
+
+#: agent/divert-scd.c:211
msgid "Reset Code"
msgstr "重設碼"
-#: agent/divert-scd.c:284
+#: agent/divert-scd.c:237
+#, c-format
+msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgstr ""
+
+#: agent/divert-scd.c:286
msgid "Repeat this Reset Code"
msgstr "請再次輸入重設碼"
-#: agent/divert-scd.c:285
+#: agent/divert-scd.c:288
+#, fuzzy
+msgid "Repeat this PUK"
+msgstr "請再次輸入 PIN"
+
+#: agent/divert-scd.c:289
msgid "Repeat this PIN"
msgstr "請再次輸入 PIN"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:294
msgid "Reset Code not correctly repeated; try again"
msgstr "前後兩次輸入的重設碼不一致; 請再試一次"
-#: agent/divert-scd.c:291
+#: agent/divert-scd.c:296
+#, fuzzy
+msgid "PUK not correctly repeated; try again"
+msgstr "前後兩次輸入的 PIN 不一致; 請再試一次"
+
+#: agent/divert-scd.c:297
msgid "PIN not correctly repeated; try again"
msgstr "前後兩次輸入的 PIN 不一致; 請再試一次"
-#: agent/divert-scd.c:303
+#: agent/divert-scd.c:309
#, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "請輸入 PIN%s%s%s 以解開卡片"
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:634 sm/export.c:650
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
#: sm/import.c:531 sm/import.c:556
#, c-format
msgid "error creating temporary file: %s\n"
msgstr "建立暫存檔時出錯: %s\n"
-#: agent/genkey.c:115 sm/export.c:641 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
#, c-format
msgid "error writing to temporary file: %s\n"
msgstr "寫入暫存檔時出錯: %s\n"
@@ -277,7 +298,7 @@ msgstr "請輸入密語至%0A以保護你的新金鑰"
msgid "Please enter the new passphrase"
msgstr "請輸入新的密語"
-#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
msgid ""
"@Options:\n"
@@ -286,109 +307,109 @@ msgstr ""
"@選項:\n"
" "
-#: agent/gpg-agent.c:119 scd/scdaemon.c:104
+#: agent/gpg-agent.c:120 scd/scdaemon.c:104
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
-#: agent/gpg-agent.c:120 scd/scdaemon.c:107
+#: agent/gpg-agent.c:121 scd/scdaemon.c:107
msgid "run in daemon mode (background)"
msgstr "以服務模式執行 (背景)"
-#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:79 tools/symcryptrun.c:164
msgid "verbose"
msgstr "囉唆模式"
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
msgid "sh-style command output"
msgstr "sh 樣式的指令輸出"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
#: tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|檔案|從「檔案」中讀取選項"
-#: agent/gpg-agent.c:130 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
msgid "do not detach from the console"
msgstr "不要從 console 分離"
-#: agent/gpg-agent.c:131
+#: agent/gpg-agent.c:132
msgid "do not grab keyboard and mouse"
msgstr "不要奪取鍵盤及滑鼠"
-#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
msgid "use a log file for the server"
msgstr "為伺服器使用日誌檔"
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "use a standard location for the socket"
msgstr "為 socket 使用標準的位置"
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
msgid "|PGM|use PGM as the SCdaemon program"
msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
msgid "do not use the SCdaemon"
msgstr "不要使用 SCdaemon"
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:154
msgid "ignore requests to change the TTY"
msgstr "忽略變更 TTY 的要求"
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:156
msgid "ignore requests to change the X display"
msgstr "忽略變更 X display 的要求"
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
msgid "|N|expire cached PINs after N seconds"
msgstr "|N|讓快取住的 PIN 在 N 秒後到期"
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:172
msgid "do not use the PIN cache when signing"
msgstr "簽署時不要使用 PIN 快取"
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:174
msgid "allow clients to mark keys as \"trusted\""
msgstr "允許用戶端將金鑰標記為 \"已信任\""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:176
msgid "allow presetting passphrase"
msgstr "允許預先設定密語"
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
msgid "enable ssh-agent emulation"
msgstr "啟用 ssh-agent 模擬"
-#: agent/gpg-agent.c:178
+#: agent/gpg-agent.c:179
msgid "|FILE|write environment settings also to FILE"
msgstr "|檔案|將環境設定也寫至「檔案」"
-#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
-#: agent/gpg-agent.c:325
+#: agent/gpg-agent.c:337
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
-#: agent/gpg-agent.c:327
+#: agent/gpg-agent.c:339
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -396,144 +417,144 @@ msgstr ""
"語法: gpg-agent [選項] [指令 [引數]]\n"
"GnuPG 私鑰管理\n"
-#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "給定的除錯等級 `%s' 無效\n"
-#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
-#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
-#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
-#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項中\n"
-#: agent/gpg-agent.c:1001 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立 `%s' 時出錯: %s\n"
-#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
-#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: agent/gpg-agent.c:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
+#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:989
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "無法建立目錄 `%s': %s\n"
-#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
msgid "name of socket too long\n"
msgstr "socket 名稱太長\n"
-#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
-#: agent/gpg-agent.c:1402
+#: agent/gpg-agent.c:1453
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "socket 名稱 `%s' 太長\n"
-#: agent/gpg-agent.c:1422
+#: agent/gpg-agent.c:1473
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
-#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
-#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
-#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
-#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
#, c-format
msgid "listening on socket `%s'\n"
msgstr "正在候聽 socket `%s'\n"
-#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
+#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "`%s' 目錄已建立\n"
-#: agent/gpg-agent.c:1537
+#: agent/gpg-agent.c:1588
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() 失敗於 `%s': %s\n"
-#: agent/gpg-agent.c:1541
+#: agent/gpg-agent.c:1592
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "無法使用 `%s' 做為家目錄\n"
-#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
-#: agent/gpg-agent.c:1693
+#: agent/gpg-agent.c:1744
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
-#: agent/gpg-agent.c:1698
+#: agent/gpg-agent.c:1749
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
-#: agent/gpg-agent.c:1718
+#: agent/gpg-agent.c:1769
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
-#: agent/gpg-agent.c:1723
+#: agent/gpg-agent.c:1774
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
-#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
-#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
-#: agent/gpg-agent.c:2100
+#: agent/gpg-agent.c:2151
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
-#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
-#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -598,42 +619,42 @@ msgstr "詢問密語時出錯: %s\n"
msgid "cancelled\n"
msgstr "已取消\n"
-#: agent/trustlist.c:132 agent/trustlist.c:322
+#: agent/trustlist.c:135 agent/trustlist.c:333
#, c-format
msgid "error opening `%s': %s\n"
msgstr "開啟 `%s' 時出錯: %s\n"
-#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "檔案 `%s', 第 %d 列: %s\n"
-#: agent/trustlist.c:167 agent/trustlist.c:175
+#: agent/trustlist.c:170 agent/trustlist.c:178
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr "命令 \"%s\" 忽略於 `%s', 第 %d 列\n"
-#: agent/trustlist.c:181
+#: agent/trustlist.c:184
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr "沒有系統信任清單 `%s' 可用\n"
-#: agent/trustlist.c:216
+#: agent/trustlist.c:228
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "不良的指紋於 `%s', 第 %d 列\n"
-#: agent/trustlist.c:242 agent/trustlist.c:249
+#: agent/trustlist.c:253 agent/trustlist.c:260
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "無效的金鑰旗標於 `%s', 第 %d 列\n"
-#: agent/trustlist.c:283 common/helpfile.c:126
+#: agent/trustlist.c:294 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "讀取 `%s' 時出錯, 第 %d 列: %s\n"
-#: agent/trustlist.c:384 agent/trustlist.c:431
+#: agent/trustlist.c:398 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "讀取已信任根憑證清單時出錯\n"
@@ -643,113 +664,116 @@ msgstr "讀取已信任根憑證清單時出錯\n"
#. percent sign is actually needed because it is also
#. a printf format string. If you need to insert a
#. plain % sign, you need to encode it as "%%25". The
-#. second "%s" gets replaced by a hexdecimal
-#. fingerprint string whereas the first one receives
-#. the name as stored in the certificate.
-#: agent/trustlist.c:541
-#, c-format
-msgid ""
-"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
-"fingerprint:%%0A %s"
-msgstr "請驗證憑證與此完全相同:%%0A \"%s\"%%0A其指紋為:%%0A %s"
-
-#. TRANSLATORS: "Correct" is the label of a button and intended to
-#. be hit if the fingerprint matches the one of the CA. The other
-#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:554
-msgid "Correct"
-msgstr "正確"
-
-#. TRANSLATORS: This prompt is shown by the Pinentry
-#. and has one special property: A "%%0A" is used by
-#. Pinentry to insert a line break. The double
-#. percent sign is actually needed because it is also
-#. a printf format string. If you need to insert a
-#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:577
+#: agent/trustlist.c:572
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr "請問你是否徹底信任%%0A \"%s\"%%0A正確驗證使用者憑證的能力?"
-#: agent/trustlist.c:587 common/audit.c:467
+#: agent/trustlist.c:578 common/audit.c:467
msgid "Yes"
msgstr "Yes"
-#: agent/trustlist.c:587 common/audit.c:469
+#: agent/trustlist.c:578 common/audit.c:469
msgid "No"
msgstr "No"
-#: agent/findkey.c:158
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:606
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr "請驗證憑證與此完全相同:%%0A \"%s\"%%0A其指紋為:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:619
+msgid "Correct"
+msgstr "正確"
+
+#: agent/trustlist.c:619
+msgid "Wrong"
+msgstr ""
+
+#: agent/findkey.c:156
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr "請注意: 密語從未變更過.%0A請現在就變更."
-#: agent/findkey.c:174
+#: agent/findkey.c:172
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s. 請現在就變更."
-#: agent/findkey.c:188 agent/findkey.c:195
+#: agent/findkey.c:186 agent/findkey.c:193
msgid "Change passphrase"
msgstr "更改密語"
-#: agent/findkey.c:196
+#: agent/findkey.c:194
msgid "I'll change it later"
msgstr "我稍後再變更"
-#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
#: tools/gpgconf-comp.c:1814
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "建立管道時出錯: %s\n"
-#: common/exechelp.c:450 common/exechelp.c:509
+#: common/exechelp.c:588 common/exechelp.c:647
#, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "無法將管道打開流以讀取: %s\n"
-#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
+#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
-#: common/exechelp.c:662 common/exechelp.c:715
+#: common/exechelp.c:800 common/exechelp.c:853
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
-#: common/exechelp.c:670
+#: common/exechelp.c:808
#, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
-#: common/exechelp.c:676 common/exechelp.c:726
+#: common/exechelp.c:814 common/exechelp.c:864
#, c-format
msgid "error running `%s': exit status %d\n"
msgstr "執行 `%s' 時出錯: 結束狀態 %d\n"
-#: common/exechelp.c:721
+#: common/exechelp.c:859
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr "執行 `%s' 時出錯: 可能尚未安裝\n"
-#: common/exechelp.c:734
+#: common/exechelp.c:872
#, c-format
msgid "error running `%s': terminated\n"
msgstr "執行 `%s' 時出錯: 已終止\n"
-#: common/http.c:1636
+#: common/http.c:1646
#, c-format
msgid "error creating socket: %s\n"
msgstr "建立 socket 時出錯: %s\n"
-#: common/http.c:1680
+#: common/http.c:1690
msgid "host not found"
msgstr "找不到主機"
@@ -1115,7 +1139,7 @@ msgstr "無法在批次模式中這樣做\n"
msgid "This command is only available for version 2 cards\n"
msgstr "祇有第二版卡片纔能用這個指令\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1849
+#: g10/card-util.c:85 scd/app-openpgp.c:1875
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\n"
@@ -2483,8 +2507,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
#: g10/gpgv.c:119
+#, fuzzy
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
"語法: gpg [選項] [檔案]\n"
@@ -5101,12 +5126,12 @@ msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
-#: g10/passphrase.c:295 g10/passphrase.c:589
+#: g10/passphrase.c:294 g10/passphrase.c:587
#, c-format
msgid " (main key ID %s)"
msgstr " (主要金鑰 ID %s)"
-#: g10/passphrase.c:309
+#: g10/passphrase.c:308
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5120,24 +5145,20 @@ msgstr ""
"%u 位元長的 %s 金鑰, ID %s,\n"
"建立於 %s%s.\n"
-#: g10/passphrase.c:335
-msgid "Repeat passphrase\n"
-msgstr "請再輸入一次密語\n"
-
-#: g10/passphrase.c:337
+#: g10/passphrase.c:334
msgid "Enter passphrase\n"
msgstr "請輸入密語\n"
-#: g10/passphrase.c:364
+#: g10/passphrase.c:362
msgid "cancelled by user\n"
msgstr "由使用者所取消\n"
-#: g10/passphrase.c:370 g10/passphrase.c:433
+#: g10/passphrase.c:368 g10/passphrase.c:431
#, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程式的問題: %s\n"
-#: g10/passphrase.c:568
+#: g10/passphrase.c:566
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
@@ -5146,12 +5167,12 @@ msgstr ""
"你需要用密語來解開下列使用者的\n"
"私鑰: \"%s\"\n"
-#: g10/passphrase.c:576
+#: g10/passphrase.c:574
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
-#: g10/passphrase.c:585
+#: g10/passphrase.c:583
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (在主鑰 ID %s 上的子鑰)"
@@ -6356,236 +6377,263 @@ msgstr ""
"語法: kbxutil [選項] [檔案]\n"
"列出, 匯出, 匯入金鑰鑰匙盒資料\n"
-#: scd/app-nks.c:359 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
-
-#: scd/app-nks.c:363 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
-#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
-#: scd/app-dinsig.c:301
+#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
+#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "收回 PIN 時傳回錯誤: %s\n"
-#: scd/app-nks.c:411
+#: scd/app-nks.c:657
msgid "the NullPIN has not yet been changed\n"
msgstr "NullPIN 還沒有變更過\n"
-#. 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-nks.c:591 scd/app-openpgp.c:1898
-msgid "|N|New PIN"
-msgstr "|N|新增 PIN"
+#: scd/app-nks.c:848
+#, fuzzy
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
+
+#: scd/app-nks.c:849
+#, fuzzy
+msgid "||Please enter the PIN for the standard keys."
+msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN"
+
+#: scd/app-nks.c:855
+#, fuzzy
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||請輸入卡片的重設碼"
+
+#: scd/app-nks.c:857
+#, fuzzy
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "||請輸入卡片的重設碼"
+
+#: scd/app-nks.c:865
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr ""
-#: scd/app-nks.c:594 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
+#: scd/app-nks.c:867
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:875
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:877
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+
+#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "取得新的 PIN 時出錯: %s\n"
-#: scd/app-openpgp.c:668
+#: scd/app-openpgp.c:669
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "存放指紋失敗: %s\n"
-#: scd/app-openpgp.c:681
+#: scd/app-openpgp.c:682
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "存放創生日期失敗: %s\n"
-#: scd/app-openpgp.c:1076
+#: scd/app-openpgp.c:1104
#, c-format
msgid "reading public key failed: %s\n"
msgstr "讀取公鑰時失敗: %s\n"
-#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
msgid "response does not contain the public key data\n"
msgstr "回應中未包含公鑰資料\n"
-#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
msgid "response does not contain the RSA modulus\n"
msgstr "回應中未包含 RSA 系數\n"
-#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
msgid "response does not contain the RSA public exponent\n"
msgstr "回應中未包含 RSA 公用指數\n"
-#: scd/app-openpgp.c:1417
+#: scd/app-openpgp.c:1448
#, c-format
msgid "using default PIN as %s\n"
msgstr "以預設 PIN 做為 %s\n"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1455
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr "使用預設 PIN 做為 %s 失敗: %s - 正在停用之後的預設使用\n"
-#: scd/app-openpgp.c:1443
-#, c-format
-msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
-
-#: scd/app-openpgp.c:1477
+#: scd/app-openpgp.c:1470
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
-#: scd/app-openpgp.c:1489
+#: scd/app-openpgp.c:1481
msgid "||Please enter the PIN"
msgstr "||請輸入 PIN"
-#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
#, 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:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
-#: scd/app-openpgp.c:2869
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
+#: scd/app-openpgp.c:2895
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "驗證 CHV%d 失敗: %s\n"
-#: scd/app-openpgp.c:1576
+#: scd/app-openpgp.c:1598
msgid "access to admin commands is not configured\n"
msgstr "管理者指令存取權限尚未組態\n"
-#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
msgid "error retrieving CHV status from card\n"
msgstr "從卡片取回 CHV 狀態時出錯\n"
-#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
msgid "card is permanently locked!\n"
msgstr "卡片永久鎖定了!!\n"
-#: scd/app-openpgp.c:1610
+#: scd/app-openpgp.c:1634
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
-#: scd/app-openpgp.c:1620
-#, c-format
-msgid ""
-"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
-"%d]"
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep
+#. it at the start of the string. Use %%0A to force a
+#. lienfeed.
+#: scd/app-openpgp.c:1642
+#, fuzzy, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
-#: scd/app-openpgp.c:1635
-msgid "|A|Please enter the Admin PIN at the reader's keypad"
-msgstr "|A|請在讀卡機鍵盤上輸入管理者 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:1655
-msgid "|A|Admin PIN"
-msgstr "|A|管理者 PIN"
+#: scd/app-openpgp.c:1654
+#, fuzzy
+msgid "|A|Please enter the Admin PIN"
+msgstr "||請輸入 PIN"
-#: scd/app-openpgp.c:1854
+#: scd/app-openpgp.c:1880
msgid "||Please enter the Reset Code for the card"
msgstr "||請輸入卡片的重設碼"
-#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "重設碼太短; 長度最少要有 %d\n"
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1923
msgid "|RN|New Reset Code"
msgstr "|RN|新增重設碼"
-#: scd/app-openpgp.c:1898
+#: scd/app-openpgp.c:1924
msgid "|AN|New Admin PIN"
msgstr "|AN|新增管理者 PIN"
-#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
+#: scd/app-openpgp.c:1924
+msgid "|N|New PIN"
+msgstr "|N|新增 PIN"
+
+#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
msgid "error reading application data\n"
msgstr "讀取應用程式資料時出錯\n"
-#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
msgid "error reading fingerprint DO\n"
msgstr "讀取指紋 DO 時出錯\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2030
msgid "key already exists\n"
msgstr "金鑰已存在\n"
-#: scd/app-openpgp.c:2008
+#: scd/app-openpgp.c:2034
msgid "existing key will be replaced\n"
msgstr "既有的金鑰將被取代\n"
-#: scd/app-openpgp.c:2010
+#: scd/app-openpgp.c:2036
msgid "generating new key\n"
msgstr "正在產生新的金鑰\n"
-#: scd/app-openpgp.c:2336
+#: scd/app-openpgp.c:2362
msgid "creation timestamp missing\n"
msgstr "缺漏創生時間戳印\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2371
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:2357
+#: scd/app-openpgp.c:2383
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
-#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:2469
+#: scd/app-openpgp.c:2495
#, c-format
msgid "failed to store the key: %s\n"
msgstr "存放金鑰失敗: %s\n"
-#: scd/app-openpgp.c:2529
+#: scd/app-openpgp.c:2555
msgid "please wait while key is being generated ...\n"
msgstr "正在產生金鑰中, 請稍候 ...\n"
-#: scd/app-openpgp.c:2543
+#: scd/app-openpgp.c:2569
msgid "generating key failed\n"
msgstr "產生金鑰時失敗\n"
-#: scd/app-openpgp.c:2546
+#: scd/app-openpgp.c:2572
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "金鑰產生完畢 (%d 秒)\n"
-#: scd/app-openpgp.c:2603
+#: scd/app-openpgp.c:2629
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
-#: scd/app-openpgp.c:2653
+#: scd/app-openpgp.c:2679
msgid "fingerprint on card does not match requested one\n"
msgstr "卡片上的指紋與所要求的那個並不吻合\n"
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2794
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡片不支援 %s 摘要演算法\n"
-#: scd/app-openpgp.c:2844
+#: scd/app-openpgp.c:2870
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前建立的簽章: %lu\n"
-#: scd/app-openpgp.c:3134
+#: scd/app-openpgp.c:3160
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
-#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's keypad"
+msgstr "||請在讀卡機鍵盤上輸入你的 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-dinsig.c:526
+#: scd/app-dinsig.c:528
msgid "|N|Initial New PIN"
msgstr "|N|開始新增 PIN"
@@ -6940,27 +6988,23 @@ msgstr "(這是 MD2 演算法)\n"
msgid "none"
msgstr "無"
-#: sm/certdump.c:154
-msgid "[none]"
-msgstr "[ 無 ]"
-
-#: sm/certdump.c:577 sm/certdump.c:622 sm/certdump.c:687 sm/certdump.c:745
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
msgid "[Error - invalid encoding]"
msgstr "[錯誤 - 無效的編碼]"
-#: sm/certdump.c:585 sm/certdump.c:630
+#: sm/certdump.c:572 sm/certdump.c:617
msgid "[Error - out of core]"
msgstr "[錯誤 - 超出核心]"
-#: sm/certdump.c:667 sm/certdump.c:723
+#: sm/certdump.c:654 sm/certdump.c:710
msgid "[Error - No name]"
msgstr "[錯誤 - 沒有名稱]"
-#: sm/certdump.c:692 sm/certdump.c:751
+#: sm/certdump.c:679 sm/certdump.c:738
msgid "[Error - invalid DN]"
msgstr "[錯誤 - 無效的 DN]"
-#: sm/certdump.c:961
+#: sm/certdump.c:948
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7164,27 +7208,27 @@ msgstr "(這是 RC2 演算法)\n"
msgid "(this does not seem to be an encrypted message)\n"
msgstr "(這看起來不像是個加密過的訊息)\n"
-#: sm/delete.c:50 sm/delete.c:101
+#: sm/delete.c:51 sm/delete.c:112
#, c-format
msgid "certificate `%s' not found: %s\n"
msgstr "找不到憑證 `%s': %s\n"
-#: sm/delete.c:111 sm/keydb.c:1399 sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
#, c-format
msgid "error locking keybox: %s\n"
msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
-#: sm/delete.c:132
+#: sm/delete.c:143
#, c-format
msgid "duplicated certificate `%s' deleted\n"
msgstr "重複的 `%s' 憑證已刪除\n"
-#: sm/delete.c:134
+#: sm/delete.c:145
#, c-format
msgid "certificate `%s' deleted\n"
msgstr "憑證 `%s' 已刪除\n"
-#: sm/delete.c:164
+#: sm/delete.c:175
#, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
@@ -7457,7 +7501,7 @@ msgstr "取得已存放的旗標時出錯: %s\n"
msgid "error storing flags: %s\n"
msgstr "存放旗標時出錯: %s\n"
-#: sm/keylist.c:623
+#: sm/keylist.c:640
msgid "Error - "
msgstr "錯誤 - "
@@ -8033,6 +8077,18 @@ msgstr ""
"語法: gpg-check-pattern [選項] 樣式檔案\n"
"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "請再輸入一次密語\n"
+
+#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+#~ msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
+
+#~ msgid "|A|Admin PIN"
+#~ msgstr "|A|管理者 PIN"
+
+#~ msgid "[none]"
+#~ msgstr "[ 無 ]"
+
#~ msgid "read options from file"
#~ msgstr "從檔案中讀取選項"