summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-07-17 21:40:53 +0200
committerWerner Koch <wk@gnupg.org>2008-07-17 21:40:53 +0200
commit9d5a10a4530c8579b034f7e7492ad4829ae883a8 (patch)
tree127fca25e584b5189a957297e6f984a1271b5612 /po
parentMinor fixes. (diff)
downloadgnupg2-9d5a10a4530c8579b034f7e7492ad4829ae883a8.tar.xz
gnupg2-9d5a10a4530c8579b034f7e7492ad4829ae883a8.zip
Do not run the setuid test if running under as root proper.
Documentation fixes. Some enhancements for the new OpenPGP Card.
Diffstat (limited to 'po')
-rw-r--r--po/be.po510
-rw-r--r--po/ca.po519
-rw-r--r--po/cs.po514
-rw-r--r--po/da.po519
-rw-r--r--po/de.po516
-rw-r--r--po/el.po514
-rw-r--r--po/eo.po519
-rw-r--r--po/es.po516
-rw-r--r--po/et.po514
-rw-r--r--po/fi.po514
-rw-r--r--po/fr.po514
-rw-r--r--po/gl.po519
-rw-r--r--po/hu.po514
-rw-r--r--po/id.po514
-rw-r--r--po/it.po514
-rw-r--r--po/ja.po516
-rw-r--r--po/nb.po513
-rw-r--r--po/pl.po512
-rw-r--r--po/pt.po514
-rw-r--r--po/pt_BR.po519
-rw-r--r--po/ro.po516
-rw-r--r--po/ru.po512
-rw-r--r--po/sk.po514
-rw-r--r--po/sv.po512
-rw-r--r--po/tr.po512
-rw-r--r--po/zh_CN.po513
-rw-r--r--po/zh_TW.po515
27 files changed, 8094 insertions, 5804 deletions
diff --git a/po/be.po b/po/be.po
index 57ed908c8..2e789f392 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -91,9 +91,10 @@ msgstr "дрэнны пароль"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr ""
@@ -101,11 +102,11 @@ msgstr ""
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -394,24 +395,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
@@ -696,8 +697,8 @@ msgstr "дрэнны пароль"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
@@ -1094,13 +1095,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr ""
@@ -1273,7 +1274,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr ""
@@ -2208,7 +2209,7 @@ msgstr "%s:%d: недапушчальныя выбары экспартаван
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr ""
@@ -2248,11 +2249,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr ""
@@ -3234,20 +3235,20 @@ msgstr "збой падпісаньня: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr ""
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr ""
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Ключ абаронены.\n"
@@ -3264,7 +3265,7 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr ""
@@ -3983,73 +3984,73 @@ msgstr "выдаліць ключы са зьвязку сакрэтных кл
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr ""
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "недапушчальныя дапомныя перавагі\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr ""
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr ""
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr ""
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr ""
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr ""
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "зашыфраваць даньні"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4063,109 +4064,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr ""
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr ""
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr ""
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr ""
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr ""
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr ""
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr ""
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr ""
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr ""
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr ""
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr ""
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4175,7 +4176,7 @@ msgid ""
" <n>y = key expires in n years\n"
msgstr ""
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4185,55 +4186,55 @@ msgid ""
" <n>y = signature expires in n years\n"
msgstr ""
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr ""
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr ""
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr ""
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr ""
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr ""
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4243,44 +4244,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr ""
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr ""
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr ""
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr ""
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr ""
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr ""
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr ""
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr ""
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4288,7 +4289,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4303,34 +4304,34 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4338,7 +4339,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4346,91 +4347,91 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr ""
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "запіс у stdout\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr ""
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr ""
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4463,30 +4464,30 @@ msgstr ""
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr ""
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr ""
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr ""
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr ""
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr "паказаць ключы й адбіткі пальцаў"
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -4959,7 +4960,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr ""
@@ -6225,26 +6226,64 @@ msgstr "недапушчальныя выбары імпартаваньня\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr ""
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "збой падпісаньня: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "запіс у stdout\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6283,6 +6322,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6298,15 +6349,15 @@ msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
msgid "reading public key failed: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6336,7 +6387,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "збой падпісаньня: %s\n"
@@ -6345,11 +6396,11 @@ msgstr "збой падпісаньня: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6380,108 +6431,106 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr ""
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "стварыць новую пару ключоў"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr ""
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6552,21 +6601,21 @@ msgstr ""
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr ""
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6635,7 +6684,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "грамадскі ключ ня знойдзены"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -6835,7 +6884,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -6884,7 +6933,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
@@ -7090,7 +7139,7 @@ msgstr ""
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr ""
@@ -7241,12 +7290,13 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к
msgid "add this secret keyring to the list"
msgstr ""
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|НАЗВА| задаць назву дапомнага сакрэтнага ключа"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ВУЗЕЛ| выкарыстоўваць гэты паслужнік для пошуку ключоў"
#: sm/gpgsm.c:365
@@ -7307,25 +7357,45 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "невядомая вэрсыя"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr ""
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7406,6 +7476,10 @@ msgstr "памылка стварэньня \"%s\": %s\n"
msgid "error storing flags: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7437,7 +7511,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7445,7 +7519,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr ""
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr ""
@@ -7571,141 +7655,145 @@ msgstr "памылка стварэньня \"%s\": %s\n"
msgid "error sending standard options: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "Паўтарыце пароль\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|ІМЯ| зашыфраваць для вылучанай асобы"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
msgid "|URL|use keyserver at URL"
msgstr ""
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 969461f88..021a4530a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -113,9 +113,10 @@ msgstr "la contrasenya és errònia"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -123,11 +124,11 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -424,24 +425,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
@@ -732,8 +733,8 @@ msgstr "canvia la contrasenya"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@ -1164,14 +1165,14 @@ msgstr ""
# Destès? ivb
# Desatès, sí. jm
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "La vostra selecció? "
@@ -1349,7 +1350,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "La selecció és invàlida.\n"
@@ -2336,7 +2337,7 @@ msgstr "%s:%d opcions d'exportació no vàlides\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVÍS: el programa podria crear un fitxer core!\n"
@@ -2381,11 +2382,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
@@ -3441,20 +3442,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Aquesta clau no està protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "La clau està protegida.\n"
@@ -3471,7 +3472,7 @@ msgstr ""
"Introduïu la nova contrasenya per a la clau secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
@@ -4265,74 +4266,74 @@ msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"S'està mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "la preferència %c%lu és duplicada\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "hi ha massa preferències «%c»\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "hi ha massa preferències «%c»\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "hi ha massa preferències «%c»\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "s'està escrivint una signatura directa\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "s'està escrivint l'autosignatura\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "xifra dades"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4346,109 +4347,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (només signar)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (només signar)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (només xifrar)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (només signar)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (només xifrar)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (només xifrar)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quina grandària voleu? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La grandària sol·licitada és %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4464,7 +4465,7 @@ msgstr ""
" <n>m = la clau caduca als n mesos\n"
" <n>y = la clau caduca als n anys\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4480,42 +4481,42 @@ msgstr ""
" <n>m = la signatura caduca als n mesos\n"
" <n>y = la signatura caduca als n anys\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Indiqueu la validesa de la clau (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Indiqueu la validesa de la signatura (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "el valor no és vàlid\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s no caduca en absolut\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s no caduca en absolut\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca el %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Aquesta signatura caduca el %s\n"
# Amb «it» es refereix a les dates? ivb
# Això vaig entendre jo. jm
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4523,19 +4524,19 @@ msgstr ""
"El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
"Tanmateix, les tractarà bé fins l'any 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4552,44 +4553,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nom i cognoms: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Adreça electrònica: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentari: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4600,7 +4601,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
@@ -4617,23 +4618,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4641,12 +4642,12 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4658,7 +4659,7 @@ msgstr ""
"useu aquest programa amb l'opció \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4670,53 +4671,53 @@ msgstr ""
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"no s'ha trobat cap anell secret de escrivible: %s\n"
"\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus pública i secreta.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4725,13 +4726,13 @@ msgstr ""
"Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
# Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4740,7 +4741,7 @@ msgstr ""
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4748,26 +4749,26 @@ msgstr ""
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4800,30 +4801,30 @@ msgstr "Notació de signatura: "
msgid "Keyring"
msgstr "Anell"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau primària:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau primària:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5311,7 +5312,7 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "el mòdul de xifratge IDEA no està present\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostra més informació\n"
@@ -6697,26 +6698,64 @@ msgstr "opcions d'importació no vàlides\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "heu trobat un bug... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "no es pot obrir el fitxer: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "no s'ha trobat la clau pública %08lX: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6755,6 +6794,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error en crear «%s»: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6770,15 +6821,15 @@ msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
msgid "reading public key failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6808,7 +6859,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
@@ -6817,11 +6868,11 @@ msgstr "l'enviament al servidor de claus ha fallat: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6852,109 +6903,108 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "error en crear «%s»: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, 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:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "error: l'empremta digital és invàlida\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "«%s» ja està comprimida\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "genera un nou parell de claus"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, 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:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "La generació de claus ha fallat: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "Introduïu el nom d'usuari: "
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -7027,22 +7077,22 @@ msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -7111,7 +7161,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@ -7325,7 +7375,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7385,7 +7435,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@ -7599,7 +7649,7 @@ msgstr "certificat duplicat: esborrat"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(No es va donar una descripció)\n"
@@ -7751,12 +7801,13 @@ msgstr "afegeix aquest anell a la llista"
msgid "add this secret keyring to the list"
msgstr "afegeix aquest anell secret a la llista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
#: sm/gpgsm.c:365
@@ -7814,26 +7865,46 @@ msgstr "no s'ha pogut connectar amb «%s»: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(No es va donar una descripció)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = omet aquesta clau\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
# No em passe! ;) ivb
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7915,6 +7986,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7946,7 +8021,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7954,7 +8029,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "l'algoritme de protecció %d%s no està suportat\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@ -8084,141 +8169,145 @@ msgstr "error mentre s'enviava a «%s»: %s\n"
msgid "error sending standard options: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa el mode de contrasenya especificat"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "error en la creació de la contrasenya: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|xifra per a NOM"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8859,10 +8948,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "no s'ha pogut obrir «%s»\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "s'està escrivint la clau secreta a «%s»\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "no es pot fer stat de «%s»: %s\n"
@@ -8928,10 +9013,6 @@ msgstr ""
#~ msgstr "la clau secreta no està disponible"
#, fuzzy
-#~ msgid "Enter New PIN: "
-#~ msgstr "Introduïu el nom d'usuari: "
-
-#, fuzzy
#~ msgid "NOTE: %s is not available in this version\n"
#~ msgstr "gpg-agent no està disponible en aquesta sessió\n"
diff --git a/po/cs.po b/po/cs.po
index f6d3547cf..6e99d8db1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -94,9 +94,10 @@ msgstr "patn heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d nen podporovn\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nemohu vytvoit `%s': %s\n"
@@ -104,11 +105,11 @@ msgstr "nemohu vytvoit `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemohu otevt `%s': %s\n"
@@ -402,24 +403,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn soubor s monostmi `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s monostmi `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "tu monosti z `%s'\n"
@@ -709,8 +710,8 @@ msgstr "zmnit heslo"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pi vytven hesla: %s\n"
@@ -1116,13 +1117,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta slo %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nelze provst v dvkovm mdu\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "V vbr? "
@@ -1289,7 +1290,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Autentizan kl\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Neplatn vbr.\n"
@@ -2247,7 +2248,7 @@ msgstr "%s:%d: neplatn parametr pro oven\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVN: program me vytvoit soubor core!\n"
@@ -2289,11 +2290,11 @@ msgstr "v mdu --pgp2 muste pout soubor (ne rouru).\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "ifrovn zprv v mdu --pgp2 vyaduje algoritmus IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran ifrovac algoritmus je neplatn\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "vybran hashovac algoritmus je neplatn\n"
@@ -3312,19 +3313,19 @@ msgstr ""
"K dispozici je jen kontroln souet kle nebo je kl na kart - passphrase "
"nelze zmnit.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Tento kl nen chrnn.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn sti primrnho kle nejsou dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn st primrnho kle jsou uloeny na kart.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Kl je chrnn.\n"
@@ -3341,7 +3342,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pro tento tajn kl.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nen zopakovno sprvn; zkuste to znovu"
@@ -4063,69 +4064,69 @@ msgstr "Podkl %s je ji revokovn.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Zobrazuji %s fotografick ID o velikosti %ld pro kl %s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "duplicita pedvolby `%s'\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "pli mnoho pedvoleb pro ifrovn\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "pli mnoho pedvoleb pro vzorkovn\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "pli mnoho pedvoleb pro komprimaci\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "neplatn poloka `%s' v etzci s pedvolbami\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "zapisuji podpis kle jm samm (direct signature)\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "zapisuji podpis kle sebou samm\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "zapisuji \"key-binding\" podpis\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dlka kle; pouiji %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dlka kle zaokrouhlena na %u bit\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Podepisovn"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "ifrovn"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Autentizace"
@@ -4139,109 +4140,109 @@ msgstr "Autentizace"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Pro kl %s lze provst: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Aktuln povolen akce: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Zapnout/vypnout schopnost ifrovat\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Konec\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Prosm, vyberte druh kle, kter chcete:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA a ElGamal (implicitn)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (pouze pro podpis)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (nastavit si vlastn pouit)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (pouze pro ifrovn)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (pouze pro podpis)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (pouze pro ifrovn)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nastavit si vlastn pouit)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Pr DSA kl DSA dlouh %u bit.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "kl %s me mt dlku v intervalu %u a %u bit.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakou dlku kle si pejete? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "velikost kle %s mus bt v intervalu %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Poadovan dlka kle je %u bit.\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bit\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4257,7 +4258,7 @@ msgstr ""
" <n>m = doba platnosti kle skon za n msc\n"
" <n>y = doba platnosti kle skon za n let\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4273,38 +4274,38 @@ msgstr ""
" <n>m = doba platnosti podpisu skon za n msc\n"
" <n>y = doba platnosti podpisu skon za n let\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Kl je platn pro? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platn pro? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "neplatn hodnota\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Platnost kle nikdy neskon\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Platnost podpisu nikdy neskon\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Platnost kle skon v %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Platnost podpisu skon v %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4312,18 +4313,18 @@ msgstr ""
"V systm neum zobrazit data po roce 2038.\n"
"V kadm ppad budou data korektn zpracovvna do roku 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Je to sprvn (a/N)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4339,44 +4340,44 @@ msgstr ""
" \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Jmno a pjmen: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve jmn\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Jmno neme zanat slic\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Jmno mus bt dlouh alespo 5 znak\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Koment: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komenti\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvte znakovou sadu `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4387,7 +4388,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
@@ -4402,25 +4403,25 @@ msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmnit (J)mno, (K)oment, (E)-mail nebo (U)konit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmnit (J)mno, (K)oment, (E)-mail, (P)okraovat dl nebo (U)konit "
"program? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Nejdv, prosm, opravte chybu\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4428,12 +4429,12 @@ msgstr ""
"Pro ochranu Vaeho tajnho kle muste zadat heslo.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4445,7 +4446,7 @@ msgstr ""
"tohoto programu s parametrem \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4458,50 +4459,50 @@ msgstr ""
"pouvat disky); dky tomu m genertor lep anci zskat dostatek "
"entropie.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Vytven kle bylo zrueno.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuji veejn kl do `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor veejnch kl (pubring): %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor tajnch kl (secring): %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru veejnch kl `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru tajnch kl `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "veejn a tajn kl byly vytvoeny a podepsny.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4509,12 +4510,12 @@ msgstr ""
"Tento kl neme bt pouit pro ifrovn. K vytvoen\n"
"sekundrnho kle pro tento el mete pout pkaz \"--edit-key\".\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoen kle se nepodailo: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4522,7 +4523,7 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4530,25 +4531,25 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvoen podkle pro kle v3 nen v souladu s OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Opravdu vytvoit? (a/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "uloen kle na kartu se nezdailo: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemohu vytvoit zlohu souboru `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: zloha kle z karty uloena do `%s'\n"
@@ -4581,29 +4582,29 @@ msgstr "Podepisovac notace: "
msgid "Keyring"
msgstr "soubor kl (keyring)"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Primrn fingerprint kle:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkle:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Primrn fingerprint kle:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkle:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Fingerprint kle ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Seriov slo karty ="
@@ -5079,7 +5080,7 @@ msgstr "VAROVN: vydan algoritmus %s nen doporuen\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA modul pro GnuPG nenalezen\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr "Vce informac naleznete na adrese http://www.gnupg.cz/faq.html\n"
@@ -6394,26 +6395,64 @@ msgstr "neplatn parametr pro vpis\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "nalezena chyba v programu ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "podepsn selhalo: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "pejmenovn `%s' na `%s' se nezdailo: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "nemohu vytvoit adres `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "chyba pi zpisu souboru kl (keyring) `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "zapisuji tajn kl do `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "veejn kl %s nebyl nalezen: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "zapisuji tajn kl do `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6454,6 +6493,18 @@ msgstr "funkce PIN callback zkonila chybou: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Nov PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "chyba pi zskn novho PINu: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6469,15 +6520,15 @@ msgstr "uloen datumu vytvoen se nezdailo: %s\n"
msgid "reading public key failed: %s\n"
msgstr "ten veejnho kle se nezdailo: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "odpov neobsahuje veejn kl\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "odpov neobsahuje RSA modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "odpov neobsahuje veejn RSA exponent\n"
@@ -6507,7 +6558,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verifikace CHV%d se nezdaila: %s\n"
@@ -6516,11 +6567,11 @@ msgstr "verifikace CHV%d se nezdaila: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "pstup k administrtorskm pkazm nen nakonfigurovn\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "chyba pi zskn CHV z karty\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "karta je trvale uzamena!\n"
@@ -6552,106 +6603,105 @@ msgstr "|A|PIN administrtora"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Nov PIN administrtora"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Nov PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "chyba pi zskn novho PINu: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "chyba pi ten aplikanch dat\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "chyba pi ten fingerpritnu DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "kl ji existuje\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "existujc kl bude pepsn\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "generovn novho kle\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "chyb asov raztko vytvoen\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nelze uloit kl: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "prosm pokejte ne bude kl vygenerovn ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "henerovn kle se nezdailo\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generovn kle dokoneno (%d sekund)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "neplatn struktura OpenPGP kraty (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "podpis %s, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dosud vytvoen podpisy: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "pstup na %s se nezdail - vadn OpenPGP karta?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Nov PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6721,22 +6771,22 @@ msgstr "neplatn radix64 znak %02X byl peskoen\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "patn formt promnn prosted GPG_AGENT_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agent protokol verze %d nen podporovn\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6804,7 +6854,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "ten veejnho kle se nezdailo: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "nelze uloit kl: %s\n"
@@ -7007,7 +7057,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7056,7 +7106,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pi zskn informac o aktulnm kli: %s\n"
@@ -7269,7 +7319,7 @@ msgstr "duplicita pedvolby `%s'\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "smazn bloku kle se nezdailo: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Nebyl zadn dn popis)\n"
@@ -7425,12 +7475,12 @@ msgstr "ber kle z tto klenky (keyringu)"
msgid "add this secret keyring to the list"
msgstr "Pro proveden tto operace je poteba tajn kl.\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#: sm/gpgsm.c:365
@@ -7492,25 +7542,45 @@ msgstr "nemohu se pipojit k `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "neznm volba `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Nebyl zadn dn popis)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = peskoit tento kl\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "nelze zpracovat URL serveru kl\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nemohu otevt `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7592,6 +7662,10 @@ msgstr "chyba pi zskn novho PINu: %s\n"
msgid "error storing flags: %s\n"
msgstr "chyba pi ten `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7623,7 +7697,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7631,7 +7705,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "ochrann algoritmus %d%s nen podporovn\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrola vytvoenho podpisu se nepodaila: %s\n"
@@ -7759,140 +7843,144 @@ msgstr "chyba pi ten `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "chyba pi hledn zznamu dvryhodnosti v `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "revokovat kl nebo vybran podkle"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "chyba pi vytven hesla: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|JMNO|ifrovat pro JMNO"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nelze zpracovat URL serveru kl\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8535,10 +8623,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "nelze zamt `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "zapisuji tajn kl do `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "nemohu pout pkaz stat na `%s': %s\n"
diff --git a/po/da.po b/po/da.po
index d26187cbd..e3878f480 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "drlig kodestning"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
@@ -102,11 +103,11 @@ msgstr "kan ikke oprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke bne '%s': %s\n"
@@ -400,24 +401,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "lser indstillinger fra `%s'\n"
@@ -701,8 +702,8 @@ msgstr "ndr kodestningen"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
@@ -1104,13 +1105,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Dit valg? "
@@ -1290,7 +1291,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
@@ -2239,7 +2240,7 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr ""
@@ -2279,11 +2280,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resumalgoritme er ugyldig\n"
@@ -3289,21 +3290,21 @@ msgstr "signering fejlede: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Nglen er beskyttet.\n"
@@ -3318,7 +3319,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
@@ -4075,75 +4076,75 @@ msgstr "Nglen er beskyttet.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "vis prferencer"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "vis prferencer"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "vis prferencer"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "vis prferencer"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
#, fuzzy
msgid "writing direct signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nsket nglestrrelse er %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "signr"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "kryptr data"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4157,109 +4158,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Vlg venligst hvilken slags ngle du vil have:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signr kun)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, fuzzy, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) DSA (signr kun)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, fuzzy, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA nglepar vil have 1024 bit.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvilken nglestrrelse nsker du? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "nsket nglestrrelse er %u bit\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4269,7 +4270,7 @@ msgid ""
" <n>y = key expires in n years\n"
msgstr ""
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4279,59 +4280,59 @@ msgid ""
" <n>y = signature expires in n years\n"
msgstr ""
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Ngle er gyldig for? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Ngle er gyldig for? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "ugyldig vrdi\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "Nglen udlber aldrig\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "Nglen udlber aldrig\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "Ngle udlber d. %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
# virker j automatisk istedetfor y?
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4341,44 +4342,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Navn m ikke starte med et tal\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal vre mindst 5 bogstaver langt\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegnsttet.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4389,7 +4390,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4404,24 +4405,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4429,12 +4430,12 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4442,7 +4443,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4450,92 +4451,92 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ngle %08lX: offentlig ngle ikke fundet: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig ngle oprettet og signeret.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette?"
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "hemmelige ngler import: %lu\n"
@@ -4570,34 +4571,34 @@ msgstr ""
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "vis ngle og fingeraftryk"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeraftryk:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5076,7 +5077,7 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr "rev- forkert ngletilbagekald\n"
@@ -6375,26 +6376,64 @@ msgstr "ugyldig rustning"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du fandt en fejl ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "kan ikke bne %s: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "pkldning af beskyttelse fejlede: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "%s: kan ikke oprette mappe: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "fejl ved skrivning af nglering `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "offentlig ngle ikke fundet"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "st aflusningsflag"
@@ -6433,6 +6472,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, 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:599
#, fuzzy, c-format
@@ -6449,15 +6500,15 @@ msgstr "ingen standard offentlig nglering\n"
msgid "reading public key failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6487,7 +6538,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "pkldning af beskyttelse fejlede: %s\n"
@@ -6496,11 +6547,11 @@ msgstr "pkldning af beskyttelse fejlede: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6531,110 +6582,109 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "fejl ved oprettelse af kodestning: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "fejl i trailerlinie\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "fjern ngle fra den hemmelige nglering"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "generr et nyt nglepar"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signatur fra: %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ingen gyldig OpenPGP data fundet.\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "Indtast bruger-id: "
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6707,21 +6757,21 @@ msgstr "ugyldigt radix64 tegn %02x udeladt\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6791,7 +6841,7 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
# er det klogt at overstte TrustDB?
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -6994,7 +7044,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7042,7 +7092,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
@@ -7250,7 +7300,7 @@ msgstr "vis prferencer"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "ingen gyldige adresser\n"
@@ -7401,12 +7451,13 @@ msgstr "tilfj denne nglering til ngleringslisten"
msgid "add this secret keyring to the list"
msgstr "tilfj denne hemmeligenglering til listen"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAME som standard hemmeligngle"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|brug denne ngletjener til at sl ngler op"
#: sm/gpgsm.c:365
@@ -7465,25 +7516,45 @@ msgstr "kan ikke bne '%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s: udelod: %s\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "importr ngler fra en ngleserver: %s\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skriver til `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke bne '%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7567,6 +7638,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7598,7 +7673,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7606,7 +7681,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Kan ikke tjekke signatur: %s\n"
@@ -7734,142 +7819,146 @@ msgstr "fejl ved lsning af '%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
#, fuzzy
msgid "Options useful for debugging"
msgstr "sl fuld fejltjekning til"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|brug pasfrasemodus N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|kryptr for NAME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "importr ngler fra en ngleserver: %s\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8176,10 +8265,6 @@ msgstr ""
#~ msgstr "kan ikke bne `%s'\n"
#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "skriver hemmeligt certifikat til '%s'\n"
-
-#, fuzzy
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "kan ikke bne '%s': %s\n"
@@ -8225,10 +8310,6 @@ msgstr ""
#~ msgstr "hemmelig ngle ikke tilgngelig"
#, fuzzy
-#~ msgid "Enter New PIN: "
-#~ msgstr "Indtast bruger-id: "
-
-#, fuzzy
#~ msgid "NOTE: %s is not available in this version\n"
#~ msgstr "RSA ngle kan ikke bruges i denne version\n"
diff --git a/po/de.po b/po/de.po
index 1786aec85..b225e17bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.6\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
-"PO-Revision-Date: 2008-05-31 12:56+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
+"PO-Revision-Date: 2008-06-27 14:10+0200\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -96,9 +96,10 @@ msgstr "Passphrase"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -106,11 +107,11 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -407,24 +408,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, 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:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
@@ -722,8 +723,8 @@ msgstr "Die Passphrase ändern"
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
@@ -1108,13 +1109,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Ihre Auswahl? "
@@ -1283,7 +1284,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
@@ -2237,7 +2238,7 @@ msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
@@ -2285,11 +2286,11 @@ msgstr ""
"Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
"Verschlüsselung\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
@@ -3325,19 +3326,19 @@ msgstr ""
"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
"keine Passphrase ist zu ändern.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Dieser Schlüssel ist nicht geschützt.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Schlüssel ist geschützt.\n"
@@ -3354,7 +3355,7 @@ msgstr ""
"Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
@@ -4092,71 +4093,71 @@ msgstr "Unterschlüssel %s ist bereits widerrufen\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "Voreinstellung `%s' ist doppelt\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "zu viele Verschlüsselungeinstellungen\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "zu viele Hashvoreinstellungen\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "zu viele Komprimierungsvoreinstellungen\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
"Digestlänge nicht verwenden\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Unterschr."
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Zertif."
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Verschl."
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Authentisierung"
@@ -4170,109 +4171,109 @@ msgstr "Authentisierung"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "UuVvAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Derzeit erlaubte Vorgänge: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Umschalten der Unterschreibfähigkeit\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Umschalten der Verschlüsselungsfähigkeit\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Umschalten der Authentisierungsfähigkeit\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Beenden\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA und Elgamal (voreingestellt)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur unterschreiben/beglaubigen)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (nur verschlüsseln)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur verschlüsseln)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4288,7 +4289,7 @@ msgstr ""
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4304,38 +4305,38 @@ msgstr ""
" <n>m = Schlüssel verfällt nach n Monaten\n"
" <n>y = Schlüssel verfällt nach n Jahren\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "Ungültiger Wert.\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Schlüssel verfällt nie\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Signature verfällt nie\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Key verfällt am %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Unterschrift verfällt am %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4343,11 +4344,11 @@ msgstr ""
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4357,7 +4358,7 @@ msgstr ""
"GnuPG erstellt eine User-ID um Ihren Schlüssel identifizierbar zu machen.\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4373,44 +4374,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Email-Adresse: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4421,7 +4422,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
@@ -4436,23 +4437,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4460,12 +4461,12 @@ msgstr ""
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4478,7 +4479,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4489,50 +4490,50 @@ msgstr ""
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4541,12 +4542,12 @@ msgstr ""
"werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n"
"Unterschlüssel für diesem Zweck erzeugen.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4554,7 +4555,7 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4562,25 +4563,25 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -4613,29 +4614,29 @@ msgstr "Beglaubigungs-\"Notation\": "
msgid "Keyring"
msgstr "Schlüsselbund"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
@@ -5117,7 +5118,7 @@ msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "Siehe %s für weitere Infos\n"
@@ -6468,26 +6469,64 @@ msgstr "Ungültige Option \"%.50s\"\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, c-format
msgid "error loading `%s': %s\n"
msgstr "Fehler beim Laden von `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open fehlgeschlagen: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
+#: jnlib/dotlock.c:235
+#, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "Die temporäre Datei `%s' kann nicht erstellt werden: %s\n"
+
+#: jnlib/dotlock.c:270
+#, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "Fehler beim Schreiben von %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
+
+#: jnlib/dotlock.c:502
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "Debug Flags setzen"
@@ -6526,6 +6565,18 @@ msgstr "PIN-Callback meldete Fehler: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Neue PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6541,15 +6592,15 @@ msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
msgid "reading public key failed: %s\n"
msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
@@ -6583,7 +6634,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
@@ -6592,11 +6643,11 @@ msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "Karte ist dauerhaft gesperrt!\n"
@@ -6628,106 +6679,104 @@ msgstr "|A|Admin-PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Neue Admin-PIN"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Neue PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "Fehler beim Lesen der Anwendungsdaten\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "Schlüssel existiert bereits\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "Existierender Schlüssel wird ersetzt werden\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "neue Schlüssel werden erzeugt\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "Erzeugungsdatum fehlt\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "Schlüsselerzeugung fehlgeschlagen\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
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:2303
+#: scd/app-openpgp.c:2305
#, 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:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr "|N|Erstmalige neue PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
@@ -6798,21 +6847,21 @@ msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "Kein aktiver Dirmngr - `%s' wird einer gestartet\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "Die Variable DIRMNGR_INFO ist fehlerhaft\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "Die Dirmngr Protokollversion %d wird nicht unterstützt\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
"Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
@@ -6881,7 +6930,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
@@ -7079,7 +7128,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
"Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(Dies ist der MD2 Algorithmus)\n"
@@ -7128,7 +7177,7 @@ msgid "no key usage specified - assuming all usages\n"
msgstr ""
"Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
@@ -7336,7 +7385,7 @@ msgstr "Zertifikat `%s' gelöscht\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "Keine gültigen Empfänger angegeben\n"
@@ -7478,13 +7527,13 @@ msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
msgid "add this secret keyring to the list"
msgstr "Als geheimen Schlüsselbund mitbenutzen"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
#: sm/gpgsm.c:365
msgid "|NAME|set terminal charset to NAME"
@@ -7537,25 +7586,44 @@ msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: Kein Server-Name angegeben\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: Zeile wird übersprungen\n"
+
+#: sm/gpgsm.c:1419
+msgid "could not parse keyserver\n"
+msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "Dieser Befehl wurde noch nicht implementiert\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -7634,6 +7702,10 @@ 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:618
+msgid "Error - "
+msgstr "Fehler - "
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7675,7 +7747,7 @@ msgstr ""
"Bitte beachten Sie, daß diese Software nicht offiziell zur Erzeugung\n"
"oder Prüfung von qualifizierten Signaturen zugelassen ist.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7687,7 +7759,17 @@ msgstr ""
"zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
"Signatur erzeugen wird."
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "Schutzverfahren %d%s wird nicht unterstützt\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
@@ -7811,138 +7893,140 @@ msgstr "Fehler beim Senden des %s-Befehls: %s\n"
msgid "error sending standard options: %s\n"
msgstr "Fehler beim Senden der Standardoptionen: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Optionen zur Einstellung der Diagnoseausgaben"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Optionen zur Einstellung der Konfiguration"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Nützliche Optionen zur Fehlersuche"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Optionen zur Einstellung der Sicherheit"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr "Optionen für eine Passphrase-Policy"
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr "Einhaltung der Passphrase-Policy erzwingen"
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
msgid "do not allow the reuse of old passphrases"
msgstr "Verbiete die Wiedernutzung alter Passphrases."
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|Auch an NAME verschlüsseln"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Konfiguration der Schlüsselserver"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
msgid "|URL|use keyserver at URL"
msgstr "Benutze Schlüsselserver unter der URL"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
-"aufzufinden."
+msgstr "|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse aufzufinden."
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Optionen zum Einstellen der Ausgabeformate"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "Konfiguration für HTTP Server"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "Benutze die HTTP Proxy Einstellung des Systems"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration der zu nutzenden LDAP-Server"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr "Liste der LDAP Server"
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
diff --git a/po/el.po b/po/el.po
index 345efe82d..2f4104854 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr " "
msgid "ssh keys greater than %d bits are not supported\n"
msgstr " %d%s\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr " `%s': %s\n"
@@ -102,11 +103,11 @@ msgstr " `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr " `%s': %s\n"
@@ -399,24 +400,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr " `%s'\n"
@@ -706,8 +707,8 @@ msgstr " "
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr " : %s\n"
@@ -1116,14 +1117,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr " (batchmode)\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr " ; "
@@ -1302,7 +1303,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr " .\n"
@@ -2275,7 +2276,7 @@ msgstr "%s:%d: \n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr ": core!\n"
@@ -2319,11 +2320,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
" --pgp2 . IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr " \n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr " \n"
@@ -3377,20 +3378,20 @@ msgstr " : %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr " .\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr " .\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr " .\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr " .\n"
@@ -3407,7 +3408,7 @@ msgstr ""
" .\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr " . "
@@ -4181,74 +4182,74 @@ msgstr " user ID \"%s\" \n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr " %s photo ID %ld 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr " %c%lu \n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr " `%c' \n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr " `%c' \n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr " `%c' \n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr " \"\" \n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr " \n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr " -\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr " \"\" \n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr " , %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr " %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr " "
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4262,109 +4263,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal ( )\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr " :\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ElGamal ()\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA ( )\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA ( )\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal ( )\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA ( )\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA ( )\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA ( )\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr " DSA 1024 bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr " ; (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr " %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr " %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4380,7 +4381,7 @@ msgstr ""
" <n>m = n \n"
" <n>y = n \n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4396,40 +4397,40 @@ msgstr ""
" <n>m = n \n"
" <n>y = n \n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr " ; (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr " ; (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr " \n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr " %s \n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr " %s \n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr " %s %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr " %s.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4437,19 +4438,19 @@ msgstr ""
" 2038.\n"
", 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr " (y/n); "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4466,44 +4467,44 @@ msgstr ""
" \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr " : "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr " \n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr " \n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr " 5 \n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr " Email: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr " Email\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr " \n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr " `%s' .\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4514,7 +4515,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr " email \n"
@@ -4529,23 +4530,23 @@ msgstr " email \n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr " (N), (C), (E)mail (Q); "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr " (N), (C), (E)mail (O)/(Q); "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr ", \n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4553,12 +4554,12 @@ msgstr ""
" .\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4570,7 +4571,7 @@ msgstr ""
" , \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4582,50 +4583,50 @@ msgstr ""
" ) . \n"
" .\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr " .\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr " .\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4636,12 +4637,12 @@ msgstr ""
" \"--edit-key\" \n"
" .\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4649,7 +4650,7 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4657,28 +4658,28 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
": v3 \n"
" OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr " ; "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr " block : %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": %08lX %s\n"
@@ -4711,30 +4712,30 @@ msgstr " : "
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr " :"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " :"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " :"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " :"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5218,7 +5219,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr " IDEA \n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = \n"
@@ -6569,26 +6570,64 @@ msgstr " \n"
msgid "you found a bug ... (%s:%d)\n"
msgstr " bug ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr " `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr " : %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr " : %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr " `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr " `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr " `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr " %08lX : %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr " `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6627,6 +6666,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr " : %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6642,15 +6693,15 @@ msgstr " cache : %s\n"
msgid "reading public key failed: %s\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6680,7 +6731,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "keyserver : %s\n"
@@ -6689,11 +6740,11 @@ msgstr "keyserver : %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6724,109 +6775,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr " : %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: free : %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' \n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr " "
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr " TrustDB: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr " block : %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr " : %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s , %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr " OpenPGP .\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6899,22 +6948,22 @@ msgstr " radix64 %02x \n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr " GPG_AGENT_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr " %d gpg-agent\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6983,7 +7032,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr " block : %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr " TrustDB: %s\n"
@@ -7185,7 +7234,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7235,7 +7284,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr " `%s': %s\n"
@@ -7447,7 +7496,7 @@ msgstr " %c%lu \n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr " block : %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "( )\n"
@@ -7598,12 +7647,13 @@ msgstr " "
msgid "add this secret keyring to the list"
msgstr " "
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|| "
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|| "
#: sm/gpgsm.c:365
@@ -7661,25 +7711,45 @@ msgstr " `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr " `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "( )\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = \n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr " URI \n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr " `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr " `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7761,6 +7831,10 @@ msgstr " : %s\n"
msgid "error storing flags: %s\n"
msgstr " `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7792,7 +7866,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7800,7 +7874,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr " %d%s\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr " : %s\n"
@@ -7930,141 +8014,145 @@ msgstr " `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr " `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N| N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr " : %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|| "
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr " URI \n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|| "
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8700,10 +8788,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr " `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr " `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr " `%s': %s\n"
diff --git a/po/eo.po b/po/eo.po
index e1a1c259b..3777a9851 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "malbona pasfrazo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
@@ -102,11 +103,11 @@ msgstr "ne povas krei '%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -399,24 +400,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
@@ -706,8 +707,8 @@ msgstr "ani la pasfrazon"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1123,14 +1124,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reimo\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Via elekto? "
@@ -1309,7 +1310,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
@@ -2263,7 +2264,7 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
@@ -2303,11 +2304,11 @@ msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "ifri mesaon kun --pgp2 postulas la ifron IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita ifrad-metodo ne validas\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
@@ -3365,20 +3366,20 @@ msgstr "subskribado malsukcesis: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "i tiu losilo ne estas protektita.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "losilo estas protektita.\n"
@@ -3395,7 +3396,7 @@ msgstr ""
"Donu la novan pasfrazon por i tiu sekreta losilo.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
@@ -4159,75 +4160,75 @@ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "prefero %c%lu ripetita\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "nevalida signo en signoeno\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
#, fuzzy
msgid "writing direct signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "skribas losilbindan subskribon\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "losilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "losilgrando rondigita is %u bitoj\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "subskribi"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "ifri datenojn"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4241,109 +4242,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (nur ifri)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian losilon vi deziras:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur ifri)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur ifri)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur subskribi)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur ifri)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur ifri)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-losilparo havos 1024 bitojn.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Kiun losilgrandon vi deziras? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita losilgrando estas %u bitoj\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita is %u bitoj\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4359,7 +4360,7 @@ msgstr ""
" <n>m = losilo eksvalidios post n monatoj\n"
" <n>y = losilo eksvalidios post n jaroj\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4375,40 +4376,40 @@ msgstr ""
" <n>m = losilo eksvalidios post n monatoj\n"
" <n>y = losilo eksvalidios post n jaroj\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "losilo validu ...? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "losilo validu por ...? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "nevalida valoro\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s neniam eksvalidios\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s neniam eksvalidios\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s eksvalidios je %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "i tiu losilo eksvalidios je %s.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4416,19 +4417,19 @@ msgstr ""
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, i estos uste traktata is 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "u tio estas usta (j/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4444,44 +4445,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komencii per cifero\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena 5 signojn\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4492,7 +4493,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
@@ -4507,23 +4508,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (F)ini? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (B)one/(F)ini? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4531,12 +4532,12 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan losilon.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4548,7 +4549,7 @@ msgstr ""
"uzante i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4560,50 +4561,50 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan ancon\n"
"akiri sufie da entropio.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Kreado de losiloj nuligita.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan losilon al '%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika losilaro trovita: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "neniu skribebla sekreta losilaro trovita: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eraro dum skribado de publika losilaro '%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4612,12 +4613,12 @@ msgstr ""
"Notu, ke i tiu losilo ne estas uzebla por ifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan losilon por tiu celo.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4625,7 +4626,7 @@ msgstr ""
"losilo estis kreita %lu sekundon en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4633,26 +4634,26 @@ msgstr ""
"losilo estis kreita %lu sekundojn en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei sublosilojn por v3-losiloj ne estas OpenPGP-kongrue\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "u vere krei? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTO: sekreta losilo %08lX eksvalidiis je %s\n"
@@ -4687,34 +4688,34 @@ msgstr "Subskribo-notacio: "
msgid "Keyring"
msgstr "losilaro"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi losilojn kaj fingropurojn"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " losilo-fingrospuro ="
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " losilo-fingrospuro ="
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " losilo-fingrospuro ="
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " losilo-fingrospuro ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5195,7 +5196,7 @@ msgstr "NOTO: ifrad-metodo %d ne trovita en preferoj\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "la aldonao por la ifro IDEA en eestas\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = bonvolu montri pli da informoj\n"
@@ -6523,26 +6524,64 @@ msgstr "nevalida kiraso"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vi trovis cimon ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "%s: ne povas krei dosierujon: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "eraro dum skribado de losilaro '%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "skribas sekretan losilon al '%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "publika losilo %08lX ne trovita: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "skribas sekretan losilon al '%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6581,6 +6620,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6596,15 +6647,15 @@ msgstr "malsukcesis rekonstrui losilaran staplon: %s\n"
msgid "reading public key failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6634,7 +6685,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
@@ -6643,11 +6694,11 @@ msgstr "Kreado de losiloj malsukcesis: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6678,109 +6729,108 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "eraro dum legado de losilbloko: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "'%s' jam densigita\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "krei novan losilparon"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, 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:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "Donu la uzantidentigilon: "
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6853,22 +6903,22 @@ msgstr "nevalida signo %02x en bazo 64 ignorita\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6937,7 +6987,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -7151,7 +7201,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7200,7 +7250,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
@@ -7414,7 +7464,7 @@ msgstr "ripetita atestilo - forviita"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "nevalida respondo de agento\n"
@@ -7565,12 +7615,13 @@ msgstr "aldoni i tiun losilaron al la listo de losilaroj"
msgid "add this secret keyring to the list"
msgstr "aldoni i tiun sekretan losilaron al la listo"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan losilon"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi i tiun losilservilon por seri losilojn"
#: sm/gpgsm.c:365
@@ -7628,25 +7679,45 @@ msgstr "ne povas konektii al '%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = supersalti i tiun losilon\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "ne povis analizi URI de losilservilo\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skribas al '%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7728,6 +7799,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7759,7 +7834,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7767,7 +7842,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "protekto-metodo %d%s ne estas realigita\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@ -7895,141 +7980,145 @@ msgstr "eraro dum sendo al '%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|uzi pasfraz-reimon N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMO|ifri por NOMO"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ne povis analizi URI de losilservilo\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOMO|uzi ifrad-metodon NOMO por pasfrazoj"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8605,10 +8694,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "ne povas malfermi '%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "skribas sekretan losilon al '%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "ne povas stat-i '%s': %s\n"
@@ -8664,10 +8749,6 @@ msgstr ""
#~ msgstr "sekreta losilo ne havebla"
#, fuzzy
-#~ msgid "Enter New PIN: "
-#~ msgstr "Donu la uzantidentigilon: "
-
-#, fuzzy
#~ msgid "NOTE: %s is not available in this version\n"
#~ msgstr "gpg-agent ne estas disponata en i tiu sesio\n"
diff --git a/po/es.po b/po/es.po
index e31fc5fc1..16633aaf5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2008-05-27 22:38+0100\n"
"Last-Translator: Jaime Surez <jaime@mundocripto.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -111,9 +111,10 @@ msgstr "Frase contrasea"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de ms de %d bits\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no se puede crear %s: %s\n"
@@ -121,11 +122,11 @@ msgstr "no se puede crear %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
@@ -420,24 +421,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "el nivel de depuracin `%s` no es vlido\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, 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:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
@@ -739,8 +740,8 @@ msgstr "Cambia la frase contrasea"
msgid "I'll change it later"
msgstr "La cambiar ms tarde"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "error creando tubera: %s\n"
@@ -1124,13 +1125,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Su eleccin: "
@@ -1299,7 +1300,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Clave de autentificacin\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Eleccin invlida.\n"
@@ -2237,7 +2238,7 @@ msgstr "%s:%d: lista de auto-localizacin de claves invlida\n"
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizacin de claves invlida\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCIN: el programa podra volcar un fichero core!\n"
@@ -2277,11 +2278,11 @@ msgstr "debe usar ficheros (no tuberas) si trabaja con --pgp2 activo.\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es invlido\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no invlido\n"
@@ -3298,19 +3299,19 @@ msgstr ""
"La clave tiene slo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contrasea que cambiar.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Esta clave no est protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no estn disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "La clave est protegida.\n"
@@ -3327,7 +3328,7 @@ msgstr ""
"Introduzca la nueva frase contrasea para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrasea repetida incorrectamente; intntelo de nuevo"
@@ -4042,71 +4043,71 @@ msgstr "La subclave %s ya ha sido revocada.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Mostrando ID fotogrfico %s de tamao %ld para la clave %s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferencia `%s' duplicada\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "demasiadas preferencias de cifrado\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "demasiadas preferencias de resumen\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias de compresin\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter invlido `%s' en cadena de preferencias\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "escribiendo firma directa\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "escribiendo autofirma\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobacin de clave\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de clave incorrecto; se usarn %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de clave redondeado a %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"AVISO: ciertos programas OpenPGP no usan claves DSAcon resmenes de este "
"tamao\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Firma"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Certificar"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Cifrado"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Autentificacin"
@@ -4120,109 +4121,109 @@ msgstr "Autentificacin"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "FfCcAaSs"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Posibles accriones para una %s clave: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Acciones permitidas actualmente: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Conmutar la capacidad de firmar\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Conmutar la capacidad de cifrado\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Conmutar la capacidad de autentificacin\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Acabado\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA y ElGamal (por defecto)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (slo firmar)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (permite elegir capacidades)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (slo cifrar)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (slo firmar)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (slo cifrar)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (permite elegir capacidades)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "El par de claves DSA tendr %u bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "De qu tamao quiere la clave? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "los tamaos de claves %s deben estar en el rango %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tamao requerido es de %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4238,7 +4239,7 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n aos\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4254,38 +4255,38 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n aos\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Validez de la clave (0)? "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Clave vlida durante? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valor invlido\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "La clave nunca caduca\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "La firma nunca caduca\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "La firma caduca el %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4293,18 +4294,18 @@ msgstr ""
"Su sistema no puede mostrar fechas ms all del 2038.\n"
"Sin embargo funcionar correctamente hasta el 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Es correcto? (s/n) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4320,44 +4321,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caracter invlido en el nombre\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un nmero\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Direccin de correo electrnico: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Direccin invlida\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Caracter invlido en el comentario\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4368,7 +4369,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la direccin de correo-e en el nombre real o en el "
@@ -4385,23 +4386,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (S)alir? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (V)ale/(S)alir? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4409,12 +4410,12 @@ msgstr ""
"Necesita una frase contrasea para proteger su clave secreta.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4426,7 +4427,7 @@ msgstr ""
"la opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4439,50 +4440,50 @@ msgstr ""
"generador de nmeros aleatorios mayor oportunidad de recoger suficiente\n"
"entropa.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Creacin de claves cancelada.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo clave pblica en `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escribiendo apuntador de la clave privada en `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo pblico de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "anillo privado de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error escribiendo anillo pblico `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "claves pblica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4490,12 +4491,12 @@ msgstr ""
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este propsito.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creacin de la clave fallida: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4503,7 +4504,7 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4511,25 +4512,25 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el estndar OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Crear de verdad? (s/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "almacenado de clave en la tarjeta fallido: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4562,29 +4563,29 @@ msgstr "Notacin de firma: "
msgid "Keyring"
msgstr "Anillo de claves"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Huella de clave primaria:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Huella de clave ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Nmero de serie de la tarjeta ="
@@ -5058,7 +5059,7 @@ msgstr "AVISO: el algoritmo de resumen %s est obsoleto\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "el plugin para el cifrado IDEA no est presente\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "por favor vea %s para ms informacin\n"
@@ -6379,26 +6380,64 @@ msgstr "opcin invlida \"%.50s\"\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "ha encontrado un error... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, c-format
msgid "error loading `%s': %s\n"
msgstr "error cargando `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "la conversin de `%s' en `%s' no est disponible\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open fall: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "la conversin de `%s' en `%s' fall: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "no se puede crear el directorio temporal `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "error escribiendo en %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "clave pblica %s no encontrada: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "establece los parmetros de depuracin"
@@ -6437,6 +6476,18 @@ msgstr "la funcin de manejo del PIN devolvi un error: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Nuevo PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error obteniendo nuevo PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6452,15 +6503,15 @@ msgstr "fallo guardando la fecha de creacin: %s\n"
msgid "reading public key failed: %s\n"
msgstr "fallo leyendo clave pblica: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "la respuesta no incluye la clave pblica\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "la respuesta no incluye el mdulo RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "la respuesta no incluye el exponente pblico RSA\n"
@@ -6490,7 +6541,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la verificacin CHV%d fall: %s\n"
@@ -6499,11 +6550,11 @@ msgstr "la verificacin CHV%d fall: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "el acceso a rdenes de administrador no est configurado\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "error recuperando el estatus CHV de la tarjeta\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "la tarjeta est bloqueada permanentemente!\n"
@@ -6537,105 +6588,104 @@ msgstr "|A|PIN Administrador"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Nuevo PIN Administrador"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Nuevo PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "error obteniendo nuevo PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "error leyendo datos de la aplicacin\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "error leyendo huella digital DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "la clave ya existe\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "la clave existente ser reemplazada\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "generando nueva clave\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "falta fecha de creacin\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "fallo al almacenar la clave: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "por favor, espere mientras se genera la clave ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "la generacin de la clave fall\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generacin de clave completada (%d segundos)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "estructura de la tarjeta OpenPGP invlida (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
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:2303
+#: scd/app-openpgp.c:2305
#, 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:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - tarjeta OpenPGP invlida?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Nuevo PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "ejecutar en modo multi servidor (primer plano)"
@@ -6704,21 +6754,21 @@ msgstr "caracter invlido radix64 %02x omitido\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "fallo al hacer la peticin proxy %s al cliente\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "no hay dirmngr en ejecucin - iniciando `%s'\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "variable de entorno DIRMNGR_INFO malformada\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "la versin del protocolo dirmngr %d no puede usarse\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
@@ -6785,7 +6835,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallo buscando la clave slo cach de dirmngr: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "fallo al colocar handle de keyDB\n"
@@ -6971,7 +7021,7 @@ msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(es el algoritmo MD2)\n"
@@ -7018,7 +7068,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "error obteniendo informacin sobre uso de la clave: %s\n"
@@ -7223,7 +7273,7 @@ msgstr "certificado `%s' borrado\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borrado del certificado \"%s\" fallido: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "no se dieron receptores vlidos\n"
@@ -7369,12 +7419,13 @@ msgstr "aade este anillo a la lista de anillos"
msgid "add this secret keyring to the list"
msgstr "aade este anillo secreto a la lista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
#: sm/gpgsm.c:365
@@ -7429,25 +7480,45 @@ msgstr "NOTA: no se podr cifrar a `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "modelo de validacin desconocido `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "lnea %d: falta nombre de entidad\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = saltar esta clave\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "no se puede interpretar la URL del servidor de claves\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecutndose con hora del sistema falsificada"
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "importando certificados comunes `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no puedo firmar usando `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "esta orden no est an implementada\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7526,6 +7597,11 @@ msgstr "error obteniendo parmetros almacenados: %s\n"
msgid "error storing flags: %s\n"
msgstr "error almacenando parmetros: %s\n"
+#: sm/keylist.c:618
+#, fuzzy
+msgid "Error - "
+msgstr "[Error - Sin nombre]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr "GPG_TTY no tiene valor - usando valor por defecto quiz absurdo\n"
@@ -7564,7 +7640,7 @@ msgstr ""
"Observe que este programa no est oficialmente aprobado para crear "
"overificar tales firmas.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7575,7 +7651,17 @@ msgstr ""
"\"%s\"\n"
"Observe que este certificado NO crear una firma cualificada!"
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "el algoritmo de proteccin %d%s no puede ser utilizado\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "la comprobacin de la firma cualificada fall: %s\n"
@@ -7697,136 +7783,140 @@ msgstr "error enviando orden %s: %s\n"
msgid "error sending standard options: %s\n"
msgstr "error enviando opciones estndar: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Opciones que controlan la salida de diagnsticos"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Opciones que controlan la configuracin"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Opciones tiles para el depurado"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Opciones que controlan la seguridad"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|las claves SSH caducan en N segundos"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|establecer vida mxima del cach de PIN en N segundos"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|establecer vida mxima de la clave SSH en N segundos"
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr "Opciones que fuerzan una poltica de frases contrasea"
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr "no permitir evitar la poltica de frases contrasea"
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|establecer longitud mnima para nuevas frases contrasea en N"
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|pedir al menos N caracteres no alfabticos para nuevas contraseas"
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FICHERO|comprobar nuevas frases contrasea con el patrn en FICHERO"
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr "|N|frase contrasea caduca tras N das"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
msgid "do not allow the reuse of old passphrases"
msgstr "no permite reusar antiguas frases contrasea"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMBRE|cifra para el ususario NOMBRE tambin"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Configuracin para servidores de claves"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
msgid "|URL|use keyserver at URL"
msgstr "|URL|usar servidor de claves en URL"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "permitir bsquedas PKA (peticiones DNS)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr "prohibir todo acceso al dirmngr"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOMBRE|usa la codificacin NOMBRE para frases contrasea PKCS#12"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "no comprobar CRLs para certificados raz"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Opciones que controlan el formato de la salida"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "Opciones que controlan la interactividad y obligacin"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "Configuracin de servidores HTTP"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "usar configuracin del proxy HTTP del sistema"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Configuracin de servidores LDAP que se usar"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr "lista de servidores LDAP"
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "Configuracin de OCSP"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr "Note que las especificacin de grupo se ignoran\n"
@@ -8477,10 +8567,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "no se puede bloquear `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "escribiendo clave privada en `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "no se puede obtener informacin de `%s': %s\n"
diff --git a/po/et.po b/po/et.po
index 6c844fb07..9ba93498a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "halb parool"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "`%s' ei nnestu luua: %s\n"
@@ -102,11 +103,11 @@ msgstr "`%s' ei nnestu luua: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei nnestu avada: %s\n"
@@ -398,24 +399,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MRKUS: vaikimisi vtmete fail `%s' puudub\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "vtmete fail `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen vtmeid failist `%s'\n"
@@ -705,8 +706,8 @@ msgstr "muuda parooli"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@ -1114,14 +1115,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Teie valik? "
@@ -1300,7 +1301,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
@@ -2263,7 +2264,7 @@ msgstr "%s:%d: vigased ekspordi vtmed\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm vib salvestada oma mlupildi!\n"
@@ -2304,11 +2305,11 @@ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate krpteerimine --pgp2 moodis nuab IDEA iffrit\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "valitud lhendi algoritm ei ole lubatud\n"
@@ -3347,20 +3348,20 @@ msgstr "allkirjastamine ebannestus: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "See vti ei ole kaitstud.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Vti on kaitstud.\n"
@@ -3377,7 +3378,7 @@ msgstr ""
"Sisestage sellele salajasele vtmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
@@ -4138,74 +4139,74 @@ msgstr "kasutaja ID \"%s\" on juba thistatud\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Nitan %s foto IDd suurusega %ld, vti 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "eelistus %c%lu on duplikaat\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "lubamatu smbol eelistuste snes\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "kirjutan otsese allkirja\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "kirjutan vtit siduva allkirja\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane vtme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "vtme suurus mardatud les %u bitini\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "krpteeri andmed"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4219,109 +4220,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (ainult krptimiseks)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist vtmetpi te soovite:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krpteerimiseks)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult krptimiseks)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult krpteerimiseks)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krpteerimiseks)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA vtmepaari pikkuseks saab 1024 bitti.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Millist vtmepikkust te soovite? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud vtmepikkus on %u bitti\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "mardatud les %u bitini\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4337,7 +4338,7 @@ msgstr ""
" <n>m = vti aegub n kuuga\n"
" <n>y = vti aegub n aastaga\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4353,40 +4354,40 @@ msgstr ""
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Vti on kehtiv kuni? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allkiri on kehtiv kuni? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "vigane vrtus\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s aegub %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allkiri aegub %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4394,19 +4395,19 @@ msgstr ""
"Teie ssteem ei saa esitada kuupevi peale aastat 2038.\n"
"Siiski ksitletakse neid korrektselt aastani 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "On see ige (j/e)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4422,44 +4423,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Prisnimi: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Lubamatu smbol nimes\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Nimi ei vi alata numbriga\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema vhemalt 5 smbolit\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Lubamatu smbol kommentaaris\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4470,7 +4471,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
@@ -4485,23 +4486,23 @@ msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (V)lju? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (O)k/(V)lju? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Palun parandage kigepealt viga\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4509,12 +4510,12 @@ msgstr ""
"Te vajate oma salajase vtme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4526,7 +4527,7 @@ msgstr ""
"kasutades seda programmi vtmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4538,50 +4539,50 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile vimaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Vtme genereerimine katkestati.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku vtme faili `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane vti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4591,43 +4592,43 @@ msgstr ""
"Krptimiseks tuleb genereerida teine vti, seda saate teha\n"
"kasutades vtit \"--edit-key\".\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekund tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekundit tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "MRKUS: v3 vtmetele alamvtmete loomine ei ole OpenPGP hilduv\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon testi? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "`%s' ei nnestu luua: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MRKUS: salajane vti %08lX aegus %s\n"
@@ -4660,30 +4661,30 @@ msgstr "Allkirja noteerimine: "
msgid "Keyring"
msgstr "Vtmehoidla"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Primaarse vtme srmejlg:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Alamvtme srmejlg:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Primaarse vtme srmejlg:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Alamvtme srmejlg:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Vtme srmejlg ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5161,7 +5162,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA ifri lisandprogrammi pole\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = esita palun tiendavat infot\n"
@@ -6490,26 +6491,64 @@ msgstr "vigased impordi vtmed\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "te leidsite vea ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "faili ei nnestu avada: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "pakendamine ebannestus: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "kataloogi `%s' ei nnestu luua: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "viga vtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "kirjutan salajase vtme faili `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "ei leia avalikku vtit %08lX: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "kirjutan salajase vtme faili `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6548,6 +6587,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6563,15 +6614,15 @@ msgstr "vtmehoidla vahemlu uuesti loomine ebannestus: %s\n"
msgid "reading public key failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6601,7 +6652,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "vtmeserverile saatmine ebannestus: %s\n"
@@ -6610,11 +6661,11 @@ msgstr "vtmeserverile saatmine ebannestus: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6645,109 +6696,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "viga vtmebloki lugemisel: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' on juba pakitud\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "genereeri uus vtmepaar"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB initsialiseerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s allkiri, snumilhendi algoritm %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6820,22 +6869,22 @@ msgstr "vigane radix64 smbol %02x vahele jetud\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6904,7 +6953,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "TrustDB initsialiseerimine ebannestus: %s\n"
@@ -7106,7 +7155,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7155,7 +7204,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
@@ -7367,7 +7416,7 @@ msgstr "eelistus %c%lu on duplikaat\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Kirjeldust ei antud)\n"
@@ -7518,12 +7567,13 @@ msgstr "lisa see vtmehoidla vtmehoidlate nimekirja"
msgid "add this secret keyring to the list"
msgstr "lisa see salajaste vtmete hoidla nimekirja"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase vtmena"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda vtmeserverit"
#: sm/gpgsm.c:365
@@ -7581,25 +7631,45 @@ msgstr "ei nnestu luua hendust serveriga `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " j = jta see vti vahele\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "ei saa parsida vtmeserveri URI\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' ei nnestu sulgeda: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7681,6 +7751,10 @@ msgstr "viga parooli loomisel: %s\n"
msgid "error storing flags: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7712,7 +7786,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7720,7 +7794,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Loodud allkirja ei nnestu kontrollida: %s\n"
@@ -7850,141 +7934,145 @@ msgstr "viga teate saatmisel serverile `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|kasuta parooli moodi N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "viga parooli loomisel: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|krpti NIMEle"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "ei saa parsida vtmeserveri URI\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|kasuta paroolidega ifri algoritmi NIMI"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8601,10 +8689,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "`%s' ei nnestu avada\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "kirjutan salajase vtme faili `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "ei nnestu lugeda `%s' atribuute: %s\n"
diff --git a/po/fi.po b/po/fi.po
index ea52a845b..9d9ca3eb1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -108,9 +108,10 @@ msgstr "väärä salasana"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -118,11 +119,11 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -415,24 +416,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -722,8 +723,8 @@ msgstr "muuta salasanaa"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@ -1133,14 +1134,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Valintasi? "
@@ -1319,7 +1320,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
@@ -2283,7 +2284,7 @@ msgstr "%s:%d: virheelliset vientivalitsimet\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
@@ -2324,11 +2325,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
@@ -3374,20 +3375,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Avainta ei ole suojattu.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Avain on suojattu.\n"
@@ -3404,7 +3405,7 @@ msgstr ""
"Syötä uusi salasana salaiselle avaimelle.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
@@ -4170,74 +4171,74 @@ msgstr ""
"Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
"(käyttäjätunnus %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "valinta %c%lu on kopio\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Valinnassa on luvaton merkki\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "kirjoitetaan suora allekirjoitus\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "kirjoitetaan oma-allekirjoitus\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "salaa tiedot"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4251,109 +4252,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (vain salaus)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (vain salaus)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (vain allekirjoitus)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-avainparissa on 1024 bittiä.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Halutun avaimen koko on %u bittiä\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4369,7 +4370,7 @@ msgstr ""
" <n>m = Avain vanhenee n kuukauden kuluttua\n"
" <n>y = Avain vanhenee n vuoden kuluttua\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4385,40 +4386,40 @@ msgstr ""
" <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
" <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Avain on voimassa? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Allekirjoitus on voimassa? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "arvo ei kelpaa\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s vanhenee %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4426,19 +4427,19 @@ msgstr ""
"Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
"Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4456,44 +4457,44 @@ msgstr ""
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Oikea nimi: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Sähköpostiosoite: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Huomautus: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4504,7 +4505,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
@@ -4519,23 +4520,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4543,12 +4544,12 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4560,7 +4561,7 @@ msgstr ""
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4572,50 +4573,50 @@ msgstr ""
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4624,12 +4625,12 @@ msgstr ""
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4637,7 +4638,7 @@ msgstr ""
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4645,26 +4646,26 @@ msgstr ""
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4697,30 +4698,30 @@ msgstr "Allekirjoitusnotaatio: "
msgid "Keyring"
msgstr "Avainrengas"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5207,7 +5208,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = näytä lisätietoja\n"
@@ -6554,26 +6555,64 @@ msgstr "virheelliset tuontivalitsimet\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "julkista avainta %08lX ei löydy: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6613,6 +6652,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6628,15 +6679,15 @@ msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
msgid "reading public key failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6666,7 +6717,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -6675,11 +6726,11 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6710,110 +6761,108 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" on jo pakattu\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "luo uusi avainpari"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
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:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6886,22 +6935,22 @@ msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6970,7 +7019,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -7172,7 +7221,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7221,7 +7270,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@ -7433,7 +7482,7 @@ msgstr "valinta %c%lu on kopio\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Kuvausta ei annettu)\n"
@@ -7584,12 +7633,13 @@ msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
msgid "add this secret keyring to the list"
msgstr "lisää tämä salainen avainrengas luetteloon"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
#: sm/gpgsm.c:365
@@ -7647,25 +7697,45 @@ msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Kuvausta ei annettu)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = ohita tämä avain\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7747,6 +7817,10 @@ msgstr "virhe luotaessa salasanaa: %s\n"
msgid "error storing flags: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7778,7 +7852,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7786,7 +7860,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@ -7916,141 +8000,145 @@ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
msgid "error sending standard options: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|käytä salasanoissa toimintatapaa N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8683,10 +8771,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "tiedostoa \"%s\" ei voi avata\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 9904e981f..e776f9ca8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -98,9 +98,10 @@ msgstr "mauvaise phrase de passe"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "le hachage de protection %d n'est pas support\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossible de crer `%s': %s\n"
@@ -108,11 +109,11 @@ msgstr "impossible de crer `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -414,24 +415,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
@@ -723,8 +724,8 @@ msgstr "changer la phrase de passe"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
@@ -1135,13 +1136,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP n %s dtecte\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Votre choix ? "
@@ -1312,7 +1313,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Cl d'authentification\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Choix invalide.\n"
@@ -2294,7 +2295,7 @@ msgstr "%s:%d: options de vrification invalides\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut crer un fichier core !\n"
@@ -2339,11 +2340,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"chiffrer un message en mode --pgp2 ncessite l'algorithme de chiffrage IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement slectionn est invalide\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage slectionne est invalide\n"
@@ -3382,21 +3383,21 @@ msgstr ""
"La cl possde seulement des items partiels ou stocks sur carte -\n"
"pas de phrase de passe changer.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Cette cl n'est pas protge.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrtes de la cl principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr ""
"Les parties secrtes de la cl principale sont stockes sur la\n"
"carte.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "La cl est protge.\n"
@@ -3411,7 +3412,7 @@ msgid ""
"\n"
msgstr "Entrez la nouvelle phrase de passe pour cette cl secrte.\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "la phrase de passe n'a pas t correctement rpte ; recommencez."
@@ -4168,72 +4169,72 @@ msgstr ""
"Affichage %s photo d'identit de taille %ld pour la cl\n"
"0x%s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "prfrence `%s' duplique\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "trop de prfrences de chiffrement\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "trop de prfrences de hachage\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "trop de prfrences de compression\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "lment `%s' invalide dans la chane de prfrences\n"
# g10/keygen.c:123 ???
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "criture de la signature directe\n"
# g10/keygen.c:123 ???
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "criture de l'auto-signature\n"
# g10/keygen.c:161 ???
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "criture de la signature de liaison\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Signer"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Chiffrer"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Authentifier"
@@ -4247,109 +4248,109 @@ msgstr "Authentifier"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsCcAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Actions possibles pour une cl %s: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Actions actuellement permises: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Inverser la capacit de signer\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Inverser la capacit de chiffrement\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Inverser la capacit d'authentifier\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Termin\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Slectionnez le type de cl dsir:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA et Elgamal (par dfaut)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (indiquez vous-mme les capacits)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (chiffrement seul)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (signature seule)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (chiffrement seul)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (indiquez vous-mme les capacits)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La paire de cls DSA fera %u bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "les cls %s peuvent faire entre %u et %u bits de longueur.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Quelle taille de cl dsirez-vous ? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "les tailles de cls %s doivent tre dans l'intervalle %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demande est %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4365,7 +4366,7 @@ msgstr ""
" <n>m = la cl expire dans n mois\n"
" <n>y = la cl expire dans n annes\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4381,38 +4382,38 @@ msgstr ""
" <n>m = la signature expire dans n mois\n"
" <n>y = la signature expire dans n annes\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "La cl est valide pour ? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "La signature est valide pour ? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valeur invalide\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "La cl n'expire pas du tout\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "La signature n'expire pas du tout\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "La cl expire le %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "La signature expire le %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4420,18 +4421,18 @@ msgstr ""
"Votre systme ne sait pas afficher les dates au-del de 2038.\n"
"Cependant la gestion des dates sera correcte jusqu' 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4447,44 +4448,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> \n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nom rel: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caractre invalide dans le nom\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit faire au moins 5 caractres de long\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Caractre invalide dans le commentaire\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caractres '%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4495,7 +4496,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Ne mettez pas d'adresse e-mail dans le nom rel ou dans le commentaire\n"
@@ -4511,23 +4512,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4536,12 +4537,12 @@ msgstr ""
"secrte.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4555,7 +4556,7 @@ msgstr ""
" --edit-key .\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4567,52 +4568,52 @@ msgstr ""
"pendant la gnration de nombres premiers; cela donne au gnrateur de\n"
"nombres alatoires une meilleure chance d'avoir assez d'entropie.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "La gnration de cl a t annule.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "criture de la cl publique dans `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "criture d'une cl secrte partielle dans `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
"aucun portes-cls public n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"aucun portes-cls secret n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls public `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls secret `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "les cls publique et secrte ont t cres et signes.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4621,13 +4622,13 @@ msgstr ""
"utiliser la commande --edit-key pour gnrer une sous-cl \n"
"cette fin.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La gnration de cl a chou: %s\n"
# on s'amuse comme on peut...
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4635,7 +4636,7 @@ msgstr ""
"la cl a t cre %lu seconde dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4643,26 +4644,26 @@ msgstr ""
"la cl a t cre %lu secondes dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"NOTE: crer des sous-cls pour des cls v3 n'est pas conforme OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Crer vraiment ? (o/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "le stockage de la cl dans la carte a chou: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossible de crer le fichier de sauvegarde `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTE: sauvegarde de la cl de la carte dans `%s'\n"
@@ -4695,29 +4696,29 @@ msgstr "Notation de signature: "
msgid "Keyring"
msgstr "Porte-cls"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Empreinte de cl principale:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-cl:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Empreinte de la cl principale:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-cl:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Empreinte de la cl ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr "N de srie de la carte ="
@@ -5212,7 +5213,7 @@ msgstr "AVERTISSEMENT: l'algorithme de hachage %s est dconseill\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "le module de chiffrement IDEA n'est pas prsent\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
@@ -6575,26 +6576,64 @@ msgstr "options de liste invalides\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vous avez trouv un bug... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "la signature a chou: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "renommer `%s' en `%s' a chou: %s \n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "impossible de crer le rpertoire `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "erreur durant l'criture du porte-cls `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "criture de la cl secrte dans `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "cl publique %s non trouve : %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "criture de la cl secrte dans `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6635,6 +6674,18 @@ msgstr "l'appel du PIN a retourn une erreur: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Nouveau code PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6650,15 +6701,15 @@ msgstr "impossible de stocker la date de cration: %s\n"
msgid "reading public key failed: %s\n"
msgstr "la lecture de la cl publique a chou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "la rponse ne contient pas les donnes de cl publique\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "la rponse ne contient pas le modulo RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "la rponse ne contient pas l'exposant public RSA\n"
@@ -6690,7 +6741,7 @@ msgstr ""
"est %d\n"
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "la vrification CHV%d a chou: %s\n"
@@ -6699,11 +6750,11 @@ msgstr "la vrification CHV%d a chou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "l'accs aux commandes d'administration n'est pas configur\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
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:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "la carte est irrmdiablement bloque !\n"
@@ -6736,108 +6787,107 @@ msgstr "|A|code PIN d'administration"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Nouveau code PIN d'administration"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Nouveau code PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "erreur pendant la lecture de donnes d'application\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "erreur pendant la lecture de l'empreinte DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "la cl existe dj\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "la cl existante sera remplace\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "gnrer une nouvelle cl\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "l'horodatage de cration est manquant\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "le stockage de la cl a chou: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "attendez que la cl se gnre...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "la gnration de la cl a chou\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "la gnration de cl a t effectue (%d secondes)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "signature %s, algorithme de hachage %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signatures cres jusqu'ici: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "impossible d'accder %s - carte OpenPGP invalide ?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Nouveau code PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6907,22 +6957,22 @@ msgstr "caractre %02X invalide en radix64 ignor\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "la variable d'environnement GPG_AGENT_INFO est mal dfinie\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "le protocole gpg-agent version %d n'est pas support\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6990,7 +7040,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "la lecture de la cl publique a chou: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "le stockage de la cl a chou: %s\n"
@@ -7193,7 +7243,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7243,7 +7293,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr ""
@@ -7458,7 +7508,7 @@ msgstr "prfrence `%s' duplique\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "la suppression du bloc de cls a chou : %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Aucune description donne)\n"
@@ -7614,12 +7664,12 @@ msgstr "enlever les cls de ce porte-cls"
msgid "add this secret keyring to the list"
msgstr "Il faut la cl secrte pour faire cela.\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#: sm/gpgsm.c:365
@@ -7681,25 +7731,45 @@ msgstr "impossible de se connecter `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "option `%s' inconnue\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Aucune description donne)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = sauter cette cl\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "impossible d'interprter l'URL du serveur de cls\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossible d'accder `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7785,6 +7855,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7816,7 +7890,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7824,7 +7898,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "l'algorithme de protection %d%s n'est pas support\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Impossible de vrifier la signature cre: %s\n"
@@ -7956,140 +8040,144 @@ msgstr ""
"erreur pendant la recherche de l'enregistrement de confiance\n"
"dans `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "rvoquer la cl ou les sous-cls slectionnes"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOM|chiffrer pour NOM"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "impossible d'interprter l'URL du serveur de cls\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8737,10 +8825,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "impossible de verrouiller `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "criture de la cl secrte dans `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "impossible d'accder `%s': %s\n"
diff --git a/po/gl.po b/po/gl.po
index b99a3a909..b73dd6b9d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "contrasinal errneo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de proteccin %d%s non est soportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
@@ -102,11 +103,11 @@ msgstr "non se pode crear `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
@@ -403,24 +404,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opcins `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opcins de `%s'\n"
@@ -710,8 +711,8 @@ msgstr "cambia-lo contrasinal"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1124,14 +1125,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "A sa seleccin? "
@@ -1310,7 +1311,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Seleccin non vlida.\n"
@@ -2277,7 +2278,7 @@ msgstr "%s:%d: opcins de exportacin non vlidas\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: o programa pode crear un ficheiro 'core'!\n"
@@ -2319,11 +2320,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "para cifrar unha mensaxe en modo --pgp2 precsase da cifra IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non vlido\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non vlido\n"
@@ -3373,20 +3374,20 @@ msgstr "fallou a sinatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Esta chave non est protexida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "A chave est protexida.\n"
@@ -3403,7 +3404,7 @@ msgstr ""
"Introduza o novo contrasinal para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
@@ -4183,74 +4184,74 @@ msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Amosando a id. fotogrfica %s de tamao %ld da chave 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferencia %c%lu duplicada\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter non vlido na cadea de preferencias\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "escribindo unha sinatura directa\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "escribindo a propia sinatura\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de chave non vlido; empregando %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de chave redondeado a %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "cifrar datos"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4264,109 +4265,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (s cifrar)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s asinar)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (s cifrar)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (s cifrar)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (s asinar)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (s cifrar)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (s cifrar)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ha ter 1024 bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Qu tamao de chave quere? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamao de chave requerido son %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4382,7 +4383,7 @@ msgstr ""
" <n>m = a chave caduca en n meses\n"
" <n>y = a chave caduca en n anos\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4398,40 +4399,40 @@ msgstr ""
" <n>m = a sinatura caduca en n meses\n"
" <n>y = a sinatura caduca en n anos\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Por canto tempo vlida a chave? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Por canto tempo vlida a sinatura? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valor non vlido\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non caduca nunca\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non caduca nunca\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s caduca o %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "A sinatura caduca o %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4439,19 +4440,19 @@ msgstr ""
"O seu sistema non pode amosar datas mis al do 2038.\n"
"Anda as, hase tratar correctamente ata o 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Isto correcto? (s/n) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4468,44 +4469,44 @@ msgstr ""
" \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nome: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caracter non vlido no nome\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun dxito\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Enderezo de E-mail: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Non un enderezo de e-mail vlido\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Carcter non vlido no comentario\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est a usa-lo xogo de caracteres `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4516,7 +4517,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non poa o enderezo de correo no nome real ou no comentario\n"
@@ -4532,23 +4533,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)ar? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)ar? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4556,12 +4557,12 @@ msgstr ""
"Necesita un contrasinal para protexe-la sa chave secreta.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4573,7 +4574,7 @@ msgstr ""
"momento, empregando este programa coa opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4585,50 +4586,50 @@ msgstr ""
"mentres se xeran os nmeros primos; isto proporcinalle ao xerador de\n"
"nmeros aleatorios unha opoertunidade de acumular entropa de abondo.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeracin de chaves.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "gravando a chave pblica en `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro pblico no que se poida escribir: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro pblico `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "creronse e asinronse as chaves pblica e secreta.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4638,12 +4639,12 @@ msgstr ""
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4651,7 +4652,7 @@ msgstr ""
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4659,26 +4660,26 @@ msgstr ""
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creacin de subchaves para chaves v3 non cumpre OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realmente? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4711,30 +4712,30 @@ msgstr "Notacin de sinaturas: "
msgid "Keyring"
msgstr "Chaveiro"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5216,7 +5217,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "o plugin de cifra IDEA non est presente\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = amosar mis informacin\n"
@@ -6562,26 +6563,64 @@ msgstr "opcins de importacin non vlidas\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "atopou un erro ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "erro lendo `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "non se puido abrir un ficheiro: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "non se puido poe-la armadura: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "non se pode crea-lo directorio `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "non se atopou a chave pblica %08lX: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "axusta-los valores de depuracin"
@@ -6622,6 +6661,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6637,15 +6688,15 @@ msgstr "fallo ao reconstru-la cach de chaveiros: %s\n"
msgid "reading public key failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6675,7 +6726,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "o envo ao servidor de chaves fallou: %s\n"
@@ -6684,11 +6735,11 @@ msgstr "o envo ao servidor de chaves fallou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6719,109 +6770,108 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "erro ao le-lo bloque de chaves: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' xa est comprimido\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "xerar un novo par de chaves"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, 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:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP vlidos.\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "Introduza o ID de usuario: "
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6894,22 +6944,22 @@ msgstr "carcter radix64 non vlido %02x omitido\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "erro ao pr '%s' na base de datos de confianza: %s\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "a versin %d do protocolo de gpg-agent non est soportada\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6978,7 +7028,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -7192,7 +7242,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7241,7 +7291,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@ -7454,7 +7504,7 @@ msgstr "certificado duplicado - borrado"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Non se deu unha descricin)\n"
@@ -7605,12 +7655,13 @@ msgstr "engadir este chaveiro lista de chaveiros"
msgid "add this secret keyring to the list"
msgstr "engadir este chaveiro secreto lista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
#: sm/gpgsm.c:365
@@ -7668,25 +7719,45 @@ msgstr "non se puido conectar a `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "destinatario por defecto `%s' descoecido\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Non se deu unha descricin)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = omitir esta chave\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escribindo a `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7768,6 +7839,10 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
msgid "error storing flags: %s\n"
msgstr "erro lendo `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7799,7 +7874,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7807,7 +7882,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "o algoritmo de proteccin %d%s non est soportado\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "fallou a comprobacin da sinatura creada: %s\n"
@@ -7937,142 +8022,146 @@ msgstr "erro ao enviar a `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depuracin total"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|emprega-lo modo de contrasinal N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8707,10 +8796,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "non se puido abrir `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "gravando a chave secreta en `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "non se puido facer stat sobre `%s': %s\n"
@@ -8776,10 +8861,6 @@ msgstr ""
#~ msgstr "a chave secreta non est dispoible"
#, fuzzy
-#~ msgid "Enter New PIN: "
-#~ msgstr "Introduza o ID de usuario: "
-
-#, fuzzy
#~ msgid "NOTE: %s is not available in this version\n"
#~ msgstr "gpg-agent non est dispoible nesta sesin\n"
diff --git a/po/hu.po b/po/hu.po
index 47a1b4332..69245de53 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "rossz jelsz"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s vd algoritmus nem tmogatott.\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
@@ -102,11 +103,11 @@ msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" llomnyt: %s.\n"
@@ -398,24 +399,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZS: Nincs alaprtelmezett opcis fjl (%s).\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opcis fjl: %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opcikat a \"%s\" llomnybl olvasom.\n"
@@ -705,8 +706,8 @@ msgstr "jelszvltoztats"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
@@ -1114,14 +1115,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinlni ktegelt mdban!\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Mit vlaszt? "
@@ -1300,7 +1301,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "rvnytelen vlaszts.\n"
@@ -2260,7 +2261,7 @@ msgstr "%s:%d: rvnytelen export opcik!\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core llomnyt hozhat ltre!\n"
@@ -2300,11 +2301,11 @@ msgstr "Csak llomnyokat (pipe-ot nem) hasznlhat --pgp2 mdban!\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "zenet titkostsa --pgp2 mdban IDEA rejtjelezt ignyel!\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "A kivlasztott rejtjelez algoritmus rvnytelen!\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "A kivlasztott kivonatol algoritmus rvnytelen!\n"
@@ -3347,20 +3348,20 @@ msgstr "Alrs sikertelen: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Ez a kulcs nem vdett.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "A kulcs vdett.\n"
@@ -3377,7 +3378,7 @@ msgstr ""
"rja be az j jelszt ehhez a titkos kulcshoz!\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
@@ -4142,74 +4143,74 @@ msgstr "\"%s\" felhasznli azonostt mr visszavontk.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s fotazonost (mret: %ld, kulcs: 0x%08lX, felh: %d) mutatsa.\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "%c%lu preferencia ktszer szerepel!\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "Tl sok \"%c\" preferencia.\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "Tl sok \"%c\" preferencia.\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "Tl sok \"%c\" preferencia.\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "rvnytelen karakter a preferencik kztt!\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "Sima alrst rok.\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "nalrst rok.\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "sszefz alrst rok.\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsmret rvnytelen; %u bitet hasznlok.\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsmretet felkerektettem %u bitre.\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "adat titkostsa"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4223,109 +4224,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (csak titkosts)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Krem, adja meg, milyen kulcsot kvn:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA s ElGamal (alaprtelmezs)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (csak alrs)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosts)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (csak titkosts)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (csak alrs)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (csak titkosts)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosts)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "A DSA kulcspr 1024 bites lesz.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Milyen kulcsmretet szeretne? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "A kvnt kulcsmret %u bit.\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerektve %u bitre.\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4341,7 +4342,7 @@ msgstr ""
" <n>m = a kulcs n hnapig rvnyes\n"
" <n>y = a kulcs n vig rvnyes\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4357,40 +4358,40 @@ msgstr ""
" <n>m = az alrs n hnapig rvnyes\n"
" <n>y = az alrs n vig rvnyes\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Meddig rvnyes a kulcs? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Meddig rvnyes az alrs? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "rvnytelen rtk!\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s soha nem jr le.\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s soha nem jr le.\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s lejr: %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Az alrs lejr: %s.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4398,19 +4399,19 @@ msgstr ""
"Az n rendszere nem tud megjelenteni 2038 utni dtumokat.\n"
"Azonban kezelni helyesen tudja ket egszen 2106-ig.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Ez gy helyes (i/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4427,44 +4428,44 @@ msgstr ""
" \"Heinrich Heine (a klt) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Teljes nv: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "rvnytelen karakter a nvben!\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "A nv lehet, hogy nem kezddhet szmmal!\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "A nv legalbb 5 karakter kell legyen!\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-mail cm: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Ez nem rvnyes e-mail cm.\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Megjegyzs: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "rvnytelen karakter a megjegyzsben!\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "n a(z) %s karakterkdolst hasznlja.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4475,7 +4476,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
@@ -4490,24 +4491,24 @@ msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (K)ilps? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (R)endben/(K)ilps? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Krem, elbb javtsa ki a hibt!\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4515,12 +4516,12 @@ msgstr ""
"Most szksg van egy jelszra (vagy mondatra), amely a titkos kulcst vdi.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4532,7 +4533,7 @@ msgstr ""
"az \"--edit-key\" opcival.\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4544,50 +4545,50 @@ msgstr ""
"a lemezeket) a prmszm generlsa alatt. Ez segti a vletlenszm-\n"
"genertort, hogy entrpit tudjon gyjteni.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Kulcs ltrehozsa megszaktva.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "rom a kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem rhat nyilvnoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "Nem rhat titkoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilvnoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "A nyilvnos s titkos kulcsokat ltrehoztam s alrtam.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4597,46 +4598,46 @@ msgstr ""
"kvn ilyen clra ltrehozni, azt az \"--edit-key\" parancs segtsgvel\n"
"teheti meg.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZS: Alkulcsok ltrehozsa v3 kulcsokhoz nem OpenPGP-megfelel.\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valban ltrehozzam? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MEGJEGYZS: %08lX titkos kulcs %s-kor lejrt.\n"
@@ -4669,30 +4670,30 @@ msgstr "Alrs-jells: "
msgid "Keyring"
msgstr "Kulcskarika"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Elsdlegeskulcs-ujjlenyomat:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr "Elsdlegeskulcs-ujjlenyomat:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5179,7 +5180,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "Az IDEA rejtjelez bvts nincs jelen!\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = tovbbi informcikat krek\n"
@@ -6522,26 +6523,64 @@ msgstr "rvnytelen import opcik!\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Tallt egy programhibt... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "Nem tudom megnyitni az llomnyt: %s.\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "Pnclozs nem sikerlt: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "Nem tudom a \"%s\" knyvtrat ltrehozni: %s.\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "Hiba a \"%s\" kulcskarika rsakor: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "rom a titkos kulcsot a %s llomnyba.\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "A(z) %08lX nyilvnos kulcsot nem tallom: %s.\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "rom a titkos kulcsot a %s llomnyba.\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6580,6 +6619,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6595,15 +6646,15 @@ msgstr "Nem tudtam jrapteni a kulcskarika cache-t: %s\n"
msgid "reading public key failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6633,7 +6684,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Klds a kulcsszerverre sikertelen: %s\n"
@@ -6642,11 +6693,11 @@ msgstr "Klds a kulcsszerverre sikertelen: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6677,109 +6728,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "Hiba a kulcsblokk olvassakor: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: Hiba szabad rekord olvassakor: %s.\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "\"%s\" mr tmrtett.\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "j kulcspr ltrehozsa"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "Bizalmi adatbzis (%s) inicializlsa sikertelen!\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s alrs, %s kivonatol algoritmus.\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem talltam rvnyes OpenPGP adatot.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6852,22 +6901,22 @@ msgstr "Kihagytam a %02x kd rvnytelen radix64 karaktert.\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "Nem megfelel formj GPG_AGENT_INFO krnyezeti vltoz!\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "%d gpg-agent protokollverzi nem tmogatott!\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6936,7 +6985,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "Bizalmi adatbzis (%s) inicializlsa sikertelen!\n"
@@ -7138,7 +7187,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7188,7 +7237,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
@@ -7400,7 +7449,7 @@ msgstr "%c%lu preferencia ktszer szerepel!\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Nincs lers.)\n"
@@ -7551,12 +7600,13 @@ msgstr "kulcskarika hozzadsa a kulcskarikalisthoz"
msgid "add this secret keyring to the list"
msgstr "titkoskulcs-karika hozzadsa a listhoz"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NV|NV hasznlata alaprtelmezett titkos kulcsknt"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|GPNV|kulcsszerver belltsa kulcsok keresshez"
#: sm/gpgsm.c:365
@@ -7614,25 +7664,45 @@ msgstr "Nem tudok kapcsoldni \"%s\" objektumhoz: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "Ismeretlen alaprtelmezett cmzett: \"%s\"\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Nincs lers.)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " h = kulcs kihagysa\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "rtelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "rok a \"%s\" llomnyba.\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "Nem tudom bezrni a(z) \"%s\" llomnyt: %s.\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7714,6 +7784,10 @@ msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
msgid "error storing flags: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7745,7 +7819,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7753,7 +7827,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "%d%s vd algoritmus nem tmogatott.\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "A ltrehozott alrs ellenrzse sikertelen: %s.\n"
@@ -7883,141 +7967,145 @@ msgstr "Hiba %s-ra/-re kldskor: %s\n"
msgid "error sending standard options: %s\n"
msgstr "Hiba %s-ra/-re kldskor: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|N. sorszm jelszmd hasznlata"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NV|titkosts NV rszre"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NV|NV rejtjelez algoritmus haszn. jelszavakhoz"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8646,10 +8734,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "Nem tudom megnyitni %s-t!\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "Nem tudom a stat mveletet elvgezni a(z) \"%s\" llomnyon: %s.\n"
diff --git a/po/id.po b/po/id.po
index 1d3402fa0..c133e5568 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -94,9 +94,10 @@ msgstr "passphrase yang buruk"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
@@ -104,11 +105,11 @@ msgstr "tidak dapat membuat %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -400,24 +401,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
@@ -707,8 +708,8 @@ msgstr "ubah passphrase"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1117,14 +1118,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Pilihan anda? "
@@ -1303,7 +1304,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
@@ -2262,7 +2263,7 @@ msgstr "%s:%d: opsi ekspor tidak valid\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
@@ -2308,11 +2309,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
@@ -3358,20 +3359,20 @@ msgstr "gagal menandai: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
@@ -3388,7 +3389,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
@@ -4156,74 +4157,74 @@ msgstr "User ID \"%s\" telah dibatalkan\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferensi %c%lu ganda \n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "menulis signature direct\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "menulis self signature\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "tandai"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "enkripsi data"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4237,109 +4238,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (hanya menandai)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4355,7 +4356,7 @@ msgstr ""
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4371,40 +4372,40 @@ msgstr ""
" <n>m = signature berakhir dalam n bulan\n"
" <n>y = signature berakhir dalam n tahun\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signature valid untuk? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s berakhir pada %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Signature kadaluarsa pada %s \n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4412,19 +4413,19 @@ msgstr ""
"Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
"Namun, ia dapat menanganinya secara benar hingga 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4440,44 +4441,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4487,7 +4488,7 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
@@ -4502,23 +4503,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4526,12 +4527,12 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4544,7 +4545,7 @@ msgstr ""
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4556,50 +4557,50 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4609,45 +4610,45 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4680,30 +4681,30 @@ msgstr "Notasi signature: "
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5180,7 +5181,7 @@ msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "plugin cipher IDEA tidak tersedia\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = beri saya informasi lebih banyak lagi\n"
@@ -6516,26 +6517,64 @@ msgstr "opsi impor tidak valid\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "anda menemukan kesalahan ...(%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "tidak dapat membuka file: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "tidak dapat membuat direktori `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "kunci publik %08lX tidak ditemukan: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6574,6 +6613,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6589,15 +6640,15 @@ msgstr "gagal membuat kembali cache keyring: %s\n"
msgid "reading public key failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6627,7 +6678,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
@@ -6636,11 +6687,11 @@ msgstr "Pengiriman keyserver gagal: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6671,109 +6722,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "gagal membaca keyblock: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' sudah dikompresi\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "buat sepasang kunci baru"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6846,22 +6895,22 @@ msgstr "karakter radix64 tidak valid %02x dilewati\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "protokol gpg-agent versi %d tidak didukung\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6930,7 +6979,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -7132,7 +7181,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7181,7 +7230,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@ -7394,7 +7443,7 @@ msgstr "preferensi %c%lu ganda \n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Tidak diberikan deskripsi)\n"
@@ -7545,12 +7594,13 @@ msgstr "tambah keyring ini ke daftar keyring"
msgid "add this secret keyring to the list"
msgstr "tambah keyring rahasia ini ke daftar"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
#: sm/gpgsm.c:365
@@ -7608,25 +7658,45 @@ msgstr "tidak dapat terkoneksi ke `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Tidak diberikan deskripsi)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = lewati kunci ini\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "tidak dapat memparsing URI keyserver\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "menulis ke `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7708,6 +7778,10 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
msgid "error storing flags: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7739,7 +7813,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7747,7 +7821,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "algoritma proteksi %d%s tidak didukung\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@ -7877,141 +7961,145 @@ msgstr "kesalahan mengirim ke `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|gunakan passphrase mode N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8644,10 +8732,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "tidak dapat membuka `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "menulis kunci rahasia ke `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "tidak dapat melakukan statistik `%s': %s\n"
diff --git a/po/it.po b/po/it.po
index 2efc8c2d0..4494d754e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "passphrase errata"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non gestito\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
@@ -102,11 +103,11 @@ msgstr "impossibile creare `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -398,24 +399,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
@@ -705,8 +706,8 @@ msgstr "cambia la passphrase"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@ -1115,14 +1116,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Cosa scegli? "
@@ -1302,7 +1303,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
@@ -2272,7 +2273,7 @@ msgstr "%s:%d: opzioni di esportazione non valide\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
@@ -2314,11 +2315,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"nella modalit --pgp2 richiesto il cifrario IDEA per cifrare un messaggio\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non valido\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non valido\n"
@@ -3363,20 +3364,20 @@ msgstr "firma fallita: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Questa chiave non protetta.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "La chiave protetta.\n"
@@ -3393,7 +3394,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
@@ -4169,74 +4170,74 @@ msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "la preferenza %c%lu doppia\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "scrittura della firma diretta\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "scrittura della autofirma\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "cifra dati"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4250,109 +4251,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (cifra solo)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (firma solo)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La coppia DSA avr 1024 bit.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave %u bit\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4368,7 +4369,7 @@ msgstr ""
" <n>m = la chiave scadr dopo n mesi\n"
" <n>y = la chiave scadr dopo n anni\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4384,40 +4385,40 @@ msgstr ""
" <n>m = la chiave scadr dopo n mesi\n"
" <n>y = la chiave scadr dopo n anni\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Firma valida per? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valore non valido\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s non ha scadenza\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s non ha scadenza\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s scadr il %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Questa firma scadr il %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4425,19 +4426,19 @@ msgstr ""
"Il tuo sistema non pu mostrare date oltre il 2038.\n"
"Comunque, sar gestita correttamente fino al 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr " giusto (s/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4454,44 +4455,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu iniziare con una cifra\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non valido\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4502,7 +4503,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
@@ -4517,23 +4518,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4541,12 +4542,12 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4558,7 +4559,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4570,50 +4571,50 @@ msgstr ""
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilit di raccogliere abbastanza entropia.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non stato trovato un portachiavi pubblico scrivibile: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non stato trovato un portachiavi segreto scrivibile: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4623,12 +4624,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4636,7 +4637,7 @@ msgstr ""
"la chiave stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4644,26 +4645,26 @@ msgstr ""
"la chiave stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4696,30 +4697,30 @@ msgstr "Annotazione della firma: "
msgid "Keyring"
msgstr "Portachiavi"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5200,7 +5201,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "il plugin per il cifrario IDEA non presente\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrami ulteriori informazioni\n"
@@ -6560,26 +6561,64 @@ msgstr "opzioni di importazione non valide\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "hai trovato un bug... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "impossibile aprire il file: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "impossibile creare la directory `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "chiave pubblica %08lX non trovata: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6618,6 +6657,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6633,15 +6684,15 @@ msgstr "rebuild della cache del portachiavi fallito: %s\n"
msgid "reading public key failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6671,7 +6722,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
@@ -6680,11 +6731,11 @@ msgstr "invio al keyserver fallito: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6715,109 +6766,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "errore leggendo il keyblock: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' gi compresso\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "genera una nuova coppia di chiavi"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6890,22 +6939,22 @@ msgstr "Carattere radix64 non valido %02x saltato\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "la versione %d del protocollo di gpg-agent non gestita\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6974,7 +7023,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -7176,7 +7225,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7225,7 +7274,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
@@ -7437,7 +7486,7 @@ msgstr "la preferenza %c%lu doppia\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Non stata data una descrizione)\n"
@@ -7588,12 +7637,13 @@ msgstr "aggiungi questo portachiavi alla lista"
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
#: sm/gpgsm.c:365
@@ -7651,25 +7701,45 @@ msgstr "impossibile connettersi a `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Non stata data una descrizione)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = salta questa chiave\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "scrittura in `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7751,6 +7821,10 @@ msgstr "errore nella creazione della passhprase: %s\n"
msgid "error storing flags: %s\n"
msgstr "errore leggendo `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7782,7 +7856,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7790,7 +7864,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "l'algoritmo di protezione %d%s non gestito\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "controllo della firma creata fallito: %s\n"
@@ -7920,141 +8004,145 @@ msgstr "errore leggendo `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usa il modo N per la passphrase"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "errore nella creazione della passhprase: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifra per NOME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8699,10 +8787,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "impossibile aprire `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "scrittura della chiave segreta in `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "impossibile eseguire stat su `%s': %s\n"
diff --git a/po/ja.po b/po/ja.po
index d219b5b41..4400cc9e3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -96,9 +96,10 @@ msgstr "ѥե졼Ǥ"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ݸ%dϥݡȤƤޤ\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "%sפǤޤ: %s\n"
@@ -106,11 +107,11 @@ msgstr "%sפǤޤ: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "%sפޤ: %s\n"
@@ -402,24 +403,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": Υץ󡦥ե%sפޤ\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ץ󡦥ե%s: %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "%sפ饪ץɤ߽Фޤ\n"
@@ -709,8 +710,8 @@ msgstr "ѥե졼ѹ"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "ѥե졼κ顼: %s\n"
@@ -1116,13 +1117,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPno. %s򸡽\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "ϥХå⡼ɤǤϤǤޤ\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "? "
@@ -1289,7 +1290,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) ǧڸ\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "̵Ǥ\n"
@@ -2222,7 +2223,7 @@ msgstr "%s:%d: ̵ʸڥץǤ\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ٹ: ץΥե뤬Ǥ뤳Ȥޤ!\n"
@@ -2262,11 +2263,11 @@ msgstr "--pgp2ꤷ顢(ѥפǤʤ) եꤻͤФʤޤ\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2⡼ɤΥåŹ沽ǤϡIDEAŹˡɬפǤ\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "򤵤줿Ź楢르ꥺϡ̵Ǥ\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "򤵤줿󥢥르ꥺϡ̵Ǥ\n"
@@ -3270,20 +3271,20 @@ msgstr "̾˼Ԥޤ: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "θݸƤޤ\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "ݸƤޤ\n"
@@ -3300,7 +3301,7 @@ msgstr ""
"̩οѥե졼ϤƤ\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "ѥե졼ȷ֤Ƥޤ󡣺ϤƤ"
@@ -4044,69 +4045,69 @@ msgstr "桼ID%sɤϡ⤦Ƥޤ\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (礭%ld) θ%s (uid %d) ΥեIDȤɽ\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "%sפνʣ\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "¿Źˡ\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "¿\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "¿밵\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "ʸ̵ʹܡ%sפޤ\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "ľܽ̾񤭹ߤޤ\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "ʽ̾񤭹ߤޤ\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "бؤν̾񤭹ߤޤ\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵ʸĹ%uӥåȤˤޤ\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Ĺ%uӥåȤ˴ݤޤ\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Encrypt"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Authenticate"
@@ -4120,109 +4121,109 @@ msgstr "Authenticate"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s˲ǽ: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "ǽ: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) ̾Ϥȿž\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) ŹϤȿž\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) ǧϤȿž\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) λ\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "˾θμ򤷤Ƥ:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSAElgamal ()\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (̾Τ)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (ȼǽϤ)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (Ź沽Τ)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (̾Τ)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (Ź沽Τ)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ȼǽϤ)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSAФ1024ӥåȤˤʤޤ\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "ɤθĹˤޤ? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "׵ᤵ줿Ĺ%uӥå\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uӥåȤ˴ݤޤ\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4238,7 +4239,7 @@ msgstr ""
" <n>m = n ֤λ\n"
" <n>y = n ǯ֤λ\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4254,40 +4255,40 @@ msgstr ""
" <n>m = ̾ n ֤λ\n"
" <n>y = ̾ n ǯ֤λ\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "֤ͭ? (0)"
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "֤̾ͭ? (0)"
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "̵\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "%s̵¤Ǥ\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "%s̵¤Ǥ\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s%sλޤ\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "ν̾%sλǤ\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4295,18 +4296,18 @@ msgstr ""
"ΥƥǤϡ2038ǯʹߤդɽǤޤ󤬡\n"
"2106ǯޤǤʤ갷ޤ\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Ǥ? (y/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4322,44 +4323,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "̾: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "̵̾ʸޤ\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "̾ǻϤƤϤޤ\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "̾5ʸʾǤʤФʤޤ\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Żҥ᡼롦ɥ쥹: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "ͭŻҥ᡼롦ɥ쥹ǤϤޤ\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Ȥ̵ʸޤ\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "ʤʸ%sפȤäƤޤ\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4370,7 +4371,7 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
@@ -4385,23 +4386,23 @@ msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤϽλ(Q)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤOK(O)λ(Q)? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "ޤ顼Ƥ\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4409,12 +4410,12 @@ msgstr ""
"̩ݸ뤿˥ѥե졼ޤ\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4426,7 +4427,7 @@ msgstr ""
"Ρ--edit-keyɥץǤĤǤѹǤޤ\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4437,50 +4438,50 @@ msgstr ""
"Ȥǥ˥Ȥ¾ΤȤ򤹤ȡҤ\n"
"𻨤礭ʤ䤹ʤΤǡᤤޤ\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "äޤ\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "%sפظ񤭹ߤޤ\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "%sפ̩֤񤭹ߤޤ\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "߲ǽʸؤĤޤ: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "߲ǽ̩ؤĤޤ: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "̩ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "̩̾ޤ\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4489,42 +4490,42 @@ msgstr ""
"θϰŹ沽ˤϻѤǤʤȤդƤŹ沽Ԥˤϡ\n"
"--edit-keyɥޥɤȤäƤ\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ": v3κϡOpenPGPŬ礷ޤ\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "˺ޤ? (y/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "ɤؤθݴɤ˼Ԥޤ: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Хååסե%sפǤޤ: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": ɸΥХååפ%sפ¸ޤ\n"
@@ -4557,29 +4558,29 @@ msgstr "̾: "
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "縰λ:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr "λ:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " 縰λ:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " λ:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " ɤ ="
@@ -5049,7 +5050,7 @@ msgstr "ٹ: 󥢥르ꥺ %s (%d) ζͤΩޤ\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEAŹˡΥץ饰󤬤ޤ\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr "ܺ٤http://www.gnupg.org/faq.html\n"
@@ -6339,26 +6340,64 @@ msgstr "̵ʰץǤ\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Хȯ ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "̾˼Ԥޤ: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "%sפ%sפؤΰư˼: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "ǥ쥯ȥ꡼%sפǤޤ: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "ء%sפνߥ顼: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "%sפ̩񤭹ߤޤ\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "%sĤޤ: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "%sפ̩񤭹ߤޤ\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6397,6 +6436,19 @@ msgstr "PINХå顼ᤷޤ: %s\n"
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:555 scd/app-openpgp.c:1698
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "PINμ顼: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6412,15 +6464,15 @@ msgstr "ݴɤ˼Ԥޤ: %s\n"
msgid "reading public key failed: %s\n"
msgstr "ɽФ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "˸ǡޤޤƤޤ\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "RSAˡ(modulus)ޤޤƤޤ\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "RSAؿޤޤƤޤ\n"
@@ -6450,7 +6502,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%dPINûޤû%d\n"
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%dθڤ˼Ԥޤ: %s\n"
@@ -6459,11 +6511,11 @@ msgstr "CHV%dθڤ˼Ԥޤ: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "ޥɤؤΥꤵƤޤ\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "ɤCHV֤θǥ顼\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "ɤʵפ˥åޤ!\n"
@@ -6494,106 +6546,104 @@ msgstr "|A|Admin PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
#, fuzzy
msgid "|AN|New Admin PIN"
msgstr "|A|Admin PIN"
-#: scd/app-openpgp.c:1696
-#, fuzzy
-msgid "|N|New PIN"
-msgstr "PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "PINμ顼: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "ץꥱ󡦥ǡɽФ顼\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "ǡ֥ȤɽФ顼\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "Ϥ⤦ޤ\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "¸θϸ򴹤ޤ\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, fuzzy, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "ؿ礭ޤ (32ӥåȤ)\n"
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "δ֡Ԥ ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "˼Ԥޤ\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "λޤ (%d)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGPɤ̵ʹ¤ (ǡ֥ 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s̾󥢥르ꥺ %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "ޤǤ˺줿̾: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s˥Ǥޤ - ̵OpenPGP?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6663,22 +6713,22 @@ msgstr "̵64ʸ%02XȤФޤ\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "GPG_AGENT_INFOĶѿν񼰤ޤ\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agentץȥ롦С%dϥݡȤƤޤ\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6748,7 +6798,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "ɽФ˼Ԥޤ: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "ݴɤ˼Ԥޤ: %s\n"
@@ -6951,7 +7001,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7000,7 +7050,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "Ըμ顼: %s\n"
@@ -7213,7 +7263,7 @@ msgstr "%sפνʣ\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "֥åκ˼Ԥޤ: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Ϥޤ)\n"
@@ -7369,12 +7419,12 @@ msgstr "θؤޤ"
msgid "add this secret keyring to the list"
msgstr "μ¹Ԥˤ̩ޤ\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#: sm/gpgsm.c:365
@@ -7436,25 +7486,45 @@ msgstr "%sפ³Ǥޤ: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "̤ΤΥץ%s\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Ϥޤ)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = θϤȤФ\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "СURLǽ\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "%sפ˥Ǥޤ: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7536,6 +7606,10 @@ msgstr "PINμ顼: %s\n"
msgid "error storing flags: %s\n"
msgstr "%sפɽФ顼: %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7567,7 +7641,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7575,7 +7649,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "ݸ르ꥺ%d%sϥݡȤƤޤ\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "줿̾θ˼Ԥޤ: %s\n"
@@ -7703,140 +7787,144 @@ msgstr "%sפɽФ顼: %s\n"
msgid "error sending standard options: %s\n"
msgstr "%sפǿѥ쥳ɤθ顼: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "μ"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "ѥե졼κ顼: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|̾|̾Ѥ˰Ź沽"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "СURLǽ\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8462,10 +8550,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "%sפåǤޤ\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "%sפ̩񤭹ߤޤ\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "%sפĴ٤뤳ȤǤޤ: %s\n"
diff --git a/po/nb.po b/po/nb.po
index fe10f1522..9d40a1b29 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -96,9 +96,10 @@ msgstr "ugyldig passfrase"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan ikke opprette %s: %s\n"
@@ -106,11 +107,11 @@ msgstr "kan ikke opprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke pne %s: %s\n"
@@ -402,24 +403,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil %s\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil %s: %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra %s\n"
@@ -704,8 +705,8 @@ msgstr "endre passfrasen"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -1104,13 +1105,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan ikke gjre dette i batchmodus\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Ditt valg? "
@@ -1277,7 +1278,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnkkel\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Ugyldig valg.\n"
@@ -2213,7 +2214,7 @@ msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
@@ -2253,11 +2254,11 @@ msgstr "du m bruke filer (og ikke en pipe) nr --pgp2 er psltt\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
@@ -3253,19 +3254,19 @@ msgstr "signering mislyktes: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Denne nkkelen er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av primrnkkelen er ikke tilgjengelig.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige deler av primrnkkelen er lagret p kort.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Nkkelen er beskyttet.\n"
@@ -3280,7 +3281,7 @@ msgid ""
"\n"
msgstr "Tast inn den nye passfrasen for denne hemmelige nkklen.\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "passfrasen ble ikke gjentatt korrekt; prv igjen"
@@ -3979,69 +3980,69 @@ msgstr "Undernkkel %s er allerede opphevet.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferansen %s er duplisert\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "for mange cipher-preferanser\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "for mange digest-preferanser\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "for mange kompresjons-preferanser\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "ugyldig oppfring %s i preferansestreng\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "skriver direkte signatur\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "skriver nkkelbindende signatur\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nkkelstrrelsen er ugyldig; bruker %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nkkelstrrelsen ble rundet opp til %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Signere"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Bekrefte"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Kryptere data"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Autentisere"
@@ -4059,109 +4060,109 @@ msgstr "Autentisere"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr ""
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Vennligst velg hvilken type nkkel du vil ha:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (bare signering)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (sette dine egne muligheter)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (bare kryptering)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (bare signering)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (bare kryptering)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (sette dine egne muligheter)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-nkkelpar vil ha %u bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Hvilken nkkelstrrelse vil du ha? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "nsket nkkelstrrelse er %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet opp til %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4177,7 +4178,7 @@ msgstr ""
" <n>m = nkkelen utgr om n months\n"
" <n>y = nkkelen utgr om n years\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4193,38 +4194,38 @@ msgstr ""
" <n>m = signaturen utgr om n months\n"
" <n>y = signaturen utgr om n years\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Nkkelen er gyldig for? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen er gyldig for? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "ugyldig verdi\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Nkkel utgr ikke i det hele tatt\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Signaturen utgr ikke i det hele tatt\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Nkkel utgr den %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen utgr den %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4232,18 +4233,18 @@ msgstr ""
"Systemet ditt kan ikke vise datoer etter 2038.\n"
"Likevel vil det bli hndtert korrekt opp til 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4259,44 +4260,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Fullt navn: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Navnet kan ikke starte med et siffer\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet m vre minst 5 tegn langt\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruker tegnsettet %s.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4307,7 +4308,7 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -4323,23 +4324,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Vennligst korriger feilen frst\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4347,12 +4348,12 @@ msgstr ""
"Du trenger en passfrase for beskytte din hemmelige nkkel.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4364,7 +4365,7 @@ msgstr ""
"hjelp av dette programmet og valget --edit-key.\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4376,50 +4377,50 @@ msgstr ""
"diskene jobbe) under primtallgenereringen; dette gir\n"
"tilfeldig-tall-generatoren en bedre sjanse til samle nok entropy.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Nkkelgenereringen ble avbrutt.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentlig nkkel til %s\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver forelpig hemmelig nkkel til %s\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmelig nkkel til %s\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbart offentlig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbart hemmelig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "feil ved skriving av offentlig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "feil ved skriving av hemmelig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nkkel opprettet og signert.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4428,13 +4429,13 @@ msgstr ""
"kanskje bruke kommandoen --edit-key for generere en\n"
"sekundrnkkel for dette formlet.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nkkelgenerering mislyktes: %s\n"
# Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4443,7 +4444,7 @@ msgstr ""
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4451,27 +4452,27 @@ msgstr ""
"nkkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MERK: opprettelse av undernkler for v3-nkler er ikke i samsvar med "
"OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Virkelig opprette? (j/N)"
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lagring av nkkel p kort mislyktes: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke opprette sikkerhetskopifil %s: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4504,29 +4505,29 @@ msgstr ""
msgid "Keyring"
msgstr "Nkkelknippe"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Fingeravtrykk for primrnkkel:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Fingeravtrykk for undernkkel:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Fingeravtrykk for primrnkkel:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Fingeravstrykk for undernkkel:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Nkkelfingeravtrykk ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
@@ -4995,7 +4996,7 @@ msgstr "ADVARSEL: digestalgoritmen %s er avlegs\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "vennligst se %s for mer informasjon\n"
@@ -6277,26 +6278,64 @@ msgstr "ugyldige listevalg\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du fant en feil ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "signering mislyktes: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "omdping fra %s til %s mislyktes: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "kan ikke opprette katalogen %s: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "feil ved skriving av nkkelknippet %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "venter p lsing av %s ...\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "fant ikke offentlig nkkel %s: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "venter p lsing av %s ...\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6335,6 +6374,18 @@ msgstr "PIN-callback returnerte en feil: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "feil ved henting av ny PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6350,15 +6401,15 @@ msgstr "klarte ikke lagre opprettelsesdatoen: %s\n"
msgid "reading public key failed: %s\n"
msgstr "lesing av offentlig nkkel mislyktes: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "respons inneholder ikke data om offentlig nkkel\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "respons inneholder ikke RSA-modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
@@ -6388,7 +6439,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %s\n"
@@ -6397,11 +6448,11 @@ msgstr "bekreftelse av CHV%d mislyktes: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "feil ved henting av CHV-status fra kort\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "kort er permanent lst!\n"
@@ -6432,104 +6483,103 @@ msgstr "|A|Admin PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "feil ved henting av ny PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "feil ved lesing av applikasjonsdata\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "feil ved lesing av fingeravtrykk DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "nkkel finnes allerede\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "eksisterende nkkel vil bli erstattet\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "generere en ny nkkel\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "tidsstempel for opprettelse mangler\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "klarte ikke lagre nkkelen: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "vennligst vent mens nkkel blir generert ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "nkkelgenerering mislyktes\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nkkelgenerering fullfrt (%d sekunder)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kortet sttter ikke digestalgoritme %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer opprettet s langt: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Ny PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6599,21 +6649,21 @@ msgstr "hoppet over ugyldig radix64-tegn %02x\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr ""
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6681,7 +6731,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "lesing av offentlig nkkel mislyktes: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "klarte ikke lagre nkkelen: %s\n"
@@ -6883,7 +6933,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -6932,7 +6982,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "feil ved henting av nvrende nkkelinfo: %s\n"
@@ -7146,7 +7196,7 @@ msgstr "preferansen %s er duplisert\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "sleting av nkkelblokk mislyktes: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "ingen gyldige adressater\n"
@@ -7301,12 +7351,12 @@ msgstr "hent nklene fra dette nkkelknippet"
msgid "add this secret keyring to the list"
msgstr "Trenger den hemmelige nkkelen for gjre dette.\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#: sm/gpgsm.c:365
@@ -7368,25 +7418,45 @@ msgstr "kan ikke opprette %s: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "ukjent valg %s\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = hopp over denne nkkelen\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "kunne ikke parse nkkelserverens URL\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke aksere %s: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7468,6 +7538,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7499,7 +7573,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7507,7 +7581,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr ""
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr ""
@@ -7635,139 +7719,143 @@ msgstr "feil ved lesing av %s: %s\n"
msgid "error sending standard options: %s\n"
msgstr "feil ved sking etter tillitspost i %s: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr ""
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAVN|kryptere for NAVN"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "kunne ikke parse nkkelserverens URL\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8150,9 +8238,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "kan ikke lse %s: %s\n"
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "venter p lsing av %s ...\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "kan ikke stat() %s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index a798688de..fc5580a01 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.7\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -92,9 +92,10 @@ msgstr "Haso"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wiksze ni %d bitw nie s obsugiwane\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nie mona utworzy ,,%s'': %s\n"
@@ -102,11 +103,11 @@ msgstr "nie mona utworzy ,,%s'': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mona otworzy ,,%s'': %s\n"
@@ -403,24 +404,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "podano bdny poziom diagnostyki ,,%s''\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, 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:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domylnego pliku opcji ,,%s''\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
@@ -712,8 +713,8 @@ msgstr "Zmiana hasa"
msgid "I'll change it later"
msgstr "Zmieni je pniej"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "bd tworzenia potoku: %s\n"
@@ -1117,13 +1118,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kart OpenPGP nr %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nie dziaa w trybie wsadowym\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Twj wybr? "
@@ -1290,7 +1291,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Niewaciwy wybr.\n"
@@ -2238,7 +2239,7 @@ msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZEENIE: program moe stworzy plik zrzutu pamici!\n"
@@ -2280,11 +2281,11 @@ msgstr "w trybie --pgp2 trzeba uywa plikw a nie potokw.\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "szyfrowanie wiadomoci w trybie --pgp2 wymaga moduu szyfru IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfrujcy jest niepoprawny\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skrtw wiadomoci jest niepoprawny\n"
@@ -3300,19 +3301,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Klucz ma tylko zalepk albo elementy na karcie - nie ma hasa do zmiany.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz tajna gwnego klucza jest niedostpna.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Cz tajna gwnego klucza jest zapisana na karcie.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
@@ -3329,7 +3330,7 @@ msgstr ""
"Wprowad nowe dugie, skomplikowane haso dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "haso nie zostao poprawnie powtrzone; jeszcze jedna prba"
@@ -4068,71 +4069,71 @@ msgstr ""
"Wywietlanie zdjcia w formacie %s o rozmiarze %ld bajtw dla klucza %s (id %"
"d).\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "ustawienie ,,%s'' powtarza si\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "zbyt wiele ustawie szyfru\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "zbyt wiele ustawie funkcji skrtu\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "zbyt wiele ustawie kompresji\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "niewaciwy element `%s' w tekcie ustawie\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "zapis podpisu bezporedniego\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "zapis podpisu klucza nim samym\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "zapis podpisu wicego klucz\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niewaciwa dugo klucza; wykorzystano %u bitw\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokrglony w gr do %u bitw\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"OSTRZEENIE: niektre programy OpenPGP nie potrafi obsuy klucza RSA o "
"tej dugoci skrtu\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Podpisywanie"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Certyfikowanie"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Szyfrowanie"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Uwierzytelnianie"
@@ -4146,109 +4147,109 @@ msgstr "Uwierzytelnianie"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "PpSsUuZz"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Moliwe akcje dla klucza %s: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Aktualnie dopuszczalne akcje: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Przeczenie moliwoci podpisywania\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Przeczenie moliwoci szyfrowania\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Przeczenie moliwoci uwierzytelniania\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Zakoczenie\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Prosz wybra rodzaj klucza:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) Para kluczy dla algorytmw DSA i Elgamala (domylne)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (moliwoci do ustawienia)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Klucz dla algorytmu Elgamala (tylko do szyfrowania)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (tylko do podpisywania)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (moliwoci do ustawienia)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Para kluczy DSA bdzie miaa %u bitw dugoci.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "Klucze %s bd miay od %u do %u bitw dugoci.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Jakiej dugoci klucz wygenerowa? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Rozmiary kluczy %s musz by z przedziau %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "dana dugo klucza to %u bitw.\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrglono do %u bitw\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4264,7 +4265,7 @@ msgstr ""
" <n>m = termin wanoci klucza upywa za n miesicy\n"
" <n>y = termin wanoci klucza upywa za n lat\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4280,38 +4281,38 @@ msgstr ""
" <n>m = termin wanoci podpisu upywa za n miesicy\n"
" <n>y = termin wanoci podpisu upywa za n lat\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Okres wanoci klucza? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Okres wanoci podpisu? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "niepoprawna warto\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Klucz nie wyganie w ogle\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Podpis nie wyganie w ogle\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Klucz traci wano %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Wano podpisu wygasa %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4319,18 +4320,18 @@ msgstr ""
"Twj system nie potrafi pokaza daty po roku 2038.\n"
"Niemniej daty do roku 2106 bd poprawnie obsugiwane.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko si zgadza (t/N)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4346,44 +4347,44 @@ msgstr ""
" \"Tadeusz eleski (Boy) <tzb@ziemianska.pl>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Imi i nazwisko: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Niewaciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Imi lub nazwisko nie moe zaczyna si od cyfry\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Imi i nazwisko musz mie co najmniej 5 znakw dugoci.\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Niewaciwy znak w komentarzu\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Uywasz zestawu znakw %s.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4394,7 +4395,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie naley umieszcza adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4411,25 +4412,25 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, przej (D)alej,\n"
"czy (W)yj z programu? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi ten bd\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4437,12 +4438,12 @@ msgstr ""
"Musisz poda dugie, skomplikowane haso aby ochroni swj klucz tajny.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4454,7 +4455,7 @@ msgstr ""
"\"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4470,50 +4471,50 @@ msgstr ""
"iloci\n"
"entropii.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zostaa anulowana.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuj klucz publiczny w ,,%s''\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuj zalepk klucza tajnego w ,,%s''\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuj klucz tajny w ,,%s''\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostay utworzone i podpisane.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4521,12 +4522,12 @@ msgstr ""
"Ten klucz nie moe by wykorzystany do szyfrowania. Komend \"--edit-key\"\n"
"mona doda do niego podklucz szyfrujcy.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powioda si: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4534,7 +4535,7 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4542,26 +4543,26 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy? (t/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zapis klucza na karcie nie powid si: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nie mona utworzy pliku kopii zapasowej ,,%s'': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -4594,29 +4595,29 @@ msgstr "Adnotacje podpisu: "
msgid "Keyring"
msgstr "Zbir kluczy"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza gwnego:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza gwnego:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
@@ -5092,7 +5093,7 @@ msgstr "OSTRZEENIE: algorytm skrtu %s jest odradzany\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "modu szyfru IDEA nie jest dostpny\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "objanienie mona przeczyta tutaj: %s\n"
@@ -6412,26 +6413,64 @@ msgstr "bdna opcja ,,%.50s''\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "znalaze(a) bd w programie ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, c-format
msgid "error loading `%s': %s\n"
msgstr "bd odczytu ,,%s'': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "konwersja z ,,%s'' do ,,%s'' niedostpna\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open nie powiodo si: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "konwersja z ,,%s'' do ,,%s'' nie powioda si: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "nie mona utworzy katalogu tymczasowego,,%s'': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "bd zapisu do %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "klucz publiczny %s nie odnaleziony: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "nasuchiwanie na gniedzie ,,%s''\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "ustawienie flag diagnostycznych"
@@ -6470,6 +6509,18 @@ msgstr "Zapytanie zwrotne o PIN zwrcio bd: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Nowy PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "bd podczas odczytu nowego PIN-u: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6485,15 +6536,15 @@ msgstr "nie powid si zapis daty utworzenia: %s\n"
msgid "reading public key failed: %s\n"
msgstr "odczyt klucza publicznego nie powid si: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "odpowied nie zawiera danych klucza publicznego\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "odpowied nie zawiera wspczynnika RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "odpowied nie zawiera publicznego wykadnika RSA\n"
@@ -6524,7 +6575,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "weryfikacja CHV%d nie powioda si: %s\n"
@@ -6533,11 +6584,11 @@ msgstr "weryfikacja CHV%d nie powioda si: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "dostp do polece administratora nie zosta skonfigurowany\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "bd podczas odczytu stanu CHV z karty\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "karta zostaa trwale zablokowana!\n"
@@ -6569,105 +6620,104 @@ msgstr "|A|PIN administratora"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Nowy PIN administratora"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Nowy PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "bd podczas odczytu nowego PIN-u: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "bd podczas odczytu danych aplikacji\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "bd podczas odczytu odcisku DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "klucz ju istnieje\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "istniejcy klucz zostanie zastpiony\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "generowanie nowego klucza\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "brak datownika utworzenia\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "nie powid si zapis klucza: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "prosz czeka na wygenerowanie klucza...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "generowanie klucza nie powiodo si\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generowanie klucza zakoczone (%d sekund)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr "odcisk na karcie nie zgadza si z danym\n"
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "karta nie obsuguje algorytmu skrtu %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "dotychczas stworzono podpisw: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie mona dosta si do %s - niepoprawna karta OpenPGP?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Nowy PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
@@ -6736,21 +6786,21 @@ msgstr "niewaciwy znak formatu radix64 %02x zosta pominity\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "dirmngr nie dziaa - uruchamianie ,,%s''\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "zy format zmiennej rodowiskowej DIRMNGR_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "wersja %d protokou dirmngr nie jest obsugiwana\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "nie mona poczy si z dirmngr - prba fallbacku\n"
@@ -6818,7 +6868,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "zaciemnienie klucza nie powiodo si: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "nie udao si przydzieli uchwytu keyDB\n"
@@ -7003,7 +7053,7 @@ msgstr "Klucz %s uywa niebezpiecznego (%u-bitowego) skrtu\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "skrt %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(to jest algorytm MD2)\n"
@@ -7049,7 +7099,7 @@ msgid "no key usage specified - assuming all usages\n"
msgstr ""
"nie okrelono sposobu wykorzystania klucza - przyjto wszystkie sposoby\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "bd podczas pobierania informacji o wykorzystaniu klucza: %s\n"
@@ -7261,7 +7311,7 @@ msgstr "certyfikat ,,%s'' usunity\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "usunicie certyfikatu ,,%s'' nie powiodo si: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "nie podano poprawnych adresatw\n"
@@ -7403,12 +7453,13 @@ msgstr "dodanie tego zbioru kluczy do listy zbiorw kluczy"
msgid "add this secret keyring to the list"
msgstr "dodanie tego zbioru kluczy tajnych do listy"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|uycie NAZWY jako domylnego klucza tajnego"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|uycie tego serwera do wyszukiwania kluczy"
#: sm/gpgsm.c:365
@@ -7464,25 +7515,45 @@ msgstr "UWAGA: nie mona zaszyfrowa do ,,%s'': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "nieznany model poprawnoci ,,%s''\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "linia %d: nie podano nazwy przedmiotu\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " p = pominicie tego klucza\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "niezrozumiay URL serwera kluczy\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "OSTRZEENIE: dziaanie z faszywym czasem systemowym: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "import wsplnych certyfikatw ,,%s''\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nie mona podpisa z uyciem ,,%s'': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "to polecenie nie zostao jeszcze zaimplementowane\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7562,6 +7633,11 @@ msgstr "bd pobierania zapisanych flag: %s\n"
msgid "error storing flags: %s\n"
msgstr "bd zapisywania flag: %s\n"
+#: sm/keylist.c:618
+#, fuzzy
+msgid "Error - "
+msgstr "[Bd - Brak nazwy]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7601,7 +7677,7 @@ msgstr ""
"Naley zauway, e to oprogramowaie nie jest oficjalnie zatwierdzone do "
"tworzenia i sprawdzania takich podpisw.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7612,7 +7688,17 @@ msgstr ""
",,%s''\n"
"Naley zauway, e ten certyfikat NIE utworzy kwalifikowanego podpisu!"
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "algorytm ochrony %d%s nie jest obsugiwany\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiodo si: %s\n"
@@ -7735,139 +7821,143 @@ msgstr "bd wysyania polecenia %s: %s\n"
msgid "error sending standard options: %s\n"
msgstr "bd wysyania standardowych opcji: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Opcje sterujce wyjciem diagnostycznym"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Opcje sterujce konfiguracj"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Opcje przydatne do diagnostyki"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|PLIK|zapisanie logw trybu serwerowego do PLIKu"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Opcje sterujce bezpieczestwem"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|przedawnienie kluczy SSH po N sekundach"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
"|N|ustawienie maksymalnego czasu ycia pamici podrcznej PIN-w na N sekund"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ustawienie maksymalnego czasu ycia kluczy SSH na N sekund"
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr "Opcje wymuszajce polityk hase"
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr "nie zezwalanie na pominicie polityki hase"
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ustawienie minimalnej dugoci nowych hase na N"
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|wymaganie przynajmniej N znakw niealfanumerycznych w nowym hale"
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|PLIK|sprawdzanie nowych hase pod ktem wzorcw z PLIKU"
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr "|N|przedawnianie hase po N dniach"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
msgid "do not allow the reuse of old passphrases"
msgstr "nie zezwalanie na ponowne uycie starych hase"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAZWA|szyfrowanie take dla odbiorcy NAZWA"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Konfiguracja dla serwerw kluczy"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "niezrozumiay URL serwera kluczy\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "zezwolenie na wyszukiwania PKA (dania DNS)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
#, fuzzy
msgid "disable all access to the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAZWA|uycie kodowania NAZWA dla hase PKCS#12"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "nie sprawdzanie CRL dla gwnych certyfikatw"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Opcje sterujce formatem wyjcia"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "Opcje sterujce interaktywnoci i wymuszaniem"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "Konfiguracja dla serwerw HTTP"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "uycie systemowego ustawienia proxy HTTP"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguracja uywanych serwerw LDAP"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "Konfiguracja dla OCSP"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr "Uwaga, okrelenia grup s ignorowane\n"
diff --git a/po/pt.po b/po/pt.po
index d621cab20..d8aa77c8b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -95,9 +95,10 @@ msgstr "frase secreta incorrecta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteco %d%s no suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossvel criar `%s': %s\n"
@@ -105,11 +106,11 @@ msgstr "impossvel criar `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossvel abrir `%s': %s\n"
@@ -402,24 +403,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de opes por omisso `%s' inexistente\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opes `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler opes de `%s'\n"
@@ -709,8 +710,8 @@ msgstr "muda a frase secreta"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
@@ -1120,14 +1121,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Opo? "
@@ -1306,7 +1307,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Opo invlida.\n"
@@ -2268,7 +2269,7 @@ msgstr "%s:%d: opes de exportao invlidas\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
@@ -2309,11 +2310,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado invlido\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado invlido\n"
@@ -3359,20 +3360,20 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3389,7 +3390,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
@@ -4155,74 +4156,74 @@ msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferncia %c%lu duplicada\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas preferncias `%c'\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas preferncias `%c'\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas preferncias `%c'\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter invlido na cadeia de caractres da preferncia\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "a escrever a assinatura directa\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "a escrever a auto-assinatura\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave invlido; a utilizar %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "cifrar dados"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4236,109 +4237,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (por omisso)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (apenas assinatura)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ter 1024 bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4354,7 +4355,7 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4370,40 +4371,40 @@ msgstr ""
" <n>m = assinatura expira em n meses\n"
" <n>y = assinatura expira em n anos\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "A chave valida por? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "A assinatura valida por? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valor invlido\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "A %s no expira nunca\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "A %s no expira nunca\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "%s expira em %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4411,19 +4412,19 @@ msgstr ""
"O seu sistema no consegue mostrar datas para alm de 2038.\n"
"No entanto, estas vo ser tratadas correctamente at 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4441,44 +4442,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caracter invlido no nome\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Caracter invlido no comentrio\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4489,7 +4490,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no coloque o endereo de email no nome verdadeiro ou no "
@@ -4506,23 +4507,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)mail ou (S)air? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4530,12 +4531,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4547,7 +4548,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4559,50 +4560,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma hiptese maior de ganhar entropia suficiente.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "a escrever chave pblica para `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves pblico com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenhum porta-chaves secreto com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves pblico `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4611,12 +4612,12 @@ msgstr ""
"Note que esta chave no pode ser usada para cifragem. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4624,7 +4625,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4632,26 +4633,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a criao de sub-chave para chaves v3 no respeito o OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4684,30 +4685,30 @@ msgstr "Notao de assinatura: "
msgid "Keyring"
msgstr "Porta-chaves"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Impresso da chave primria:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Impresso da subchave:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr "Impresso da chave primria:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Impresso da subchave:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impresso da chave ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5192,7 +5193,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "o 'plugin' com a cifra IDEA no est presente\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = mostrar mais informaes\n"
@@ -6530,26 +6531,64 @@ msgstr "opes de importao invlidas\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc encontrou um bug ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "impossvel abrir %s: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "criao de armadura falhou: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "%s: impossvel criar directoria: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "chave pblica %08lX no encontrada: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "a escrever chave privada para `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6588,6 +6627,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na criao da frase secreta: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6603,15 +6654,15 @@ msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
msgid "reading public key failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6641,7 +6692,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
@@ -6650,11 +6701,11 @@ msgstr "A gerao de chaves falhou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6685,109 +6736,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na criao da frase secreta: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura do bloco de chave: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro ao ler registo livre: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "%s' j comprimido\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, 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:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6860,22 +6909,22 @@ msgstr "caracter radix64 invlido %02x ignorado\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "varivel de ambiente GPG_AGENT_INFO invlida\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "a verso %d do protocolo gpg-agent no suportada\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6944,7 +6993,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "falha ao inicializar a base de dados de confiana: %s\n"
@@ -7146,7 +7195,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7197,7 +7246,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@ -7410,7 +7459,7 @@ msgstr "preferncia %c%lu duplicada\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "resposta do agente invlida\n"
@@ -7563,12 +7612,13 @@ msgstr ""
msgid "add this secret keyring to the list"
msgstr "adicionar este porta-chaves secreto lista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omisso"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDEREO|usar este servidor para buscar chaves"
#: sm/gpgsm.c:365
@@ -7628,25 +7678,45 @@ msgstr "impossvel ligar a `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "destinatrio por omisso desconhecido `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = saltar esta chave\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "no consegui processar a URI do servidor de chaves\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "a escrever para `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossvel fechar `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7728,6 +7798,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7759,7 +7833,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7767,7 +7841,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "algoritmo de proteco %d%s no suportado\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "verificao da assinatura criada falhou: %s\n"
@@ -7897,143 +7981,147 @@ msgstr "erro ao enviar para `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usar mode de frase secreta N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro na criao da frase secreta: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|cifrar para NOME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "no consegui processar a URI do servidor de chaves\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8652,10 +8740,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "impossvel abrir `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "a escrever chave privada para `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "impossvel 'stat' a `%s': %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 276be1d71..c9ad9278c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -99,9 +99,10 @@ msgstr "frase secreta incorreta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteo %d no suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
msgstr "impossvel criar %s: %s\n"
@@ -109,11 +110,11 @@ msgstr "impossvel criar %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossvel abrir `%s': %s\n"
@@ -406,24 +407,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de opes padro `%s' inexistente\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de opes `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo opes de `%s'\n"
@@ -710,8 +711,8 @@ msgstr "muda a frase secreta"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
@@ -1126,14 +1127,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Sua opo? "
@@ -1313,7 +1314,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Opo invlida.\n"
@@ -2279,7 +2280,7 @@ msgstr "AVISO: `%s' um arquivo vazio\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
@@ -2319,11 +2320,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado no vlido\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado no vlido\n"
@@ -3363,21 +3364,21 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3394,7 +3395,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
@@ -4155,79 +4156,79 @@ msgstr "A chave protegida.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "ignorado `%s': duplicado\n"
# muitas ou demais ???
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "Preferncias demais"
# muitas ou demais ???
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "Preferncias demais"
# muitas ou demais ???
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "Preferncias demais"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Caractere invlido no nome\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
#, fuzzy
msgid "writing direct signature\n"
msgstr "escrevendo auto-assinatura\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
# key binding ???
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "criptografar dados"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4241,109 +4242,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (padro)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, fuzzy, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, fuzzy, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ter 1024 bits.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Que tamanho de chave voc quer? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4359,7 +4360,7 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
#, fuzzy
msgid ""
"Please specify how long the signature should be valid.\n"
@@ -4376,40 +4377,40 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "A chave valida por? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "A chave valida por? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valor invlido\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "A chave no expira nunca\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "A chave no expira nunca\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4417,19 +4418,19 @@ msgstr ""
"Seu sistema no consegue mostrar datas alm de 2038.\n"
"Apesar disso, elas sero corretamente manipuladas at 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4446,44 +4447,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caractere invlido no nome\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Caractere invlido no comentrio\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4494,7 +4495,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4509,24 +4510,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4534,12 +4535,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4551,7 +4552,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4563,50 +4564,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma chance melhor de conseguir entropia suficiente.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado pblico para `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "chave %08lX: chave pblica no encontrada: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "impossvel bloquear chaveiro secreto: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4615,12 +4616,12 @@ msgstr ""
"Note que esta chave no pode ser usada para criptografia. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4628,7 +4629,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4636,26 +4637,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar %s: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4692,34 +4693,34 @@ msgstr "Notao: "
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listar as chaves e as impresses digitais"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Impresso digital:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Impresso digital:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Impresso digital:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impresso digital:"
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5200,7 +5201,7 @@ msgstr "NOTA: algoritmo de criptografia %d no encontrado nas preferncias\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr "rev- revogaes de chaves incorreta\n"
@@ -6537,26 +6538,64 @@ msgstr "armadura invlida"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc encontrou um bug ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "impossvel abrir arquivo: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "criao de armadura falhou: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "%s: impossvel criar diretrio: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "chave pblica no encontrada"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "definir parmetros de depurao"
@@ -6595,6 +6634,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "erro na criao da frase secreta: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6610,15 +6661,15 @@ msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
msgid "reading public key failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6648,7 +6699,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
@@ -6657,11 +6708,11 @@ msgstr "A gerao de chaves falhou: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6692,109 +6743,108 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "erro na criao da frase secreta: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "erro na leitura de `%s': %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: erro lendo registro livre: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "%lu chaves processadas\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "gerar um novo par de chaves"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, 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:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "assinatura %s de: %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP vlido encontrado.\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "Digite o identificador de usurio: "
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6867,21 +6917,21 @@ msgstr "caractere radix64 invlido %02x ignorado\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "algoritmo de proteo %d no suportado\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6950,7 +7000,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
@@ -7164,7 +7214,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7214,7 +7264,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -7424,7 +7474,7 @@ msgstr "certificado duplicado - removido"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "nenhum endereo vlido\n"
@@ -7575,12 +7625,13 @@ msgstr "adicionar este chaveiro lista de chaveiros"
msgid "add this secret keyring to the list"
msgstr "adicionar este chaveiro secreto lista"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta padro"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDEREO|usar este servidor para buscar chaves"
#: sm/gpgsm.c:365
@@ -7640,25 +7691,45 @@ msgstr "impossvel abrir `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "destinatrio padro desconhecido `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr ""
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "chave %08lX: subchave ignorada\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "impossvel escrever para o chaveiro: %s\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossvel abrir `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7740,6 +7811,10 @@ 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:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7771,7 +7846,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7779,7 +7854,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "algoritmo de proteo %d no suportado\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "leitura de registro de assinatura falhou: %s\n"
@@ -7908,144 +7993,148 @@ msgstr "erro na leitura de `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
#, fuzzy
msgid "Options useful for debugging"
msgstr "habilitar depurao completa"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|usar frase secreta modo N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "erro na criao da frase secreta: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOME|criptografar para NOME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "impossvel escrever para o chaveiro: %s\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8482,10 +8571,6 @@ msgstr ""
#~ msgstr "impossvel abrir `%s'\n"
#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "escrevendo certificado privado para `%s'\n"
-
-#, fuzzy
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "impossvel abrir `%s': %s\n"
@@ -8537,10 +8622,6 @@ msgstr ""
#~ msgstr "chave secreta no disponvel"
#, fuzzy
-#~ msgid "Enter New PIN: "
-#~ msgstr "Digite o identificador de usurio: "
-
-#, fuzzy
#~ msgid "NOTE: %s is not available in this version\n"
#~ msgstr "chave RSA no pode ser usada nesta verso\n"
diff --git a/po/ro.po b/po/ro.po
index d1bac7466..575677cf9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -98,9 +98,10 @@ msgstr "fraz-parol incorect"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nu pot crea `%s': %s\n"
@@ -108,11 +109,11 @@ msgstr "nu pot crea `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
@@ -405,24 +406,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT: nici un fiier opiuni implicit `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fiier opiuni `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc opiuni din `%s'\n"
@@ -715,8 +716,8 @@ msgstr "schimb fraza-parol"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eroare la crearea frazei-parol: %s\n"
@@ -1123,13 +1124,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru n modul batch\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Selecia d-voastr? "
@@ -1296,7 +1297,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Selecie invalid.\n"
@@ -2251,7 +2252,7 @@ msgstr "%s:%d: opiuni verificare invalide\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fiier core!\n"
@@ -2296,11 +2297,11 @@ msgstr ""
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrarea unui mesaj n modul --pgp2 necesit un cifru IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
@@ -3316,19 +3317,19 @@ msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz "
"parol de schimbat.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Aceast cheie nu este protejat.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Prile secrete ale cheii primare nu sunt disponibile.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Pri secrete ale cheii primare sunt stacate pe card.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Cheia este protejat.\n"
@@ -3345,7 +3346,7 @@ msgstr ""
"Introducei noua fraz-parol pentru acest cheie secret.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol nu a fost repetat corect; mai ncercai o dat"
@@ -4080,69 +4081,69 @@ msgstr "Subcheia %s este deja revocat.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Afiez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferina `%s' duplicat\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "prea multe preferine de cifrare\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "prea multe preferine de rezumat\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "prea multe preferine de compresie\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "articol invalid `%s' n irul de preferine\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "scriu semntur direct\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "scriu auto semntur\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "scriu semntur legat de cheie\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid; folosesc %u bii\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit la %u bii\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Semneaz"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Cifreaz"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Autentific"
@@ -4156,109 +4157,109 @@ msgstr "Autentific"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsCcAaTt"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Aciuni posibile pentru o cheie %s: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Aciuni permise curent: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Comut capabilitatea de semnare\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Comut capabilitatea de cifrare\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Comut capabilitatea de autentificare\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Terminat\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Selectai ce fel de cheie dorii:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA i Elgamal (implicit)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (numai semnare)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (seteaz singur capabilitile)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (numai cifrare)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (numai semnare)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (seteaz singur capabilitile)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Perechea de chei DSA va avea %u bii.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "cheile %s pot avea lungimea ntre %u i %u bii.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Ce lungime de cheie dorii? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "dimensiunile cheii %s trebuie s fie n intervalul %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Lungimea cheii necesar este %u bii\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rotunjit prin adaos la %u bii\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4274,7 +4275,7 @@ msgstr ""
" <n>m = cheia expir n n luni\n"
" <n>y = cheia expir n n ani\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4290,38 +4291,38 @@ msgstr ""
" <n>m = semntura expir n n luni\n"
" <n>y = semntura expir n n ani\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Cheia este valid pentru? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Semntura este valid pentru? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "valoare invalid\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Cheia nu expir deloc\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Semntura nu expir deloc\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Cheia expir pe %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Semntura expir pe %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4329,18 +4330,18 @@ msgstr ""
"Sistemul d-voastr nu poate afia date dup 2038.\n"
"Totui, acestea vor fi corect mnuite pn n 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4357,44 +4358,44 @@ msgstr ""
" \"Popa Ioan (popic) <popa.ioan@compania.ro>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Nume real: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Caracter invalid n nume\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate ncepe cu o cifr\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s fie de cel puin 5 caractere\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Adres de email: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Nu este o adres de email valid\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Comentariu: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Caracter invalid n comentariu\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Folosii setul de caractere `%s'\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4405,7 +4406,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
@@ -4420,23 +4421,23 @@ msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (T)Termin? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "V rugm corectai mai nti eroarea\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4444,12 +4445,12 @@ msgstr ""
"Avei nevoie de o fraz-parol pentru a v proteja cheia secret.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4460,7 +4461,7 @@ msgstr ""
"O s o fac oricum. Putei schimba fraza-parol oricnd, folosind acest\n"
"program cu opiunea \"--edit-key\".\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4472,50 +4473,50 @@ msgstr ""
"n timpul generrii numerelor prime; aceasta d o ans generatorului de\n"
"numere aleatoare o ans mai bun de a aduna destul entropie.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scriu cheia public n `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scriu talonul (stub) cheii secrete n `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei public de scris: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei secret de scris: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "cheile secret i public au fost create i semnate.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4525,12 +4526,12 @@ msgstr ""
"s folosii comanda \"--edit-key\" pentru a genera o subcheie secundar\n"
"pentru acest scop.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a euat: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4538,7 +4539,7 @@ msgstr ""
"cheia a fost creat %lu secund n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4546,25 +4547,25 @@ msgstr ""
"cheia a fost creat %lu secunde n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOT: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Creai ntr-adevr? (d/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "stocarea cheii pe card a euat: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nu pot crea fiier de rezerv `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOT: copia de sigurana a cheii cardului salvat la `%s'\n"
@@ -4597,29 +4598,29 @@ msgstr "Notare semntur: "
msgid "Keyring"
msgstr "Inel de chei"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Amprent cheie primar:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Amprent subcheie:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Amprent cheie primar:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Amprent subcheie:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Amprent cheie ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Card nr. serie ="
@@ -5094,7 +5095,7 @@ msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = arat-mi mai multe informaii\n"
@@ -6421,26 +6422,64 @@ msgstr "opiuni enumerare invalide\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "ai gsit un bug ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "nu pot deschide fiierul: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a euat: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "nu pot crea directorul `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "scriu cheia secret n `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "cheia public %s nu a fost gsit: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "scriu cheia secret n `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6479,6 +6518,18 @@ msgstr "apelul PIN a returnat eroare: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|PIN Nou"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eroare la obinere noului PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6494,15 +6545,15 @@ msgstr "am euat s stochez data crerii: %s\n"
msgid "reading public key failed: %s\n"
msgstr "citirea cheii publice a euat: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "rspunsul nu conine datele cheii publice\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "rspunsul nu conine modulul RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "rspunsul nu conine exponentul public RSA\n"
@@ -6532,7 +6583,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "verificarea CHV%d a euat: %s\n"
@@ -6541,11 +6592,11 @@ msgstr "verificarea CHV%d a euat: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "accesul la comenzile de administrare nu este configurat\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "eroare la recuperarea strii CHV de pe card\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "cardul este ncuiat permanent!\n"
@@ -6576,105 +6627,104 @@ msgstr "|A|PIN Admin"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|PIN Admin Nou"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|PIN Nou"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "eroare la obinere noului PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "eroare la citirea datelor aplicaiei\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "eroare la citirea amprentei DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "cheia exist deja\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "cheia existent va fi nlocuit\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "generez o nou cheie\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "timestamp-ul de creare lipsete\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "am euat s stochez cheia: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "v rugm ateptai ct vreme este creat noua cheie ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "generarea cheii a euat\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "generarea cheii este complet (%d secunde)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "structur invalid a cardului OpenPGP (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "semntur %s, algoritm rezumat %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "semnturi create pn acum: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|PIN Nou"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6747,22 +6797,22 @@ msgstr "caracter radix64 invalid %02X srit\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "variabila de mediu GPG_AGENT_INFO anormal\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agent versiune protocol %d nu este suportat\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6831,7 +6881,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "citirea cheii publice a euat: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "am euat s stochez cheia: %s\n"
@@ -7034,7 +7084,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7084,7 +7134,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "eroare la obinerea informaiei pentru cheia curent: %s\n"
@@ -7297,7 +7347,7 @@ msgstr "preferina `%s' duplicat\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "stergere keyblock a euat: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(Nici o descriere dat)\n"
@@ -7449,12 +7499,13 @@ msgstr "adaug acest inel de chei la lista inelelor de chei"
msgid "add this secret keyring to the list"
msgstr "adaug acest inel de chei secret la list"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NUME|folosete NUME ca cheie secret implicit"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|folosete acest server de chei pentru a cuta chei"
#: sm/gpgsm.c:365
@@ -7512,25 +7563,46 @@ msgstr "nu m pot conecta la `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "opiune necunoscut `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Nici o descriere dat)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = sri peste cheia asta\n"
+
+#
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "nu am putut interpreta URL-ul serverului de chei\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7612,6 +7684,10 @@ msgstr "eroare la obinere noului PIN: %s\n"
msgid "error storing flags: %s\n"
msgstr "eroare la citire `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7643,7 +7719,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7651,7 +7727,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "algoritm de protecie %d%s nu este suportat\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "verificarea semnturii create a euat: %s\n"
@@ -7779,142 +7865,146 @@ msgstr "eroare trimitere la `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|folosete modul fraz-parol N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "eroare la crearea frazei-parol: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NUME|cifrare pentru NUME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
#
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NUME|folosete algoritm cifrare NUME pentru fraza-parol"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8566,10 +8656,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "nu pot ncuia (lock) `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "scriu cheia secret n `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "nu pot obine statistici `%s': %s\n"
diff --git a/po/ru.po b/po/ru.po
index 76ba4dbf5..d11b2b47f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -88,9 +88,10 @@ msgstr "Фраза-пароль"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "не могу создать `%s': %s\n"
@@ -98,11 +99,11 @@ msgstr "не могу создать `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
@@ -383,24 +384,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "запрошен недупустимый уровень отладки `%s'\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, fuzzy, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации из файла `%s'\n"
@@ -693,8 +694,8 @@ msgstr "сменить фразу-пароль"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr ""
@@ -1096,13 +1097,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s \n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "невозможно сделать это в пакетном режиме\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Ваш выбор (?-подробнее)? "
@@ -1269,7 +1270,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Ключ аутентификации\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
@@ -2201,7 +2202,7 @@ msgstr "%s:%d: недопустимый список auto-key-locate\n"
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
@@ -2242,11 +2243,11 @@ msgstr "Следует использовать файлы (а не каналы
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция\n"
@@ -3255,19 +3256,19 @@ msgstr "не удалось подписать: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретная часть главного ключа отсутствует.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретная часть главного ключа сохранена на карте.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
@@ -3284,7 +3285,7 @@ msgstr ""
"Введите новую фразу-пароль для данного секретного ключа.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
@@ -3997,71 +3998,71 @@ msgstr "Подключ %s уже отозван\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "предпочтение `%s' дублируется\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "слишком много предпочтений для шифра\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "слишком много предпочтений для хэш-функций\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "слишком много предпочтений для методов сжатия\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "недопустимое вхождение `%s' в строке предпочтений\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr ""
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "сохраняем самоподпись\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "сохраняем объединяющую подпись\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; используется %u бит\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа приведен к %u битам\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"ВНИМАНИЕ: некоторые реализации OpenPGP не смогут обработать DSA ключи с "
"такой длиной хеш-функции\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Подписать"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Сертифицировать"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Зашифровать"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Атентифицировать"
@@ -4075,109 +4076,109 @@ msgstr "Атентифицировать"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Возможные действия для ключа %s:"
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Допустимы действия:"
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Переключить возможность использования для подписи\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Переключить возможность использования для шифрования\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Переключить возможность использования для аутентификации\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Завершено\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Выберите требуемый тип ключа:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA и ElGamal (по умолчанию)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (только для подписи)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (с требуемыми возможностями)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (только для шифрования)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (только для подписи)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (только для шифрования)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (с требуемыми возможностями)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Какой размер ключа необходим? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запрашиваемый размер ключа %u бит\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4193,7 +4194,7 @@ msgstr ""
" <n>m = срок действительности n месяцев\n"
" <n>y = срок действительности n лет\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4209,38 +4210,38 @@ msgstr ""
" <n>m = срок действительности подписи n месяцев\n"
" <n>y = срок действительности подписи n лет\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Ключ действителен до? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Подпись действительна до? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "недопустимое значение\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Ключ не имеет ограничения срока действительности\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Подпись не имеет ограничения срока действительности\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Ключ действителен до: %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Подпись действительна до: %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4248,18 +4249,18 @@ msgstr ""
"Ваша система не может корректно отображать даты после 2038.\n"
"Однако, даты не превышающие 2106 будут обработаны корректно.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4274,44 +4275,44 @@ msgstr ""
" \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Ваше настоящее имя: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в Имени\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "Email-адрес: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Неправильный e-mail адрес\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Комментарий: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Используемая таблица символов: `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4322,7 +4323,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
@@ -4337,24 +4338,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4362,12 +4363,12 @@ msgstr ""
"Для защиты секретного ключа необходима фраза-пароль.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4379,7 +4380,7 @@ msgstr ""
"запустив данную программу с ключом \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4392,50 +4393,50 @@ msgstr ""
"обращения к дискам) в процессе генерации; это даст генератору\n"
"случайных чисел возможность получить лучшую энтропию.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "сохранение заглушки секретного ключа в `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "открытый и закрытый ключи созданы и подписаны.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4443,44 +4444,44 @@ msgstr ""
"Учтите, данный ключ не может использоваться для шифрования. Можно\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N)"
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "сбой сохранения ключа на карту: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "не могу создать резервную копию, файл `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -4513,29 +4514,29 @@ msgstr "Примечание к подписи"
msgid "Keyring"
msgstr "Таблица ключей"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr "Отпечаток ключа ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5007,7 +5008,7 @@ msgstr "ВНИМАНИЕ: хеш-функция %s считается устар
msgid "the IDEA cipher plugin is not present\n"
msgstr "модуль поддержки шифра IDEA не обнаружен\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "для дополнительной информации см. %s\n"
@@ -6321,26 +6322,64 @@ msgstr "недопустимый список параметров\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Вы нашли ошибку ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "ошибка чтения `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "преобразование из `%s' в `%s' недоступно\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr ""
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "сбой преобразования `%s' в `%s': %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "невозможно создание временного каталога `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "ошибка записи в %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "открытый ключ %s не найден: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "слушаем сокет `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6379,6 +6418,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Новый PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "ошибка при получении нового PIN: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6394,15 +6445,15 @@ msgstr "сбой сохранения даты создания: %s\n"
msgid "reading public key failed: %s\n"
msgstr "сбой чтения открытого ключа: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "ответ не содержит данных открытого ключа\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "в ответе отсутствует модуль RSA\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "в ответе отсутствует открытая экспонента RSA\n"
@@ -6432,7 +6483,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "при проверке CHV%d сбой: %s\n"
@@ -6441,11 +6492,11 @@ msgstr "при проверке CHV%d сбой: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "доступ к командам управления не настроен\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "ошибка получения статуса CHV с карты\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "карта заблокирована!\n"
@@ -6477,105 +6528,104 @@ msgstr "|A|Административный PID"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Новый административный PIN"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Новый PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "ошибка при получении нового PIN: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "ошибка чтения данных приложения\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "ошибка чтения отпечатка DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "ключ уже существует\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "существующий ключ будет заменен\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "генерация нового ключа\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "пропущен штамп создания создания\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "сбой сохранения ключа: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "сбой при генерации ключа\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "ключ сгенерирован (%d секунд)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "карта не поддерживает функцию хеширования %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "подписей создано: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
"проверка административного PIN в данный момент запрещена этой командой\n"
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа %s - неработоспособная карта OpenPGP?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Новый PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6645,21 +6695,21 @@ msgstr "недопустимый символ radix64 %02X пропущен\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "нет запущеного dirmngr - запуск `%s'\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "протокол dirmngr версии %d не поддерживается\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
@@ -6726,7 +6776,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "сбой при удалении блока ключа: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr ""
@@ -6924,7 +6974,7 @@ msgstr "ключ DSA %s использует небезопасный (%u бит
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(это MD2 алгоритм)\n"
@@ -6969,7 +7019,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "не задана применимость ключа - подразумеваем все\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "ошибка получения информации применимости ключа: %s\n"
@@ -7181,7 +7231,7 @@ msgstr "сертификат `%s' удален\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "удаление сертификата \"%s\" неудачно: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "не заданы получатели\n"
@@ -7323,12 +7373,13 @@ msgstr "добавить данную таблицу ключей в списо
msgid "add this secret keyring to the list"
msgstr "добавить данную таблицу секретных ключей в список"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
#: sm/gpgsm.c:365
@@ -7384,25 +7435,45 @@ msgstr "не могу зашифровать для `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "неизвестный параметр `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(Пояснения отсутствуют)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = пропустить этот ключ\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "не могу проанализировать URL сервера ключей\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "невозможно подписать используя `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "данная команды всё еще не реализована\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7481,6 +7552,11 @@ msgstr "ошибка получения сохраненных флагов: %s\
msgid "error storing flags: %s\n"
msgstr "ошибка сохранения флагов: %s\n"
+#: sm/keylist.c:618
+#, fuzzy
+msgid "Error - "
+msgstr "[Ошибка - Нет имени]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7515,7 +7591,7 @@ msgstr ""
"Учтите, что для данной программы официально не одобрено создание и проверка "
"подобных подписей.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7523,7 +7599,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "метод защиты %d%s не поддерживается\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr ""
@@ -7647,143 +7733,147 @@ msgstr "ошибка отправки %s команды: %s\n"
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки стандартных параметров: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Параметры контролирующие вывод диагностики"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Параметры контролирующие конфигурацию"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Параметры полезные для отладки"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|FILE|сохранять журнал режима сервера в FILE"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Параметры контролирующие безопасность"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
#, fuzzy
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|кеш PIN просрочен после N секунд"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
#, fuzzy
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|кеш PIN просрочен после N секунд"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|кеш PIN просрочен после N секунд"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "разрешить предустановленную фразу-пароль"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|зашифровать для получателя NAME"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Конфигурация серверов ключей"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "не могу проанализировать URL сервера ключей\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
#, fuzzy
msgid "disable all access to the dirmngr"
msgstr "передать команду dirmngr"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "не проверять CRLd для корневых сертификатов"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Параметры контрролирующие формат вывода"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "Настройки HTTP серверов"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "использовать системные настройки HTTP проки"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Настройки LDAP серверов"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "Настройки OCSP"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 7d74793c8..148bad482 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -91,9 +91,10 @@ msgstr "nesprvne heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d%s nie je podporovn\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nemem vytvori `%s': %s\n"
@@ -101,11 +102,11 @@ msgstr "nemem vytvori `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemem otvori `%s': %s\n"
@@ -399,24 +400,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn sbor s monosami `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "sbor s monosami `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "tam monosti z `%s'\n"
@@ -706,8 +707,8 @@ msgstr "zmeni heslo"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
@@ -1116,14 +1117,14 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemono previes v dvkovom mde\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "V vber? "
@@ -1302,7 +1303,7 @@ msgid " (3) Authentication key\n"
msgstr ""
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Neplatn vber.\n"
@@ -2273,7 +2274,7 @@ msgstr "%s:%d: neplatn parameter pre export\n"
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program me vytvori sbor core!\n"
@@ -2315,11 +2316,11 @@ msgstr "v mde --pgp2 muste poui sbor (nie rru).\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "ifrovanie sprv v mde --pgp2 vyaduje algoritmus IDEA\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran ifrovac algoritmus je neplatn\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "vybran hashovac algoritmus je neplatn\n"
@@ -3371,20 +3372,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Tento k nie je chrnen.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "k je chrnen.\n"
@@ -3401,7 +3402,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pre tento tajn k.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
@@ -4162,74 +4163,74 @@ msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Zobrazujem %s fotografick ID s vekosou %ld pre k 0x%08lX (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "duplicita predvoby %c%lu\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "prli vea `%c' predvolieb\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
#, fuzzy
msgid "too many digest preferences\n"
msgstr "prli vea `%c' predvolieb\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
#, fuzzy
msgid "too many compression preferences\n"
msgstr "prli vea `%c' predvolieb\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "neplatn znak v reazci s predvobami\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "zapisujem podpis ka nm samm (direct signature)\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "zapisujem podpis ka sebou samm\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dka ka; pouijem %u bitov\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dka ka zaokrhlen na %u bitov\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
#, fuzzy
msgid "Sign"
msgstr "sign"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
#, fuzzy
msgid "Encrypt"
msgstr "ifrova dta"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr ""
@@ -4243,109 +4244,109 @@ msgstr ""
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr ""
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr ""
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr ""
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr ""
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, fuzzy, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%d) ElGamal (len na ifrovanie)\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr ""
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr ""
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Prosm, vyberte druh ka, ktor chcete:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA a ElGamal (implicitn)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na ifrovanie)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (len na ifrovanie)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (len na podpis)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (len na ifrovanie)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, fuzzy, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na ifrovanie)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Pr kov DSA bude ma dku 1024 bitov.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "Ak vekos ka si prajete? (1024) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Poadovan dka ka je %u bitov.\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrhlen na %u bitov\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4361,7 +4362,7 @@ msgstr ""
" <n>m = doba platnosti ka skon za n mesiacov\n"
" <n>y = doba platnosti ka skon za n rokov\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4377,40 +4378,40 @@ msgstr ""
" <n>m = doba platnosti podpisu skon za n mesiacov\n"
" <n>y = doba platnosti podpisu skon za n rokov\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "K je platn na? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "Podpis je platn na? (0) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "neplatn hodnota\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
#, fuzzy
msgid "Key does not expire at all\n"
msgstr "platnos %s neskon\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
#, fuzzy
msgid "Signature does not expire at all\n"
msgstr "platnos %s neskon\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, fuzzy, c-format
msgid "Key expires at %s\n"
msgstr "platnos %s skon %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, fuzzy, c-format
msgid "Signature expires at %s\n"
msgstr "Platnos podpisu vypr %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4418,19 +4419,19 @@ msgstr ""
"V systm nevie zobrazi dtumy po roku 2038.\n"
"V kadom prpade bud dtumy korektne spracovvan do roku 2106.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
#, fuzzy
msgid "Is this correct? (y/N) "
msgstr "Je to sprvne (a/n)? "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
#, fuzzy
msgid ""
"\n"
@@ -4447,44 +4448,44 @@ msgstr ""
" \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Meno a priezvisko: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve mene\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Meno neme zana slicou\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus by dlh aspo 5 znakov\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Komentr: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komentri\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvate znakov sadu `%s'.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4495,7 +4496,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
@@ -4510,23 +4511,23 @@ msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (U)koni? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (P)okraova/(U)koni? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Najskr, prosm, opravte chybu\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4534,12 +4535,12 @@ msgstr ""
"Na ochranu Vho tajnho ka muste zada heslo.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4551,7 +4552,7 @@ msgstr ""
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4563,50 +4564,50 @@ msgstr ""
"pouva disky); vaka tomu m genertor lepiu ancu zska dostatok "
"entropie.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Vytvranie ka bolo zruen.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisujem verejn k do `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenjden zapisovaten sbor verejnch kov (pubring): %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenjden zapisovaten sbor tajnch kov (secring): %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru verejnch kov `%s': %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "verejn a tajn k boli vytvoren a podpsan.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4615,12 +4616,12 @@ msgstr ""
"Tento k neme by pouit na ifrovanie. Pre vytvorenie\n"
"sekundrneho ka na tento el mete poui prkaz \"--edit-key\".\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4628,7 +4629,7 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4636,26 +4637,26 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvorenie podka pre ke v3 nie je v slade s OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutone vytvori? "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemem vytvori `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: platnos tajnho ka %08lX skonila %s\n"
@@ -4688,30 +4689,30 @@ msgstr "Podpisov notcia: "
msgid "Keyring"
msgstr "sbor kov (keyring)"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Primrny fingerprint ka:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Fingerprint podka:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " Primrny fingerprint ka:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Fingerprint podka:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint ka ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr ""
@@ -5196,7 +5197,7 @@ msgstr ""
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA modul pre GnuPG nenjden\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, fuzzy, c-format
msgid "please see %s for more information\n"
msgstr " i = prosm o viac informci\n"
@@ -6536,26 +6537,64 @@ msgstr "neplatn parameter pre import\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "njden chyba v programe ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "nemono otvori sbor: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "kdovanie do ASCII formtu zlyhalo: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "nemem vytvori adresr `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "chyba pri zpise sboru kov (keyring) `%s': %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "zapisujem tajn k do `%s'\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "verejn k %08lX nebol njden: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "zapisujem tajn k do `%s'\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6596,6 +6635,18 @@ msgstr ""
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr ""
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "chyba pri vytvran hesla: %s\n"
+
#: scd/app-openpgp.c:599
#, fuzzy, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6611,15 +6662,15 @@ msgstr "zlyhalo obnovenie vyrovnvacej pamti kov: %s\n"
msgid "reading public key failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr ""
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr ""
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr ""
@@ -6649,7 +6700,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr ""
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, fuzzy, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "nepodarilo posla k na server: %s\n"
@@ -6658,11 +6709,11 @@ msgstr "nepodarilo posla k na server: %s\n"
msgid "access to admin commands is not configured\n"
msgstr ""
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr ""
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr ""
@@ -6693,109 +6744,107 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr ""
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr ""
-
-#: scd/app-openpgp.c:1700
-#, fuzzy, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "chyba pri vytvran hesla: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
#, fuzzy
msgid "error reading application data\n"
msgstr "chyba pri tan bloku ka: %s\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
#, fuzzy
msgid "error reading fingerprint DO\n"
msgstr "%s: chyba pri tan vonho zznamu: %s\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
#, fuzzy
msgid "key already exists\n"
msgstr "`%s' je u skomprimovan\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr ""
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
#, fuzzy
msgid "generating new key\n"
msgstr "vytvori nov pr kov"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr ""
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr ""
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, fuzzy, c-format
msgid "failed to store the key: %s\n"
msgstr "nemem inicializova databzu dvery: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr ""
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
#, fuzzy
msgid "generating key failed\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, fuzzy, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr ""
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, fuzzy, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "%s podpis, hashovac algoritmus %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr ""
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr ""
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, fuzzy, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenjden iadne platn dta vo formte OpenPGP.\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-dinsig.c:526
+msgid "|N|Initial New PIN"
+msgstr ""
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6868,22 +6917,22 @@ msgstr "neplatn znak vo formte radix64 %02x bol preskoen\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "zl formt premennej prostredia GPG_AGENT_INFO\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "gpg-agent protokol verzie %d nie je podporovan\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6952,7 +7001,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "nemem inicializova databzu dvery: %s\n"
@@ -7154,7 +7203,7 @@ msgstr ""
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7203,7 +7252,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
@@ -7415,7 +7464,7 @@ msgstr "duplicita predvoby %c%lu\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(iadny popis)\n"
@@ -7570,12 +7619,13 @@ msgstr ""
msgid "add this secret keyring to the list"
msgstr "prida tento sbor tajnch kov do zoznamu"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|MENO|poui MENO ako implicitn tajn k"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
"|POTA|poui tento server kov na vyhadvanie\n"
" kov"
@@ -7635,25 +7685,45 @@ msgstr "nemem sa pripoji k `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "neznmy implicitn adrest `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(iadny popis)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = preskoi tento k\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "nemono poui URI servera kov - chyba analzy URI\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "zapisujem do '%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nemem zavrie `%s': %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7735,6 +7805,10 @@ msgstr "chyba pri vytvran hesla: %s\n"
msgid "error storing flags: %s\n"
msgstr "chyba pri tan `%s': %s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7766,7 +7840,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7774,7 +7848,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "ochrann algoritmus %d%s nie je podporovn\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "kontrola vytvorenho podpisu sa nepodarila: %s\n"
@@ -7904,141 +7988,145 @@ msgstr "chyba pri posielan na `%s': %s\n"
msgid "error sending standard options: %s\n"
msgstr "chyba pri posielan na `%s': %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|poui md hesla N"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "chyba pri vytvran hesla: %s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|MENO|ifrova pre MENO"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "nemono poui URI servera kov - chyba analzy URI\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
#, fuzzy
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|ALG|poui ifrovac algoritmus ALG pre hesl"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8662,10 +8750,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "nemono otvori `%s'\n"
-#, fuzzy
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "zapisujem tajn k do `%s'\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "nemem poui prkaz stat na `%s': %s\n"
diff --git a/po/sv.po b/po/sv.po
index a9734b5f3..b9dd4065d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2007-11-12 16:08+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -111,9 +111,10 @@ msgstr "Lösenfras"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
@@ -121,11 +122,11 @@ msgstr "kan inte skapa \"%s\": %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
@@ -419,24 +420,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, 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:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
@@ -732,8 +733,8 @@ msgstr "ändra lösenfras"
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
@@ -1143,13 +1144,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Vad väljer du? "
@@ -1316,7 +1317,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Ogiltigt val.\n"
@@ -2264,7 +2265,7 @@ msgid "invalid auto-key-locate list\n"
msgstr "ogiltig auto-key-locate-lista\n"
# Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
@@ -2307,11 +2308,11 @@ msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
@@ -3343,19 +3344,19 @@ msgstr ""
"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
"att ändra.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Denna nyckel är inte skyddad.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Nyckeln är skyddad.\n"
@@ -3372,7 +3373,7 @@ msgstr ""
"Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "lösenfrasen repeterades inte korrekt; försök igen."
@@ -4108,71 +4109,71 @@ msgstr "Undernyckeln %s är redan spärrad.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "inställningen \"%s\" förekommer flera gånger\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "för många chifferinställningar\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "för många sammandragsinställningar\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "för många komprimeringsinställningar\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "ogiltig post \"%s\" i inställningssträngen\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "skriver direkt signatur\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "skriver självsignatur\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
"sammandragsstorleken\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "Signera"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Certifiera"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Kryptera"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Autentisera"
@@ -4190,110 +4191,110 @@ msgstr "Autentisera"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "Möjliga åtgärder för en %s-nyckel: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "För närvarande tillåtna åtgärder: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) Växla signeringsförmågan\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Växla krypteringsförmågan\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Växla autentiseringsförmågan\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Färdig\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA och Elgamal (standard)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (ställ in dina egna förmågor)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (endast kryptering)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (endast signering)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ställ in dina egna förmågor)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "Vilken nyckelstorlek vill du ha? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4310,7 +4311,7 @@ msgstr ""
" <n>y = nyckeln blir ogiltig efter n år\n"
# borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4326,38 +4327,38 @@ msgstr ""
" <n>m = signaturen blir ogiltig efter n månader\n"
" <n>y = signaturen blir ogiltig efter n år\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen är giltig hur länge? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "ogiltigt värde\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Nyckeln går aldrig ut\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "Signaturen går aldrig ut\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Nyckeln går ut %s\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "Signaturen går ut %s\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4365,18 +4366,18 @@ msgstr ""
"Ditt system kan inte visa datum senare än år 2038.\n"
"Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta? (j/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4394,44 +4395,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-postadress: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du använder teckentabellen \"%s\"\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4442,7 +4443,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte e-postadressen som namn eller kommentar\n"
@@ -4458,24 +4459,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4483,12 +4484,12 @@ msgstr ""
"Du behöver en lösenfras för att skydda din hemliga nyckel\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4500,7 +4501,7 @@ msgstr ""
"om du använder detta program med flaggan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4512,51 +4513,51 @@ msgstr ""
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver den publika nyckeln till \"%s\"\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4565,13 +4566,13 @@ msgstr ""
"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
"syfte.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format behövs inte i singularis
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4579,7 +4580,7 @@ msgstr ""
"nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4587,25 +4588,25 @@ msgstr ""
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -4638,29 +4639,29 @@ msgstr "Signaturnotation: "
msgid "Keyring"
msgstr "Nyckelring"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Kortets serienr ="
@@ -5141,7 +5142,7 @@ msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "insticksmodul för IDEA-chiffer är inte installerat\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "se %s för mer information\n"
@@ -6494,26 +6495,64 @@ msgstr "ogiltig flagga \"%.50s\"\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, c-format
msgid "error loading `%s': %s\n"
msgstr "fel vid inläsning av \"%s\": %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open misslyckades: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "fel vid skrivning till %s: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "publika nyckeln %s hittades inte: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "lyssnar på uttaget \"%s\"\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "ställ in felsökningsflaggor"
@@ -6552,6 +6591,18 @@ msgstr "PIN-återanrop returnerade fel: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Ny PIN-kod"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "fel vid hämtning av ny PIN-kod: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6567,15 +6618,15 @@ msgstr "misslyckades med att lagra datum för skapandet: %s\n"
msgid "reading public key failed: %s\n"
msgstr "läsning av publik nyckel misslyckades: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "svaret innehåller inte publikt nyckeldata\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "svaret innehåller inte en RSA-modulus\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "svaret innehåller inte den publika RSA-exponenten\n"
@@ -6605,7 +6656,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "validering av CHV%d misslyckades: %s\n"
@@ -6614,11 +6665,11 @@ msgstr "validering av CHV%d misslyckades: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "fel vid hämtning av CHV-status från kort\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "kortet är låst permanent!\n"
@@ -6649,106 +6700,105 @@ msgstr "|A|Admin PIN-kod"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN-kod"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Ny PIN-kod"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "fel vid hämtning av ny PIN-kod: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "fel vid läsning av programdata\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "fel vid läsning av fingeravtryckets DO\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "nyckeln finns redan\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "befintlig nyckel kommer att ersättas\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "genererar ny nyckel\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "tidsstämpel för skapandet saknas\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "misslyckades med att lagra nyckeln: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "var god vänta under tiden nyckeln genereras ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "nyckelgenereringen misslyckades\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
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:2303
+#: scd/app-openpgp.c:2305
#, 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:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "signaturer skapade hittills: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Ny PIN-kod"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
@@ -6818,21 +6868,21 @@ msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "ingen körande dirmngr - startar \"%s\"\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "dirmngr-protokoll version %d stöds inte\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
@@ -6900,7 +6950,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "skuggning av nyckeln misslyckades: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "misslyckades med att allokera keyDB-hanterare\n"
@@ -7086,7 +7136,7 @@ msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(det här är MD2-algoritmen)\n"
@@ -7131,7 +7181,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
@@ -7345,7 +7395,7 @@ msgstr "certifikatet \"%s\" togs bort\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "inga giltiga mottagare angavs\n"
@@ -7487,12 +7537,13 @@ msgstr "lägg till denna nyckelring till listan över nyckelringar"
msgid "add this secret keyring to the list"
msgstr "lägg till denna hemliga nyckelring till listan"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|VÄRD|använd den här nyckelservern för att slå upp nycklar"
#: sm/gpgsm.c:365
@@ -7548,25 +7599,45 @@ msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
msgid "unknown validation model `%s'\n"
msgstr "okänd valideringsmodell \"%s\"\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "rad %d: inget ämnesnamn angivit\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = hoppa över denna nyckel\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "kunde inte tolka url till nyckelserver\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan inte signera med \"%s\": %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "det här kommandot har ännu inte implementerats\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7645,6 +7716,11 @@ 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:618
+#, fuzzy
+msgid "Error - "
+msgstr "[Fel - Inget namn]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7685,7 +7761,7 @@ msgstr ""
"Observera att den här programvaran inte officiellt godkänts för att skapa "
"eller validera sådana signaturer.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7697,7 +7773,17 @@ msgstr ""
"Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
"signatur!"
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "skyddsalgoritmen %d%s stöds inte\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
@@ -7819,137 +7905,141 @@ msgstr "fel vid sändning av %s-kommando: %s\n"
msgid "error sending standard options: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Flaggor som kontrollerar diagnosutdata"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Flaggor som kontrollerar konfigurationen"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Flaggor användbara för felsökning"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|FIL|skriv serverlägesloggar till FIL"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Flaggor som kontrollerar säkerheten"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
msgid "do not allow the reuse of old passphrases"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Konfiguration för nyckelservrar"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
msgid "|URL|use keyserver at URL"
msgstr "|URL| använd nyckelservern på URL"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
#, fuzzy
msgid "disable all access to the dirmngr"
msgstr "skicka ett kommando till dirmngr"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "kontrollera inte spärrlistor för rotcertifikat"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Flaggor som kontrollerar formatet på utdata"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "Konfiguration för HTTP-servrar"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "använd systemets HTTP-proxyinställningar"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Konfiguration av LDAP-servrar som ska användas"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "Konfiguration för OCSP"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr "Observera att gruppspecifikationer ignoreras\n"
diff --git a/po/tr.po b/po/tr.po
index 01a61701d..34d6df82a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.9.94\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -91,9 +91,10 @@ msgstr "Anahtar Parolası"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -101,11 +102,11 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
@@ -386,24 +387,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, fuzzy, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, 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:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -698,8 +699,8 @@ msgstr "anahtar parolası değiştirir"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
@@ -1101,13 +1102,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "Seçiminiz? "
@@ -1274,7 +1275,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) Kimlik kanıtlama anahtarı\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
@@ -2214,7 +2215,7 @@ msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
@@ -2254,11 +2255,11 @@ msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
@@ -3281,19 +3282,19 @@ msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmamış.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "Anahtar korunmuş.\n"
@@ -3310,7 +3311,7 @@ msgstr ""
"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4071,71 +4072,71 @@ msgstr ""
"Anahtar 0x%3$s (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
"gösteriliyor\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "'%s' tercihi yinelendi\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "çok fazla şifreleme tercihi\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "çok fazla özümleme tercihi\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "çok fazla sıkıştırma tercihi\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "doğrudan imza yazılıyor\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "öz-imza yazılıyor\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
"UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
"çalışamayabilir\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "İmzalama"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "Onayla"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "Şifrele"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "Kimlik kanıtla"
@@ -4149,109 +4150,109 @@ msgstr "Kimlik kanıtla"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "OoŞşKkçÇ"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "bir %s anahtarı için olası eylemler: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "Şimdilik mümkün eylemler: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) İmzalama yeteneğini açar/kapar\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) Şifreleme yeteneğini açar/kapar\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) Bitti\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (yeteneklerini belirtin)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (yalnız şifrelemek için)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sadece imzalamak için)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (yeteneklerini belirtin)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA anahtar çifti %u bit olacak.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "İstenen anahtar uzunluğu: %u bit\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4267,7 +4268,7 @@ msgstr ""
" <n>m = anahtar n ay geçerli\n"
" <n>y = anahtar n yıl geçerli\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4283,38 +4284,38 @@ msgstr ""
" <n>m = imza n ay geçerli\n"
" <n>y = imza n yıl geçerli\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "Anahtar ne kadar geçerli olacak? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "İmza ne kadar geçerli olacak? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "değer hatalı\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "Anahtar hep geçerli olacak\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "İmza hep geçerli olacak\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "Anahtarın geçerliliği %s de bitecek.\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "İmzanın geçerliliği %s de bitecek.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4322,18 +4323,18 @@ msgstr ""
"Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
"Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4349,44 +4350,44 @@ msgstr ""
"\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "E-posta adresiniz: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "Önbilgi: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4397,7 +4398,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4413,24 +4414,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4438,12 +4439,12 @@ msgstr ""
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4455,7 +4456,7 @@ msgstr ""
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4468,50 +4469,50 @@ msgstr ""
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4519,19 +4520,19 @@ msgstr ""
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4539,26 +4540,26 @@ msgstr ""
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4591,29 +4592,29 @@ msgstr "imza simgelemi: "
msgid "Keyring"
msgstr "Anahtarlık"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " Kart seri no. ="
@@ -5085,7 +5086,7 @@ msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA şifre eklentisi yok\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
@@ -6412,26 +6413,64 @@ msgstr "liste seçenekleri geçersiz\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open başarısız: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "%s yazılırken hata: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr ""
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "genel anahtar %s yok: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "`%s' soketi dinlemede\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "hata ayıklama bayrakları ayarlanır"
@@ -6471,6 +6510,18 @@ msgstr "PIN eylemcisi hata döndürdü: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|Yeni PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "yeni PIN alınırken hata: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6486,15 +6537,15 @@ msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
msgid "reading public key failed: %s\n"
msgstr "genel anahtar okuması başarısız: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "yanıt genel anahtar verisi içermiyor\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "yanıt RSA modülü içermiyor\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "yanıt RSA genel bileşenini içermiyor\n"
@@ -6524,7 +6575,7 @@ 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:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
@@ -6533,11 +6584,11 @@ msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "karttan CHV durumu alınırken hata\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "kart kalıcı olarak kilitli!\n"
@@ -6569,104 +6620,103 @@ msgstr "|A|Yönetici PIN'i"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|Yeni Yönetici PIN'i"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|Yeni PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "yeni PIN alınırken hata: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "uygulama verisi okunurken hata\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "parmakizi DO okunurken hata\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "anahtar zaten mevcut\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "mevcut anahtar konulacak\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "yeni anahtar üretiliyor\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "oluşturum zaman damgası kayıp\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, 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:1953
+#: scd/app-openpgp.c:1955
#, 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:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, 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:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "anahtarın saklanması başarısız: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "anahtar üretimi başarısızlığa uğradı\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
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:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "kart %s özet algoritmasını desteklemiyor\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
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:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|Yeni PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
@@ -6737,21 +6787,21 @@ msgstr "geçersiz radix64 karakteri %02x atlandı\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
@@ -6819,7 +6869,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "anahtar gölgelenemedi: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
@@ -7017,7 +7067,7 @@ msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(bu, MD2 algoritmasıdır)\n"
@@ -7062,7 +7112,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
@@ -7275,7 +7325,7 @@ msgstr "sertifika `%s' silindi\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "\"%s\" sertifikası silinemedi: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "geçerli alıcılar verilmedi\n"
@@ -7417,12 +7467,13 @@ msgstr "bu anahtarlığı anahtarlık listesine ekler"
msgid "add this secret keyring to the list"
msgstr "bu gizli anahtarlığı listeye ekler"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
#: sm/gpgsm.c:365
@@ -7477,25 +7528,45 @@ msgstr "`%s'e şifrelenemez: %s\n"
msgid "unknown validation model `%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%d. satır: konu ismi belirtilmemiş\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " a = bu anahtarı atla\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' kullanarak imzalanamıyor: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "bu komut henüz gerçeklenmedi\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7574,6 +7645,11 @@ 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:618
+#, fuzzy
+msgid "Error - "
+msgstr "[Hata - Adsız]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr "GPG_TTY atanmamıştı - kullanımı sorunlara yolaçabilir\n"
@@ -7612,7 +7688,7 @@ msgstr ""
"Bu yazılımın böyle imzaları oluşturmak ve doğrulamak için resmi onaylı "
"olmadığına dikkat ediniz.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7623,7 +7699,17 @@ msgstr ""
"\"%s\"\n"
"Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "koruma algoritması %d%s desteklenmiyor\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "nitelikli sertifika için sınama başarısız: %s\n"
@@ -7747,143 +7833,147 @@ msgstr "%s komutu gönderilirken hata: %s\n"
msgid "error sending standard options: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "Tanı çıktısını denetleyen seçenekler"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "Yapılandırmayı denetleyen seçenekler"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "Hata ayıklamaya elverişli seçenekler"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "Güvenliği denetleyen seçenekler"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
#, fuzzy
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
#, fuzzy
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|İSİM|İSİM için şifreleme yapar"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "Anahtar sunucular için yapılandırma"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "PKA aramalarına izin verilir (DNS istekleri)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
#, fuzzy
msgid "disable all access to the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "kök sertifikalar için CRLler sınanmaz"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "Çıktı biçimini denetleyen seçenekler"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "HTTP sunucuları için yapılandırma"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "sistemin HTTP vekil ayarları kullanılır"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "Kullanılacak LDAP sunucularının yapılandırması"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "OCSP için yapılandırma"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b1a0357bb..c1b6e69ac 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -98,9 +98,10 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
@@ -108,11 +109,11 @@ msgstr "无法建立‘%s’：%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’： %s\n"
@@ -406,24 +407,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -713,8 +714,8 @@ msgstr "更改密码"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
@@ -1116,13 +1117,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "您的选择？ "
@@ -1289,7 +1290,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -2206,7 +2207,7 @@ msgstr "%s：%d：无效的 auto-key-locate 清单\n"
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
@@ -2246,11 +2247,11 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
@@ -3243,19 +3244,19 @@ msgstr "签名时失败： %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3272,7 +3273,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
@@ -3985,69 +3986,69 @@ msgstr "子钥 %s 已被吊销。\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "签名"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "验证"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "认证"
@@ -4061,109 +4062,109 @@ msgstr "认证"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "目前允许的操作："
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 密钥对会有 %u 位。\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4179,7 +4180,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4195,38 +4196,38 @@ msgstr ""
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久？(%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4234,18 +4235,18 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4261,44 +4262,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "真实姓名："
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "电子邮件地址："
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "注释："
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4309,7 +4310,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -4324,23 +4325,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4348,12 +4349,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4365,7 +4366,7 @@ msgstr ""
"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4375,50 +4376,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4426,42 +4427,42 @@ msgstr ""
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败：%s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4494,30 +4495,30 @@ msgstr "签名注记："
msgid "Keyring"
msgstr "钥匙环"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr "子钥指纹："
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@ -4983,7 +4984,7 @@ msgstr "警告：不建议使用散列算法 %s\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA 算法插件不存在\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
@@ -6260,26 +6261,64 @@ msgstr "无效的列表选项\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "您找到一个程序缺陷了……(%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, fuzzy, c-format
msgid "error loading `%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "签名时失败： %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "无法建立目录‘%s’：%s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "等待‘%s’上的锁\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "找不到公钥 %s：%s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "等待‘%s’上的锁\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr ""
@@ -6320,6 +6359,18 @@ msgstr "PIN 回调返回错误：%s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "新的 PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6335,15 +6386,15 @@ msgstr "无法存储创建日期：%s\n"
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥：%s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
@@ -6373,7 +6424,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败：%s\n"
@@ -6382,11 +6433,11 @@ msgstr "验证 CHV%d 失败：%s\n"
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定！\n"
@@ -6417,104 +6468,103 @@ msgstr "|A|管理员 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "新的 PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "获取新 PIN 时出错：%s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥：%s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "请稍候，正在生成密钥……\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名：%lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡？\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "新的 PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr ""
@@ -6584,22 +6634,22 @@ msgstr "跳过无效的 64 进制字符 %02x\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr ""
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr ""
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
#, fuzzy
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, fuzzy, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
@@ -6667,7 +6717,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥：%s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥：%s\n"
@@ -6870,7 +6920,7 @@ msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -6919,7 +6969,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, fuzzy, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
@@ -7132,7 +7182,7 @@ msgstr "首选项‘%s’重复\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "删除密钥区块时失败：%s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
@@ -7288,12 +7338,12 @@ msgstr "从这个钥匙环里取用密钥"
msgid "add this secret keyring to the list"
msgstr "要有私钥才能这么做。\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#: sm/gpgsm.c:365
@@ -7355,25 +7405,45 @@ msgstr "无法连接至‘%s’：%s\n"
msgid "unknown validation model `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(不给定描述)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = 跳过这把密钥\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "无法解析公钥服务器 URL\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7455,6 +7525,10 @@ msgstr "获取新 PIN 时出错：%s\n"
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错：%s\n"
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr ""
@@ -7486,7 +7560,7 @@ msgid ""
"signatures.\n"
msgstr ""
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7494,7 +7568,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "保护算法 %d%s 未被支持\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
@@ -7622,140 +7706,144 @@ msgstr "读取‘%s’时出错：%s\n"
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "从导出的子钥中删除所有密码"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误：%s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|某甲|为收件者“某甲”加密"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "无法解析公钥服务器 URL\n"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr ""
@@ -8357,9 +8445,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "无法锁定‘%s’：%s\n"
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "等待‘%s’上的锁\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "无法获得文件‘%s’的信息： %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 49c6b6246..566a4f8c5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\n"
"PO-Revision-Date: 2008-03-26 22:35+0800\n"
"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -94,9 +94,10 @@ msgstr "密語"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "無法建立 `%s': %s\n"
@@ -104,11 +105,11 @@ msgstr "無法建立 `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "無法開啟 `%s': %s\n"
@@ -388,24 +389,24 @@ msgid "invalid debug-level `%s' given\n"
msgstr "給定的除錯等級 `%s' 無效\n"
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項中\n"
@@ -689,8 +690,8 @@ msgstr "更改密語"
msgid "I'll change it later"
msgstr "我稍後再變更"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "建立管道時出錯: %s\n"
@@ -1070,13 +1071,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "你要選哪一個? "
@@ -1243,7 +1244,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "無效的選擇.\n"
@@ -2157,7 +2158,7 @@ msgstr "%s:%d: 無效的自動金鑰定址清單\n"
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
@@ -2197,11 +2198,11 @@ msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
@@ -3198,19 +3199,19 @@ msgstr "簽署時失敗: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
msgid "This key is not protected.\n"
msgstr "這把金鑰未被保護.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
msgid "Key is protected.\n"
msgstr "金鑰已保護.\n"
@@ -3227,7 +3228,7 @@ msgstr ""
"請輸入要給這把私鑰用的新密語.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
msgid "passphrase not correctly repeated; try again"
msgstr "前後兩次輸入的密語不一致; 請再試一次"
@@ -3942,69 +3943,69 @@ msgstr "子鑰 %s 已撤銷.\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:269
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "偏好設定 `%s' 重複了\n"
-#: g10/keygen.c:275
+#: g10/keygen.c:276
msgid "too many cipher preferences\n"
msgstr "編密偏好過多\n"
-#: g10/keygen.c:277
+#: g10/keygen.c:278
msgid "too many digest preferences\n"
msgstr "摘要偏好過多\n"
-#: g10/keygen.c:279
+#: g10/keygen.c:280
msgid "too many compression preferences\n"
msgstr "壓縮偏好過多\n"
-#: g10/keygen.c:404
+#: g10/keygen.c:405
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "偏好字串中含有無效的 `%s' 項目\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:885
msgid "writing direct signature\n"
msgstr "寫入直接簽章中\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:927
msgid "writing self signature\n"
msgstr "寫入自我簽章中\n"
-#: g10/keygen.c:983
+#: g10/keygen.c:984
msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
msgid "Sign"
msgstr "簽署"
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
msgid "Certify"
msgstr "保證"
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
msgid "Authenticate"
msgstr "鑑定"
@@ -4018,109 +4019,109 @@ msgstr "鑑定"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 金鑰可能的動作: "
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
msgid "Current allowed actions: "
msgstr "目前可進行的動作: "
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 切換簽署性能\n"
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 切換加密性能\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 切換鑑定性能\n"
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
msgid "Please select what kind of key you want:\n"
msgstr "請選擇你要使用的金鑰種類:\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA 和 Elgamal (預設)\n"
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (僅能用於簽署)\n"
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (你能自己設定性能)\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (僅能用於加密)\n"
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (僅能用於簽署)\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (僅能用於加密)\n"
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (你能自己設定性能)\n"
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 金鑰對會有 %u 位元長.\n"
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "你想要用多大的金鑰尺寸? (%u) "
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "你所要求的金鑰尺寸是 %u 位元\n"
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4136,7 +4137,7 @@ msgstr ""
" <n>m = 金鑰在 n 月後會到期\n"
" <n>y = 金鑰在 n 年後會到期\n"
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4152,38 +4153,38 @@ msgstr ""
" <n>m = 簽章在 n 月後會到期\n"
" <n>y = 簽章在 n 年後會到期\n"
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
msgid "Key is valid for? (0) "
msgstr "金鑰的有效期限是多久? (0) "
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "簽章的有效期限是多久? (%s) "
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
msgid "invalid value\n"
msgstr "無效的數值\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
msgid "Key does not expire at all\n"
msgstr "金鑰完全不會過期\n"
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
msgid "Signature does not expire at all\n"
msgstr "簽章完全不會過期\n"
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
#, c-format
msgid "Key expires at %s\n"
msgstr "金鑰將會在 %s 到期\n"
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
#, c-format
msgid "Signature expires at %s\n"
msgstr "簽章將會在 %s 到期.\n"
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4191,18 +4192,18 @@ msgstr ""
"你的系統無法顯示 2038 年以後的日期.\n"
"不過, 它可以正確處理直到 2106 年之前的年份.\n"
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4217,44 +4218,44 @@ msgstr ""
" \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
"\n"
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
msgid "Real name: "
msgstr "真實姓名: "
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
msgid "Email address: "
msgstr "電子郵件地址: "
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
msgid "Comment: "
msgstr "註釋: "
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "你正在使用 `%s' 字元集.\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4265,7 +4266,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
@@ -4280,23 +4281,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4304,12 +4305,12 @@ msgstr ""
"你需要一個密語來保護你的私鑰.\n"
"\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4321,7 +4322,7 @@ msgstr ""
"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
"\n"
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4332,50 +4333,50 @@ msgstr ""
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在寫入公鑰至 `%s'\n"
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "正在寫入私鑰 stub 至 `%s'\n"
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在寫入私鑰至 `%s'\n"
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4383,42 +4384,42 @@ msgstr ""
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "儲存金鑰到卡片上時失敗: %s\n"
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4451,30 +4452,30 @@ msgstr "簽章註記: "
msgid "Keyring"
msgstr "鑰匙圈"
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
msgid "Primary key fingerprint:"
msgstr " 主鑰指紋:"
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1556
+#: g10/keylist.c:1513
msgid " Primary key fingerprint:"
msgstr " 主鑰指紋:"
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
# use tty
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
msgid " Card serial no. ="
msgstr " 卡片序號 ="
@@ -4939,7 +4940,7 @@ msgstr "警告: 已不建議使用 %s 摘要演算法\n"
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA 編密法外掛模組不存在\n"
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
#, c-format
msgid "please see %s for more information\n"
msgstr "請參考 %s 上進一步的資訊\n"
@@ -6214,26 +6215,64 @@ msgstr "無效的選項 \"%.50s\"\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
#, c-format
msgid "error loading `%s': %s\n"
msgstr "載入 `%s' 時出錯: %s\n"
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr "沒有從 `%s' 到 `%s' 之間的轉換可用\n"
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
msgstr "iconv_open 失敗: %s\n"
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
#, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "從 `%s' 轉換成 `%s' 失敗: %s\n"
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "無法建立暫存目錄 `%s': %s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "寫入 %s 時出錯: %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "正在等候 `%s' 鎖定...\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "找不到公鑰 %s: %s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "正在等候 `%s' 鎖定...\n"
+
#: kbx/kbxutil.c:92
msgid "set debugging flags"
msgstr "設定除錯旗標"
@@ -6272,6 +6311,18 @@ msgstr "收回 PIN 時傳回錯誤: %s\n"
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:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|新增 PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "取得新的 PIN 時出錯: %s\n"
+
#: scd/app-openpgp.c:599
#, c-format
msgid "failed to store the fingerprint: %s\n"
@@ -6287,15 +6338,15 @@ msgstr "存放創生日期失敗: %s\n"
msgid "reading public key failed: %s\n"
msgstr "讀取公鑰時失敗: %s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
msgid "response does not contain the public key data\n"
msgstr "回應中未包含公鑰資料\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
msgid "response does not contain the RSA modulus\n"
msgstr "回應中未包含 RSA 系數\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
msgid "response does not contain the RSA public exponent\n"
msgstr "回應中未包含 RSA 公用指數\n"
@@ -6325,7 +6376,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "驗證 CHV%d 失敗: %s\n"
@@ -6334,11 +6385,11 @@ msgstr "驗證 CHV%d 失敗: %s\n"
msgid "access to admin commands is not configured\n"
msgstr "管理者指令存取權限尚未組態\n"
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
msgid "error retrieving CHV status from card\n"
msgstr "從卡片取回 CHV 狀態時出錯\n"
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
msgid "card is permanently locked!\n"
msgstr "卡片永久鎖定了!!\n"
@@ -6368,104 +6419,103 @@ msgstr "|A|管理者 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
msgid "|AN|New Admin PIN"
msgstr "|AN|新增管理者 PIN"
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "|N|新增 PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "取得新的 PIN 時出錯: %s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
msgid "error reading application data\n"
msgstr "讀取應用程式資料時出錯\n"
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
msgid "error reading fingerprint DO\n"
msgstr "讀取指紋 DO 時出錯\n"
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
msgid "key already exists\n"
msgstr "金鑰已存在\n"
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
msgid "existing key will be replaced\n"
msgstr "既有的金鑰將被取代\n"
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
msgid "generating new key\n"
msgstr "正在產生新的金鑰\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
msgid "creation timestamp missing\n"
msgstr "缺漏創生時間戳印\n"
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
#, c-format
msgid "failed to store the key: %s\n"
msgstr "存放金鑰失敗: %s\n"
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
msgid "please wait while key is being generated ...\n"
msgstr "正在產生金鑰中, 請稍候 ...\n"
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
msgid "generating key failed\n"
msgstr "產生金鑰時失敗\n"
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "金鑰產生完畢 (%d 秒)\n"
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
msgid "fingerprint on card does not match requested one\n"
msgstr "卡片上的指紋與所要求的那個並不吻合\n"
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡片不支援 %s 摘要演算法\n"
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前建立的簽章: %lu\n"
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\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-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "|N|新增 PIN"
+
#: scd/scdaemon.c:105
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
@@ -6534,21 +6584,21 @@ msgstr "已跳過無效的 radix64 字符 %02x\n"
msgid "failed to proxy %s inquiry to client\n"
msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
#, c-format
msgid "no running dirmngr - starting `%s'\n"
msgstr "沒有執行中的 dirmngr - 正在啟動 `%s'\n"
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr "被變造的 DIRMNGR_INFO 環境變數\n"
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "未支援 dirmngr 協定版本 %d\n"
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr "無法連線至 dirmngr - 正試著退回\n"
@@ -6615,7 +6665,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
msgid "failed to allocated keyDB handle\n"
msgstr "配置 keyDB handle 失敗\n"
@@ -6800,7 +6850,7 @@ msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr "(這是 MD2 演算法)\n"
@@ -6846,7 +6896,7 @@ msgstr ""
msgid "no key usage specified - assuming all usages\n"
msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
#, c-format
msgid "error getting key usage information: %s\n"
msgstr "取得金鑰用途資訊時出錯: %s\n"
@@ -7051,7 +7101,7 @@ msgstr "憑證 `%s' 已刪除\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
msgid "no valid recipients given\n"
msgstr "沒有給定有效的收件者\n"
@@ -7191,12 +7241,13 @@ msgstr "將此金鑰鑰匙圈加到金鑰鑰匙圈清單中"
msgid "add this secret keyring to the list"
msgstr "將此私鑰鑰匙圈加到清單中"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
msgid "|NAME|use NAME as default secret key"
msgstr "|名字|使用「名字」做為預設私鑰"
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|主機|使用此金鑰伺服器來查找金鑰"
#: sm/gpgsm.c:365
@@ -7251,25 +7302,45 @@ msgstr "請注意: 將無法加密為 `%s': %s\n"
msgid "unknown validation model `%s'\n"
msgstr "未知的驗證模型 `%s'\n"
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "第 %d 列: 沒有給定的物件名稱\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = 跳過這把金鑰\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "無法剖析金鑰伺服器 URL\n"
+
+#: sm/gpgsm.c:1502
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "正在匯入通用憑證 `%s'\n"
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "無法用 `%s' 來簽署: %s\n"
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
msgid "this command has not yet been implemented\n"
msgstr "這個指令尚未實做完成\n"
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7348,6 +7419,11 @@ msgstr "取得已存放的旗標時出錯: %s\n"
msgid "error storing flags: %s\n"
msgstr "存放旗標時出錯: %s\n"
+#: sm/keylist.c:618
+#, fuzzy
+msgid "Error - "
+msgstr "[錯誤 - 沒有名稱]"
+
#: sm/misc.c:55
msgid "GPG_TTY has not been set - using maybe bogus default\n"
msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
@@ -7384,7 +7460,7 @@ msgid ""
"signatures.\n"
msgstr "請注意, 本軟體並未正式被認可來建立或驗證這樣的簽章.\n"
-#: sm/qualified.c:277
+#: sm/qualified.c:276
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@ -7395,7 +7471,17 @@ msgstr ""
"\"%s\"\n"
"請注意, 這個憑證並 不會 建立出合格的簽章!"
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "%d%s 保護演算法未支援\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
#, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "檢查合格憑證時失敗: %s\n"
@@ -7517,136 +7603,140 @@ msgstr "送出 `%s' 指令時出錯: %s\n"
msgid "error sending standard options: %s\n"
msgstr "送出標準選項時出錯: %s\n"
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
msgid "Options controlling the diagnostic output"
msgstr "控制著診斷性輸出的選項"
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
msgid "Options controlling the configuration"
msgstr "控制著組態的選項"
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
msgid "Options useful for debugging"
msgstr "對除錯有幫助的選項"
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
msgid "|FILE|write server mode logs to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至「檔案」"
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
msgid "Options controlling the security"
msgstr "控制著安全性的選項"
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
msgid "|N|expire SSH keys after N seconds"
msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr "|N|把 PIN 快取最大生存時間設成 N 秒"
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
msgid "Options enforcing a passphrase policy"
msgstr "強制執行密語原則的選項"
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
msgid "do not allow to bypass the passphrase policy"
msgstr "不允許略過密語原則"
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
msgid "|N|set minimal required length for new passphrases to N"
msgstr "|N|把新密語所需的最短長度設成 N"
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr "|N|新密語至少要有 N 個非字母的字符"
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr "|檔案|用「檔案」中的樣式來檢查新密語"
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
msgid "|N|expire the passphrase after N days"
msgstr "|N|在 N 天之後讓密語過期"
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
msgid "do not allow the reuse of old passphrases"
msgstr "不允許重複使用舊密語"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|名字|也加密給使用者 ID「名字」"
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
msgstr "金鑰伺服器組態"
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
msgid "|URL|use keyserver at URL"
msgstr "|URL|使用位於 URL 的金鑰伺服器"
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
msgid "allow PKA lookups (DNS requests)"
msgstr "允許 PKA 查找 (DNS 請求)"
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
msgid "disable all access to the dirmngr"
msgstr "停用所有的 dirmngr 存取"
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr "|名稱|將「名稱」編碼用於 PKCS#12 密語"
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
msgid "do not check CRLs for root certificates"
msgstr "不要為根憑證檢查 CRL"
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
msgid "Options controlling the format of the output"
msgstr "控制著輸出格式的選項"
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
msgid "Options controlling the interactivity and enforcement"
msgstr "控制著互動及強制執行的選項"
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
msgid "Configuration for HTTP servers"
msgstr "HTTP 伺服器組態"
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
msgid "use system's HTTP proxy setting"
msgstr "使用系統的 HTTP 代理伺服器設定"
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
msgid "Configuration of LDAP servers to use"
msgstr "要用的 LDAP 伺服器組態"
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
msgid "LDAP server list"
msgstr "LDAP 伺服器清單"
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
msgid "Configuration for OCSP"
msgstr "OCSP 組態"
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
msgid "Note that group specifications are ignored\n"
msgstr "請注意群組規格已忽略\n"
@@ -7920,9 +8010,6 @@ msgstr ""
#~ msgid "can't lock `%s': %s\n"
#~ msgstr "無法鎖定 `%s': %s\n"
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "正在等候 `%s' 鎖定...\n"
-
#~ msgid "can't stat `%s': %s\n"
#~ msgstr "無法取得檔案 `%s' 的資訊: %s\n"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 05:30:01 +0100