diff options
author | Werner Koch <[email protected]> | 2002-05-02 07:48:39 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2002-05-02 07:48:39 +0000 |
commit | 1b65d681ff642877b2cf1d4080e1138bf3aa6173 (patch) | |
tree | 09aefe8725b90f9304ebe78d7c18be9ff03c9b21 | |
parent | * keyedit.c (menu_adduid): 2440bis04 says that multiple attribute packets (diff) | |
download | gnupg-1b65d681ff642877b2cf1d4080e1138bf3aa6173.tar.gz gnupg-1b65d681ff642877b2cf1d4080e1138bf3aa6173.zip |
util/
* memory.c (alloc): Malloc at least 1 byte. Noted by Winona Brown.
g10/
* options.skel: Removed the comment on trusted-keys because this
option is now deprecated.
-rw-r--r-- | THANKS | 1 | ||||
-rw-r--r-- | g10/ChangeLog | 5 | ||||
-rw-r--r-- | g10/options.skel | 11 | ||||
-rw-r--r-- | po/ChangeLog | 4 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/ja.po | 1907 | ||||
-rw-r--r-- | util/ChangeLog | 4 | ||||
-rw-r--r-- | util/memory.c | 6 |
8 files changed, 953 insertions, 987 deletions
@@ -198,6 +198,7 @@ Walter Koch [email protected] Wayne Chapeskie [email protected] Werner Koch [email protected] Wim Vandeputte [email protected] +Winona Brown [email protected] Yosiaki IIDA [email protected] Yoshihiro Kajiki [email protected] diff --git a/g10/ChangeLog b/g10/ChangeLog index 6143bfcc9..9d07c0a32 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-05-02 Werner Koch <[email protected]> + + * options.skel: Removed the comment on trusted-keys because this + option is now deprecated. + 2002-05-01 David Shaw <[email protected]> * keyedit.c (menu_adduid): 2440bis04 says that multiple attribute diff --git a/g10/options.skel b/g10/options.skel index 0a24bc32c..f6a354088 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -31,17 +31,6 @@ $Id$ #default-key 621CC013 -# GnuPG ultimately trusts all keys in the secret keyring. If you do -# not have all your secret keys online available you should use this -# option to tell GnuPG about ultimately trusted keys. -# You have to give the long keyID here which can be obtained by using -# the --list-key command along with the option --with-colons; you will -# get a line similiar to this one: -# pub:u:1024:17:5DE249965B0358A2:1999-03-15:2006-02-04:59:f: -# the 5th field is what you want. - -#trusted-key 12345678ABCDEF01 - # If you do not pass a recipient to gpg, it will ask for one. # Using this option you can encrypt to a default key. key validation diff --git a/po/ChangeLog b/po/ChangeLog index a0fd6a3a6..d7c9a351d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2002-04-30 Werner Koch <[email protected]> + + * ja.po: Updated, also a bit too late for the release. + 2002-04-29 Werner Koch <[email protected]> * pl.po: Update. @@ -823,7 +823,7 @@ msgstr "WARNUNG: %s ist eine mi�billigte Option.\n" #: g10/g10.c:1253 g10/g10.c:1270 #, c-format msgid "please use \"--keyserver-options %s\" instead\n" -msgstr "Bitte benutzen Sie stattdessen \"--keyserver-option %s\".\n" +msgstr "Bitte benutzen Sie stattdessen \"--keyserver-options %s\".\n" #: g10/g10.c:1347 msgid "WARNING: program may create a core file!\n" @@ -8,10 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6\n" -"POT-Creation-Date: 2002-04-29 17:09+0200\n" -"PO-Revision-Date: 2002-02-08 08:47+0900\n" +"POT-Creation-Date: 2002-04-19 11:22+0200\n" +"PO-Revision-Date: 2002-04-20 23:43+0900\n" "Last-Translator: IIDA Yosiaki <[email protected]>\n" -"Language-Team: Japanese <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +22,7 @@ msgstr "�ٹ�: ��Ф��������Ѥ��Ƥ��ޤ�!\n" #: util/secmem.c:89 msgid "please see http://www.gnupg.org/faq.html for more information\n" -msgstr "" +msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n" #: util/secmem.c:326 msgid "operation is not possible without initialized secure memory\n" @@ -32,27 +32,27 @@ msgstr "������Ѥߤΰ����ʥ�����ʤ����ˤϼ¹ԤǤ��ޤ���\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n" -#: util/miscutil.c:296 util/miscutil.c:331 +#: util/miscutil.c:297 util/miscutil.c:327 msgid "yes" msgstr "yes" -#: util/miscutil.c:297 util/miscutil.c:334 +#: util/miscutil.c:298 util/miscutil.c:330 msgid "yY" msgstr "yY" -#: util/miscutil.c:298 util/miscutil.c:332 +#: util/miscutil.c:299 util/miscutil.c:328 msgid "no" msgstr "no" -#: util/miscutil.c:299 util/miscutil.c:335 +#: util/miscutil.c:300 util/miscutil.c:331 msgid "nN" msgstr "nN" -#: g10/keyedit.c:815 util/miscutil.c:333 +#: g10/keyedit.c:810 util/miscutil.c:329 msgid "quit" msgstr "quit" -#: util/miscutil.c:336 +#: util/miscutil.c:332 msgid "qQ" msgstr "qQ" @@ -262,9 +262,8 @@ msgid "unusable secret key" msgstr "���ѤǤ��ʤ���̩���Ǥ�" #: util/errors.c:107 -#, fuzzy msgid "keyserver error" -msgstr "����Ū�ʥ��顼" +msgstr "�������С��Υ��顼" #: util/logger.c:249 #, c-format @@ -352,7 +351,7 @@ msgstr "" "��ʬ��Ĺ��������������ޤ���OS����ä��������\n" "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n" -#: g10/g10.c:287 +#: g10/g10.c:281 msgid "" "@Commands:\n" " " @@ -360,172 +359,165 @@ msgstr "" "@���ޥ��:\n" " " -#: g10/g10.c:289 +#: g10/g10.c:283 msgid "|[file]|make a signature" msgstr "|[�ե�����]|��̾�����" -#: g10/g10.c:290 +#: g10/g10.c:284 msgid "|[file]|make a clear text signature" msgstr "|[�ե�����]|���ꥢ��̾�����" -#: g10/g10.c:291 +#: g10/g10.c:285 msgid "make a detached signature" msgstr "ʬΥ��̾�����" -#: g10/g10.c:292 +#: g10/g10.c:286 msgid "encrypt data" msgstr "�ǡ�����Ź沽" -#: g10/g10.c:293 +#: g10/g10.c:287 msgid "|[files]|encrypt files" -msgstr "" +msgstr "|[�ե����뷲]|�ե����뷲��Ź沽" -#: g10/g10.c:294 +#: g10/g10.c:288 msgid "encryption only with symmetric cipher" msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����" -#: g10/g10.c:295 +#: g10/g10.c:289 msgid "store only" msgstr "��¸�Τ�" -#: g10/g10.c:296 +#: g10/g10.c:290 msgid "decrypt data (default)" msgstr "�ǡ��������� (����)" -#: g10/g10.c:297 +#: g10/g10.c:291 msgid "|[files]|decrypt files" -msgstr "" +msgstr "|[�ե����뷲]|�ե����뷲������" -#: g10/g10.c:298 +#: g10/g10.c:292 msgid "verify a signature" msgstr "��̾��" -#: g10/g10.c:300 +#: g10/g10.c:294 msgid "list keys" msgstr "���ΰ���" -#: g10/g10.c:302 +#: g10/g10.c:296 msgid "list keys and signatures" msgstr "���Ƚ�̾�ΰ���" -#: g10/g10.c:303 +#: g10/g10.c:297 msgid "check key signatures" msgstr "���ν�̾��" -#: g10/g10.c:304 +#: g10/g10.c:298 msgid "list keys and fingerprints" msgstr "���Ȼ���ΰ���" -#: g10/g10.c:305 +#: g10/g10.c:299 msgid "list secret keys" msgstr "��̩���ΰ���" -#: g10/g10.c:306 +#: g10/g10.c:300 msgid "generate a new key pair" msgstr "���������Ф�����" -#: g10/g10.c:307 -#, fuzzy +#: g10/g10.c:301 msgid "remove keys from the public keyring" -msgstr "�������ؤ��鸰����" +msgstr "�������ؤ��鸰������" -#: g10/g10.c:309 -#, fuzzy +#: g10/g10.c:303 msgid "remove keys from the secret keyring" -msgstr "��̩���ؤ��鸰����" +msgstr "��̩���ؤ��鸰������" -#: g10/g10.c:310 +#: g10/g10.c:304 msgid "sign a key" msgstr "���˽�̾" -#: g10/g10.c:311 +#: g10/g10.c:305 msgid "sign a key locally" msgstr "��������Ū�˽�̾" -#: g10/g10.c:312 -#, fuzzy +#: g10/g10.c:306 msgid "sign a key non-revocably" -msgstr "��������Ū�˽�̾" +msgstr "�˴��Ǥ��ʤ��褦���˽�̾" -#: g10/g10.c:313 -#, fuzzy +#: g10/g10.c:307 msgid "sign a key locally and non-revocably" -msgstr "��������Ū�˽�̾" +msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾" -#: g10/g10.c:314 +#: g10/g10.c:308 msgid "sign or edit a key" msgstr "���ؤν�̾���Խ�" -#: g10/g10.c:315 +#: g10/g10.c:309 msgid "generate a revocation certificate" msgstr "�˴������������" -#: g10/g10.c:316 +#: g10/g10.c:310 msgid "export keys" msgstr "����Ф�" -#: g10/g10.c:317 +#: g10/g10.c:311 msgid "export keys to a key server" msgstr "�������С��˸���Ф�" -#: g10/g10.c:318 +#: g10/g10.c:312 msgid "import keys from a key server" msgstr "�������С����鸰���ɤ߹���" -#: g10/g10.c:320 -#, fuzzy +#: g10/g10.c:314 msgid "search for keys on a key server" -msgstr "�������С��˸���Ф�" +msgstr "�������С��θ�������" -#: g10/g10.c:322 -#, fuzzy +#: g10/g10.c:316 msgid "update all keys from a keyserver" -msgstr "�������С����鸰���ɤ߹���" +msgstr "�������С����鸰��������������" -#: g10/g10.c:326 +#: g10/g10.c:320 msgid "import/merge keys" msgstr "�����ɹ���/ʻ��" -#: g10/g10.c:328 +#: g10/g10.c:322 msgid "list only the sequence of packets" msgstr "�ѥ��å���Τߤΰ���" -#: g10/g10.c:330 +#: g10/g10.c:324 msgid "export the ownertrust values" msgstr "��ͭ�Ԥ��Ѥ����ͤ�Ф�" -#: g10/g10.c:332 +#: g10/g10.c:326 msgid "import ownertrust values" msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���" -#: g10/g10.c:334 +#: g10/g10.c:328 msgid "update the trust database" msgstr "���ѥǡ����١�����" -#: g10/g10.c:336 -#, fuzzy +#: g10/g10.c:330 msgid "unattended trust database update" -msgstr "���ѥǡ����١�����" +msgstr "�����Ƥ��Ƥʤ����ѥǡ����١�����" -#: g10/g10.c:337 +#: g10/g10.c:331 msgid "fix a corrupted trust database" msgstr "���줿���ѥǡ����١�������" -#: g10/g10.c:338 +#: g10/g10.c:332 msgid "De-Armor a file or stdin" msgstr "" "�ե�����ޤ���ɸ�����Ϥ�\n" "��������" -#: g10/g10.c:340 +#: g10/g10.c:334 msgid "En-Armor a file or stdin" msgstr "�ե�����ޤ���ɸ�����Ϥ�������" -#: g10/g10.c:342 +#: g10/g10.c:336 msgid "|algo [files]|print message digests" msgstr "|���르�ꥺ�� [�ե�����]|��å�������������" -#: g10/g10.c:346 +#: g10/g10.c:340 msgid "" "@\n" "Options:\n" @@ -535,242 +527,238 @@ msgstr "" "���ץ����:\n" " " -#: g10/g10.c:348 +#: g10/g10.c:342 msgid "create ascii armored output" msgstr "ASCII���������������" -#: g10/g10.c:350 +#: g10/g10.c:344 msgid "|NAME|encrypt for NAME" msgstr "|̾��|��̾�����Ѥ˰Ź沽" -#: g10/g10.c:353 +#: g10/g10.c:347 msgid "|NAME|use NAME as default recipient" msgstr "" "|̾��|����μ����ԤȤ���\n" "��̾���פ����" -#: g10/g10.c:355 +#: g10/g10.c:349 msgid "use the default key as default recipient" msgstr "����μ����Ԥ˴���θ������" -#: g10/g10.c:361 +#: g10/g10.c:355 msgid "use this user-id to sign or decrypt" msgstr "" "��̾������ˤ��Υ桼����id\n" "�����" -#: g10/g10.c:362 +#: g10/g10.c:356 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|���̥�٥��N������\n" "(0����)" -#: g10/g10.c:364 +#: g10/g10.c:358 msgid "use canonical text mode" msgstr "����ƥ����ȡ��⡼�ɤ����" -#: g10/g10.c:371 +#: g10/g10.c:365 msgid "use as output file" msgstr "���ϥե�����Ȥ��ƻ���" -#: g10/g10.c:372 +#: g10/g10.c:366 msgid "verbose" msgstr "��Ĺ" -#: g10/g10.c:373 +#: g10/g10.c:367 msgid "be somewhat more quiet" msgstr "����Ť�" -#: g10/g10.c:374 +#: g10/g10.c:368 msgid "don't use the terminal at all" msgstr "ü�����Ի���" -#: g10/g10.c:375 +#: g10/g10.c:369 msgid "force v3 signatures" msgstr "����Ū��v3��̾" -#: g10/g10.c:376 -#, fuzzy +#: g10/g10.c:370 msgid "do not force v3 signatures" -msgstr "����Ū��v3��̾" +msgstr "v3��̾�������ʤ�" -#: g10/g10.c:377 -#, fuzzy +#: g10/g10.c:371 msgid "force v4 key signatures" -msgstr "����Ū��v3��̾" +msgstr "����Ū��v4��̾" -#: g10/g10.c:378 -#, fuzzy +#: g10/g10.c:372 msgid "do not force v4 key signatures" -msgstr "����Ū��v3��̾" +msgstr "v4��̾�������ʤ�" -#: g10/g10.c:379 +#: g10/g10.c:373 msgid "always use a MDC for encryption" msgstr "�Ź沽�ˤϾ��MDC�����" -#: g10/g10.c:381 -#, fuzzy +#: g10/g10.c:375 msgid "never use a MDC for encryption" -msgstr "�Ź沽�ˤϾ��MDC�����" +msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�" -#: g10/g10.c:383 +#: g10/g10.c:377 msgid "do not make any changes" msgstr "̵�ѹ�" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:385 +#: g10/g10.c:379 msgid "use the gpg-agent" msgstr "gpg����������Ȥ����" -#: g10/g10.c:388 +#: g10/g10.c:382 msgid "batch mode: never ask" msgstr "�Хå����⡼��: ��ǧ��ά" -#: g10/g10.c:389 +#: g10/g10.c:383 msgid "assume yes on most questions" msgstr "" "�����Ƥ��μ����������yes\n" "�Ȥߤʤ�" -#: g10/g10.c:390 +#: g10/g10.c:384 msgid "assume no on most questions" msgstr "" "�����Ƥ��μ����������no\n" "�Ȥߤʤ�" -#: g10/g10.c:391 +#: g10/g10.c:385 msgid "add this keyring to the list of keyrings" msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�" -#: g10/g10.c:392 +#: g10/g10.c:386 msgid "add this secret keyring to the list" msgstr "�����ˤ�����̩���ؤ��ɲ�" -#: g10/g10.c:393 +#: g10/g10.c:387 msgid "show which keyring a listed key is on" -msgstr "" +msgstr "�����θ������븰�ؤ�ɽ��" -#: g10/g10.c:394 +#: g10/g10.c:388 msgid "|NAME|use NAME as default secret key" msgstr "" "|̾��|�������̩���Ȥ���\n" "��̾���פ����" -#: g10/g10.c:395 +#: g10/g10.c:389 msgid "|HOST|use this keyserver to lookup keys" msgstr "|�ۥ���|���θ����ˤ��θ������С������" -#: g10/g10.c:397 +#: g10/g10.c:391 msgid "|NAME|set terminal charset to NAME" msgstr "" "|CHARSET̾|ü����charset���CHARSET̾��\n" "������" -#: g10/g10.c:398 +#: g10/g10.c:392 msgid "read options from file" msgstr "" "�ե����뤫�饪�ץ�����\n" "�ɤ߹���" -#: g10/g10.c:402 +#: g10/g10.c:396 msgid "|FD|write status info to this FD" msgstr "" "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n" "�Ф�" -#: g10/g10.c:404 -#, fuzzy +#: g10/g10.c:398 msgid "|[file]|write status info to file" msgstr "" -"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n" +"|�ե�����|���ơ����������ե������\n" "�Ф�" -#: g10/g10.c:410 +#: g10/g10.c:404 msgid "|KEYID|ultimately trust this key" msgstr "|��ID|���θ�����Ū�˿��Ѥ���" -#: g10/g10.c:411 +#: g10/g10.c:405 msgid "|FILE|load extension module FILE" msgstr "" "|�ե�����|��ĥ�⥸�塼��Υե������\n" "�ɤ߹���" -#: g10/g10.c:412 +#: g10/g10.c:406 msgid "emulate the mode described in RFC1991" msgstr "" "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n" "����" -#: g10/g10.c:413 +#: g10/g10.c:407 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n" "�������OpenPGP�ο��������" -#: g10/g10.c:414 -#, fuzzy +#: g10/g10.c:408 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" -"�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n" -"�������OpenPGP�ο��������" +"�ѥ��åȤȰŹ������Υ��ץ���\n" +"�������PGP 2.x�ο��������" -#: g10/g10.c:418 +#: g10/g10.c:412 msgid "|N|use passphrase mode N" msgstr "|N|�ѥ��ե졼�����⡼��N�����" -#: g10/g10.c:420 +#: g10/g10.c:414 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n" "���������르�ꥺ������" -#: g10/g10.c:422 +#: g10/g10.c:416 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n" "���르�ꥺ������" -#: g10/g10.c:424 +#: g10/g10.c:418 msgid "|NAME|use cipher algorithm NAME" msgstr "" "|̾��|��̾���פΰŹ楢�르�ꥺ���\n" "����" -#: g10/g10.c:425 +#: g10/g10.c:419 msgid "|NAME|use message digest algorithm NAME" msgstr "" "|̾��|��̾���פΥ�å���������\n" "���르�ꥺ������" -#: g10/g10.c:426 +#: g10/g10.c:420 msgid "|N|use compress algorithm N" msgstr "" "|̾��|��̾���פΰ��̥��르�ꥺ���\n" "����" -#: g10/g10.c:427 +#: g10/g10.c:421 msgid "throw keyid field of encrypted packets" msgstr "" "�Ź�ѥ��åȤθ�ID�ե������\n" "������" -#: g10/g10.c:428 +#: g10/g10.c:422 msgid "Show Photo IDs" -msgstr "" +msgstr "�ե���ID��ɽ��" -#: g10/g10.c:429 +#: g10/g10.c:423 msgid "Don't show Photo IDs" -msgstr "" +msgstr "�ե���ID��ɽ�����ʤ�" -#: g10/g10.c:430 +#: g10/g10.c:424 msgid "Set command line to view Photo IDs" msgstr "" +"�ե���ID��������륳�ޥ�ɹ�\n" +"������" -#: g10/g10.c:431 +#: g10/g10.c:425 msgid "|NAME=VALUE|use this notation data" msgstr "|̾��=��|��������ǡ��������" -#: g10/g10.c:434 +#: g10/g10.c:428 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -779,7 +767,7 @@ msgstr "" "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n" "�ޥ˥奢�롦�ڡ���������������)\n" -#: g10/g10.c:437 +#: g10/g10.c:431 msgid "" "@\n" "Examples:\n" @@ -799,15 +787,15 @@ msgstr "" " --list-keys [̾��] ����ɽ��\n" " --fingerprint [̾��] �����ɽ��\n" -#: g10/g10.c:579 +#: g10/g10.c:567 msgid "Please report bugs to <[email protected]>.\n" msgstr "�Х��Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n" -#: g10/g10.c:583 +#: g10/g10.c:571 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)" -#: g10/g10.c:586 +#: g10/g10.c:574 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -817,7 +805,7 @@ msgstr "" "��̾�����ڡ��Ź沽������\n" "�����ư��ϡ����ϥǡ����˰�¸\n" -#: g10/g10.c:597 +#: g10/g10.c:585 msgid "" "\n" "Supported algorithms:\n" @@ -825,255 +813,248 @@ msgstr "" "\n" "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n" -#: g10/g10.c:671 +#: g10/g10.c:659 msgid "usage: gpg [options] " msgstr "�Ȥ���: gpg [���ץ����] " -#: g10/g10.c:728 +#: g10/g10.c:716 msgid "conflicting commands\n" msgstr "���ޥ�ɤξ���\n" -#: g10/g10.c:903 +#: g10/g10.c:891 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "����: ����Υ��ץ���ե�����`%s'������ޤ���\n" -#: g10/g10.c:907 +#: g10/g10.c:895 #, c-format msgid "option file `%s': %s\n" msgstr "���ץ���ե�����`%s': %s\n" -#: g10/g10.c:914 +#: g10/g10.c:902 #, c-format msgid "reading options from `%s'\n" msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n" -#: g10/g10.c:1197 +#: g10/g10.c:1185 #, c-format msgid "%s is not a valid character set\n" msgstr "%s��������ʸ������ǤϤ���ޤ���\n" -#: g10/g10.c:1214 +#: g10/g10.c:1202 msgid "could not parse keyserver URI\n" -msgstr "" +msgstr "�������С���URI�������ǽ\n" -#: g10/g10.c:1228 +#: g10/g10.c:1216 #, c-format msgid "unable to set exec-path to %s\n" -msgstr "" +msgstr "exec-path��%s��������ǽ\n" -#: g10/g10.c:1251 g10/g10.c:1267 -#, fuzzy, c-format +#: g10/g10.c:1239 g10/g10.c:1255 +#, c-format msgid "WARNING: %s is a deprecated option.\n" -msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n" +msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n" -#: g10/g10.c:1253 g10/g10.c:1270 +#: g10/g10.c:1241 g10/g10.c:1258 #, c-format msgid "please use \"--keyserver-options %s\" instead\n" -msgstr "" +msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n" -#: g10/g10.c:1347 +#: g10/g10.c:1329 msgid "WARNING: program may create a core file!\n" msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n" -#: g10/g10.c:1351 +#: g10/g10.c:1333 #, c-format msgid "WARNING: %s overrides %s\n" -msgstr "" +msgstr "�ٹ�: %s��%s���ͥ��\n" -#: g10/g10.c:1358 g10/g10.c:1369 +#: g10/g10.c:1340 g10/g10.c:1351 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "����: ����%s���Ѥ��ޤ���!\n" -#: g10/g10.c:1360 g10/g10.c:1380 +#: g10/g10.c:1342 g10/g10.c:1362 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n" -#: g10/g10.c:1363 +#: g10/g10.c:1345 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n" -#: g10/g10.c:1389 +#: g10/g10.c:1371 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n" -#: g10/g10.c:1395 +#: g10/g10.c:1377 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n" -#: g10/g10.c:1401 +#: g10/g10.c:1383 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -msgstr "" +msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n" -#: g10/g10.c:1414 +#: g10/g10.c:1396 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -msgstr "" +msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥ�IDEA�Ź椬�ᤵ��ޤ� \n" -#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 +#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620 #: g10/sign.c:798 msgid "this message may not be usable by PGP 2.x\n" -msgstr "" +msgstr "���Υ�å�������PGP 2.x�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n" -#: g10/g10.c:1470 g10/g10.c:1482 +#: g10/g10.c:1451 g10/g10.c:1463 msgid "selected cipher algorithm is invalid\n" msgstr "���줿�Ź楢�르�ꥺ���̵���Ǥ�\n" -#: g10/g10.c:1476 g10/g10.c:1488 +#: g10/g10.c:1457 g10/g10.c:1469 msgid "selected digest algorithm is invalid\n" msgstr "���줿���르�ꥺ���̵���Ǥ�\n" -#: g10/g10.c:1492 -#, fuzzy +#: g10/g10.c:1473 msgid "the given signature policy URL is invalid\n" -msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n" +msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n" -#: g10/g10.c:1496 -#, fuzzy +#: g10/g10.c:1477 msgid "the given certification policy URL is invalid\n" -msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n" +msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n" -#: g10/g10.c:1499 +#: g10/g10.c:1480 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n" -#: g10/g10.c:1501 +#: g10/g10.c:1482 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed�������ͤ�ɬ�פǤ�\n" -#: g10/g10.c:1503 +#: g10/g10.c:1484 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n" -#: g10/g10.c:1505 +#: g10/g10.c:1486 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n" -#: g10/g10.c:1508 +#: g10/g10.c:1489 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n" -#: g10/g10.c:1512 +#: g10/g10.c:1493 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n" -#: g10/g10.c:1516 -#, fuzzy +#: g10/g10.c:1497 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n" -msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n" +msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n" -#: g10/g10.c:1519 -#, fuzzy +#: g10/g10.c:1500 msgid "invalid preferences\n" -msgstr "ͥ���̤ΰ���" +msgstr "̵����ͥ����\n" -#: g10/g10.c:1613 +#: g10/g10.c:1594 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n" -#: g10/g10.c:1633 +#: g10/g10.c:1614 msgid "--store [filename]" msgstr "--store [�ե�����̾]" -#: g10/g10.c:1640 +#: g10/g10.c:1621 msgid "--symmetric [filename]" msgstr "--symmetric [�ե�����̾]" -#: g10/g10.c:1648 +#: g10/g10.c:1629 msgid "--encrypt [filename]" msgstr "--encrypt [�ե�����̾]" -#: g10/g10.c:1665 +#: g10/g10.c:1646 msgid "--sign [filename]" msgstr "--sign [�ե�����̾]" -#: g10/g10.c:1678 +#: g10/g10.c:1659 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [�ե�����̾]" -#: g10/g10.c:1692 -#, fuzzy +#: g10/g10.c:1673 msgid "--sign --symmetric [filename]" -msgstr "--symmetric [�ե�����̾]" +msgstr "--sign --symmetric [�ե�����̾]" -#: g10/g10.c:1701 +#: g10/g10.c:1682 msgid "--clearsign [filename]" msgstr "--clearsign [�ե�����̾]" -#: g10/g10.c:1719 +#: g10/g10.c:1700 msgid "--decrypt [filename]" msgstr "--decrypt [�ե�����̾]" -#: g10/g10.c:1730 +#: g10/g10.c:1711 msgid "--sign-key user-id" msgstr "--sign-key �桼����id" -#: g10/g10.c:1738 +#: g10/g10.c:1719 msgid "--lsign-key user-id" msgstr "--lsign-key �桼����id" -#: g10/g10.c:1746 -#, fuzzy +#: g10/g10.c:1727 msgid "--nrsign-key user-id" -msgstr "--sign-key �桼����id" +msgstr "--nrsign-key �桼����id" -#: g10/g10.c:1754 -#, fuzzy +#: g10/g10.c:1735 msgid "--nrlsign-key user-id" -msgstr "--lsign-key �桼����id" +msgstr "--nrlsign-key �桼����id" -#: g10/g10.c:1762 +#: g10/g10.c:1743 msgid "--edit-key user-id [commands]" msgstr "--edit-key �桼����id [���ޥ��]" -#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709 +#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709 #, c-format msgid "can't open %s: %s\n" msgstr "%s�������ޤ���: %s\n" -#: g10/g10.c:1833 +#: g10/g10.c:1814 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [�桼����id] [����]" -#: g10/g10.c:1916 +#: g10/g10.c:1897 #, c-format msgid "dearmoring failed: %s\n" msgstr "��������˼��Ԥ��ޤ���: %s\n" -#: g10/g10.c:1924 +#: g10/g10.c:1905 #, c-format msgid "enarmoring failed: %s\n" msgstr "�����˼��Ԥ��ޤ���: %s\n" -#: g10/g10.c:2011 +#: g10/g10.c:1992 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n" -#: g10/g10.c:2097 +#: g10/g10.c:2078 msgid "[filename]" msgstr "[�ե�����̾]" -#: g10/g10.c:2101 +#: g10/g10.c:2082 msgid "Go ahead and type your message ...\n" msgstr "���Ϥ��ޤ�����å��������פ��Ƥ������� ...\n" -#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 +#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94 #: g10/verify.c:139 #, c-format msgid "can't open `%s'\n" msgstr "`%s'�������ޤ���\n" -#: g10/g10.c:2313 +#: g10/g10.c:2294 msgid "" "the first character of a notation name must be a letter or an underscore\n" msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n" -#: g10/g10.c:2319 +#: g10/g10.c:2300 msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" @@ -1081,11 +1062,11 @@ msgstr "" "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n" "'='�ǽ����ʤ���Фʤ�ޤ���\n" -#: g10/g10.c:2325 +#: g10/g10.c:2306 msgid "dots in a notation name must be surrounded by other characters\n" msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n" -#: g10/g10.c:2333 +#: g10/g10.c:2314 msgid "a notation value must not use any control characters\n" msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n" @@ -1195,19 +1176,18 @@ msgstr "Ŭ��: " #. a string with valid answers #: g10/pkclist.c:252 msgid "iImMqQsS" -msgstr "" +msgstr "iImMqQsS" #: g10/pkclist.c:258 -#, fuzzy, c-format +#, c-format msgid "" "No trust value assigned to:\n" "%4u%c/%08lX %s \"" msgstr "" -"%lu�˿����٤����ꤵ��Ƥ��ޤ���:\n" +"�����٤����ꤵ��Ƥ��ޤ���:\n" "%4u%c/%08lX %s \"" #: g10/pkclist.c:270 -#, fuzzy msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -1217,40 +1197,35 @@ msgstr "" "¾�Υ桼�����θ������������ڤ��뤿��ˡ����Υ桼�����ο����٤����\n" "��������(�ѥ��ݡ��Ȥ��Ƥ��ä��ꡢ¾������������Ⱦȹ礷����...)?\n" "\n" -" 1 = ̤��\n" -" 2 = ���Ѥ� �ʤ�\n" -" 3 = �������ٿ��Ѥ���\n" -" 4 = �����˿��Ѥ���\n" -" s = ���ܤ��������\n" #: g10/pkclist.c:273 #, c-format msgid " %d = Don't know\n" -msgstr "" +msgstr " %d = ̤��\n" #: g10/pkclist.c:274 -#, fuzzy, c-format +#, c-format msgid " %d = I do NOT trust\n" -msgstr "%08lX: ���θ��Ͽ��ѤǤ��� ����\n" +msgstr " %d = ���Ѥ� �ʤ�\n" #: g10/pkclist.c:275 #, c-format msgid " %d = I trust marginally\n" -msgstr "" +msgstr " %d = �������ٿ��Ѥ���\n" #: g10/pkclist.c:276 -#, fuzzy, c-format +#, c-format msgid " %d = I trust fully\n" -msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n" +msgstr " %d = �����˿��Ѥ���\n" #: g10/pkclist.c:278 #, c-format msgid " %d = I trust ultimately\n" -msgstr "" +msgstr " %d = ����Ū�˿��Ѥ���\n" #: g10/pkclist.c:279 msgid " i = please show me more information\n" -msgstr "" +msgstr " i = ���ܤ��������\n" #: g10/pkclist.c:281 msgid " m = back to the main menu\n" @@ -1258,7 +1233,7 @@ msgstr " m = ���˥塼�����\n" #: g10/pkclist.c:284 msgid " s = skip this key\n" -msgstr "" +msgstr " s = ���θ��ϤȤФ�\n" #: g10/pkclist.c:285 msgid " q = quit\n" @@ -1269,9 +1244,8 @@ msgid "Your decision? " msgstr "���ʤ��η����? " #: g10/pkclist.c:313 -#, fuzzy msgid "Do you really want to set this key to ultimate trust? " -msgstr "���θ��������˺�����ޤ���? " +msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? " #: g10/pkclist.c:325 msgid "Certificates leading to an ultimately trusted key:\n" @@ -1297,10 +1271,10 @@ msgid "%08lX: key has expired\n" msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n" #: g10/pkclist.c:442 -#, fuzzy, c-format +#, c-format msgid "" "%08lX: There is no indication that this key really belongs to the owner\n" -msgstr " ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n" +msgstr "%08lX: ���θ����ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n" #: g10/pkclist.c:448 #, c-format @@ -1353,9 +1327,8 @@ msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "�ٹ�: �����������ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n" #: g10/pkclist.c:574 -#, fuzzy msgid "Note: This key has been disabled.\n" -msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�" +msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n" #: g10/pkclist.c:579 msgid "Note: This key has expired!\n" @@ -1398,17 +1371,14 @@ msgid "%s: skipped: public key already present\n" msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n" #: g10/pkclist.c:752 -#, fuzzy msgid "You did not specify a user ID. (you may use \"-r\")\n" -msgstr "" -"�桼����ID�����ꤵ��Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n" -"\n" +msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n" #: g10/pkclist.c:762 msgid "" "\n" "Enter the user ID. End with an empty line: " -msgstr "" +msgstr "\n�桼����ID�����ϡ����Ԥǽ�λ: " #: g10/pkclist.c:776 msgid "No such user ID.\n" @@ -1423,9 +1393,8 @@ msgid "Public key is disabled.\n" msgstr "�������ϻ��ѶػߤǤ���\n" #: g10/pkclist.c:806 -#, fuzzy msgid "skipped: public key already set\n" -msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n" +msgstr "�����å�: ������������ѤߤǤ�\n" #: g10/pkclist.c:849 #, c-format @@ -1435,7 +1404,7 @@ msgstr "����μ�����`%s'�����Ĥ���ޤ���\n" #: g10/pkclist.c:893 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: �����å�: �������ϻ��Ѷػ�\n" +msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n" #: g10/pkclist.c:943 msgid "no valid addressees\n" @@ -1444,22 +1413,21 @@ msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n" #: g10/keygen.c:180 #, c-format msgid "preference %c%lu is not valid\n" -msgstr "" +msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n" #: g10/keygen.c:187 -#, fuzzy, c-format +#, c-format msgid "preference %c%lu duplicated\n" -msgstr "`%s'���å�: ��ʣ\n" +msgstr "����%c%lu�ν�ʣ\n" #: g10/keygen.c:192 -#, fuzzy, c-format +#, c-format msgid "too many `%c' preferences\n" -msgstr "ͥ���̤ΰ���" +msgstr "¿������`%c'����\n" #: g10/keygen.c:257 -#, fuzzy msgid "invalid character in preference string\n" -msgstr "̾����̵����ʸ��������ޤ�\n" +msgstr "����ʸ�����̵����ʸ��������ޤ�\n" #: g10/keygen.c:399 msgid "writing self signature\n" @@ -1504,16 +1472,16 @@ msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n" #: g10/keygen.c:784 -#, fuzzy, c-format +#, c-format msgid " (%d) RSA (sign only)\n" -msgstr " (%d) DSA (��̾�Τ�)\n" +msgstr " (%d) RSA (��̾�Τ�)\n" #: g10/keygen.c:786 -#, fuzzy, c-format +#, c-format msgid " (%d) RSA (encrypt only)\n" -msgstr " (%d) ElGamal (�Ź沽�Τ�)\n" +msgstr " (%d) RSA (�Ź沽�Τ�)\n" -#: g10/keyedit.c:516 g10/keygen.c:789 +#: g10/keyedit.c:508 g10/keygen.c:789 msgid "Your selection? " msgstr "�ɤ�ˤ��ޤ���? " @@ -1521,7 +1489,7 @@ msgstr "�ɤ�ˤ��ޤ���? " msgid "The use of this algorithm is deprecated - create anyway? " msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? " -#: g10/keyedit.c:529 g10/keygen.c:823 +#: g10/keyedit.c:521 g10/keygen.c:823 msgid "Invalid selection.\n" msgstr "̵��������Ǥ���\n" @@ -1614,7 +1582,6 @@ msgstr "" " <n>y = ͭ������ n ǯ��\n" #: g10/keygen.c:951 -#, fuzzy msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1623,7 +1590,7 @@ msgid "" " <n>m = signature expires in n months\n" " <n>y = signature expires in n years\n" msgstr "" -"���δ��¤���Ƥ���������\n" +"��̾�δ��¤���Ƥ���������\n" " 0 = ̵����\n" " <n> = ͭ������ n ����\n" " <n>w = ͭ������ n ����\n" @@ -1635,24 +1602,23 @@ msgid "Key is valid for? (0) " msgstr "����ͭ�����֤�? (0)" #: g10/keygen.c:975 -#, fuzzy msgid "Signature is valid for? (0) " -msgstr "����ͭ�����֤�? (0)" +msgstr "��̾��ͭ�����֤�? (0)" #: g10/keygen.c:980 msgid "invalid value\n" msgstr "̵������\n" #: g10/keygen.c:985 -#, fuzzy, c-format +#, c-format msgid "%s does not expire at all\n" -msgstr "����̵���¤Ǥ�\n" +msgstr "%s��̵���¤Ǥ�\n" #. print the date when the key expires #: g10/keygen.c:992 -#, fuzzy, c-format +#, c-format msgid "%s expires at %s\n" -msgstr "����%s�ˤƴ����ڤ�ˤʤ�ޤ�\n" +msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n" #: g10/keygen.c:998 msgid "" @@ -1758,15 +1724,14 @@ msgstr "" "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n" "\n" -#: g10/keyedit.c:701 g10/keygen.c:1218 -#, fuzzy +#: g10/keyedit.c:696 g10/keygen.c:1218 msgid "passphrase not correctly repeated; try again" -msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n" +msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ������Ϥ��Ƥ�������" #: g10/keygen.c:1219 #, c-format msgid "%s.\n" -msgstr "" +msgstr "%s.\n" #: g10/keygen.c:1225 msgid "" @@ -1810,35 +1775,34 @@ msgid "writing secret key to `%s'\n" msgstr "`%s'����̩������ߤޤ�\n" #: g10/keygen.c:1952 -#, fuzzy, c-format +#, c-format msgid "no writable public keyring found: %s\n" -msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n" +msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n" #: g10/keygen.c:1958 -#, fuzzy, c-format +#, c-format msgid "no writable secret keyring found: %s\n" -msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n" +msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n" #: g10/keygen.c:1972 -#, fuzzy, c-format +#, c-format msgid "error writing public keyring `%s': %s\n" -msgstr "����`%s'�ν���ߥ��顼: %s\n" +msgstr "��������`%s'�ν���ߥ��顼: %s\n" #: g10/keygen.c:1979 -#, fuzzy, c-format +#, c-format msgid "error writing secret keyring `%s': %s\n" -msgstr "����`%s'�ν���ߥ��顼: %s\n" +msgstr "��̩����`%s'�ν���ߥ��顼: %s\n" #: g10/keygen.c:1999 msgid "public and secret key created and signed.\n" msgstr "����������̩�����ꡢ��̾���ޤ�����\n" #: g10/keygen.c:2000 -#, fuzzy msgid "key marked as ultimately trusted.\n" -msgstr "����Ū�˿��Ѥ������ؤξ�����:\n" +msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n" -#: g10/keygen.c:2011 +#: g10/keygen.c:2009 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1846,39 +1810,39 @@ msgstr "" "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n" "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n" -#: g10/keygen.c:2023 g10/keygen.c:2131 +#: g10/keygen.c:2021 g10/keygen.c:2127 #, c-format msgid "Key generation failed: %s\n" msgstr "���������˼��Ԥ��ޤ���: %s\n" -#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228 +#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n" -#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230 +#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n" -#: g10/keygen.c:2078 +#: g10/keygen.c:2076 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n" -#: g10/keygen.c:2107 +#: g10/keygen.c:2103 msgid "Really create? " msgstr "�����˺��ޤ���? " #: g10/decrypt.c:92 g10/encode.c:590 msgid "--output doesn't work for this command\n" -msgstr "" +msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n" #: g10/encode.c:92 g10/encode.c:296 -#, fuzzy, c-format +#, c-format msgid "`%s' already compressed\n" -msgstr "%lu����������ޤ���\n" +msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n" #: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 #: g10/tdbio.c:552 @@ -1898,7 +1862,7 @@ msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n" #: g10/encode.c:285 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n" #: g10/encode.c:313 #, c-format @@ -1908,7 +1872,7 @@ msgstr "`%s'�����ɤ߹��ߤޤ�\n" #: g10/encode.c:347 msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" -msgstr "" +msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n" #: g10/encode.c:563 #, c-format @@ -1916,14 +1880,14 @@ msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s�Ź沽 ������: %s\n" #: g10/delkey.c:69 g10/export.c:141 -#, fuzzy, c-format +#, c-format msgid "key `%s' not found: %s\n" -msgstr "�桼����'%s'�����Ĥ���ޤ���: %s\n" +msgstr "��`%s'�����Ĥ���ޤ���: %s\n" #: g10/delkey.c:77 g10/export.c:161 -#, fuzzy, c-format +#, c-format msgid "error reading keyblock: %s\n" -msgstr "`%s'���ɹ��ߥ��顼: %s\n" +msgstr "���֥��å����ɹ��ߥ��顼: %s\n" #: g10/export.c:169 #, c-format @@ -1936,11 +1900,11 @@ msgid "key %08lX: not protected - skipped\n" msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n" #: g10/export.c:188 -#, fuzzy, c-format +#, c-format msgid "key %08lX: PGP 2.x style key - skipped\n" -msgstr "�� %08lX: ���������Ǥ� - �����å�\n" +msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n" -#: g10/export.c:255 +#: g10/export.c:254 msgid "WARNING: nothing exported\n" msgstr "�ٹ�: ����Ф��Ƥ��ޤ���\n" @@ -1950,21 +1914,21 @@ msgstr "pk����å���Υ���ȥ��¿�����ޤ� - ���Ѷػ�\n" #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:187 g10/getkey.c:2272 +#: g10/getkey.c:187 g10/getkey.c:2271 msgid "[User id not found]" msgstr "[�桼����id�����Ĥ���ޤ���]" #: g10/getkey.c:1360 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" -msgstr "" +msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n" -#: g10/getkey.c:1989 +#: g10/getkey.c:1988 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n" -#: g10/getkey.c:2036 +#: g10/getkey.c:2035 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n" @@ -2044,15 +2008,15 @@ msgstr " ��̩�����ɹ���: %lu\n" msgid " secret keys unchanged: %lu\n" msgstr " ̵�ѹ�����̩��: %lu\n" -#: g10/import.c:438 g10/import.c:657 +#: g10/import.c:438 g10/import.c:654 #, c-format msgid "key %08lX: no user ID\n" msgstr "��%08lX: �桼����ID������ޤ���\n" #: g10/import.c:455 -#, fuzzy, c-format +#, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" -msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '" +msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n" #: g10/import.c:462 #, c-format @@ -2063,158 +2027,158 @@ msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n" msgid "this may be caused by a missing self-signature\n" msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n" -#: g10/import.c:474 g10/import.c:726 +#: g10/import.c:475 g10/import.c:723 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n" -#: g10/import.c:479 +#: g10/import.c:480 #, c-format msgid "key %08lX: new key - skipped\n" msgstr "�� %08lX: ���������Ǥ� - �����å�\n" -#: g10/import.c:489 -#, fuzzy, c-format +#: g10/import.c:490 +#, c-format msgid "no writable keyring found: %s\n" -msgstr "����`%s'�ν���ߥ��顼: %s\n" +msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n" -#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817 +#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817 #, c-format msgid "writing to `%s'\n" msgstr "`%s'�ؤν�Ф�\n" -#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786 +#: g10/import.c:498 g10/import.c:569 g10/import.c:674 g10/import.c:783 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "����`%s'�ν���ߥ��顼: %s\n" -#: g10/import.c:505 +#: g10/import.c:503 #, c-format msgid "key %08lX: public key imported\n" msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n" -#: g10/import.c:524 +#: g10/import.c:522 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n" -#: g10/import.c:542 g10/import.c:743 +#: g10/import.c:540 g10/import.c:740 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n" -#: g10/import.c:549 g10/import.c:749 +#: g10/import.c:547 g10/import.c:746 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n" -#: g10/import.c:579 +#: g10/import.c:574 #, c-format msgid "key %08lX: 1 new user ID\n" msgstr "��%08lX: �������桼����ID��1��\n" -#: g10/import.c:582 +#: g10/import.c:577 #, c-format msgid "key %08lX: %d new user IDs\n" msgstr "��%08lX: �������桼����ID��%d��\n" -#: g10/import.c:585 +#: g10/import.c:580 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "��%08lX: ��������̾��1��\n" -#: g10/import.c:588 +#: g10/import.c:583 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "��%08lX: ��������̾��%d��\n" -#: g10/import.c:591 +#: g10/import.c:586 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "��%08lX: ������������1��\n" -#: g10/import.c:594 +#: g10/import.c:589 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "��%08lX: ������������%d��\n" -#: g10/import.c:604 +#: g10/import.c:599 #, c-format msgid "key %08lX: not changed\n" msgstr "��%08lX: �ѹ��ʤ�\n" -#: g10/import.c:671 -#, fuzzy, c-format +#: g10/import.c:668 +#, c-format msgid "no default secret keyring: %s\n" -msgstr "����θ������ؤ�����ޤ���\n" +msgstr "�������̩���ؤ�����ޤ���: %s\n" -#: g10/import.c:682 +#: g10/import.c:679 #, c-format msgid "key %08lX: secret key imported\n" msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n" #. we can't merge secret keys -#: g10/import.c:686 +#: g10/import.c:683 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n" -#: g10/import.c:691 +#: g10/import.c:688 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n" -#: g10/import.c:720 +#: g10/import.c:717 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n" -#: g10/import.c:760 +#: g10/import.c:757 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "��%08lX: ̵�����˴�������: %s - ����\n" -#: g10/import.c:791 +#: g10/import.c:788 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n" -#: g10/import.c:826 +#: g10/import.c:823 #, c-format msgid "key %08lX: no user ID for signature\n" msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n" -#: g10/import.c:839 -#, fuzzy, c-format +#: g10/import.c:836 +#, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" -msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n" +msgstr "��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n" -#: g10/import.c:841 -#, fuzzy, c-format +#: g10/import.c:838 +#, c-format msgid "key %08lX: invalid self-signature on user id \"%s\"\n" -msgstr "��%08lX: ̵���ʼ��ʽ�̾�Ǥ�\n" +msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n" -#: g10/import.c:858 +#: g10/import.c:855 #, c-format msgid "key %08lX: no subkey for key binding\n" msgstr "��%08lX: �����б���������������ޤ���\n" -#: g10/import.c:868 +#: g10/import.c:865 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n" -#: g10/import.c:869 +#: g10/import.c:866 #, c-format msgid "key %08lX: invalid subkey binding\n" msgstr "��%08lX: ̵�����������б��Ǥ�\n" -#: g10/import.c:899 +#: g10/import.c:896 #, c-format msgid "key %08lX: skipped user ID '" msgstr "��%08lX: �����åפ����桼����ID '" -#: g10/import.c:922 +#: g10/import.c:919 #, c-format msgid "key %08lX: skipped subkey\n" msgstr "��%08lX: �����åפ�������\n" @@ -2223,252 +2187,248 @@ msgstr "��%08lX: �����åפ�������\n" #. * to import non-exportable signature when we have the #. * the secret key used to create this signature - it #. * seems that this makes sense -#: g10/import.c:945 +#: g10/import.c:942 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n" -#: g10/import.c:954 +#: g10/import.c:951 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "��%08lX: �˴��������ä����ꤵ��Ƥ��ޤ� - �����å�\n" -#: g10/import.c:971 +#: g10/import.c:968 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n" -#: g10/import.c:1072 +#: g10/import.c:1069 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n" -#: g10/import.c:1131 +#: g10/import.c:1128 #, c-format msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n" -msgstr "" +msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n" -#: g10/import.c:1145 +#: g10/import.c:1142 #, c-format msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n" -msgstr "" +msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n" -#: g10/import.c:1201 +#: g10/import.c:1198 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "��%08lX: �˴���������ɲ�\n" -#: g10/import.c:1231 -#, fuzzy, c-format +#: g10/import.c:1228 +#, c-format msgid "key %08lX: direct key signature added\n" -msgstr "��%08lX: ��������̾��%d��\n" +msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n" -#: g10/keyedit.c:142 +#: g10/keyedit.c:140 msgid "[revocation]" msgstr "[�˴�]" -#: g10/keyedit.c:143 +#: g10/keyedit.c:141 msgid "[self-signature]" msgstr "[���ʽ�̾]" -#: g10/keyedit.c:214 g10/keylist.c:139 +#: g10/keyedit.c:212 msgid "1 bad signature\n" msgstr "̵���ʽ�̾1��\n" -#: g10/keyedit.c:216 g10/keylist.c:141 +#: g10/keyedit.c:214 #, c-format msgid "%d bad signatures\n" msgstr "̵���ʽ�̾%d��\n" -#: g10/keyedit.c:218 g10/keylist.c:143 +#: g10/keyedit.c:216 msgid "1 signature not checked due to a missing key\n" msgstr "�����ʤ�����1�Ĥν�̾�ڤ��ޤ���\n" -#: g10/keyedit.c:220 g10/keylist.c:145 +#: g10/keyedit.c:218 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "�����ʤ�����%d�Ĥν�̾�ڤ��ޤ���\n" -#: g10/keyedit.c:222 g10/keylist.c:147 +#: g10/keyedit.c:220 msgid "1 signature not checked due to an error\n" msgstr "���顼�Τ���1�Ĥν�̾�ڤ��ޤ���\n" -#: g10/keyedit.c:224 g10/keylist.c:149 +#: g10/keyedit.c:222 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "���顼�Τ���%d�Ĥν�̾�ڤ��ޤ���\n" -#: g10/keyedit.c:226 +#: g10/keyedit.c:224 msgid "1 user ID without valid self-signature detected\n" msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n" -#: g10/keyedit.c:228 +#: g10/keyedit.c:226 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n" -#: g10/keyedit.c:335 -#, fuzzy, c-format +#: g10/keyedit.c:333 +#, c-format msgid "User ID \"%s\" is revoked." -msgstr "�����ݸ��Ƥ��ޤ���\n" +msgstr "�桼����ID \"%s\" ���˴�����Ƥ��ޤ���" -#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053 -#, fuzzy +#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048 msgid "Are you sure you still want to sign it? (y/N) " -msgstr "���θ�Ĺ�������ˤ����Ǥ���? " +msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) " -#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059 +#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054 msgid " Unable to sign.\n" -msgstr "" +msgstr " ��̾��ǽ��\n" #. It's a local sig, and we want to make a #. exportable sig. -#: g10/keyedit.c:364 +#: g10/keyedit.c:362 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" +"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n" +"������̾�Ǥ���\n" -#: g10/keyedit.c:368 +#: g10/keyedit.c:366 msgid "Do you want to promote it to a full exportable signature? (y/N) " -msgstr "" +msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) " -#: g10/keyedit.c:388 -#, fuzzy, c-format +#: g10/keyedit.c:386 +#, c-format msgid "\"%s\" was already locally signed by key %08lX\n" -msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n" +msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n" -#: g10/keyedit.c:393 -#, fuzzy, c-format +#: g10/keyedit.c:391 +#, c-format msgid "\"%s\" was already signed by key %08lX\n" -msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n" +msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n" -#: g10/keyedit.c:405 +#: g10/keyedit.c:403 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n" -#: g10/keyedit.c:420 -#, fuzzy +#: g10/keyedit.c:418 msgid "This key has expired!" -msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n" +msgstr "���θ��ϴ����ڤ�Ǥ�!" -#: g10/keyedit.c:440 -#, fuzzy, c-format +#: g10/keyedit.c:436 +#, c-format msgid "This key is due to expire on %s.\n" -msgstr "���θ����ݸ��Ƥ��ޤ���\n" +msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n" -#: g10/keyedit.c:444 -msgid "Do you want your signature to expire at the same time? (Y/n) " -msgstr "" +#: g10/keyedit.c:440 +msgid "Do you want your signature to expire at the same time? (y/N) " +msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (y/N) " -#: g10/keyedit.c:477 +#: g10/keyedit.c:469 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ʤ����⤷��ޤ���\n" -#: g10/keyedit.c:479 +#: g10/keyedit.c:471 msgid "This would make the key unusable in PGP 2.x.\n" -msgstr "" +msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n" -#: g10/keyedit.c:500 +#: g10/keyedit.c:492 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" +"��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n" +"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ����\"0\"�����Ϥ��Ƥ���������\n" -#: g10/keyedit.c:504 +#: g10/keyedit.c:496 #, c-format msgid " (0) I will not answer.%s\n" -msgstr "" +msgstr " (0) �����ޤ���%s\n" -#: g10/keyedit.c:506 +#: g10/keyedit.c:498 #, c-format msgid " (1) I have not checked at all.%s\n" -msgstr "" +msgstr " (1) ��������ǧ���Ƥ��ޤ���%s\n" -#: g10/keyedit.c:508 +#: g10/keyedit.c:500 #, c-format msgid " (2) I have done casual checking.%s\n" -msgstr "" +msgstr " (2) �������ǧ���ޤ�����%s\n" -#: g10/keyedit.c:510 +#: g10/keyedit.c:502 #, c-format msgid " (3) I have done very careful checking.%s\n" -msgstr "" +msgstr " (3) ���ʤ����դ��Ƴ�ǧ���ޤ�����%s\n" -#: g10/keyedit.c:535 +#: g10/keyedit.c:527 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \"" -#: g10/keyedit.c:544 -#, fuzzy +#: g10/keyedit.c:536 msgid "" "\n" "The signature will be marked as non-exportable.\n" -msgstr "" -"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n" -"\n" +msgstr "\n��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n" -#: g10/keyedit.c:548 -#, fuzzy +#: g10/keyedit.c:540 msgid "" "\n" "The signature will be marked as non-revocable.\n" -msgstr "" -"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n" -"\n" +msgstr "\n��̾���˴��ԲĤ����ꤵ��ޤ���\n" -#: g10/keyedit.c:553 +#: g10/keyedit.c:545 msgid "" "\n" "I have not checked this key at all.\n" -msgstr "" +msgstr "\n���θ�����������ǧ���Ƥ��ޤ���\n" -#: g10/keyedit.c:557 +#: g10/keyedit.c:549 msgid "" "\n" "I have checked this key casually.\n" -msgstr "" +msgstr "\n���θ��ϰ������ǧ���ޤ�����\n" -#: g10/keyedit.c:561 +#: g10/keyedit.c:553 msgid "" "\n" "I have checked this key very carefully.\n" -msgstr "" +msgstr "\n���θ��ϡ����ʤ����դ��Ƴ�ǧ���ޤ�����\n" -#: g10/keyedit.c:569 +#: g10/keyedit.c:561 msgid "Really sign? " msgstr "�����˽�̾���ޤ���? " -#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279 +#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279 #, c-format msgid "signing failed: %s\n" msgstr "��̾�˼��Ԥ��ޤ���: %s\n" -#: g10/keyedit.c:658 +#: g10/keyedit.c:653 msgid "This key is not protected.\n" msgstr "���θ����ݸ��Ƥ��ޤ���\n" -#: g10/keyedit.c:662 +#: g10/keyedit.c:657 msgid "Secret parts of primary key are not available.\n" msgstr "�縰����̩��ʬ�������ޤ���\n" -#: g10/keyedit.c:666 +#: g10/keyedit.c:661 msgid "Key is protected.\n" msgstr "�����ݸ��Ƥ��ޤ���\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:681 #, c-format msgid "Can't edit this key: %s\n" msgstr "���θ����Խ��Ǥ��ޤ���: %s\n" -#: g10/keyedit.c:692 +#: g10/keyedit.c:687 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2476,7 +2436,7 @@ msgstr "" "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n" "\n" -#: g10/keyedit.c:706 +#: g10/keyedit.c:701 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2485,564 +2445,554 @@ msgstr "" "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n" "\n" -#: g10/keyedit.c:709 +#: g10/keyedit.c:704 msgid "Do you really want to do this? " msgstr "�����˼¹Ԥ��ޤ���? " -#: g10/keyedit.c:773 +#: g10/keyedit.c:768 msgid "moving a key signature to the correct place\n" msgstr "���ν�̾�����������˰�ư���ޤ�\n" -#: g10/keyedit.c:815 +#: g10/keyedit.c:810 msgid "quit this menu" msgstr "���Υ�˥塼��λ" -#: g10/keyedit.c:816 +#: g10/keyedit.c:811 msgid "q" msgstr "q" -#: g10/keyedit.c:817 +#: g10/keyedit.c:812 msgid "save" msgstr "save" -#: g10/keyedit.c:817 +#: g10/keyedit.c:812 msgid "save and quit" msgstr "��¸���ƽ�λ" -#: g10/keyedit.c:818 +#: g10/keyedit.c:813 msgid "help" msgstr "help" -#: g10/keyedit.c:818 +#: g10/keyedit.c:813 msgid "show this help" msgstr "���Υإ�פ�" -#: g10/keyedit.c:820 +#: g10/keyedit.c:815 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:820 +#: g10/keyedit.c:815 msgid "show fingerprint" msgstr "�����" -#: g10/keyedit.c:821 +#: g10/keyedit.c:816 msgid "list" msgstr "list" -#: g10/keyedit.c:821 +#: g10/keyedit.c:816 msgid "list key and user IDs" msgstr "���ȥ桼����ID�ΰ���" -#: g10/keyedit.c:822 +#: g10/keyedit.c:817 msgid "l" msgstr "l" -#: g10/keyedit.c:823 +#: g10/keyedit.c:818 msgid "uid" msgstr "uid" -#: g10/keyedit.c:823 +#: g10/keyedit.c:818 msgid "select user ID N" msgstr "�桼����ID N������" -#: g10/keyedit.c:824 +#: g10/keyedit.c:819 msgid "key" msgstr "key" -#: g10/keyedit.c:824 +#: g10/keyedit.c:819 msgid "select secondary key N" msgstr "����N������" -#: g10/keyedit.c:825 +#: g10/keyedit.c:820 msgid "check" msgstr "check" -#: g10/keyedit.c:825 +#: g10/keyedit.c:820 msgid "list signatures" msgstr "��̾�ΰ���" -#: g10/keyedit.c:826 +#: g10/keyedit.c:821 msgid "c" msgstr "c" -#: g10/keyedit.c:827 +#: g10/keyedit.c:822 msgid "sign" msgstr "sign" -#: g10/keyedit.c:827 +#: g10/keyedit.c:822 msgid "sign the key" msgstr "���ؽ�̾" -#: g10/keyedit.c:828 +#: g10/keyedit.c:823 msgid "s" msgstr "s" -#: g10/keyedit.c:829 +#: g10/keyedit.c:824 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:829 +#: g10/keyedit.c:824 msgid "sign the key locally" msgstr "��������Ū�˽�̾" -#: g10/keyedit.c:830 -#, fuzzy +#: g10/keyedit.c:825 msgid "nrsign" -msgstr "sign" +msgstr "nrsign" -#: g10/keyedit.c:830 -#, fuzzy +#: g10/keyedit.c:825 msgid "sign the key non-revocably" -msgstr "��������Ū�˽�̾" +msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾" -#: g10/keyedit.c:831 -#, fuzzy +#: g10/keyedit.c:826 msgid "nrlsign" -msgstr "lsign" +msgstr "nrlsign" -#: g10/keyedit.c:831 -#, fuzzy +#: g10/keyedit.c:826 msgid "sign the key locally and non-revocably" -msgstr "��������Ū�˽�̾" +msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾" -#: g10/keyedit.c:832 +#: g10/keyedit.c:827 msgid "debug" msgstr "debug" -#: g10/keyedit.c:833 +#: g10/keyedit.c:828 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:833 +#: g10/keyedit.c:828 msgid "add a user ID" msgstr "�桼����ID���ɲ�" -#: g10/keyedit.c:834 +#: g10/keyedit.c:829 msgid "addphoto" -msgstr "" +msgstr "addphoto" -#: g10/keyedit.c:834 -#, fuzzy +#: g10/keyedit.c:829 msgid "add a photo ID" -msgstr "�桼����ID���ɲ�" +msgstr "�ե���ID���ɲ�" -#: g10/keyedit.c:835 +#: g10/keyedit.c:830 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:835 +#: g10/keyedit.c:830 msgid "delete user ID" msgstr "�桼����ID�κ��" #. delphoto is really deluid in disguise -#: g10/keyedit.c:837 +#: g10/keyedit.c:832 msgid "delphoto" -msgstr "" +msgstr "delphoto" -#: g10/keyedit.c:838 +#: g10/keyedit.c:833 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:838 +#: g10/keyedit.c:833 msgid "add a secondary key" msgstr "�������ɲ�" -#: g10/keyedit.c:839 +#: g10/keyedit.c:834 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:839 +#: g10/keyedit.c:834 msgid "delete a secondary key" msgstr "�����κ��" -#: g10/keyedit.c:840 +#: g10/keyedit.c:835 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:840 +#: g10/keyedit.c:835 msgid "delete signatures" msgstr "��̾�κ��" -#: g10/keyedit.c:841 +#: g10/keyedit.c:836 msgid "expire" msgstr "expire" -#: g10/keyedit.c:841 +#: g10/keyedit.c:836 msgid "change the expire date" msgstr "ͭ�����¤��ѹ�" -#: g10/keyedit.c:842 +#: g10/keyedit.c:837 msgid "primary" -msgstr "" +msgstr "primary" -#: g10/keyedit.c:842 +#: g10/keyedit.c:837 msgid "flag user ID as primary" -msgstr "" +msgstr "�桼����ID���ˤ���" -#: g10/keyedit.c:843 +#: g10/keyedit.c:838 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:843 +#: g10/keyedit.c:838 msgid "toggle between secret and public key listing" msgstr "��̩���ȸ������ΰ��������ؤ�" -#: g10/keyedit.c:845 +#: g10/keyedit.c:840 msgid "t" msgstr "t" -#: g10/keyedit.c:846 +#: g10/keyedit.c:841 msgid "pref" msgstr "pref" -#: g10/keyedit.c:846 -#, fuzzy +#: g10/keyedit.c:841 msgid "list preferences (expert)" -msgstr "ͥ���̤ΰ���" +msgstr "�����ΰ��� (�������ѡ���)" -#: g10/keyedit.c:847 +#: g10/keyedit.c:842 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:847 -#, fuzzy +#: g10/keyedit.c:842 msgid "list preferences (verbose)" -msgstr "ͥ���̤ΰ���" +msgstr "�����ΰ��� (��Ĺ)" -#: g10/keyedit.c:848 -#, fuzzy +#: g10/keyedit.c:843 msgid "setpref" -msgstr "pref" +msgstr "setpref" -#: g10/keyedit.c:848 -#, fuzzy +#: g10/keyedit.c:843 msgid "set preference list" -msgstr "ͥ���̤ΰ���" +msgstr "�����ΰ���������" -#: g10/keyedit.c:849 -#, fuzzy +#: g10/keyedit.c:844 msgid "updpref" -msgstr "pref" +msgstr "updpref" -#: g10/keyedit.c:849 -#, fuzzy +#: g10/keyedit.c:844 msgid "updated preferences" -msgstr "ͥ���̤ΰ���" +msgstr "�����ΰ�����" -#: g10/keyedit.c:850 +#: g10/keyedit.c:845 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:850 +#: g10/keyedit.c:845 msgid "change the passphrase" msgstr "�ѥ��ե졼�����ѹ�" -#: g10/keyedit.c:851 +#: g10/keyedit.c:846 msgid "trust" msgstr "trust" -#: g10/keyedit.c:851 +#: g10/keyedit.c:846 msgid "change the ownertrust" msgstr "��ͭ�Կ��Ѥ��ѹ�" -#: g10/keyedit.c:852 +#: g10/keyedit.c:847 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:852 +#: g10/keyedit.c:847 msgid "revoke signatures" msgstr "��̾���˴�" -#: g10/keyedit.c:853 +#: g10/keyedit.c:848 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:853 +#: g10/keyedit.c:848 msgid "revoke a secondary key" msgstr "�������˴�" -#: g10/keyedit.c:854 +#: g10/keyedit.c:849 msgid "disable" msgstr "disable" -#: g10/keyedit.c:854 +#: g10/keyedit.c:849 msgid "disable a key" msgstr "���λ��Ѥ�ػߤ���" -#: g10/keyedit.c:855 +#: g10/keyedit.c:850 msgid "enable" msgstr "enable" -#: g10/keyedit.c:855 +#: g10/keyedit.c:850 msgid "enable a key" msgstr "���λ��Ѥ���Ĥ���" -#: g10/keyedit.c:856 +#: g10/keyedit.c:851 msgid "showphoto" -msgstr "" +msgstr "showphoto" -#: g10/keyedit.c:856 +#: g10/keyedit.c:851 msgid "show photo ID" -msgstr "" +msgstr "�ե���ID��ɽ��" -#: g10/delkey.c:112 g10/keyedit.c:876 +#: g10/delkey.c:112 g10/keyedit.c:871 msgid "can't do that in batchmode\n" msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n" -#: g10/keyedit.c:913 -#, fuzzy, c-format +#: g10/keyedit.c:908 +#, c-format msgid "error reading secret keyblock `%s': %s\n" -msgstr "`%s'���ɹ��ߥ��顼: %s\n" +msgstr "��̩���֥��å�`%s'���ɹ��ߥ��顼: %s\n" -#: g10/keyedit.c:931 +#: g10/keyedit.c:926 msgid "Secret key is available.\n" msgstr "��̩�������ѤǤ��ޤ���\n" -#: g10/keyedit.c:962 +#: g10/keyedit.c:957 msgid "Command> " msgstr "���ޥ��> " -#: g10/keyedit.c:994 +#: g10/keyedit.c:989 msgid "Need the secret key to do this.\n" msgstr "���μ¹Ԥˤ���̩��������ޤ���\n" -#: g10/keyedit.c:998 +#: g10/keyedit.c:993 msgid "Please use the command \"toggle\" first.\n" msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n" -#: g10/keyedit.c:1047 -#, fuzzy +#: g10/keyedit.c:1042 msgid "Key is revoked." -msgstr "�����ݸ��Ƥ��ޤ���\n" +msgstr "�����˴�����Ƥ��ޤ���" -#: g10/keyedit.c:1066 +#: g10/keyedit.c:1061 msgid "Really sign all user IDs? " msgstr "���������桼����ID�˽�̾���ޤ���? " -#: g10/keyedit.c:1067 +#: g10/keyedit.c:1062 msgid "Hint: Select the user IDs to sign\n" msgstr "����: �ޤ���̾����桼����ID�����ޤ�\n" -#: g10/keyedit.c:1092 +#: g10/keyedit.c:1087 #, c-format msgid "This command is not allowed while in %s mode.\n" -msgstr "" +msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n" -#: g10/keyedit.c:1112 g10/keyedit.c:1133 +#: g10/keyedit.c:1107 g10/keyedit.c:1128 msgid "You must select at least one user ID.\n" msgstr "�桼����ID�ʤ��Ȥ�ҤȤ����Ƥ���������\n" -#: g10/keyedit.c:1114 +#: g10/keyedit.c:1109 msgid "You can't delete the last user ID!\n" msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n" -#: g10/keyedit.c:1117 +#: g10/keyedit.c:1112 msgid "Really remove all selected user IDs? " msgstr "�������桼����ID�������˺�����ޤ���? " -#: g10/keyedit.c:1118 +#: g10/keyedit.c:1113 msgid "Really remove this user ID? " msgstr "���Υ桼����ID�������˺�����ޤ���? " -#: g10/keyedit.c:1156 g10/keyedit.c:1178 +#: g10/keyedit.c:1151 g10/keyedit.c:1173 msgid "You must select at least one key.\n" msgstr "���ʤ��Ȥ�ҤȤ����Ƥ���������\n" -#: g10/keyedit.c:1160 +#: g10/keyedit.c:1155 msgid "Do you really want to delete the selected keys? " msgstr "�������������˺�����ޤ���? " -#: g10/keyedit.c:1161 +#: g10/keyedit.c:1156 msgid "Do you really want to delete this key? " msgstr "���θ��������˺�����ޤ���? " -#: g10/keyedit.c:1182 +#: g10/keyedit.c:1177 msgid "Do you really want to revoke the selected keys? " msgstr "���������������˴����ޤ���? " -#: g10/keyedit.c:1183 +#: g10/keyedit.c:1178 msgid "Do you really want to revoke this key? " msgstr "���θ����������˴����ޤ���? " -#: g10/keyedit.c:1252 -#, fuzzy +#: g10/keyedit.c:1244 msgid "Really update the preferences for the selected user IDs? " -msgstr "�������桼����ID�������˺�����ޤ���? " +msgstr "�����桼����ID�������������˹������ޤ���? " -#: g10/keyedit.c:1254 -#, fuzzy +#: g10/keyedit.c:1246 msgid "Really update the preferences? " -msgstr "�˴�������������˺��ޤ���? (y/N)" +msgstr "�����������˹������ޤ���? " -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1284 msgid "Save changes? " msgstr "�ѹ�����¸���ޤ���? " -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1287 msgid "Quit without saving? " msgstr "��¸�����˽�λ���ޤ���? " -#: g10/keyedit.c:1306 +#: g10/keyedit.c:1298 #, c-format msgid "update failed: %s\n" msgstr "�����˼��Ԥ��ޤ���: %s\n" -#: g10/keyedit.c:1313 +#: g10/keyedit.c:1305 #, c-format msgid "update secret failed: %s\n" msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n" -#: g10/keyedit.c:1320 +#: g10/keyedit.c:1312 msgid "Key not changed so no update needed.\n" msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n" -#: g10/keyedit.c:1332 +#: g10/keyedit.c:1323 msgid "Invalid command (try \"help\")\n" msgstr "̵���ʥ��ޥ�� (��help�פ�)\n" -#: g10/keyedit.c:1489 -#, fuzzy, c-format +#: g10/keyedit.c:1480 +#, c-format msgid "This key may be revoked by %s key %s%s\n" -msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n" +msgstr "���θ���%s��%s%s�ˤ�ä��˴����줿�褦�Ǥ�\n" -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1483 msgid " (sensitive)" -msgstr "" +msgstr " (�ǥꥱ����)" -#: g10/keyedit.c:1497 g10/keyedit.c:1523 +#: g10/keyedit.c:1488 g10/keyedit.c:1514 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX ����: %s ����: %s" -#: g10/keyedit.c:1506 +#: g10/keyedit.c:1497 #, c-format msgid " trust: %c/%c" msgstr " trust: %c/%c" -#: g10/keyedit.c:1510 +#: g10/keyedit.c:1501 msgid "This key has been disabled" msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�" -#: g10/keyedit.c:1539 +#: g10/keyedit.c:1530 #, c-format msgid "rev! subkey has been revoked: %s\n" msgstr "rev! �������˴��ѤߤǤ�: %s\n" -#: g10/keyedit.c:1542 +#: g10/keyedit.c:1533 msgid "rev- faked revocation found\n" msgstr "rev- �Ǥä��������˴���ȯ��\n" -#: g10/keyedit.c:1544 +#: g10/keyedit.c:1535 #, c-format msgid "rev? problem checking revocation: %s\n" msgstr "rev? �˴���ǧ�㳲: %s\n" -#: g10/keyedit.c:1574 +#: g10/keyedit.c:1565 msgid "" "Please note that the shown key validity is not necessary correct\n" "unless you restart the program.\n" msgstr "" +"�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n" +"�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n" -#: g10/keyedit.c:1660 +#: g10/keyedit.c:1651 msgid "" "WARNING: This key already has a photo ID.\n" " Adding another photo ID may confuse some versions of PGP.\n" msgstr "" +"�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n" +" �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n" -#: g10/keyedit.c:1664 g10/keyedit.c:1691 -#, fuzzy +#: g10/keyedit.c:1655 g10/keyedit.c:1682 msgid "Are you sure you still want to add it? (y/N) " -msgstr "���θ�Ĺ�������ˤ����Ǥ���? " +msgstr "����Ǥ��ɲä������Ǥ���? (y/N) " -#: g10/keyedit.c:1672 +#: g10/keyedit.c:1663 msgid "You may only have one photo ID on a key.\n" -msgstr "" +msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n" -#: g10/keyedit.c:1686 +#: g10/keyedit.c:1677 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" +"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n" +" ���θ�����ݤ��뤫�⤷��ޤ���\n" -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1688 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "" +msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n" -#: g10/keyedit.c:1832 +#: g10/keyedit.c:1819 msgid "Delete this good signature? (y/N/q)" msgstr "������������̾�������ޤ���? (y/N/q)" -#: g10/keyedit.c:1842 +#: g10/keyedit.c:1823 msgid "Delete this invalid signature? (y/N/q)" msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1827 msgid "Delete this unknown signature? (y/N/q)" msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1833 msgid "Really delete this self-signature? (y/N)" msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)" -#: g10/keyedit.c:1866 +#: g10/keyedit.c:1847 #, c-format msgid "Deleted %d signature.\n" msgstr "%d�Ĥν�̾�������ޤ�����\n" -#: g10/keyedit.c:1867 +#: g10/keyedit.c:1848 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d�Ĥν�̾�������ޤ�����\n" -#: g10/keyedit.c:1870 +#: g10/keyedit.c:1851 msgid "Nothing deleted.\n" msgstr "���������Ƥ��ޤ���\n" -#: g10/keyedit.c:1943 +#: g10/keyedit.c:1920 msgid "Please remove selections from the secret keys.\n" msgstr "��̩���������Ȥ��Ƥ���������\n" -#: g10/keyedit.c:1949 +#: g10/keyedit.c:1926 msgid "Please select at most one secondary key.\n" msgstr "�⡹1�Ĥ����������Ƥ���������\n" -#: g10/keyedit.c:1953 +#: g10/keyedit.c:1930 msgid "Changing expiration time for a secondary key.\n" msgstr "������ͭ�����¤��ѹ����ޤ���\n" -#: g10/keyedit.c:1955 +#: g10/keyedit.c:1932 msgid "Changing expiration time for the primary key.\n" msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n" -#: g10/keyedit.c:1997 +#: g10/keyedit.c:1974 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n" -#: g10/keyedit.c:2013 +#: g10/keyedit.c:1990 msgid "No corresponding signature in secret ring\n" msgstr "��̩���ؤ��б������̾������ޤ���\n" -#: g10/keyedit.c:2096 -#, fuzzy +#: g10/keyedit.c:2072 msgid "Please select exactly one user ID.\n" -msgstr "�桼����ID�ʤ��Ȥ�ҤȤ����Ƥ���������\n" +msgstr "�桼����ID�ä���ҤȤ����Ƥ���������\n" -#: g10/keyedit.c:2284 +#: g10/keyedit.c:2260 #, c-format msgid "No user ID with index %d\n" msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2306 #, c-format msgid "No secondary key with index %d\n" msgstr "%d�֤������Ϥ���ޤ���\n" -#: g10/keyedit.c:2444 +#: g10/keyedit.c:2420 msgid "user ID: \"" msgstr "�桼����ID: \"" -#: g10/keyedit.c:2449 +#: g10/keyedit.c:2425 #, c-format msgid "" "\"\n" @@ -3051,117 +3001,111 @@ msgstr "" "\"\n" "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n" -#: g10/keyedit.c:2452 -#, fuzzy, c-format +#: g10/keyedit.c:2428 +#, c-format msgid "" "\"\n" "locally signed with your key %08lX at %s\n" msgstr "" "\"\n" -"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n" +"���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n" -#: g10/keyedit.c:2457 -#, fuzzy, c-format +#: g10/keyedit.c:2433 +#, c-format msgid "This signature expired on %s.\n" -msgstr "%s��̾����̾��: %s\n" +msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n" -#: g10/keyedit.c:2461 -#, fuzzy +#: g10/keyedit.c:2437 msgid "Are you sure you still want to revoke it? (y/N) " -msgstr "���θ����������˴����ޤ���? " +msgstr "����Ǥ��˴��������Ǥ���? (y/N) " -#: g10/keyedit.c:2465 -#, fuzzy +#: g10/keyedit.c:2441 msgid "Create a revocation certificate for this signature? (y/N) " -msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)" +msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) " #. FIXME: detect duplicates here -#: g10/keyedit.c:2490 +#: g10/keyedit.c:2467 msgid "You have signed these user IDs:\n" msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n" -#: g10/keyedit.c:2504 -#, fuzzy, c-format +#: g10/keyedit.c:2481 +#, c-format msgid " signed by %08lX at %s%s%s\n" -msgstr " %08lX��%s�˽�̾����Ƥ��ޤ�\n" +msgstr " %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n" -#: g10/keyedit.c:2512 +#: g10/keyedit.c:2489 #, c-format msgid " revoked by %08lX at %s\n" msgstr " %08lX��%s���˴�����Ƥ��ޤ�\n" -#: g10/keyedit.c:2532 +#: g10/keyedit.c:2509 msgid "You are about to revoke these signatures:\n" msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n" -#: g10/keyedit.c:2542 -#, fuzzy, c-format +#: g10/keyedit.c:2519 +#, c-format msgid " signed by %08lX at %s%s\n" -msgstr " %08lX��%s�˽�̾����Ƥ��ޤ�\n" +msgstr " %08lX��%s%s�˽�̾����Ƥ��ޤ�\n" -#: g10/keyedit.c:2544 +#: g10/keyedit.c:2521 msgid " (non-exportable)" -msgstr "" +msgstr " (��Ф��Բ�)" -#: g10/keyedit.c:2551 -#, fuzzy +#: g10/keyedit.c:2528 msgid "Really create the revocation certificates? (y/N) " -msgstr "�˴�������������˺��ޤ���? (y/N)" +msgstr "�˴�������������˺��ޤ���? (y/N) " -#: g10/keyedit.c:2581 +#: g10/keyedit.c:2558 msgid "no secret key\n" msgstr "��̩��������ޤ���\n" -#: g10/keyedit.c:2730 +#: g10/keyedit.c:2710 #, c-format msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" -msgstr "" +msgstr "%s����%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n" #. This isn't UTF8 as it is a URL(?) -#: g10/keylist.c:87 -#, fuzzy +#: g10/keylist.c:82 msgid "Signature policy: " -msgstr "%s��̾����̾��: %s\n" +msgstr "��̾�ݥꥷ��: " -#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730 +#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730 msgid "WARNING: invalid notation data found\n" msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n" #. This is UTF8 -#: g10/keylist.c:120 -#, fuzzy +#: g10/keylist.c:115 msgid "Signature notation: " -msgstr "����: " +msgstr "��̾����: " -#: g10/keylist.c:127 +#: g10/keylist.c:122 msgid "not human readable" -msgstr "" +msgstr "�ͤˤ��ɤ�ޤ���" -#: g10/keylist.c:216 +#: g10/keylist.c:187 msgid "Keyring" -msgstr "" +msgstr "����" #. of subkey -#: g10/keylist.c:423 g10/mainproc.c:856 +#: g10/keylist.c:387 g10/mainproc.c:856 #, c-format msgid " [expires: %s]" msgstr " [ͭ������: %s]" -#: g10/keylist.c:889 +#: g10/keylist.c:852 msgid "Fingerprint:" msgstr "����:" #. use tty #. Translators: this should fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID -#: g10/keylist.c:895 +#: g10/keylist.c:858 msgid " Fingerprint:" msgstr " ����:" -#: g10/keylist.c:899 -#, fuzzy +#: g10/keylist.c:862 msgid " Key fingerprint =" -msgstr " ����:" +msgstr " ���� =" #: g10/encr-data.c:66 g10/mainproc.c:255 #, c-format @@ -3198,14 +3142,14 @@ msgid "public key decryption failed: %s\n" msgstr "������������˼��Ԥ��ޤ���: %s\n" #: g10/mainproc.c:429 g10/mainproc.c:448 -#, fuzzy, c-format +#, c-format msgid "assuming %s encrypted data\n" -msgstr "%s�Ź沽���줿�ǡ���\n" +msgstr "%s�Ź沽���줿�ǡ�������\n" #: g10/mainproc.c:436 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" -msgstr "" +msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n" #: g10/mainproc.c:466 msgid "decryption okay\n" @@ -3260,9 +3204,8 @@ msgid "BAD signature from \"" msgstr "������ ��̾: \"" #: g10/mainproc.c:1306 g10/mainproc.c:1328 -#, fuzzy msgid "Expired signature from \"" -msgstr "��������̾: \"" +msgstr "�����ڤ�ν�̾: \"" #: g10/mainproc.c:1307 g10/mainproc.c:1329 msgid "Good signature from \"" @@ -3270,7 +3213,7 @@ msgstr "��������̾: \"" #: g10/mainproc.c:1331 msgid "[uncertain]" -msgstr "" +msgstr "[�Գ���]" #: g10/mainproc.c:1351 msgid " aka \"" @@ -3316,21 +3259,21 @@ msgstr "" #: g10/misc.c:378 #, c-format msgid "Warning: unsafe ownership on %s \"%s\"\n" -msgstr "" +msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n" #: g10/misc.c:410 #, c-format msgid "Warning: unsafe permissions on %s \"%s\"\n" -msgstr "" +msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n" #: g10/misc.c:435 msgid "the IDEA cipher plugin is not present\n" -msgstr "" +msgstr "IDEA�Ź�Υץ饰������ޤ���\n" #: g10/misc.c:436 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" -msgstr "" +msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n" #: g10/parse-packet.c:119 #, c-format @@ -3342,51 +3285,46 @@ msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n" msgid "subpacket of type %d has critical bit set\n" msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n" -#: g10/passphrase.c:442 g10/passphrase.c:489 +#: g10/passphrase.c:330 g10/passphrase.c:377 msgid "gpg-agent is not available in this session\n" msgstr "���Υ��å�����gpg����������Ȥ�̵���Ǥ�\n" -#: g10/passphrase.c:450 +#: g10/passphrase.c:338 msgid "can't set client pid for the agent\n" -msgstr "" +msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n" -#: g10/passphrase.c:458 +#: g10/passphrase.c:346 msgid "can't get server read FD for the agent\n" -msgstr "" +msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n" -#: g10/passphrase.c:465 +#: g10/passphrase.c:353 msgid "can't get server write FD for the agent\n" -msgstr "" +msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:386 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν�����������ޤ���\n" -#: g10/passphrase.c:511 -#, fuzzy, c-format +#: g10/passphrase.c:399 +#, c-format msgid "gpg-agent protocol version %d is not supported\n" -msgstr "�ݸ�르�ꥺ��%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n" +msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n" -#: g10/hkp.c:147 g10/passphrase.c:532 +#: g10/hkp.c:148 g10/passphrase.c:420 #, c-format msgid "can't connect to `%s': %s\n" msgstr "`%s'����³�Ǥ��ޤ���: %s\n" -#: g10/passphrase.c:554 +#: g10/passphrase.c:442 msgid "communication problem with gpg-agent\n" -msgstr "" - -#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919 -#, fuzzy -msgid "problem with the agent - disabling agent use\n" -msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n" +msgstr "gpg-agent�Ȥ��̿��㳲\n" -#: g10/passphrase.c:631 g10/passphrase.c:1017 +#: g10/passphrase.c:511 g10/passphrase.c:897 #, c-format msgid " (main key ID %08lX)" msgstr " (�縰ID %08lX)" -#: g10/passphrase.c:641 +#: g10/passphrase.c:521 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3397,32 +3335,36 @@ msgstr "" "\"%.*s\"\n" "%u�ӥå�%s��, ID %08lX�������դ�%s%s\n" -#: g10/passphrase.c:662 +#: g10/passphrase.c:542 msgid "Enter passphrase\n" msgstr "�ѥ��ե졼��������\n" -#: g10/passphrase.c:664 +#: g10/passphrase.c:544 msgid "Repeat passphrase\n" msgstr "�ѥ��ե졼���������\n" -#: g10/passphrase.c:705 +#: g10/passphrase.c:585 msgid "passphrase too long\n" msgstr "�ѥ��ե졼����Ĺ��ޤ�\n" -#: g10/passphrase.c:718 +#: g10/passphrase.c:598 msgid "invalid response from agent\n" msgstr "����������Ȥ����̵���ʱ���\n" -#: g10/passphrase.c:727 g10/passphrase.c:808 +#: g10/passphrase.c:607 g10/passphrase.c:688 msgid "cancelled by user\n" msgstr "�桼�����ˤ���ä�\n" -#: g10/passphrase.c:729 g10/passphrase.c:890 +#: g10/passphrase.c:609 g10/passphrase.c:770 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n" -#: g10/passphrase.c:1003 +#: g10/passphrase.c:691 g10/passphrase.c:799 +msgid "problem with the agent - disabling agent use\n" +msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n" + +#: g10/passphrase.c:883 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3432,20 +3374,20 @@ msgstr "" "���Υ桼��������̩���Υ��å���������ˤ�\n" "�ѥ��ե졼��������ޤ�: \"" -#: g10/passphrase.c:1012 +#: g10/passphrase.c:892 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s" -#: g10/passphrase.c:1063 +#: g10/passphrase.c:943 msgid "can't query password in batchmode\n" msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n" -#: g10/passphrase.c:1067 +#: g10/passphrase.c:947 msgid "Enter passphrase: " msgstr "�ѥ��ե졼��������: " -#: g10/passphrase.c:1071 +#: g10/passphrase.c:951 msgid "Repeat passphrase: " msgstr "�ѥ��ե졼���������: " @@ -3456,33 +3398,33 @@ msgstr "" "��¸����ˤϡ�--output�ץ��ץ�������Ѥ��Ƥ�������\n" #: g10/plaintext.c:108 -#, fuzzy, c-format +#, c-format msgid "error creating `%s': %s\n" -msgstr "`%s'���ɹ��ߥ��顼: %s\n" +msgstr "`%s'�κ������顼: %s\n" -#: g10/plaintext.c:337 +#: g10/plaintext.c:336 msgid "Detached signature.\n" msgstr "ʬΥ��̾��\n" -#: g10/plaintext.c:341 +#: g10/plaintext.c:340 msgid "Please enter name of data file: " msgstr "�ǡ������ե������̾��������: " -#: g10/plaintext.c:362 +#: g10/plaintext.c:361 msgid "reading stdin ...\n" msgstr "ɸ�����Ϥ���ɹ����� ...\n" -#: g10/plaintext.c:396 +#: g10/plaintext.c:395 msgid "no signed data\n" msgstr "��̾���줿�ǡ���������ޤ���\n" -#: g10/plaintext.c:404 +#: g10/plaintext.c:403 #, c-format msgid "can't open signed data `%s'\n" msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n" #: g10/pubkey-enc.c:100 -#, fuzzy, c-format +#, c-format msgid "anonymous recipient; trying secret key %08lX ...\n" msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n" @@ -3495,9 +3437,9 @@ msgid "old encoding of the DEK is not supported\n" msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n" #: g10/pubkey-enc.c:177 -#, fuzzy, c-format +#, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "�ݸ�르�ꥺ��%d��̤�Τ������ԲĤǤ�\n" +msgstr "�ݸ�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n" #: g10/pubkey-enc.c:220 #, c-format @@ -3511,58 +3453,57 @@ msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n" #. HKP does not support v3 fingerprints #: g10/hkp.c:70 -#, fuzzy, c-format +#, c-format msgid "requesting key %08lX from HKP keyserver %s\n" -msgstr "��%08lX��%s���� ...\n" +msgstr "��%08lX��HKP�������С�%s����\n" #: g10/hkp.c:94 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n" -#: g10/hkp.c:171 +#: g10/hkp.c:172 #, c-format msgid "error sending to `%s': %s\n" msgstr "`%s'�ؤ��������顼: %s\n" -#: g10/hkp.c:186 +#: g10/hkp.c:187 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "`%s'�ؤ����������� (����=%u)\n" -#: g10/hkp.c:189 +#: g10/hkp.c:190 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n" -#: g10/hkp.c:471 +#: g10/hkp.c:472 #, c-format msgid "searching for \"%s\" from HKP server %s\n" -msgstr "" +msgstr "\"%s\"��HKP�����С�%s���鸡��\n" -#: g10/hkp.c:521 -#, fuzzy, c-format +#: g10/hkp.c:522 +#, c-format msgid "can't search keyserver: %s\n" -msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n" +msgstr "�������С����Ǥ��ޤ���: %s\n" #: g10/seckey-cert.c:53 msgid "secret key parts are not available\n" msgstr "��̩��ʬ�������ޤ���\n" #: g10/seckey-cert.c:59 -#, fuzzy, c-format +#, c-format msgid "protection algorithm %d%s is not supported\n" -msgstr "�ݸ�르�ꥺ��%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n" +msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n" #: g10/seckey-cert.c:215 -#, fuzzy msgid "Invalid passphrase; please try again" -msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ������� ...\n" +msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������" #: g10/seckey-cert.c:216 #, c-format msgid "%s ...\n" -msgstr "" +msgstr "%s ...\n" #: g10/seckey-cert.c:273 msgid "WARNING: Weak key detected - please change passphrase again.\n" @@ -3570,7 +3511,7 @@ msgstr "�ٹ�: �夤���Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n" #: g10/seckey-cert.c:311 msgid "generating the deprecated 16-bit checksum for secret key protection\n" -msgstr "" +msgstr "ȿ�Ф��줿16�ӥåȤΥ����å��������̩�����ݸ������\n" #: g10/sig-check.c:205 msgid "" @@ -3602,7 +3543,7 @@ msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n" #, c-format msgid "" "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" -msgstr "" +msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n" #: g10/sign.c:274 #, c-format @@ -3621,12 +3562,12 @@ msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n" #: g10/sign.c:618 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǽ�̾�Ǥ�������Ǥ�\n" #: g10/sign.c:643 g10/sign.c:812 #, c-format msgid "can't create %s: %s\n" -msgstr "%s���Ǥ��ޤ���: %s\n" +msgstr "%s������Ǥ��ޤ���: %s\n" #: g10/sign.c:704 msgid "signing:" @@ -3634,12 +3575,12 @@ msgstr "��̾:" #: g10/sign.c:796 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "" +msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n" #: g10/sign.c:953 -#, fuzzy, c-format +#, c-format msgid "%s encryption will be used\n" -msgstr "����˼��Ԥ��ޤ���: %s\n" +msgstr "%s�Ź沽����Ѥ��ޤ�\n" #: g10/textfilter.c:134 #, c-format @@ -3681,7 +3622,7 @@ msgid "%s: can't create lock\n" msgstr "%s: ���å����Ǥ��ޤ���\n" #: g10/tdbio.c:480 g10/tdbio.c:544 -#, fuzzy, c-format +#, c-format msgid "%s: can't make lock\n" msgstr "%s: ���å����Ǥ��ޤ���\n" @@ -3782,19 +3723,19 @@ msgstr "" "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n" #: g10/trustdb.c:200 -#, fuzzy, c-format +#, c-format msgid "`%s' is not a valid long keyID\n" -msgstr "'%s' ���������緿��ID�Ǥ���ޤ���\n" +msgstr "`%s' ���������緿��ID�Ǥ���ޤ���\n" #: g10/trustdb.c:235 -#, fuzzy, c-format +#, c-format msgid "key %08lX: accepted as trusted key\n" -msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ�����\n" +msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n" #: g10/trustdb.c:274 -#, fuzzy, c-format +#, c-format msgid "key %08lX occurs more than once in the trustdb\n" -msgstr "��%08lX: ���ѥǡ����١�������Ͽ�Ǥ��ޤ���\n" +msgstr "��%08lX�����ѥǡ����١�����ʣ������ޤ�\n" #: g10/trustdb.c:290 #, c-format @@ -3807,9 +3748,9 @@ msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "���ѥ쥳����%lu, �ꥯ�����ȡ�������%d: �ɽФ��˼��Ԥ��ޤ���: %s\n" #: g10/trustdb.c:338 -#, fuzzy, c-format +#, c-format msgid "trust record %lu is not of requested type %d\n" -msgstr "���ѥ쥳����%lu: ����˼��Ԥ��ޤ���: %s\n" +msgstr "���ѥ쥳����%lu���ᤵ�줿��%d�ǤϤ���ޤ���\n" #: g10/trustdb.c:353 #, c-format @@ -3822,34 +3763,32 @@ msgid "trustdb: sync failed: %s\n" msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n" #: g10/trustdb.c:468 -#, fuzzy msgid "no need for a trustdb check\n" -msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n" +msgstr "���ѥǡ����١����θ��ڤ����פǤ�\n" -#: g10/trustdb.c:474 g10/trustdb.c:1641 -#, fuzzy, c-format +#: g10/trustdb.c:474 g10/trustdb.c:1638 +#, c-format msgid "next trustdb check due at %s\n" -msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n" +msgstr "���ѥǡ����١����μ���θ��ڤ�%s�Ǥ�\n" -#: g10/trustdb.c:779 -#, fuzzy +#: g10/trustdb.c:776 msgid "checking the trustdb\n" -msgstr "��ͭ�Կ��Ѥ��ѹ�" +msgstr "���ѥǡ����١����θ���\n" -#: g10/trustdb.c:933 -#, fuzzy, c-format +#: g10/trustdb.c:930 +#, c-format msgid "public key %08lX not found: %s\n" -msgstr "�����������Ĥ���ޤ���" +msgstr "������%08lX�����Ĥ���ޤ���: %s\n" -#: g10/trustdb.c:1515 +#: g10/trustdb.c:1512 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" -msgstr "" +msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n" -#: g10/trustdb.c:1593 +#: g10/trustdb.c:1590 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -msgstr "" +msgstr "����%d�Ǹ��ڡ���̾�Ѥ�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" #: g10/verify.c:108 msgid "" @@ -3962,7 +3901,7 @@ msgstr "�оΰŹ�ˡ�μ夤������뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n" #: g10/seskey.c:200 msgid "DSA requires the use of a 160 bit hash algorithm\n" -msgstr "" +msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n" #: g10/delkey.c:116 msgid "can't do that in batchmode without \"--yes\"\n" @@ -3977,23 +3916,22 @@ msgid "This is a secret key! - really delete? " msgstr "�������̩���Ǥ�! �����˺�����ޤ���? " #: g10/delkey.c:156 -#, fuzzy, c-format +#, c-format msgid "deleting keyblock failed: %s\n" -msgstr "���֥��å��ΰ����˼��Ԥ��ޤ���: %s\n" +msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n" -#: g10/delkey.c:166 +#: g10/delkey.c:161 msgid "ownertrust information cleared\n" -msgstr "" +msgstr "��ͭ�Կ��Ѿ���ꥢ���ޤ���\n" -#: g10/delkey.c:194 -#, fuzzy, c-format +#: g10/delkey.c:189 +#, c-format msgid "there is a secret key for public key \"%s\"!\n" -msgstr "���θ������ˤ���������̩��������ޤ�!\n" +msgstr "���θ������ˤ���������̩�� \"%s\" ������ޤ�!\n" -#: g10/delkey.c:196 -#, fuzzy +#: g10/delkey.c:191 msgid "use option \"--delete-secret-keys\" to delete it first.\n" -msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n" +msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n" #: g10/helptext.c:47 msgid "" @@ -4012,6 +3950,10 @@ msgid "" "access to the secret key. Answer \"yes\" to set this key to\n" "ultimately trusted\n" msgstr "" +"Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n" +"�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n" +"�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n" +"\"yes\"�Ȥ�����������������\n" #: g10/helptext.c:60 msgid "If you want to use this revoked key anyway, answer \"yes\"." @@ -4163,6 +4105,34 @@ msgid "" "\n" "If you don't know what the right answer is, answer \"0\"." msgstr "" +"���Υ桼����ID�˽�̾����Ȥ��ϡ����Υ桼����ID��̾���οͤ���\n" +"���ͭ���Ƥ��롢�Ȥ������Ȥ��ǧ����٤��Ǥ������ʤ����ɤ���\n" +"�����տ�����ǧ�����Τ���¾�οͤ������Τ餻��ȡ������Ǥ���\n" +"\n" +"\"0\" �ϡ����ʤ����ɤ��������տ�����ǧ�����Τ����ä˼�ĥ����\n" +" ���Ȥ�����̣�Ǥ���\n" +"\n" +"\"1\" �ϡ����ν�ͭ�Ԥȼ�ĥ���Ƥ���ͤ����θ����ͭ���Ƥ��롢��\n" +" ���ʤ��Ͽ����ƤϤ����ΤΡ���ǧ���������Ƥʤ��ä����ޤ�\n" +" �ϤǤ��ʤ��ä����Ȥ�����̣�Ǥ�������ϡ��ڥ�͡����Ȥ�\n" +" �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n" +"\n" +"\"2\" �ϡ����ʤ���������γ�ǧ�����Ȥ�����̣�Ǥ������Ȥ���\n" +" ���λ���ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID���ǧ\n" +" ������礬�����Ǥ���\n" +"\n" +"\"3\" �ϡ����ʤ������ϰϤˤ錄�기�ڤ������Ȥ�����̣�Ǥ���\n" +" ���Ȥ��С����ν�ͭ���ܿͤȸ��λ���ڤ���(�ѥ��ݡ���\n" +" �Τ褦��) ��¤�Τ�Ĥ��������ե���ID�Ĥ��μ��ʤǡ����ν�\n" +" ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ��ǧ��\n" +" �ơ�(�Żҥ��θʤɤ�) �����Żҥ�롦���ɥ쥹��\n" +" ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥڤ�����礬�����Ǥ���\n" +"\n" +"�嵭2��3����ϡ�*ñ�ʤ�*��ˤ����ʤ����Ȥ������Ȥ�ǰƬ���֤�\n" +"�Ƥ���������¾�θ��˽�̾����ݡ��ְ���פ�ֹ��ϰϡפ������\n" +"̣���뤫��ǽ�Ū�˷���Τϡ����ʤ��Ǥ���\n" +"\n" +"���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������" #: g10/helptext.c:194 msgid "Answer \"yes\" is you want to sign ALL the user IDs" @@ -4229,13 +4199,12 @@ msgid "" "to the current list of preferences. The timestamp of all affected\n" "self-signatures will be advanced by one second.\n" msgstr "" +"���� (�ޤ�������) �桼����ID���������ߤ������������ѹ�\n" +"���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n" #: g10/helptext.c:238 -#, fuzzy msgid "Please enter the passhrase; this is a secret sentence \n" -msgstr "" -"�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ���\n" -" ���������������������줳��� " +msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n" #: g10/helptext.c:244 msgid "Please repeat the last passphrase, so you are sure what you typed in." @@ -4306,24 +4275,24 @@ msgid "No help available for `%s'" msgstr "`%s'�Υإ�פϤ���ޤ���" #: g10/keydb.c:177 -#, fuzzy, c-format +#, c-format msgid "error creating keyring `%s': %s\n" -msgstr "����`%s'�ν���ߥ��顼: %s\n" +msgstr "����`%s'�κ������顼: %s\n" #: g10/keydb.c:188 #, c-format msgid "changing permission of `%s' failed: %s\n" -msgstr "" +msgstr "`%s' �ؤε��Ĥ��ѹ��˼���: %s\n" #: g10/keydb.c:197 -#, fuzzy, c-format +#, c-format msgid "keyring `%s' created\n" -msgstr "%s: ���ؤ��Ǥ��ޤ���\n" +msgstr "���� `%s' ���Ǥ��ޤ���\n" #: g10/keydb.c:587 -#, fuzzy, c-format +#, c-format msgid "failed to rebuild keyring cache: %s\n" -msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n" +msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n" #: g10/keyring.c:1235 msgid "WARNING: 2 files with confidential information exists.\n" @@ -4344,286 +4313,274 @@ msgid "Please fix this possible security flaw\n" msgstr "���ΰ�����η�٤������Ƥ�������\n" #: g10/keyring.c:1337 -#, fuzzy, c-format +#, c-format msgid "checking keyring `%s'\n" -msgstr "����`%s'����å��Ǥ��ޤ���: %s\n" +msgstr "����`%s'�ڤ��Ƥ��ޤ�\n" #: g10/keyring.c:1368 -#, fuzzy, c-format +#, c-format msgid "%lu keys so far checked (%lu signatures)\n" -msgstr "%lu���ޤǽ���\n" +msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n" #: g10/keyring.c:1379 -#, fuzzy, c-format +#, c-format msgid "%lu keys checked (%lu signatures)\n" -msgstr "���Ƚ�̾�ΰ���" +msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n" #: g10/keyring.c:1441 #, c-format msgid "%s: keyring created\n" msgstr "%s: ���ؤ��Ǥ��ޤ���\n" -#, fuzzy -#~ msgid "Are you sure you still want to sign it?\n" -#~ msgstr "���θ�Ĺ�������ˤ����Ǥ���? " - -#, fuzzy -#~ msgid " Are you sure you still want to sign it?\n" -#~ msgstr "���θ�Ĺ�������ˤ����Ǥ���? " - -#, fuzzy -#~ msgid "Really sign? (y/N) " -#~ msgstr "�����˽�̾���ޤ���? " +msgid "too many random bits requested; the limit is %d\n" +msgstr "�����ࡦ�ӥåȤ������ᤷ��Ǥ����³��� %d\n" -#~ msgid "too many random bits requested; the limit is %d\n" -#~ msgstr "�����ࡦ�ӥåȤ������ᤷ��Ǥ����³��� %d\n" +msgid "|[NAMES]|check the trust database" +msgstr "|[̾��]|���ѥǡ����١���������å�" -#~ msgid "|[NAMES]|check the trust database" -#~ msgstr "|[̾��]|���ѥǡ����١���������å�" +msgid "--delete-secret-key user-id" +msgstr "--delete-secret-key �桼����id" -#~ msgid "--delete-secret-key user-id" -#~ msgstr "--delete-secret-key �桼����id" +msgid "--delete-key user-id" +msgstr "--delete-key �桼����id" -#~ msgid "--delete-key user-id" -#~ msgstr "--delete-key �桼����id" +msgid "--delete-secret-and-public-key user-id" +msgstr "--delete-secret-and-public-key �桼����id" -#~ msgid "--delete-secret-and-public-key user-id" -#~ msgstr "--delete-secret-and-public-key �桼����id" +msgid "For info see http://www.gnupg.org" +msgstr "KUWASIKU WA http://www.gnupg.org/ WO GORANKUDASAI" -#~ msgid "For info see http://www.gnupg.org" -#~ msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI" +msgid "sSmMqQ" +msgstr "sSmMqQ" -#~ msgid "sSmMqQ" -#~ msgstr "sSmMqQ" - -#~ msgid "" -#~ "Could not find a valid trust path to the key. Let's see whether we\n" -#~ "can assign some missing owner trust values.\n" -#~ "\n" -#~ msgstr "" -#~ "���ؤ�ͭ���ʿ��Ѥη�ϩ�����Ĥ���ޤ���\n" -#~ "���ʤ��ͤο����٤�����Ǥ��ʤ����ɤ�����Ĵ�٤ޤ��礦��\n" -#~ "\n" +msgid "" +"Could not find a valid trust path to the key. Let's see whether we\n" +"can assign some missing owner trust values.\n" +"\n" +msgstr "" +"���ؤ�ͭ���ʿ��Ѥη�ϩ�����Ĥ���ޤ���\n" +"���ʤ��ͤο����٤�����Ǥ��ʤ����ɤ�����Ĵ�٤ޤ��礦��\n" +"\n" -#~ msgid "" -#~ "No path leading to one of our keys found.\n" -#~ "\n" -#~ msgstr "" -#~ "������θ��ػ���ϩ������ޤ���\n" -#~ "\n" +msgid "" +"No path leading to one of our keys found.\n" +"\n" +msgstr "" +"������θ��ػ���ϩ������ޤ���\n" +"\n" -#~ msgid "" -#~ "No certificates with undefined trust found.\n" -#~ "\n" -#~ msgstr "" -#~ "�����٤�̤����ξ�����Ϥ���ޤ���\n" -#~ "\n" +msgid "" +"No certificates with undefined trust found.\n" +"\n" +msgstr "" +"�����٤�̤����ξ�����Ϥ���ޤ���\n" +"\n" -#~ msgid "" -#~ "No trust values changed.\n" -#~ "\n" -#~ msgstr "" -#~ "�����٤��ѹ��Ϥ���ޤ���\n" -#~ "\n" +msgid "" +"No trust values changed.\n" +"\n" +msgstr "" +"�����٤��ѹ��Ϥ���ޤ���\n" +"\n" -#~ msgid "%08lX: no info to calculate a trust probability\n" -#~ msgstr "%08lX: �����٤�����������ޤ���\n" +msgid "%08lX: no info to calculate a trust probability\n" +msgstr "%08lX: �����٤�����������ޤ���\n" -#~ msgid "Enter the user ID: " -#~ msgstr "�桼����ID������: " +msgid "Enter the user ID: " +msgstr "�桼����ID������: " -#~ msgid "skipped: public key already set with --encrypt-to\n" -#~ msgstr "�����å�: �������ϴ��� --encrypt-to ������ѤߤǤ�\n" +msgid "skipped: public key already set with --encrypt-to\n" +msgstr "�����å�: �������ϴ��� --encrypt-to ������ѤߤǤ�\n" -#~ msgid "%s: error checking key: %s\n" -#~ msgstr "%s: ���θ��ڥ��顼: %s\n" +msgid "%s: error checking key: %s\n" +msgstr "%s: ���θ��ڥ��顼: %s\n" -#~ msgid " (%d) RSA (sign and encrypt)\n" -#~ msgstr " (%d) RSA (��̾�ȰŹ沽)\n" +msgid " (%d) RSA (sign and encrypt)\n" +msgstr " (%d) RSA (��̾�ȰŹ沽)\n" -#~ msgid "Do you really want to create a sign and encrypt key? " -#~ msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? " +msgid "Do you really want to create a sign and encrypt key? " +msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? " -#~ msgid "Do you really need such a large keysize? " -#~ msgstr "����ʤ�Ĺ�����������ˤ���ޤ���? " +msgid "Do you really need such a large keysize? " +msgstr "����ʤ�Ĺ�����������ˤ���ޤ���? " -#~ msgid "%s: user not found: %s\n" -#~ msgstr "%s: �桼���������Ĥ���ޤ���: %s\n" +msgid "%s: user not found: %s\n" +msgstr "%s: �桼���������Ĥ���ޤ���: %s\n" -#~ msgid "certificate read problem: %s\n" -#~ msgstr "��������ɹ��߾㳲: %s\n" +msgid "certificate read problem: %s\n" +msgstr "��������ɹ��߾㳲: %s\n" -#~ msgid "too many entries in unk cache - disabled\n" -#~ msgstr "unk����å���Υ���ȥ��¿�����ޤ� - ���Ѷػ�\n" +msgid "too many entries in unk cache - disabled\n" +msgstr "unk����å���Υ���ȥ��¿�����ޤ� - ���Ѷػ�\n" -#~ msgid "secret key %08lX not imported (use %s to allow for it)\n" -#~ msgstr "��̩��%08lX���ɤ߹��ޤ�ޤ��� (ͭ���ˤ���ˤ�%s��Ȥ��ޤ�)\n" +msgid "secret key %08lX not imported (use %s to allow for it)\n" +msgstr "��̩��%08lX���ɤ߹��ޤ�ޤ��� (ͭ���ˤ���ˤ�%s��Ȥ��ޤ�)\n" -#~ msgid "key %08lX: our copy has no self-signature\n" -#~ msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n" +msgid "key %08lX: our copy has no self-signature\n" +msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n" -#~ msgid "%s: user not found\n" -#~ msgstr "%s: �桼���������Ĥ���ޤ���\n" +msgid "%s: user not found\n" +msgstr "%s: �桼���������Ĥ���ޤ���\n" -#~ msgid "update of trustdb failed: %s\n" -#~ msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n" +msgid "update of trustdb failed: %s\n" +msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n" -#~ msgid "no keyserver known (use option --keyserver)\n" -#~ msgstr "" -#~ "���Τθ������С��Ϥ���ޤ��� (--keyserver���ץ�����Ȥ��ޤ��礦)\n" +msgid "no keyserver known (use option --keyserver)\n" +msgstr "" +"���Τθ������С��Ϥ���ޤ��� (--keyserver���ץ�����Ȥ��ޤ��礦)\n" -#~ msgid "%s: not a valid key ID\n" -#~ msgstr "%s: ��������ID�Ǥ���ޤ���\n" +msgid "%s: not a valid key ID\n" +msgstr "%s: ��������ID�Ǥ���ޤ���\n" -#~ msgid "assuming bad MDC due to an unknown critical bit\n" -#~ msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ�������MDC�Ȥߤʤ��ޤ�\n" +msgid "assuming bad MDC due to an unknown critical bit\n" +msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ�������MDC�Ȥߤʤ��ޤ�\n" -#~ msgid "error reading dir record for LID %lu: %s\n" -#~ msgstr "LID %lu�Υǥ��쥯�ȥ���쥳���ɤ��ɽФ����顼: %s\n" +msgid "error reading dir record for LID %lu: %s\n" +msgstr "LID %lu�Υǥ��쥯�ȥ���쥳���ɤ��ɽФ����顼: %s\n" -#~ msgid "lid %lu: expected dir record, got type %d\n" -#~ msgstr "lid %lu: ���Ԥ��줿�ǥ��쥯�ȥ���쥳���ɡ�������%d\n" +msgid "lid %lu: expected dir record, got type %d\n" +msgstr "lid %lu: ���Ԥ��줿�ǥ��쥯�ȥ���쥳���ɡ�������%d\n" -#~ msgid "no primary key for LID %lu\n" -#~ msgstr "LID %lu�μ縰������ޤ���\n" +msgid "no primary key for LID %lu\n" +msgstr "LID %lu�μ縰������ޤ���\n" -#~ msgid "error reading primary key for LID %lu: %s\n" -#~ msgstr "LID %lu�μ縰���ɽФ����顼: %s\n" +msgid "error reading primary key for LID %lu: %s\n" +msgstr "LID %lu�μ縰���ɽФ����顼: %s\n" -#~ msgid "get_dir_record: search_record failed: %s\n" -#~ msgstr "get_dir_record: search_record �˼��Ԥ��ޤ���: %s\n" +msgid "get_dir_record: search_record failed: %s\n" +msgstr "get_dir_record: search_record �˼��Ԥ��ޤ���: %s\n" -#~ msgid "key %08lX: query record failed\n" -#~ msgstr "��%08lX: �쥳���ɤ���礻�˼���\n" +msgid "key %08lX: query record failed\n" +msgstr "��%08lX: �쥳���ɤ���礻�˼���\n" -#~ msgid "key %08lX: already in trusted key table\n" -#~ msgstr "��%08lX: ���˿��Ѥ��븰��ɽ�ˤ���ޤ�\n" +msgid "key %08lX: already in trusted key table\n" +msgstr "��%08lX: ���˿��Ѥ��븰��ɽ�ˤ���ޤ�\n" -#~ msgid "NOTE: secret key %08lX is NOT protected.\n" -#~ msgstr "����: ��̩��%08lX���ݸ��Ƥ��� ����\n" +msgid "NOTE: secret key %08lX is NOT protected.\n" +msgstr "����: ��̩��%08lX���ݸ��Ƥ��� ����\n" -#~ msgid "key %08lX: secret and public key don't match\n" -#~ msgstr "��%08lX: ��̩���ȸ��������б����Ƥ��ޤ���\n" +msgid "key %08lX: secret and public key don't match\n" +msgstr "��%08lX: ��̩���ȸ��������б����Ƥ��ޤ���\n" -#~ msgid "enumerate secret keys failed: %s\n" -#~ msgstr "��̩�������˼��Ԥ��ޤ���: %s\n" +msgid "enumerate secret keys failed: %s\n" +msgstr "��̩�������˼��Ԥ��ޤ���: %s\n" -#~ msgid "key %08lX.%lu: Good subkey binding\n" -#~ msgstr "��%08lX.%lu: �������б���ͭ���Ǥ�\n" +msgid "key %08lX.%lu: Good subkey binding\n" +msgstr "��%08lX.%lu: �������б���ͭ���Ǥ�\n" -#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -#~ msgstr "��%08lX.%lu: �������б���̵���Ǥ�: %s\n" +msgid "key %08lX.%lu: Invalid subkey binding: %s\n" +msgstr "��%08lX.%lu: �������б���̵���Ǥ�: %s\n" -#~ msgid "key %08lX.%lu: Valid key revocation\n" -#~ msgstr "��%08lX.%lu: ͭ���ʸ����˴�\n" +msgid "key %08lX.%lu: Valid key revocation\n" +msgstr "��%08lX.%lu: ͭ���ʸ����˴�\n" -#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n" -#~ msgstr "��%08lX.%lu: ̵���ʸ����˴�: %s\n" +msgid "key %08lX.%lu: Invalid key revocation: %s\n" +msgstr "��%08lX.%lu: ̵���ʸ����˴�: %s\n" -#~ msgid "key %08lX.%lu: Valid subkey revocation\n" -#~ msgstr "��%08lX.%lu: ͭ�����������˴�\n" +msgid "key %08lX.%lu: Valid subkey revocation\n" +msgstr "��%08lX.%lu: ͭ�����������˴�\n" -#~ msgid "Good self-signature" -#~ msgstr "ͭ���ʼ��ʽ�̾" +msgid "Good self-signature" +msgstr "ͭ���ʼ��ʽ�̾" -#~ msgid "Invalid self-signature" -#~ msgstr "̵���ʼ��ʽ�̾" +msgid "Invalid self-signature" +msgstr "̵���ʼ��ʽ�̾" -#~ msgid "Valid user ID revocation skipped due to a newer self signature" -#~ msgstr "���������ʽ�̾����Ƥ���Τǡ�ͭ���ʥ桼����ID���˴��ϹԤ��ޤ���" +msgid "Valid user ID revocation skipped due to a newer self signature" +msgstr "���������ʽ�̾����Ƥ���Τǡ�ͭ���ʥ桼����ID���˴��ϹԤ��ޤ���" -#~ msgid "Valid user ID revocation" -#~ msgstr "ͭ���ʥ桼����ID���˴�" +msgid "Valid user ID revocation" +msgstr "ͭ���ʥ桼����ID���˴�" -#~ msgid "Invalid user ID revocation" -#~ msgstr "̵���ʥ桼����ID���˴�" +msgid "Invalid user ID revocation" +msgstr "̵���ʥ桼����ID���˴�" -#~ msgid "Valid certificate revocation" -#~ msgstr "ͭ���ʾ�������˴�" +msgid "Valid certificate revocation" +msgstr "ͭ���ʾ�������˴�" -#~ msgid "Good certificate" -#~ msgstr "ͭ���ʾ�����" +msgid "Good certificate" +msgstr "ͭ���ʾ�����" -#~ msgid "Invalid certificate revocation" -#~ msgstr "̵���ʾ�������˴�" +msgid "Invalid certificate revocation" +msgstr "̵���ʾ�������˴�" -#~ msgid "Invalid certificate" -#~ msgstr "̵���ʾ�����" +msgid "Invalid certificate" +msgstr "̵���ʾ�����" -#~ msgid "sig record %lu[%d] points to wrong record.\n" -#~ msgstr "��̾�쥳����%lu[%d] �ϸ��ä��쥳���ɤ�ؤ��Ƥ��ޤ���\n" +msgid "sig record %lu[%d] points to wrong record.\n" +msgstr "��̾�쥳����%lu[%d] �ϸ��ä��쥳���ɤ�ؤ��Ƥ��ޤ���\n" -#~ msgid "duplicated certificate - deleted" -#~ msgstr "��ʣ���������� - ���" +msgid "duplicated certificate - deleted" +msgstr "��ʣ���������� - ���" -#~ msgid "tdbio_search_dir failed: %s\n" -#~ msgstr "tdbio_search_dir �˼��Ԥ��ޤ���: %s\n" +msgid "tdbio_search_dir failed: %s\n" +msgstr "tdbio_search_dir �˼��Ԥ��ޤ���: %s\n" -#~ msgid "lid ?: insert failed: %s\n" -#~ msgstr "lid ?: �����˼��Ԥ��ޤ���: %s\n" +msgid "lid ?: insert failed: %s\n" +msgstr "lid ?: �����˼��Ԥ��ޤ���: %s\n" -#~ msgid "lid %lu: insert failed: %s\n" -#~ msgstr "lid %lu: �����˼��Ԥ��ޤ���: %s\n" +msgid "lid %lu: insert failed: %s\n" +msgstr "lid %lu: �����˼��Ԥ��ޤ���: %s\n" -#~ msgid "lid %lu: inserted\n" -#~ msgstr "lid %lu: �������ޤ���\n" +msgid "lid %lu: inserted\n" +msgstr "lid %lu: �������ޤ���\n" -#~ msgid "error reading dir record: %s\n" -#~ msgstr "�ǥ��쥯�ȥ���쥳���ɤ��ɽФ����顼: %s\n" +msgid "error reading dir record: %s\n" +msgstr "�ǥ��쥯�ȥ���쥳���ɤ��ɽФ����顼: %s\n" -#~ msgid "\t%lu keys with errors\n" -#~ msgstr "\t%lu���ˤϥ��顼������ޤ�\n" +msgid "\t%lu keys with errors\n" +msgstr "\t%lu���ˤϥ��顼������ޤ�\n" -#~ msgid "\t%lu keys inserted\n" -#~ msgstr "\t%lu�����������ޤ���\n" +msgid "\t%lu keys inserted\n" +msgstr "\t%lu�����������ޤ���\n" -#~ msgid "lid %lu: dir record w/o key - skipped\n" -#~ msgstr "lid %lu: ���ʤ��Υǥ��쥯�ȥ���쥳���� - �����å�\n" +msgid "lid %lu: dir record w/o key - skipped\n" +msgstr "lid %lu: ���ʤ��Υǥ��쥯�ȥ���쥳���� - �����å�\n" -#~ msgid "\t%lu due to new pubkeys\n" -#~ msgstr "\t%lu������������\n" +msgid "\t%lu due to new pubkeys\n" +msgstr "\t%lu������������\n" -#~ msgid "\t%lu keys skipped\n" -#~ msgstr "\t%lu�����åפ��ޤ���\n" +msgid "\t%lu keys skipped\n" +msgstr "\t%lu�����åפ��ޤ���\n" -#~ msgid "\t%lu keys updated\n" -#~ msgstr "\t%lu�������ޤ���\n" +msgid "\t%lu keys updated\n" +msgstr "\t%lu�������ޤ���\n" -#~ msgid "Ooops, no keys\n" -#~ msgstr "���äȡ���������ޤ���\n" +msgid "Ooops, no keys\n" +msgstr "���äȡ���������ޤ���\n" -#~ msgid "Ooops, no user IDs\n" -#~ msgstr "���äȡ��桼����ID������ޤ���\n" +msgid "Ooops, no user IDs\n" +msgstr "���äȡ��桼����ID������ޤ���\n" -#~ msgid "check_trust: search dir record failed: %s\n" -#~ msgstr "check_trust: �ǥ��쥯�ȥ���쥳���ɤθ����˼��Ԥ��ޤ���: %s\n" +msgid "check_trust: search dir record failed: %s\n" +msgstr "check_trust: �ǥ��쥯�ȥ���쥳���ɤθ����˼��Ԥ��ޤ���: %s\n" -#~ msgid "key %08lX: insert trust record failed: %s\n" -#~ msgstr "��%08lX: ���ѥ쥳���ɤ������˼��Ԥ��ޤ���: %s\n" +msgid "key %08lX: insert trust record failed: %s\n" +msgstr "��%08lX: ���ѥ쥳���ɤ������˼��Ԥ��ޤ���: %s\n" -#~ msgid "key %08lX.%lu: inserted into trustdb\n" -#~ msgstr "��%08lX.%lu: ���ѥ쥳���ɤ��������ޤ���\n" +msgid "key %08lX.%lu: inserted into trustdb\n" +msgstr "��%08lX.%lu: ���ѥ쥳���ɤ��������ޤ���\n" -#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" -#~ msgstr "��%08lX.%lu: ̤��ˤǤ��Ƥ��ޤ� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n" +msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" +msgstr "��%08lX.%lu: ̤��ˤǤ��Ƥ��ޤ� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n" -#~ msgid "key %08lX.%lu: expired at %s\n" -#~ msgstr "��%08lX.%lu: %s�Ǵ����ڤ�Ǥ�\n" +msgid "key %08lX.%lu: expired at %s\n" +msgstr "��%08lX.%lu: %s�Ǵ����ڤ�Ǥ�\n" -#~ msgid "key %08lX.%lu: trust check failed: %s\n" -#~ msgstr "��%08lX.%lu: ���Ѥθ��ڤ˼��Ԥ��ޤ���: %s\n" +msgid "key %08lX.%lu: trust check failed: %s\n" +msgstr "��%08lX.%lu: ���Ѥθ��ڤ˼��Ԥ��ޤ���: %s\n" -#~ msgid "problem finding '%s' in trustdb: %s\n" -#~ msgstr "���ѥǡ����١�������'%s'�θ����˾㳲: %s\n" +msgid "problem finding '%s' in trustdb: %s\n" +msgstr "���ѥǡ����١�������'%s'�θ����˾㳲: %s\n" -#~ msgid "user '%s' not in trustdb - inserting\n" -#~ msgstr "�桼����'%s'�Ͽ��ѥǡ����١�������Ͽ����Ƥ��ޤ��� - ����\n" +msgid "user '%s' not in trustdb - inserting\n" +msgstr "�桼����'%s'�Ͽ��ѥǡ����١�������Ͽ����Ƥ��ޤ��� - ����\n" -#~ msgid "failed to put '%s' into trustdb: %s\n" -#~ msgstr "'%s'�ο��ѥǡ����١����ؤ���Ͽ�˼��Ԥ��ޤ���: %s\n" +msgid "failed to put '%s' into trustdb: %s\n" +msgstr "'%s'�ο��ѥǡ����١����ؤ���Ͽ�˼��Ԥ��ޤ���: %s\n" -#~ msgid "WARNING: can't yet handle long pref records\n" -#~ msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n" +msgid "WARNING: can't yet handle long pref records\n" +msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n" -#~ msgid "%s: can't create keyring: %s\n" -#~ msgstr "%s: ���ؤ��Ǥ��ޤ���: %s\n" +msgid "%s: can't create keyring: %s\n" +msgstr "%s: ���ؤ��Ǥ��ޤ���: %s\n" diff --git a/util/ChangeLog b/util/ChangeLog index edc261806..aad8eb107 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +2002-05-02 Werner Koch <[email protected]> + + * memory.c (alloc): Malloc at least 1 byte. Noted by Winona Brown. + 2002-04-23 David Shaw <[email protected]> * miscutil.c: New function answer_is_yes_no_default() to give a diff --git a/util/memory.c b/util/memory.c index fef2acc82..fb099f852 100644 --- a/util/memory.c +++ b/util/memory.c @@ -415,6 +415,8 @@ FNAME(alloc)( size_t n FNAMEPRT ) char *p; #ifdef M_GUARD + if(!n) + out_of_core(n,0); /* should never happen */ if( !(p = malloc( n + EXTRA_ALIGN+5 )) ) out_of_core(n,0); store_len(p,n,0); @@ -422,6 +424,10 @@ FNAME(alloc)( size_t n FNAMEPRT ) p[4+EXTRA_ALIGN+n] = MAGIC_END_BYTE; return p+EXTRA_ALIGN+4; #else + /* mallocing zero bytes is undefined by ISO-C, so we better make + sure that it won't happen */ + if (!n) + n = 1; if( !(p = malloc( n )) ) out_of_core(n,0); return p; |