From 99e70f7ac7865400c20f417933b4abd6cf1968e2 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 11 Nov 2000 17:17:52 +0000 Subject: Paul's LFS pacthes and started with pipemode --- AUTHORS | 5 +- ChangeLog | 15 + NEWS | 2 + THANKS | 4 +- TODO | 16 + VERSION | 2 +- acinclude.m4 | 82 +++ configure.in | 12 +- doc/gpg.sgml | 8 + g10/ChangeLog | 31 ++ g10/Makefile.am | 1 + g10/armor.c | 11 +- g10/g10.c | 15 +- g10/keydb.h | 2 +- g10/main.h | 3 + g10/packet.h | 34 +- g10/parse-packet.c | 15 +- g10/pipemode.c | 231 +++++++++ g10/ringedit.c | 6 +- g10/verify.c | 1 - include/ChangeLog | 6 + include/iobuf.h | 15 +- po/ChangeLog | 6 +- po/ja.po | 1400 ++++++++++++++++++++++++++-------------------------- util/ChangeLog | 25 +- util/iobuf.c | 104 ++-- 26 files changed, 1283 insertions(+), 769 deletions(-) create mode 100644 g10/pipemode.c diff --git a/AUTHORS b/AUTHORS index 8b541fcac..03f37abc9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,6 +33,9 @@ Niklas Hernaeus Disclaimer Nils Ellmenreich Assignment (configure.in, cipher/rndlinux.c, FAQ) +Paul Eggert + (configuration macros for LFS) + Pedro Morais Translations [pt_BR] Rémi Guyomarch Assignment @@ -50,7 +53,7 @@ Walter Koch Translations [de] Werner Koch Assignment (started the whole thing) -Yosiaki IIDA Translations [ja] +Yosiaki IIDA Translations [ja] diff --git a/ChangeLog b/ChangeLog index a65930c47..f4b78ffea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-11-11 Paul Eggert + + Actually Paul's patches are dated 2000-20-17; I applied them today + and merged some ChangeLog entries (wk@gnupg.org). + + * configure.in (AC_SYS_LARGEFILE): Add. + (try_large_file): Remove. All uses removed. + (AC_CHECK_FUNCS): Remove fopen64 and fstat64. + + * acinclude.m4 (AC_SYS_LARGEFILE_TEST_INCLUDES, + AC_SYS_LARGEFILE_MACRO_VALUE, AC_SYS_LARGEFILE): New macros, + taken from GNU tar. + + * configure.in (AC_CHECK_FUNCS): Add fseeko. + 2000-10-17 Werner Koch * configure.in: Disabled fopen64 checks for Solaris and HPUX. diff --git a/NEWS b/NEWS index 1b05d154b..52f2a9e54 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ + * Better LFS support. + * New option --ignore-crc-error Noteworthy changes in version 1.0.4 (2000-10-17) diff --git a/THANKS b/THANKS index a28fe6497..700e0ae6d 100644 --- a/THANKS +++ b/THANKS @@ -27,6 +27,7 @@ Daniel Eisenbud eisenbud@cs.swarthmore.edu Daniel Koening dan@mail.isis.de Daniel Resare daniel@resare.com Dave Dykstra dwd@bell-labs.com +David C Niemi niemi@tuxers.net David Champion dgc@uchicago.edu David Ellement ellement@sdd.hp.com David Hallinan hallinan@rtd.com @@ -47,6 +48,7 @@ Frank Tobin ftobin@uiuc.edu Gabriel Rosenkoetter gr@eclipsed.net Gaël Quéri gqueri@mail.dotcom.fr Giampaolo Tomassoni g.tomassoni@libero.it +Gilbert Fernandes gilbert_fernandes@hotmail.com Greg Louis glouis@dynamicro.on.ca Greg Troxel gdt@ir.bbn.com Gregory Steuck steuck@iname.com @@ -147,7 +149,7 @@ Walter Koch koch@hsp.de Wayne Chapeskie waynec@spinnaker.com Werner Koch wk@gnupg.org Wim Vandeputte bunbun@reptile.rug.ac.be -Yosiaki IIDA iida@secom.ne.jp +Yosiaki IIDA iida@ring.gr.jp Yoshihiro Kajiki kajiki@ylug.org nbecker@hns.com diff --git a/TODO b/TODO index 179d2ce6c..ea4b33022 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,16 @@ + * Add Dave's UTS patches + + * Don't display the "no secret for decryption available" + + ** Check whether the use of -u and --clearsign created 2 signatures. + removed dups from the skclist. + + * Replace mkinstalldir etc. with nnewer copies. + + * We need another special packet at the end of a clearsign message to mark + it's end and allow for multiple signature for one message. + * option to set the signature expiration time for key sigs. * Option to warn when a non MDC message is decrypted? @@ -39,6 +51,10 @@ Scheduled for 1.1 ----------------- + * David C Niemi pointed out that the code for --no-default-keyring does not + work as expected, because in g10/g10.c sec_nring will be set in the option + switch but later checked to see whether there are any keyrings. + * export by user-IDs does only export the first matching name which leads to a problem in cases where there are 2 keys with identically user-IDs. diff --git a/VERSION b/VERSION index a702fca56..d99a1985e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.4-1 +1.0.4b diff --git a/acinclude.m4 b/acinclude.m4 index 76b3dd46a..1d1539845 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -720,4 +720,86 @@ if test $gnupg_cv_mkdir_takes_one_arg = yes ; then fi ]) + +dnl AC_SYS_LARGEFILE is stolen from tar. +dnl This can be removed once the official successor to autoconf 2.13 is out. +#serial 12 + +dnl By default, many hosts won't let programs access large files; +dnl one must use special compiler options to get large-file access to work. +dnl For more details about this brain damage please see: +dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html + +dnl Written by Paul Eggert . + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_TEST_INCLUDES +AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, + [[#include + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + ]]) + +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, +dnl COMMENT, INCLUDES,FUNCTION-BODY) +AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, + [AC_CACHE_CHECK([for $1 value needed for large files], $3, + [$3=no + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES +$5 + , + [$6], + , + [AC_TRY_COMPILE([#define $1 $2] +AC_SYS_LARGEFILE_TEST_INCLUDES +$5 + , + [$6], + [$3=$2])])]) + if test "[$]$3" != no; then + AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) + fi]) + +AC_DEFUN(AC_SYS_LARGEFILE, + [AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) + if test "$enable_largefile" != no; then + + AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , + [ac_save_CC="$CC" + CC="$CC -n32" + AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , + ac_cv_sys_largefile_CC=' -n32') + CC="$ac_save_CC"]) + fi]) + if test "$ac_cv_sys_largefile_CC" != no; then + CC="$CC$ac_cv_sys_largefile_CC" + fi + + AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.]) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, + ac_cv_sys_largefile_source, + [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).], + [#include ], [return !ftello;]) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, + ac_cv_sys_large_files, + [Define for large files, on AIX-style hosts.]) + AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, + ac_cv_sys_xopen_source, + [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], + [#include ], [return !ftello;]) + fi + ]) + + + + dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/configure.in b/configure.in index 720314b57..e96ebdb02 100644 --- a/configure.in +++ b/configure.in @@ -155,6 +155,7 @@ dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_PROG_CC AC_PROG_CPP AC_ISC_POSIX +AC_SYS_LARGEFILE AC_PROG_INSTALL AC_PROG_AWK AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) @@ -166,7 +167,6 @@ MPI_OPT_FLAGS="" try_gettext=yes try_gdbm=yes -try_large_file=yes case "${target}" in *-*-mingw32*) # special stuff for Windoze NT @@ -206,7 +206,6 @@ case "${target}" in if test -z "$GCC" ; then CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE" fi - try_large_file="no" ;; *-dec-osf4*) if test -z "$GCC" ; then @@ -217,9 +216,6 @@ case "${target}" in ;; m68k-atari-mint) ;; - *-solaris*) - try_large_file="no" - ;; *) ;; esac @@ -424,11 +420,7 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS(strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap) AC_CHECK_FUNCS(memmove gettimeofday getrusage gethrtime setrlimit clock_gettime) AC_CHECK_FUNCS(memicmp atexit raise getpagesize strftime nl_langinfo) -AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask) - -if test $try_large_file = "yes"; then -AC_CHECK_FUNCS(fopen64 fstat64) -fi +AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask fseeko) GNUPG_CHECK_MLOCK GNUPG_FUNC_MKDIR_TAKES_ONE_ARG diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 1899b2c69..ec8abffd8 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1412,6 +1412,14 @@ used by anonymous recipients (created by using --throw-keyid) and might come handy in case where an encrypted message contains a bogus key ID. + +--enable-special-filenames + +This options enables a mode in which filenames of the form +-&n, where n is a non-negative decimal number, +refer to the file descriptor n and not to a file with that name. + + diff --git a/g10/ChangeLog b/g10/ChangeLog index d5f62ae1a..a37eac868 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,36 @@ +2000-11-11 Paul Eggert + + Clean up the places in the code that incorrectly use "long" or + "unsigned long" for file offsets. The correct type to use is + "off_t". The difference is important on large-file hosts, + where "off_t" is longer than "long". + + * keydb.h (struct keyblock_pos_struct.offset): + Use off_t, not ulong, for file offsets. + * packet.h (dbg_search_packet, dbg_copy_some_packets, + search_packet, copy_some_packets): Likewise. + * parse-packet.c (parse, dbg_search_packet, search_packet, + dbg_copy_some_packets, copy_some_packets): Likewise. + * ringedit.c (keyring_search): Likewise. + + * parse-packet.c (parse): Do not use %lu to report file + offsets in error diagnostics; it's not portable. + * ringedit.c (keyring_search): Likewise. + +2000-11-09 Werner Koch + + * g10.c (main): New option --enable-special-filenames. + +2000-11-07 Werner Koch + + * g10.c (main): New command --pipemode. + * pipemode.c: New. + 2000-10-23 Werner Koch + * armor.c (armor_filter): Changed output of hdrlines, so that a CR + is emitted for DOS systems. + * keygen.c (read_parameter_file): Add a cast for isspace(). * status.c (myread): Use SIGINT instead of SIGHUP for DOS. diff --git a/g10/Makefile.am b/g10/Makefile.am index fcf443ecb..7559eebb2 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -65,6 +65,7 @@ gpg_SOURCES = g10.c \ tdbio.h \ delkey.c \ keygen.c \ + pipemode.c \ helptext.c gpgv_SOURCES = gpgv.c \ diff --git a/g10/armor.c b/g10/armor.c index 576a15ff4..dc646e83f 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -928,8 +928,15 @@ armor_filter( void *opaque, int control, iobuf_writestr(a, LF ); } - if( afx->hdrlines ) - iobuf_writestr(a, afx->hdrlines); + if ( afx->hdrlines ) { + for ( s = afx->hdrlines; *s; s++ ) { + #ifdef HAVE_DOSISH_SYSTEM + if ( *s == '\n' ) + iobuf_put( a, '\r'); + #endif + iobuf_put(a, *s ); + } + } iobuf_writestr(a, LF ); afx->status++; afx->idx = 0; diff --git a/g10/g10.c b/g10/g10.c index 9fabc9360..403c72943 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -107,6 +107,7 @@ enum cmd_and_opt_values { aNull = 0, aDeArmor, aEnArmor, aGenRandom, + aPipeMode, oTextmode, oFingerprint, @@ -183,6 +184,7 @@ enum cmd_and_opt_values { aNull = 0, oDisablePubkeyAlgo, oAllowNonSelfsignedUID, oAllowFreeformUID, + oEnableSpecialFilenames, oNoLiteral, oSetFilesize, oHonorHttpProxy, @@ -328,6 +330,7 @@ static ARGPARSE_OPTS opts[] = { { aPrintMDs, "print-mds" , 256, "@"}, /* old */ { aListTrustDB, "list-trustdb",0 , "@"}, { aListTrustPath, "list-trust-path",0, "@"}, + { aPipeMode, "pipemode", 0, "@" }, { oKOption, NULL, 0, "@"}, { oPasswdFD, "passphrase-fd",1, "@" }, { oCommandFD, "command-fd",1, "@" }, @@ -386,6 +389,7 @@ static ARGPARSE_OPTS opts[] = { { oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" }, { oMergeOnly, "merge-only", 0, "@" }, { oTryAllSecrets, "try-all-secrets", 0, "@" }, + { oEnableSpecialFilenames, "enable-special-filenames", 0, "@" }, { oEmu3DESS2KBug, "emulate-3des-s2k-bug", 0, "@"}, { oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"}, {0} }; @@ -766,6 +770,7 @@ main( int argc, char **argv ) case aEnArmor: set_cmd( &cmd, aEnArmor); break; case aExportOwnerTrust: set_cmd( &cmd, aExportOwnerTrust); break; case aImportOwnerTrust: set_cmd( &cmd, aImportOwnerTrust); break; + case aPipeMode: set_cmd( &cmd, aPipeMode); break; case oArmor: opt.armor = 1; opt.no_armor=0; break; case oOutput: opt.outfile = pargs.r.ret_str; break; @@ -940,7 +945,9 @@ main( int argc, char **argv ) case oMergeOnly: opt.merge_only = 1; break; case oTryAllSecrets: opt.try_all_secrets = 1; break; case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break; - + case oEnableSpecialFilenames: + iobuf_enable_special_filenames (1); + break; default : pargs.err = configfp? 1:2; break; } } @@ -1515,6 +1522,12 @@ main( int argc, char **argv ) wrong_args("--import-ownertrust [file]"); import_ownertrust( argc? *argv:NULL ); break; + + case aPipeMode: + if ( argc ) + wrong_args ("--pipemode"); + run_in_pipemode (); + break; case aListPackets: opt.list_packets=1; diff --git a/g10/keydb.h b/g10/keydb.h index 5cb8b5a5d..6dcfa0dc3 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -69,7 +69,7 @@ enum resource_type { struct keyblock_pos_struct { int resno; /* resource number */ enum resource_type rt; - ulong offset; /* position information */ + off_t offset; /* position information */ unsigned count; /* length of the keyblock in packets */ IOBUF fp; /* used by enum_keyblocks */ int secret; /* working on a secret keyring */ diff --git a/g10/main.h b/g10/main.h index cd52c827b..f6657a2c2 100644 --- a/g10/main.h +++ b/g10/main.h @@ -154,6 +154,9 @@ int decrypt_message( const char *filename ); int hash_datafiles( MD_HANDLE md, MD_HANDLE md2, STRLIST files, const char *sigfilename, int textmode ); +/*-- pipemode.c --*/ +void run_in_pipemode (void); + /*-- signal.c --*/ void init_signals(void); void pause_on_sigusr( int which ); diff --git a/g10/packet.h b/g10/packet.h index a554b7535..db931d756 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -270,21 +270,31 @@ int list_packets( IOBUF a ); int set_packet_list_mode( int mode ); #if DEBUG_PARSE_PACKET -int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, const char* file, int lineno ); -int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt, const char* file, int lineno ); -int dbg_copy_all_packets( IOBUF inp, IOBUF out, const char* file, int lineno ); -int dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, const char* file, int lineno ); -int dbg_skip_some_packets( IOBUF inp, unsigned n, const char* file, int lineno ); -#define search_packet( a,b,c,d ) dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ ) -#define parse_packet( a, b ) dbg_parse_packet( (a), (b), __FILE__, __LINE__ ) -#define copy_all_packets( a,b ) dbg_copy_all_packets((a),(b), __FILE__, __LINE__ ) -#define copy_some_packets( a,b,c ) dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ ) -#define skip_some_packets( a,b ) dbg_skip_some_packets((a),(b), __FILE__, __LINE__ ) +int dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos, + const char* file, int lineno ); +int dbg_parse_packet( IOBUF inp, PACKET *ret_pkt, + const char* file, int lineno ); +int dbg_copy_all_packets( IOBUF inp, IOBUF out, + const char* file, int lineno ); +int dbg_copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff, + const char* file, int lineno ); +int dbg_skip_some_packets( IOBUF inp, unsigned n, + const char* file, int lineno ); +#define search_packet( a,b,c,d ) \ + dbg_search_packet( (a), (b), (c), (d), __FILE__, __LINE__ ) +#define parse_packet( a, b ) \ + dbg_parse_packet( (a), (b), __FILE__, __LINE__ ) +#define copy_all_packets( a,b ) \ + dbg_copy_all_packets((a),(b), __FILE__, __LINE__ ) +#define copy_some_packets( a,b,c ) \ + dbg_copy_some_packets((a),(b),(c), __FILE__, __LINE__ ) +#define skip_some_packets( a,b ) \ + dbg_skip_some_packets((a),(b), __FILE__, __LINE__ ) #else -int search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos ); +int search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos ); int parse_packet( IOBUF inp, PACKET *ret_pkt); int copy_all_packets( IOBUF inp, IOBUF out ); -int copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff ); +int copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff ); int skip_some_packets( IOBUF inp, unsigned n ); #endif diff --git a/g10/parse-packet.c b/g10/parse-packet.c index ee2ff56eb..30566a8cb 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -39,7 +39,7 @@ static int mpi_print_mode = 0; static int list_mode = 0; static int parse( IOBUF inp, PACKET *pkt, int reqtype, - ulong *retpos, int *skip, IOBUF out, int do_skip + off_t *retpos, int *skip, IOBUF out, int do_skip #ifdef DEBUG_PARSE_PACKET ,const char *dbg_w, const char *dbg_f, int dbg_l #endif @@ -158,7 +158,7 @@ parse_packet( IOBUF inp, PACKET *pkt ) */ #ifdef DEBUG_PARSE_PACKET int -dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, +dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos, const char *dbg_f, int dbg_l ) { int skip, rc; @@ -170,7 +170,7 @@ dbg_search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos, } #else int -search_packet( IOBUF inp, PACKET *pkt, int pkttype, ulong *retpos ) +search_packet( IOBUF inp, PACKET *pkt, int pkttype, off_t *retpos ) { int skip, rc; @@ -215,7 +215,7 @@ copy_all_packets( IOBUF inp, IOBUF out ) */ #ifdef DEBUG_PARSE_PACKET int -dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, +dbg_copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff, const char *dbg_f, int dbg_l ) { PACKET pkt; @@ -230,7 +230,7 @@ dbg_copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff, } #else int -copy_some_packets( IOBUF inp, IOBUF out, ulong stopoff ) +copy_some_packets( IOBUF inp, IOBUF out, off_t stopoff ) { PACKET pkt; int skip, rc=0; @@ -284,7 +284,7 @@ skip_some_packets( IOBUF inp, unsigned n ) * if OUT is not NULL, a special copymode is used. */ static int -parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, +parse( IOBUF inp, PACKET *pkt, int reqtype, off_t *retpos, int *skip, IOBUF out, int do_skip #ifdef DEBUG_PARSE_PACKET ,const char *dbg_w, const char *dbg_f, int dbg_l @@ -309,8 +309,7 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos, hdrlen=0; hdr[hdrlen++] = ctb; if( !(ctb & 0x80) ) { - log_error("%s: invalid packet (ctb=%02x) near %lu\n", - iobuf_where(inp), ctb, iobuf_tell(inp) ); + log_error("%s: invalid packet (ctb=%02x)\n", iobuf_where(inp), ctb ); rc = G10ERR_INVALID_PACKET; goto leave; } diff --git a/g10/pipemode.c b/g10/pipemode.c new file mode 100644 index 000000000..4d9f0a31a --- /dev/null +++ b/g10/pipemode.c @@ -0,0 +1,231 @@ +/* pipemode.c - pipemode handler + * Copyright (C) 2000 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#include +#include +#include +#include +#include + +#include "options.h" +#include "packet.h" +#include "errors.h" +#include "iobuf.h" +#include "keydb.h" +#include "memory.h" +#include "util.h" +#include "main.h" +#include "status.h" +#include "filter.h" + + +#define CONTROL_PACKET_SPACE 30 + +enum pipemode_state_e { + STX_init = 0, + STX_wait_operation, + STX_begin, + STX_text, + STX_wait_init +}; + + +struct pipemode_context_s { + enum pipemode_state_e state; + int operation; + int stop; +}; + + +static size_t +make_control ( byte *buf, int code, int operation ) +{ + const byte *sesmark; + size_t sesmarklen, n=0;; + + sesmark = get_session_marker( &sesmarklen ); + if ( sesmarklen > 20 ) + BUG(); + + buf[n++] = 0xff; /* new format, type 63, 1 length byte */ + n++; /* length will fixed below */ + memcpy(buf+n, sesmark, sesmarklen ); n+= sesmarklen; + buf[n++] = 2; /* control type: pipemode marker */ + buf[n++] = code; + buf[n++] = operation; + buf[1] = n-2; + return n; +} + + +static int +pipemode_filter( void *opaque, int control, + IOBUF a, byte *buf, size_t *ret_len) +{ + size_t size = *ret_len; + struct pipemode_context_s *stx = opaque; + int rc=0; + size_t n = 0; + int esc = 0; + + if( control == IOBUFCTRL_UNDERFLOW ) { + *ret_len = 0; + /* reserve some space for one control packet */ + if ( size <= CONTROL_PACKET_SPACE ) + BUG(); + size -= CONTROL_PACKET_SPACE; + + + while ( n < size ) { + int c = iobuf_get (a); + if (c == -1) { + if ( stx->state != STX_init ) { + log_error ("EOF encountered at wrong state\n"); + stx->stop = 1; + return -1; + } + break; + } + if ( esc ) { + switch (c) { + case '@': + if ( stx->state == STX_text ) { + buf[n++] = c; + break; + } + log_error ("@@ not allowed in current state\n"); + return -1; + case '<': /* begin of stream part */ + if ( stx->state != STX_init ) { + log_error ("nested begin of stream\n"); + stx->stop = 1; + return -1; + } + stx->state = STX_wait_operation; + break; + case '>': /* end of stream part */ + if ( stx->state != STX_wait_init ) { + log_error ("invalid state for @>\n"); + stx->stop = 1; + return -1; + } + stx->state = STX_init; + break; + case 'V': /* operation = verify */ + case 'E': /* operation = encrypt */ + case 'S': /* operation = sign */ + case 'B': /* operation = detach sign */ + case 'C': /* operation = clearsign */ + case 'D': /* operation = decrypt */ + if ( stx->state != STX_wait_operation ) { + log_error ("invalid state for operation code\n"); + stx->stop = 1; + return -1; + } + stx->operation = c; + stx->state = STX_begin; + n += make_control ( buf, 1, stx->operation ); + goto leave; + + case 't': /* plaintext text follows */ + if ( stx->state != STX_begin ) { + log_error ("invalid state for @t\n"); + stx->stop = 1; + return -1; + } + if ( stx->operation != 'E' ) { + log_error ("invalid operation for @t\n"); + stx->stop = 1; + return -1; + } + stx->state = STX_text; + n += make_control ( buf, 2, c ); + goto leave; + + case '.': /* ready */ + if ( stx->state == STX_text ) + ; + else { + log_error ("invalid state for @.\n"); + stx->stop = 1; + return -1; + } + stx->state = STX_wait_init; + n += make_control ( buf, 3, c ); + goto leave; + + default: + log_error ("invalid escape sequence 0x%02x in stream\n", + c); + stx->stop = 1; + return -1; + } + esc = 0; + } + else if (c == '@') + esc = 1; + else + buf[n++] = c; + } + + leave: + if ( !n ) { + stx->stop = 1; + rc = -1; /* eof */ + } + *ret_len = n; + } + else if( control == IOBUFCTRL_DESC ) + *(char**)buf = "pipemode_filter"; + return rc; +} + + + +void +run_in_pipemode(void) +{ + IOBUF fp; + armor_filter_context_t afx; + struct pipemode_context_s stx; + int rc; + + memset( &afx, 0, sizeof afx); + memset( &stx, 0, sizeof stx); + + fp = iobuf_open("-"); + iobuf_push_filter (fp, pipemode_filter, &stx ); + + if( !opt.no_armor ) + iobuf_push_filter( fp, armor_filter, &afx ); + + do { + log_debug ("pipemode: begin proc_packets\n"); + rc = proc_packets( NULL, fp ); + log_debug ("pipemode: end proc_packets: %s\n", g10_errstr (rc)); + } while ( !stx.stop ); + +} + + + + + diff --git a/g10/ringedit.c b/g10/ringedit.c index 382d7281f..4ece1ec56 100644 --- a/g10/ringedit.c +++ b/g10/ringedit.c @@ -1106,7 +1106,7 @@ keyring_search( PACKET *req, KBPOS *kbpos, IOBUF iobuf, const char *fname ) int rc; PACKET pkt; int save_mode; - ulong offset; + off_t offset; int pkttype = req->pkttype; PKT_public_key *req_pk = req->pkt.public_key; PKT_secret_key *req_sk = req->pkt.secret_key; @@ -1188,9 +1188,9 @@ keyring_read( KBPOS *kbpos, KBNODE *ret_root ) } if( !kbpos->valid ) - log_debug("kbpos not valid in keyring_read, want %d\n", (int)kbpos->offset ); + log_debug("kbpos not valid in keyring_read\n" ); if( iobuf_seek( a, kbpos->offset ) ) { - log_error("can't seek to %lu\n", kbpos->offset); + log_error("can't seek\n"); iobuf_close(a); return G10ERR_KEYRING_OPEN; } diff --git a/g10/verify.c b/g10/verify.c index fcc2f09ad..924fc85ce 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -161,4 +161,3 @@ verify_files( int nfiles, char **files ) } return 0; } - diff --git a/include/ChangeLog b/include/ChangeLog index 7f6d87f80..de9b690f4 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2000-11-11 Paul Eggert + + * iobuf.h (iobuf_get_filelength): Now returns off_t, not u32. + (struct iobuf_struct, iobuf_set_limit, + iobuf_tell, iobuf_seek): Use off_t, not ulong, for file offsets. + 2000-10-12 Werner Koch * mpi.h: Changed the way mpi_limb_t is defined. diff --git a/include/iobuf.h b/include/iobuf.h index a2eabb661..3a6e4f09d 100644 --- a/include/iobuf.h +++ b/include/iobuf.h @@ -40,9 +40,9 @@ typedef struct iobuf_struct *IOBUF; /* fixme: we should hide most of this stuff */ struct iobuf_struct { int use; /* 1 input , 2 output, 3 temp */ - unsigned long nlimit; - unsigned long nbytes; /* used together with nlimit */ - unsigned long ntotal; /* total bytes read (position of stream) */ + off_t nlimit; + off_t nbytes; /* used together with nlimit */ + off_t ntotal; /* total bytes read (position of stream) */ int nofast; /* used by the iobuf_get() */ void *directfp; struct { @@ -73,6 +73,7 @@ struct iobuf_struct { int iobuf_debug_mode; +void iobuf_enable_special_filenames ( int yes ); IOBUF iobuf_alloc(int use, size_t bufsize); IOBUF iobuf_temp(void); IOBUF iobuf_temp_with_content( const char *buffer, size_t length ); @@ -96,10 +97,10 @@ void iobuf_clear_eof(IOBUF a); #define iobuf_set_error(a) do { (a)->error = 1; } while(0) #define iobuf_error(a) ((a)->error) -void iobuf_set_limit( IOBUF a, unsigned long nlimit ); +void iobuf_set_limit( IOBUF a, off_t nlimit ); -ulong iobuf_tell( IOBUF a ); -int iobuf_seek( IOBUF a, ulong newpos ); +off_t iobuf_tell( IOBUF a ); +int iobuf_seek( IOBUF a, off_t newpos ); int iobuf_readbyte(IOBUF a); int iobuf_read(IOBUF a, byte *buf, unsigned buflen ); @@ -115,7 +116,7 @@ int iobuf_write_temp( IOBUF a, IOBUF temp ); size_t iobuf_temp_to_buffer( IOBUF a, byte *buffer, size_t buflen ); void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp ); -u32 iobuf_get_filelength( IOBUF a ); +off_t iobuf_get_filelength( IOBUF a ); #define IOBUF_FILELENGTH_LIMIT 0xffffffff const char *iobuf_get_real_fname( IOBUF a ); const char *iobuf_get_fname( IOBUF a ); diff --git a/po/ChangeLog b/po/ChangeLog index 623cbc24f..ca7c655bc 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2000-10-23 Werner Koch + + * ja.po: Updated. + 2000-10-19 Werner Koch Fixed a typo in all files. @@ -19,7 +23,7 @@ Wed Jul 12 13:32:06 CEST 2000 Werner Koch Small English spelling correction in all files. -Wed Jul 5 13:28:45 CEST 2000 Werner Koch +Wed Jul 5 13:28:45 CEST 2000 Werner Koch * fr.po: Minor changes by Gael diff --git a/po/ja.po b/po/ja.po index 323da4a05..ffc2a7166 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,15 +1,15 @@ # Japanese messages for GnuPG -# Copyright (C) 1999 Free Software Foundation, Inc. -# IIDA Yosiaki , 1999-2000. +# Copyright (C) 1999, 2000 Free Software Foundation, Inc. +# IIDA Yosiaki , 1999-2000. # Yoshihiro Kajiki , 1999. # Special thanks to "Takashi P.KATOH". # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.0.0h\n" +"Project-Id-Version: gnupg 1.0.4\n" "POT-Creation-Date: 2000-10-16 19:22+0200\n" -"PO-Revision-Date: 2000-02-16 20:10+09:00\n" -"Last-Translator: IIDA Yosiaki \n" +"PO-Revision-Date: 2000-10-19 23:08+09:00\n" +"Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" @@ -17,15 +17,15 @@ msgstr "" #: util/secmem.c:79 msgid "Warning: using insecure memory!\n" -msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤ä¤Ð¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n" #: util/secmem.c:295 msgid "operation is not possible without initialized secure memory\n" -msgstr "½é´ü²½¤µ¤ì¤¿°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" +msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" #: util/secmem.c:296 msgid "(you may have used the wrong program for this task)\n" -msgstr "(¤³¤ÎÌÜŪ¤Ë¤ÏÉÔŬÀÚ¤Ê¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n" +msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n" #: util/miscutil.c:277 util/miscutil.c:306 msgid "yes" @@ -57,19 +57,19 @@ msgstr " #: util/errors.c:55 msgid "unknown packet type" -msgstr "¥Ñ¥±¥Ã¥È¥¿¥¤¥×¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤΥѥ±¥Ã¥È¡¦¥¿¥¤¥×¤Ç¤¹" #: util/errors.c:56 msgid "unknown version" -msgstr "¥Ð¡¼¥¸¥ç¥ó¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤΥС¼¥¸¥ç¥ó¤Ç¤¹" #: util/errors.c:57 msgid "unknown pubkey algorithm" -msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤθø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" #: util/errors.c:58 msgid "unknown digest algorithm" -msgstr "Í×Ìó¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤÎÍ×Ì󥢥르¥ê¥º¥à¤Ç¤¹" #: util/errors.c:59 msgid "bad public key" @@ -85,23 +85,23 @@ msgstr " #: util/errors.c:62 msgid "checksum error" -msgstr "¥Á¥§¥Ã¥¯¥µ¥à¥¨¥é¡¼" +msgstr "¥Á¥§¥Ã¥¯¥µ¥à¡¦¥¨¥é¡¼" #: util/errors.c:63 msgid "bad passphrase" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó" +msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔÀµ¤Ç¤¹" #: util/errors.c:64 msgid "public key not found" -msgstr "¸ø³«¸°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" +msgstr "¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" #: util/errors.c:65 msgid "unknown cipher algorithm" -msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤΰŹ楢¥ë¥´¥ê¥º¥à¤Ç¤¹" #: util/errors.c:66 msgid "can't open the keyring" -msgstr "¸°¥ê¥ó¥°¤¬³«¤±¤Þ¤»¤ó" +msgstr "¸°Îؤ¬³«¤±¤Þ¤»¤ó" #: util/errors.c:67 msgid "invalid packet" @@ -109,19 +109,19 @@ msgstr "̵ #: util/errors.c:68 msgid "invalid armor" -msgstr "̵¸ú¤ÊÁõ¹Ã¤Ç¤¹" +msgstr "̵¸ú¤ÊÊñÁõ¤Ç¤¹" #: util/errors.c:69 msgid "no such user id" -msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó" +msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó" #: util/errors.c:70 msgid "secret key not available" -msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó" +msgstr "ÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó" #: util/errors.c:71 msgid "wrong secret key used" -msgstr "ÉÔÀµ¤ÊÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹" +msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹" #: util/errors.c:72 msgid "not supported" @@ -133,15 +133,15 @@ msgstr " #: util/errors.c:74 msgid "file read error" -msgstr "¥Õ¥¡¥¤¥ë¤ÎÆɤ߽Ф·¥¨¥é¡¼" +msgstr "¥Õ¥¡¥¤¥ë¤ÎÆɽФ·¥¨¥é¡¼" #: util/errors.c:75 msgid "file write error" -msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼" +msgstr "¥Õ¥¡¥¤¥ë¤Î½ñ¹þ¤ß¥¨¥é¡¼" #: util/errors.c:76 msgid "unknown compress algorithm" -msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤΰµ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" #: util/errors.c:77 msgid "file open error" @@ -149,23 +149,23 @@ msgstr " #: util/errors.c:78 msgid "file create error" -msgstr "¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó" +msgstr "¥Õ¥¡¥¤¥ë¤ÎºîÀ®¥¨¥é¡¼" #: util/errors.c:79 msgid "invalid passphrase" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" +msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ìµ¸ú¤Ç¤¹" #: util/errors.c:80 msgid "unimplemented pubkey algorithm" -msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "̤¼ÂÁõ¤Î¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" #: util/errors.c:81 msgid "unimplemented cipher algorithm" -msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "̤¼ÂÁõ¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" #: util/errors.c:82 msgid "unknown signature class" -msgstr "½ð̾¤Î¥¯¥é¥¹¤¬ÉÔÌÀ¤Ç¤¹" +msgstr "̤ÃΤνð̾¥¯¥é¥¹¤Ç¤¹" #: util/errors.c:83 msgid "trust database error" @@ -173,7 +173,7 @@ msgstr " #: util/errors.c:84 msgid "bad MPI" -msgstr "MPI ¤¬ÉÔÀµ¤Ç¤¹" +msgstr "ÉÔÀµ¤ÊMPI¤Ç¤¹" #: util/errors.c:85 msgid "resource limit" @@ -181,7 +181,7 @@ msgstr " #: util/errors.c:86 msgid "invalid keyring" -msgstr "¸°¥ê¥ó¥°¤¬Ìµ¸ú¤Ç¤¹" +msgstr "¸°Îؤ¬Ìµ¸ú¤Ç¤¹" #: util/errors.c:87 msgid "bad certificate" @@ -189,7 +189,7 @@ msgstr " #: util/errors.c:88 msgid "malformed user id" -msgstr "¥æ¡¼¥¶ ID ¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó" +msgstr "¥æ¡¼¥¶¡¼ID¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó" #: util/errors.c:89 msgid "file close error" @@ -197,15 +197,15 @@ msgstr " #: util/errors.c:90 msgid "file rename error" -msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¤¬¤Ç¤­¤Þ¤»¤ó" +msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¥¨¥é¡¼" #: util/errors.c:91 msgid "file delete error" -msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤¬¤Ç¤­¤Þ¤»¤ó" +msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¥¨¥é¡¼" #: util/errors.c:92 msgid "unexpected data" -msgstr "ͽ´ü¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¡¼¥¿¤Ç¤¹" +msgstr "ͽ´ü¤»¤Ì¥Ç¡¼¥¿¤Ç¤¹" #: util/errors.c:93 msgid "timestamp conflict" @@ -229,15 +229,15 @@ msgstr "̵ #: util/errors.c:98 msgid "bad URI" -msgstr "URI ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" +msgstr "URI¤¬ÉÔÀµ¤Ç¤¹" #: util/errors.c:99 msgid "unsupported URI" -msgstr "¤½¤Î URI ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó" +msgstr "¤½¤ÎURI¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó" #: util/errors.c:100 msgid "network error" -msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¨¥é¡¼" +msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¨¥é¡¼" #: util/errors.c:102 msgid "not encrypted" @@ -260,58 +260,58 @@ msgstr " #: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256 #, c-format msgid "can't open `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó: %s\n" #: cipher/random.c:315 -#, fuzzy, c-format +#, c-format msgid "can't stat `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: cipher/random.c:320 #, c-format msgid "`%s' is not a regular file - ignored\n" -msgstr "" +msgstr "`%s' ¤ÏÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" #: cipher/random.c:325 msgid "note: random_seed file is empty\n" -msgstr "" +msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Ï¶õ¤Ç¤¹\n" #: cipher/random.c:331 msgid "warning: invalid size of random_seed file - not used\n" -msgstr "" +msgstr "·Ù¹ð: ̵¸ú¤Ê¥µ¥¤¥º¤Î random_seed ¥Õ¥¡¥¤¥ë - »È¤¤¤Þ¤»¤ó\n" #: cipher/random.c:339 -#, fuzzy, c-format +#, c-format msgid "can't read `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤òÆɤá¤Þ¤»¤ó: %s\n" #: cipher/random.c:377 msgid "note: random_seed file not updated\n" -msgstr "" +msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¤·¤Þ¤»¤ó\n" #: cipher/random.c:397 -#, fuzzy, c-format +#, c-format msgid "can't create `%s': %s\n" -msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: cipher/random.c:404 -#, fuzzy, c-format +#, c-format msgid "can't write `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤Ë½ñ¤±¤Þ¤»¤ó: %s\n" #: cipher/random.c:407 -#, fuzzy, c-format +#, c-format msgid "can't close `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤òÊĤ¸¤é¤ì¤Þ¤»¤ó: %s\n" #: cipher/random.c:418 #, c-format msgid "too many random bits requested; the limit is %d\n" -msgstr "" +msgstr "¥é¥ó¥À¥à¡¦¥Ó¥Ã¥È¤ò¤¿¤¯¤µ¤óÍ׵ᤷ²á¤®¤Ç¤¹¡£¸Â³¦¤Ï %d\n" #: cipher/random.c:650 msgid "WARNING: using insecure random number generator!!\n" -msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤Íð¿ôÀ¸À®ÁõÃÖ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n" +msgstr "·Ù¹ð: ¤ä¤Ð¤¤Íð¿ôÀ¸À®»Ò¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n" #: cipher/random.c:651 msgid "" @@ -321,10 +321,10 @@ msgid "" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" msgstr "" -"¤³¤Î OS ¤ËÅëºÜ¤µ¤ì¤Æ¤¤¤ëµ¿»÷Íð¿ôÀ¸À®¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢\n" -"°Å¹æÍѤȤ·¤Æ¤ÏÉÔŬÅö¤Ç¤¹¡£¶¯¸Ç¤ÊÍð¿ô¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó¡£\n" +"ÅëºÜ¤µ¤ì¤Æ¤¤¤ëÍð¿ôÀ¸À®»Ò¤Ï¡¢°Å¹æÍѤȤ·¤Æ¤Ï¤ª¤½¤Þ¤Ä¤Ç¡¢\n" +"¶¯¤¤Íð¿ô¤¬¤Ç¤­¤Þ¤»¤ó!\n" "\n" -"¤³¤Î¥×¥í¥°¥é¥à¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿¥Ç¡¼¥¿¤Ï°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n" +"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n" "\n" #: cipher/rndlinux.c:142 @@ -335,8 +335,8 @@ msgid "" "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" "\n" -"½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£¥¨¥ó¥È¥í¥Ô¡¼¤òÁý²Ã¤µ¤»¤ë¤è¤¦¤Ë\n" -"OS ¤ÎÀßÄê¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£(%d bytes °Ê¾å¤Î¼þ´ü¤¬É¬ÍפǤ¹)\n" +"½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n" +"¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n" #: g10/g10.c:206 msgid "" @@ -348,11 +348,11 @@ msgstr "" #: g10/g10.c:208 msgid "|[file]|make a signature" -msgstr "|[file]|½ð̾¤òºîÀ®" +msgstr "|[¥Õ¥¡¥¤¥ë]|½ð̾¤òºîÀ®" #: g10/g10.c:209 msgid "|[file]|make a clear text signature" -msgstr "|[file]|¥¯¥ê¥¢½ð̾¤òºîÀ®" +msgstr "|[¥Õ¥¡¥¤¥ë]|¥¯¥ê¥¢½ð̾¤òºîÀ®" #: g10/g10.c:210 msgid "make a detached signature" @@ -372,7 +372,7 @@ msgstr " #: g10/g10.c:214 msgid "decrypt data (default)" -msgstr "¥Ç¡¼¥¿¤òÉü¹æ (¥Ç¥Õ¥©¥ë¥È)" +msgstr "¥Ç¡¼¥¿¤òÉü¹æ (´ûÄê)" #: g10/g10.c:215 msgid "verify a signature" @@ -400,15 +400,15 @@ msgstr " #: g10/g10.c:223 msgid "generate a new key pair" -msgstr "¿·¤·¤¤¸°¥Ú¥¢¤òºîÀ®" +msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®" #: g10/g10.c:224 msgid "remove key from the public keyring" -msgstr "¸ø³«¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü" +msgstr "¸ø³«¸°Îؤ«¤é¸°¤òºï½ü" #: g10/g10.c:226 msgid "remove key from the secret keyring" -msgstr "ÈëÌ©¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü" +msgstr "ÈëÌ©¸°Îؤ«¤é¸°¤òºï½ü" #: g10/g10.c:227 msgid "sign a key" @@ -416,15 +416,15 @@ msgstr " #: g10/g10.c:228 msgid "sign a key locally" -msgstr "¥í¡¼¥«¥ë¤Ë¤Æ¸°¤Ë½ð̾" +msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" #: g10/g10.c:229 msgid "sign or edit a key" -msgstr "¸°¤Ø¤Î½ð̾¤Þ¤¿¤ÏÊÔ½¸" +msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸" #: g10/g10.c:230 msgid "generate a revocation certificate" -msgstr "ÇË´þ¾ÚÌÀ½ñ¤òºîÀ®" +msgstr "ÇË´þ¾ÚÌÀ½ñ¤òÀ¸À®" #: g10/g10.c:231 msgid "export keys" @@ -432,7 +432,7 @@ msgstr " #: g10/g10.c:232 msgid "export keys to a key server" -msgstr "¸°¥µ¡¼¥Ð¤Ë¸°¤òÅÐÏ¿" +msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹" #: g10/g10.c:233 msgid "import keys from a key server" @@ -440,7 +440,7 @@ msgstr " #: g10/g10.c:237 msgid "import/merge keys" -msgstr "¸°¤ÎÆɤ߹þ¤ß/¥Þ¡¼¥¸" +msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç" #: g10/g10.c:239 msgid "list only the sequence of packets" @@ -460,7 +460,7 @@ msgstr " #: g10/g10.c:247 msgid "|[NAMES]|check the trust database" -msgstr "|[NAMES]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯" +msgstr "|[̾Á°]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯" #: g10/g10.c:248 msgid "fix a corrupted trust database" @@ -468,15 +468,17 @@ msgstr " #: g10/g10.c:249 msgid "De-Armor a file or stdin" -msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã½üµî" +msgstr "" +"¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n" +"ÊñÁõ½üµî" #: g10/g10.c:251 msgid "En-Armor a file or stdin" -msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã²½" +msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½" #: g10/g10.c:253 msgid "|algo [files]|print message digests" -msgstr "|algo [files]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ" +msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ" #: g10/g10.c:257 msgid "" @@ -490,35 +492,41 @@ msgstr "" #: g10/g10.c:259 msgid "create ascii armored output" -msgstr "¥¢¥¹¥­¡¼·Á¼°¤ÎÁõ¹Ã¤òÀ¸À®" +msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®" #: g10/g10.c:261 msgid "|NAME|encrypt for NAME" -msgstr "|NAME|NAME ÍѤ˰Ź沽" +msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽" #: g10/g10.c:264 msgid "|NAME|use NAME as default recipient" -msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤Æ\n" +"¡Ö̾Á°¡×¤ò»ÈÍÑ" #: g10/g10.c:266 msgid "use the default key as default recipient" -msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÍѤ¤¤ë" +msgstr "´ûÄê¤Î¼õ¿®¼Ô¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ" #: g10/g10.c:270 msgid "use this user-id to sign or decrypt" -msgstr "½ð̾¤äÉü¹æ¤Ë ¤³¤Î user-id ¤òÍѤ¤¤ë" +msgstr "" +"½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n" +"¤ò»ÈÍÑ" #: g10/g10.c:271 msgid "|N|set compress level N (0 disables)" -msgstr "|N|°µ½Ì¥ì¥Ù¥ë¤ò N ¤ËÀßÄꤹ¤ë (0 ¤ÏÈó°µ½Ì)" +msgstr "" +"|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n" +"(0¤ÏÈó°µ½Ì)" #: g10/g10.c:273 msgid "use canonical text mode" -msgstr "ɸ½à¥Æ¥­¥¹¥È¥â¡¼¥É¤òÍѤ¤¤ë" +msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ" #: g10/g10.c:274 msgid "use as output file" -msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤ÆÍѤ¤¤ë" +msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" #: g10/g10.c:275 msgid "verbose" @@ -530,114 +538,147 @@ msgstr " #: g10/g10.c:277 msgid "don't use the terminal at all" -msgstr "üËö¤ò»ÈÍѤ·¤Ê¤¤" +msgstr "üËö¤òÉÔ»ÈÍÑ" #: g10/g10.c:278 msgid "force v3 signatures" -msgstr "¶¯À©Åª¤Ë v3 ½ð̾¤¹¤ë" +msgstr "¶¯À©Åª¤Ëv3½ð̾" #: g10/g10.c:279 msgid "always use a MDC for encryption" -msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤Ë MDC ¤ò»ÈÍÑ" +msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ" #: g10/g10.c:280 msgid "do not make any changes" -msgstr "Á´¤Æ¤ÎÊѹ¹¤òÍѤ¤¤Ê¤¤" +msgstr "̵Êѹ¹" #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, #: g10/g10.c:282 msgid "batch mode: never ask" -msgstr "¥Ð¥Ã¥Á¥â¡¼¥É: Ì䤤¹ç¤ï¤»¤ò¹Ô¤ï¤Ê¤¤" +msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά" #: g10/g10.c:283 msgid "assume yes on most questions" -msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë yes ¤È¸«¤Ê¤¹" +msgstr "" +"¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n" +"¤È¤ß¤Ê¤¹" #: g10/g10.c:284 msgid "assume no on most questions" -msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë no ¤È¸«¤Ê¤¹" +msgstr "" +"¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n" +"¤È¤ß¤Ê¤¹" #: g10/g10.c:285 msgid "add this keyring to the list of keyrings" -msgstr "¸°¥ê¥ó¥°¤Î°ìÍ÷¤Ë ¤³¤Î¸°¤ò²Ã¤¨¤ë" +msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ" #: g10/g10.c:286 msgid "add this secret keyring to the list" -msgstr "°ìÍ÷¤Ë ¤³¤ÎÈëÌ©¸°¥ê¥ó¥°¤ò²Ã¤¨¤ë" +msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ" #: g10/g10.c:287 msgid "|NAME|use NAME as default secret key" -msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤ÎÈëÌ©¸°¤È¤·¤Æ NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n" +"¡Ö̾Á°¡×¤ò»ÈÍÑ" #: g10/g10.c:288 msgid "|HOST|use this keyserver to lookup keys" -msgstr "|HOST|¸°¤Î¸¡º÷¤Ë ¤³¤Î¸°¥µ¡¼¥Ð¤òÍѤ¤¤ë" +msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ" #: g10/g10.c:289 msgid "|NAME|set terminal charset to NAME" -msgstr "|NAME|üËö¤Îʸ»ú¥³¡¼¥É¤ò NAME ¤ËÀßÄꤹ¤ë" +msgstr "" +"|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n" +"¤ËÀßÄê" #: g10/g10.c:290 msgid "read options from file" -msgstr "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤à" +msgstr "" +"¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n" +"Æɤ߹þ¤à" #: g10/g10.c:294 msgid "|FD|write status info to this FD" -msgstr "|FD|¤³¤Î FD ¤Ë¾õÂÖ¤ò½ñ¤­½Ð¤¹" +msgstr "" +"|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n" +"½ñ¤­½Ð¤¹" #: g10/g10.c:299 msgid "|KEYID|ulimately trust this key" -msgstr "" +msgstr "|¸°ID|¤³¤Î¡Ö¸°¡×¤òµæ¶ËŪ¤Ë¿®ÍѤ¹¤ë" #: g10/g10.c:300 msgid "|FILE|load extension module FILE" -msgstr "|FILE|³ÈÄ¥¥â¥¸¥å¡¼¥ë FILE ¤òÆɤߤ³¤à" +msgstr "" +"|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n" +"Æɤ߹þ¤à" #: g10/g10.c:301 msgid "emulate the mode described in RFC1991" -msgstr "RFC1991 ¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤òÍѤ¤¤ë" +msgstr "" +"RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n" +"»ÈÍÑ" #: g10/g10.c:302 msgid "set all packet, cipher and digest options to OpenPGP behavior" -msgstr "Á´¤Æ¤Î¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç¥ó¤ò OpenPGP ¤Î¿¶Éñ¤ËÀßÄê" +msgstr "" +"¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç\n" +"¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê" #: g10/g10.c:303 msgid "|N|use passphrase mode N" -msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¥â¡¼¥É N ¤òÍѤ¤¤ë" +msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¡¦¥â¡¼¥ÉN¤ò»ÈÍÑ" #: g10/g10.c:305 msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î¥á¥Ã\n" +"¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à¤ò»ÈÍÑ" #: g10/g10.c:307 msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î°Å¹æ\n" +"¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ" #: g10/g10.c:308 msgid "|NAME|use cipher algorithm NAME" -msgstr "|NAME|°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|¡Ö̾Á°¡×¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò\n" +"»ÈÍÑ" #: g10/g10.c:309 msgid "|NAME|use message digest algorithm NAME" -msgstr "|NAME|¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|¡Ö̾Á°¡×¤Î¥á¥Ã¥»¡¼¥¸Í×Ìó\n" +"¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ" #: g10/g10.c:310 msgid "|N|use compress algorithm N" -msgstr "|NAME|°µ½Ì¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë" +msgstr "" +"|̾Á°|¡Ö̾Á°¡×¤Î°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò\n" +"»ÈÍÑ" #: g10/g10.c:311 msgid "throw keyid field of encrypted packets" -msgstr "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸° ID ¥Õ¥£¡¼¥ë¥É¤òÁ÷½Ð¤¹¤ë" +msgstr "" +"°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n" +"¤òÁ÷½Ð" #: g10/g10.c:312 msgid "|NAME=VALUE|use this notation data" -msgstr "|NAME=VALUE|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤òÍѤ¤¤ë" +msgstr "|̾Á°=ÃÍ|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤ò»ÈÍÑ" #: g10/g10.c:315 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" +"@\n" +"(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n" +"¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n" #: g10/g10.c:318 msgid "" @@ -653,15 +694,15 @@ msgstr "" "@\n" "Îã:\n" "\n" -" -se -r Bob [file] ¥æ¡¼¥¶ Bob ¤Ø¤Î½ð̾¤È°Å¹æ²½\n" -" --clearsign [file] ¥¯¥ê¥¢½ð̾¤òÀ¸À®\n" -" --detach-sign [file] ʬΥ½ð̾¤òÀ¸À®\n" -" --list-keys [names] ¸°¤òɽ¼¨\n" -" --fingerprint [names] »ØÌæ¤òɽ¼¨\n" +" -se -r Bob [¥Õ¥¡¥¤¥ë] ¥æ¡¼¥¶¡¼Bob¤Ø¤Î½ð̾¤È°Å¹æ²½\n" +" --clearsign [¥Õ¥¡¥¤¥ë] ¥¯¥ê¥¢½ð̾¤òÀ¸À®\n" +" --detach-sign [¥Õ¥¡¥¤¥ë] ʬΥ½ð̾¤òÀ¸À®\n" +" --list-keys [̾Á°] ¸°¤òɽ¼¨\n" +" --fingerprint [̾Á°] »ØÌæ¤òɽ¼¨\n" #: g10/g10.c:418 msgid "Please report bugs to .\n" -msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é ¤Þ¤Ç¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£\n" +msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n" #: g10/g10.c:422 msgid "Usage: gpg [options] [files] (-h for help)" @@ -673,9 +714,9 @@ msgid "" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -"½ñ¼°: gpg [options] [files]\n" -"½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¡¢¤Þ¤¿¤Ï Éü¹æ\n" -"¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ÏÆþÎϥǡ¼¥¿¤Ë°Í¸\n" +"½ñ¼°: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" +"½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¤äÉü¹æ\n" +"´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n" #: g10/g10.c:432 msgid "" @@ -687,7 +728,7 @@ msgstr "" #: g10/g10.c:511 msgid "usage: gpg [options] " -msgstr "»È¤¤Êý: gpg [options] " +msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] " #: g10/g10.c:564 msgid "conflicting commands\n" @@ -696,41 +737,41 @@ msgstr " #: g10/g10.c:704 #, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "Ãí°Õ: ¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s' ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s'¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/g10.c:708 #, c-format msgid "option file `%s': %s\n" -msgstr "¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s': %s\n" +msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë`%s': %s\n" #: g10/g10.c:715 #, c-format msgid "reading options from `%s'\n" -msgstr "`%s' ¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n" +msgstr "`%s'¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n" #: g10/g10.c:905 #, c-format msgid "%s is not a valid character set\n" -msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%s¤ÏÀµ¤·¤¤Ê¸»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/g10.c:970 msgid "WARNING: program may create a core file!\n" -msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Ï¥³¥¢¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" #: g10/g10.c:974 g10/g10.c:983 #, c-format msgid "NOTE: %s is not for normal use!\n" -msgstr "Ãí°Õ: %s ¤ÏÄ̾ï¤ÏÍѤ¤¤Þ¤»¤ó!\n" +msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n" #: g10/g10.c:976 #, c-format msgid "%s not allowed with %s!\n" -msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" +msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" #: g10/g10.c:979 #, c-format msgid "%s makes no sense with %s!\n" -msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤Æ¤â°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó!\n" +msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" #: g10/g10.c:998 g10/g10.c:1010 msgid "selected cipher algorithm is invalid\n" @@ -742,32 +783,32 @@ msgstr " #: g10/g10.c:1020 msgid "the given policy URL is invalid\n" -msgstr "Í¿¤¨¤é¤ì¤¿¥Ý¥ê¥·¡¼ URL ¤Ï̵¸ú¤Ç¤¹\n" +msgstr "¤¢¤¿¤¨¤é¤ì¤¿¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" #: g10/g10.c:1023 #, c-format msgid "compress algorithm must be in range %d..%d\n" -msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï %d..%d ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/g10.c:1025 msgid "completes-needed must be greater than 0\n" -msgstr "completes-needed ¤Ï 0 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" +msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" #: g10/g10.c:1027 msgid "marginals-needed must be greater than 1\n" -msgstr "marginals-needed ¤Ï 1 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" +msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" #: g10/g10.c:1029 msgid "max-cert-depth must be in range 1 to 255\n" -msgstr "max-cert-depth ¤Ï 1 ¤«¤é 255 ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/g10.c:1032 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "Ãí°Õ: ñ½ã¤Ê S2K ¥â¡¼¥É (0) ¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" +msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" #: g10/g10.c:1036 msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "̵¸ú¤Ê S2K ¥â¡¼¥É¡£0, 1 ¤Þ¤¿¤Ï 3 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/g10.c:1121 #, c-format @@ -804,47 +845,47 @@ msgstr "--decrypt [ #: g10/g10.c:1207 msgid "--sign-key user-id" -msgstr "--sign-key user-id" +msgstr "--sign-key ¥æ¡¼¥¶¡¼id" #: g10/g10.c:1215 msgid "--lsign-key user-id" -msgstr "--lsign-key user-id" +msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" #: g10/g10.c:1223 msgid "--edit-key user-id [commands]" -msgstr "--edit-key user-id [¥³¥Þ¥ó¥É]" +msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" #: g10/g10.c:1239 msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key user-id" +msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id" #: g10/g10.c:1242 msgid "--delete-key user-id" -msgstr "--delete-key user-id" +msgstr "--delete-key ¥æ¡¼¥¶¡¼id" #: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393 #, c-format msgid "can't open %s: %s\n" -msgstr "%s ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n" #: g10/g10.c:1294 msgid "-k[v][v][v][c] [user-id] [keyring]" -msgstr "-k[v][v][v][c] [user-id] [¸°¥ê¥ó¥°]" +msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" #: g10/g10.c:1360 #, c-format msgid "dearmoring failed: %s\n" -msgstr "Áõ¹Ã½üµî¤Ë¼ºÇÔ: %s\n" +msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/g10.c:1368 #, c-format msgid "enarmoring failed: %s\n" -msgstr "Áõ¹Ã²½¤Ë¼ºÇÔ: %s\n" +msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/g10.c:1439 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "¥Ï¥Ã¥·¥å¥¢¥ë¥´¥ê¥º¥à `%s' ¤Ï̵¸ú¤Ç¤¹\n" +msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n" #: g10/g10.c:1520 msgid "[filename]" @@ -852,12 +893,12 @@ msgstr "[ #: g10/g10.c:1524 msgid "Go ahead and type your message ...\n" -msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ²¼¤µ¤¤ ...\n" +msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n" #: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113 #, c-format msgid "can't open `%s'\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó\n" +msgstr "`%s'¤¬³«¤±¤Þ¤»¤ó\n" #: g10/g10.c:1737 msgid "" @@ -869,12 +910,12 @@ msgid "" "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -"Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Î¤ß¤òÍѤ¤¡¢'=' " -"¤òȼ¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +"Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢¤Î¤ß¤òÍѤ¤¡¢\n" +"'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/g10.c:1749 msgid "dots in a notation name must be surrounded by other characters\n" -msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/g10.c:1757 msgid "a notation value must not use any control characters\n" @@ -883,23 +924,23 @@ msgstr " #: g10/armor.c:302 #, c-format msgid "armor: %s\n" -msgstr "Áõ¹Ã: %s\n" +msgstr "ÊñÁõ: %s\n" #: g10/armor.c:331 msgid "invalid armor header: " -msgstr "̵¸ú¤ÊÁõ¹Ã¥Ø¥Ã¥À: " +msgstr "̵¸ú¤ÊÊñÁõ¥Ø¥Ã¥À¡¼: " #: g10/armor.c:338 msgid "armor header: " -msgstr "Áõ¹Ã¥Ø¥Ã¥À: " +msgstr "ÊñÁõ¥Ø¥Ã¥À¡¼: " #: g10/armor.c:349 msgid "invalid clearsig header\n" -msgstr "̵¸ú¤Ê¥¯¥ê¥¢½ð̾¥Ø¥Ã¥À\n" +msgstr "̵¸ú¤Ê¥¯¥ê¥¢½ð̾¥Ø¥Ã¥À¡¼\n" #: g10/armor.c:401 msgid "nested clear text signatures\n" -msgstr "¥Í¥¹¥È¤µ¤ì¤¿¥¯¥ê¥¢½ð̾\n" +msgstr "Æþ¤ì»Ò¤Î¥¯¥ê¥¢½ð̾\n" #: g10/armor.c:525 msgid "invalid dash escaped line: " @@ -907,63 +948,63 @@ msgstr "̵ #: g10/armor.c:537 msgid "unexpected armor:" -msgstr "ͽ´ü¤·¤Ê¤¤Áõ¹Ã:" +msgstr "ͽ´ü¤»¤ÌÊñÁõ:" #: g10/armor.c:654 #, c-format msgid "invalid radix64 character %02x skipped\n" -msgstr "̵¸ú¤Ê radix64 ʸ»ú %02x ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "̵¸ú¤Ê64¿Êʸ»ú%02x¤ò¤È¤Ð¤·¤Þ¤¹\n" #: g10/armor.c:697 msgid "premature eof (no CRC)\n" -msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (CRC ¤¬¤¢¤ê¤Þ¤»¤ó)\n" +msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (CRC¤¬¤¢¤ê¤Þ¤»¤ó)\n" #: g10/armor.c:731 msgid "premature eof (in CRC)\n" -msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (CRC ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n" +msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (CRC¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n" #: g10/armor.c:735 msgid "malformed CRC\n" -msgstr "CRC ¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" +msgstr "CRC¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" #: g10/armor.c:739 #, c-format msgid "CRC error; %06lx - %06lx\n" -msgstr "CRC ¥¨¥é¡¼; %06lx - %06lx\n" +msgstr "CRC¥¨¥é¡¼¡£%06lx - %06lx\n" #: g10/armor.c:756 msgid "premature eof (in Trailer)\n" -msgstr "eof ¤¬Á᤹¤®¤Þ¤¹ (Trailer ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n" +msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (¸åÈøÉô¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n" #: g10/armor.c:760 msgid "error in trailer line\n" -msgstr "Trailer ¹Ô¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "¸åÈø¤Î¹Ô¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n" #: g10/armor.c:906 msgid "For info see http://www.gnupg.org" -msgstr "" +msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI" #: g10/armor.c:1027 msgid "no valid OpenPGP data found.\n" -msgstr "Í­¸ú¤Ê OpenPGP ¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "Í­¸ú¤ÊOpenPGP¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" #: g10/armor.c:1032 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "̵¸ú¤ÊÁõ¹Ã: ¹Ô¤ÎŤµ¤¬ %d ʸ»ú¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n" +msgstr "̵¸ú¤ÊÊñÁõ: ¹Ô¤ÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n" #: g10/armor.c:1036 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -"Áõ¹Ã¤ÎÃæ¤Ë quoted printable ʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë MTA " -"¤¬»ÈÍѤµ¤ì¤¿¤Î¤Ç¤·¤ç¤¦\n" +"ÊñÁõ¤ÎÃæ¤Ë quoted printable ʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë\n" +"MTA¤ò»ÈÍѤ·¤¿¤Î¤Ç¤·¤ç¤¦\n" #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID #: g10/keyedit.c:1189 g10/pkclist.c:53 msgid " Fingerprint:" -msgstr " »ØÌæ:" +msgstr " »ØÌæ:" #: g10/pkclist.c:80 msgid "Fingerprint:" @@ -971,33 +1012,31 @@ msgstr " #: g10/pkclist.c:116 msgid "No reason specified" -msgstr "" +msgstr "Íýͳ¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" #: g10/pkclist.c:118 -#, fuzzy msgid "Key is superseded" -msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +msgstr "¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹" #: g10/pkclist.c:120 -#, fuzzy msgid "Key has been compromised" -msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" +msgstr "¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿" #: g10/pkclist.c:122 msgid "Key is no longer used" -msgstr "" +msgstr "¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó" #: g10/pkclist.c:124 msgid "User ID is no longer valid" -msgstr "" +msgstr "¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó" #: g10/pkclist.c:128 msgid "Reason for revocation: " -msgstr "" +msgstr "ÇË´þÍýͳ: " #: g10/pkclist.c:145 msgid "Revocation comment: " -msgstr "" +msgstr "ŬÍÑ: " #. a string with valid answers #: g10/pkclist.c:303 @@ -1010,7 +1049,7 @@ msgid "" "No trust value assigned to %lu:\n" "%4u%c/%08lX %s \"" msgstr "" -"%lu ¤Ë¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" +"%lu¤Ë¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" "%4u%c/%08lX %s \"" #: g10/pkclist.c:319 @@ -1025,18 +1064,18 @@ msgid "" " 4 = I trust fully\n" " s = please show me more information\n" msgstr "" -"¾¤Î¥æ¡¼¥¶¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ²¼¤µ¤¤\n" -"(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤È¾È¹ç¤·¤¿¤ê...)?\n" +"¾¤Î¥æ¡¼¥¶¡¼¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¡¼¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ\n" +"¤¯¤À¤µ¤¤(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤È¾È¹ç¤·¤¿¤ê...)?\n" "\n" " 1 = ̤ÃÎ\n" -" 2 = ¿®ÍѤ·¤Ê¤¤\n" +" 2 = ¿®ÍѤ· ¤Ê¤¤\n" " 3 = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n" " 4 = ´°Á´¤Ë¿®ÍѤ¹¤ë\n" " s = ¤è¤ê¾Ü¤·¤¤¾ðÊó¤ò¸«¤ë\n" #: g10/pkclist.c:328 msgid " m = back to the main menu\n" -msgstr " m = ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë\n" +msgstr " m = ¥á¡¼¥ó¡¦¥á¥Ë¥å¡¼¤ËÌá¤ë\n" #: g10/pkclist.c:330 msgid " q = quit\n" @@ -1056,8 +1095,8 @@ msgid "" "can assign some missing owner trust values.\n" "\n" msgstr "" -"¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤΥѥ¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£·ç¤±¤Æ¤¤¤ë¿Í¤Î¿®ÍÑÅÙ¤ò\n" -"ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n" +"¸°¤Ø¤ÎÍ­¸ú¤Ê¿®ÍѤηÐÏ©¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" +"¤¤¤Ê¤¤¿Í¤Î¿®ÍÑÅÙ¤¬ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n" "\n" #: g10/pkclist.c:435 @@ -1065,7 +1104,7 @@ msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" -"²æ¡¹¤Î¸°¤Ø»ê¤ë¥Ñ¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£\n" +"¤³¤Á¤é¤Î¸°¤Ø»ê¤ë·ÐÏ©¤¬¤¢¤ê¤Þ¤»¤ó¡£\n" "\n" #: g10/pkclist.c:437 @@ -1087,21 +1126,21 @@ msgstr "" #: g10/pkclist.c:457 #, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "¸° %08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" +msgstr "¸°%08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" #: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598 msgid "Use this key anyway? " -msgstr "¤½¤ì¤Ç¤â ¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? " +msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? " #: g10/pkclist.c:469 #, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" +msgstr "¸°%08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" #: g10/pkclist.c:512 #, c-format msgid "%08lX: key has expired\n" -msgstr "¸° %08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!\n" +msgstr "¸°%08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹\n" #: g10/pkclist.c:518 #, c-format @@ -1111,14 +1150,16 @@ msgstr "%08lX: #: g10/pkclist.c:533 #, c-format msgid "%08lX: We do NOT trust this key\n" -msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó\n" +msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó\n" #: g10/pkclist.c:539 #, c-format msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" -msgstr "%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢¤½¤ì¤Ç¤â¼õ¤±Æþ¤ì¤Þ¤¹\n" +msgstr "" +"%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢\n" +"¤¤¤Á¤ª¤¦¼õÍý¤·¤Þ¤¹\n" #: g10/pkclist.c:545 msgid "This key probably belongs to the owner\n" @@ -1135,9 +1176,9 @@ msgid "" "the next question with yes\n" "\n" msgstr "" -"¤³¤Î¸°¤ÏËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" +"¤³¤Î¸°¤ÏËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ ¤»¤ó¡£\n" "º£¤«¤é¹Ô¤¦¤³¤È¤ò *³Î¼Â¤Ë* Íý²ò¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢\n" -"¼¡¤Î¼ÁÌä¤Ë¤Ï no ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" +"¼¡¤Î¼ÁÌä¤Ë¤Ïno¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" #: g10/pkclist.c:607 g10/pkclist.c:630 @@ -1150,7 +1191,7 @@ msgstr " #: g10/pkclist.c:652 msgid " This could mean that the signature is forgery.\n" -msgstr " ½ð̾¤Ïµ¶Êª¤À¤È»×¤ï¤ì¤Þ¤¹¡£\n" +msgstr " ½ð̾¤¬µ¶Êª¤Ê¤³¤È¤â¤¢¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£\n" #: g10/pkclist.c:657 msgid "WARNING: This subkey has been revoked by its owner!\n" @@ -1162,29 +1203,29 @@ msgstr " #: g10/pkclist.c:687 msgid "WARNING: This key is not certified with a trusted signature!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" #: g10/pkclist.c:689 msgid "" " There is no indication that the signature belongs to the owner.\n" -msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n" +msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n" #: g10/pkclist.c:706 msgid "WARNING: We do NOT trust this key!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó!\n" #: g10/pkclist.c:707 msgid " The signature is probably a FORGERY.\n" -msgstr " ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n" +msgstr " ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n" #: g10/pkclist.c:714 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ç¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n" #: g10/pkclist.c:717 msgid " It is not certain that the signature belongs to the owner.\n" -msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" +msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" #: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012 #, c-format @@ -1200,42 +1241,44 @@ msgstr "%s: msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" -msgstr "¥æ¡¼¥¶ ID ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó(\"-r\" ¤òÍѤ¤¤¿¤Ç¤·¤ç¤¦)¡£\n" +msgstr "" +"¥æ¡¼¥¶¡¼ID¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó (¡Ö-r¡×¤òÍѤ¤¤Þ¤·¤ç¤¦) ¡£\n" +"\n" #: g10/pkclist.c:864 msgid "Enter the user ID: " -msgstr "¥æ¡¼¥¶ ID ¤òÆþÎÏ: " +msgstr "¥æ¡¼¥¶¡¼ID¤òÆþÎÏ: " #: g10/pkclist.c:876 msgid "No such user ID.\n" -msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" +msgstr "¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" #: g10/pkclist.c:881 msgid "skipped: public key already set as default recipient\n" -msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¿®¼Ô¤È¤·¤ÆÀßÄêºÑ¤ß¤Ç¤¹\n" #: g10/pkclist.c:904 msgid "Public key is disabled.\n" -msgstr "¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿¡£\n" +msgstr "¸ø³«¸°¤Ï»ÈÍѶػߤǤ¹¡£\n" #: g10/pkclist.c:911 msgid "skipped: public key already set with --encrypt-to\n" -msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤Ë¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤ÇÀßÄêºÑ¤ß¤Ç¤¹\n" #: g10/pkclist.c:942 #, c-format msgid "unknown default recipient `%s'\n" -msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô `%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "´ûÄê¤Î¼õ¿®¼Ô`%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/pkclist.c:975 #, c-format msgid "%s: error checking key: %s\n" -msgstr "%s: ¸°¤Î¥¨¥é¡¼: %s\n" +msgstr "%s: ¸°¤Î¸¡¾Ú¥¨¥é¡¼: %s\n" #: g10/pkclist.c:980 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿\n" +msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï»ÈÍѶػß\n" #: g10/pkclist.c:1018 msgid "no valid addressees\n" @@ -1250,23 +1293,23 @@ msgid "writing key binding signature\n" msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" #: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436 -#, fuzzy, c-format +#, c-format msgid "keysize invalid; using %u bits\n" -msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n" +msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n" #: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441 -#, fuzzy, c-format +#, c-format msgid "keysize rounded up to %u bits\n" -msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" +msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" #: g10/keygen.c:540 msgid "Please select what kind of key you want:\n" -msgstr "¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ²¼¤µ¤¤:\n" +msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" #: g10/keygen.c:542 #, c-format msgid " (%d) DSA and ElGamal (default)\n" -msgstr " (%d) DSA ¤È ElGamal (¥Ç¥Õ¥©¥ë¥È)\n" +msgstr " (%d) DSA¤ÈElGamal (´ûÄê)\n" #: g10/keygen.c:543 #, c-format @@ -1284,13 +1327,13 @@ msgid " (%d) ElGamal (sign and encrypt)\n" msgstr " (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n" #: g10/keygen.c:548 -#, fuzzy, c-format +#, c-format msgid " (%d) RSA (sign and encrypt)\n" -msgstr " (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n" +msgstr " (%d) RSA (½ð̾¤È°Å¹æ²½)\n" #: g10/keygen.c:552 msgid "Your selection? " -msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«? " +msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? " #: g10/keygen.c:563 g10/keygen.c:571 msgid "Do you really want to create a sign and encrypt key? " @@ -1308,27 +1351,26 @@ msgid "" " default keysize is 1024 bits\n" " highest suggested keysize is 2048 bits\n" msgstr "" -"¿·¤·¤¤ %s ¸°¥Ú¥¢¤ÎÀ¸À®¤Ë¤Ä¤¤¤Æ\n" -" ºÇ¾®¤Î¸°¥µ¥¤¥º¤Ï is 768 ¥Ó¥Ã¥È\n" -" ¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¥¤¥º¤Ï 1024 ¥Ó¥Ã¥È\n" -" ºÇÂç¤Î¸°¥µ¥¤¥º¤Ï 2048 ¥Ó¥Ã¥È\n" +"¿·¤·¤¤%s¸°ÂФòÀ¸À®¤·¤Þ¤¹¡£\n" +" ºÇ¾®¤Î¸°Ä¹¤Ï 768 ¥Ó¥Ã¥È\n" +" ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n" +" ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n" #: g10/keygen.c:604 msgid "What keysize do you want? (1024) " -msgstr "¤É¤Î¸°¥µ¥¤¥º¤òÁªÂò¤·¤Þ¤¹¤«? (1024) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " #: g10/keygen.c:609 msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA ¤Î¸°¥µ¥¤¥º¤Ï 512 ¤«¤é 1024 ¤Þ¤Ç¤Ç¤¹\n" +msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n" #: g10/keygen.c:611 msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n" +msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n" #: g10/keygen.c:613 -#, fuzzy msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n" +msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n" #. It is ridiculous and an annoyance to use larger key sizes! #. * GnuPG can handle much larger sizes; but it takes an eternity @@ -1341,41 +1383,41 @@ msgstr " #: g10/keygen.c:624 #, c-format msgid "keysize too large; %d is largest value allowed.\n" -msgstr "¸°¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹; %d ¤¬ºÇÂç¤Ç¤¹¡£\n" +msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n" #: g10/keygen.c:629 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" msgstr "" -"2048 °Ê¾å¤Î¸°¥µ¥¤¥º¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n" +"2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n" "¿ä¾©¤·¤Þ¤»¤ó!\n" #: g10/keygen.c:632 msgid "Are you sure that you want this keysize? " -msgstr "¤³¤Î¸°¥µ¥¤¥º¤ÇËÜÅö¤ËÎɤ¤¤Ç¤¹¤«? " +msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? " #: g10/keygen.c:633 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" msgstr "" -"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢¹¶·â¤ËÂФ·¤Æ " -"¤¹¤­¤À¤é¤±¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤!\n" +"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢\n" +"¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n" #: g10/keygen.c:641 msgid "Do you really need such a large keysize? " -msgstr "¤¢¤Ê¤¿¤ÏËÜÅö¤Ë¤³¤Î¤è¤¦¤ÊŤ¤¸°¤¬É¬ÍפǤ¹¤«? " +msgstr "¤³¤ó¤Ê¤ËŤ¤¸°¤¬ËÜÅö¤Ë¤¤¤ê¤Þ¤¹¤«? " #: g10/keygen.c:647 #, c-format msgid "Requested keysize is %u bits\n" -msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n" +msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n" #: g10/keygen.c:650 g10/keygen.c:654 #, c-format msgid "rounded up to %u bits\n" -msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" +msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" #: g10/keygen.c:702 msgid "" @@ -1386,16 +1428,16 @@ msgid "" " m = key expires in n months\n" " y = key expires in n years\n" msgstr "" -"¸°¤Î´ü¸Â¤ò·è¤á¤Æ²¼¤µ¤¤\n" +"¸°¤Î´ü¸Â¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£\n" " 0 = ̵´ü¸Â\n" -" = Í­¸ú´ü¸Â n Æü\n" +" = Í­¸ú´ü¸Â n Æü´Ö\n" " w = Í­¸ú´ü¸Â n ½µ´Ö\n" -" m = Í­¸ú´ü¸Â n ·î\n" -" y = Í­¸ú´ü¸Â n ǯ\n" +" m = Í­¸ú´ü¸Â n ¤«·î´Ö\n" +" y = Í­¸ú´ü¸Â n ǯ´Ö\n" #: g10/keygen.c:717 msgid "Key is valid for? (0) " -msgstr "¸°¤ÎÍ­¸úÀ­¤Ï? (0)" +msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" #: g10/keygen.c:722 msgid "invalid value\n" @@ -1409,7 +1451,7 @@ msgstr " #: g10/keygen.c:733 #, c-format msgid "Key expires at %s\n" -msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n" +msgstr "¸°¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n" #: g10/keygen.c:736 msgid "" @@ -1421,7 +1463,7 @@ msgstr "" #: g10/keygen.c:741 msgid "Is this correct (y/n)? " -msgstr "¤³¤ì¤ÇÎɤ¤¤Ç¤¹¤« (y/n)? " +msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? " #: g10/keygen.c:784 msgid "" @@ -1433,9 +1475,9 @@ msgid "" "\n" msgstr "" "\n" -"¤¢¤Ê¤¿¤Î¸°¤ò¼±Ê̤¹¤ë¤¿¤á¤Ë ¥æ¡¼¥¶ ID ¤¬É¬ÍפǤ¹¡£\n" -"¤³¤Î¥½¥Õ¥È¤ÏËÜ̾¡¢Ãí¼á¡¢ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤«¤é¡¢¼¡¤Î½ñ¼°¤Ç¥æ¡¼¥¶ ID " -"¤òºîÀ®¤·¤Þ¤¹:\n" +"¤¢¤Ê¤¿¤Î¸°¤òƱÄꤹ¤ë¤¿¤á¤Ë¥æ¡¼¥¶¡¼ID¤¬É¬ÍפǤ¹¡£\n" +"¤³¤Î¥½¥Õ¥È¤ÏËÜ̾¡¢¥³¥á¥ó¥È¡¢ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤«¤é\n" +"¼¡¤Î½ñ¼°¤Ç¥æ¡¼¥¶¡¼ID¤ò¹½À®¤·¤Þ¤¹:\n" " \"Heinrich Heine (Der Dichter) \"\n" "\n" @@ -1449,32 +1491,32 @@ msgstr "̾ #: g10/keygen.c:806 msgid "Name may not start with a digit\n" -msgstr "̾Á°¤Ï¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" +msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" #: g10/keygen.c:808 msgid "Name must be at least 5 characters long\n" -msgstr "̾Á°¤Ï 5 ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" #: g10/keygen.c:816 msgid "Email address: " -msgstr "ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹: " +msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: " #: g10/keygen.c:827 msgid "Not a valid email address\n" -msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/keygen.c:835 msgid "Comment: " -msgstr "Ãí¼á: " +msgstr "¥³¥á¥ó¥È: " #: g10/keygen.c:841 msgid "Invalid character in comment\n" -msgstr "Ãí¼á¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" #: g10/keygen.c:864 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "¤¢¤Ê¤¿¤Ïʸ»ú¥³¡¼¥É `%s' ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" +msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" #: g10/keygen.c:870 #, c-format @@ -1483,42 +1525,41 @@ msgid "" " \"%s\"\n" "\n" msgstr "" -"¼¡¤Î¥æ¡¼¥¶ ID ¤òÀßÄꤷ¤Þ¤·¤¿:\n" +"¼¡¤Î¥æ¡¼¥¶¡¼ID¤òÀßÄꤷ¤Þ¤·¤¿:\n" " \"%s\"\n" "\n" #: g10/keygen.c:874 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "" +msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n" #: g10/keygen.c:879 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" #: g10/keygen.c:889 -#, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " +msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? " #: g10/keygen.c:890 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " -msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " +msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? " #: g10/keygen.c:909 msgid "Please correct the error first\n" -msgstr "" +msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" #: g10/keygen.c:947 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹¡£\n" +"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" #: g10/keyedit.c:468 g10/keygen.c:955 msgid "passphrase not correctly repeated; try again.\n" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ²¼¤µ¤¤¡£\n" +msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keygen.c:961 msgid "" @@ -1527,9 +1568,9 @@ msgid "" "using this program with the option \"--edit-key\".\n" "\n" msgstr "" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤½¤ì¤Ï°­¤¤¹Í¤¨¤Ç¤¹!\n" -"³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤Î \"--edit-key\" \n" -"¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï\n" +"¤¢¤ê¤Þ¤»¤ó! ¤¤¤Á¤ª¤¦Â³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à\n" +"¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" "\n" #: g10/keygen.c:982 @@ -1539,31 +1580,31 @@ msgid "" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"º£¤«¤éŤ¤Íð¿ô¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥Ü¡¼¥É¤òÂǤĤȤ«¡¢¥Þ¥¦¥¹¤òÆ°¤«¤¹¤È¤«¡¢\n" -"¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ê¤É¤Î¾¤Î¹ÔÆ°¤òƱ»þ¤Ë¹Ô¤¦¤È¡¢Íð¿ôÀ¸À®ÁõÃ֤ˤÆ\n" -"Í𻨤µ¤ÎÂ礭¤ÊÎɤ¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n" +"º£¤«¤éŤ¤Íð¿ô¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥Ü¡¼¥É¤òÂǤĤȤ«¡¢¥Þ¥¦¥¹¤òÆ°¤«¤¹\n" +"¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n" +"Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n" #: g10/keygen.c:1431 msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA ¸°¥Ú¥¢¤Ï 1024 ¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹\n" +msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" #: g10/keygen.c:1474 msgid "Key generation canceled.\n" msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n" #: g10/keygen.c:1571 -#, fuzzy, c-format +#, c-format msgid "writing public key to `%s'\n" -msgstr "`%s' ¤Ø¤Î¸ø³«¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "`%s'¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" #: g10/keygen.c:1572 -#, fuzzy, c-format +#, c-format msgid "writing secret key to `%s'\n" -msgstr "`%s' ¤Ø¤ÎÈëÌ©¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "`%s'¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" #: g10/keygen.c:1668 msgid "public and secret key created and signed.\n" -msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬ºîÀ®¤µ¤ì¡¢½ð̾¤µ¤ì¤Þ¤·¤¿¡£\n" +msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n" #: g10/keygen.c:1673 msgid "" @@ -1571,28 +1612,28 @@ msgid "" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n" -"\"--edit-key\" ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keygen.c:1690 g10/keygen.c:1791 #, c-format msgid "Key generation failed: %s\n" -msgstr "¸°¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" -msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" #: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" -msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" #: g10/keygen.c:1769 msgid "Really create? " -msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? " #: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454 #: g10/tdbio.c:515 @@ -1603,7 +1644,7 @@ msgstr "%s: #: g10/encode.c:113 #, c-format msgid "error creating passphrase: %s\n" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÀ¸À®¤Ë¼ºÇÔ: %s\n" +msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n" #: g10/encode.c:171 g10/encode.c:324 #, c-format @@ -1613,32 +1654,32 @@ msgstr "%s: #: g10/encode.c:271 #, c-format msgid "reading from `%s'\n" -msgstr "`%s' ¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n" +msgstr "`%s'¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n" #: g10/encode.c:492 #, c-format msgid "%s/%s encrypted for: %s\n" -msgstr "%s/%s °Å¹æ²½ ¼õ¿®¼Ô: %s\n" +msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: %s\n" #: g10/export.c:153 #, c-format msgid "%s: user not found: %s\n" -msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/export.c:162 #, c-format msgid "certificate read problem: %s\n" -msgstr "¾ÚÌÀ½ñ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n" +msgstr "¾ÚÌÀ½ñ¤ÎÆɹþ¤ß¾ã³²: %s\n" #: g10/export.c:171 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" #: g10/export.c:182 -#, fuzzy, c-format +#, c-format msgid "key %08lX: not protected - skipped\n" -msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" #: g10/export.c:232 msgid "WARNING: nothing exported\n" @@ -1646,277 +1687,276 @@ msgstr " #: g10/getkey.c:211 msgid "too many entries in pk cache - disabled\n" -msgstr "pk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n" +msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" #: g10/getkey.c:350 msgid "too many entries in unk cache - disabled\n" -msgstr "unk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n" +msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" #: g10/getkey.c:1308 g10/getkey.c:1347 msgid "RSA key cannot be used in this version\n" -msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï RSA ¥­¡¼¤Ï»È¤¨¤Þ¤»¤ó\n" +msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏRSA¸°¤Ï»È¤¨¤Þ¤»¤ó\n" #: g10/getkey.c:1310 g10/getkey.c:1349 msgid "No key for user ID\n" -msgstr "¥æ¡¼¥¶ ID ¤Î¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¥æ¡¼¥¶¡¼ID¤Î¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/getkey.c:1388 g10/getkey.c:1428 msgid "No user ID for key\n" -msgstr "¸°¤Î¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°¤Î¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" -msgstr "Éû¸° %08lX ¤ò»ÈÍѤ·¤Þ¤¹ - ¼ç¸° %08lX ¤ÎÂåÍÑ\n" +msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n" #: g10/getkey.c:2050 -#, fuzzy msgid "[User id not found]" -msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" #: g10/import.c:182 #, c-format msgid "skipping block of type %d\n" -msgstr "¥¿¥¤¥× %d ¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "¥¿¥¤¥×%d¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" #: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847 #, c-format msgid "%lu keys so far processed\n" -msgstr "%lu ¸°¤Þ¤Ç½èÍý\n" +msgstr "%lu¸°¤Þ¤Ç½èÍý\n" #: g10/import.c:194 #, c-format msgid "error reading `%s': %s\n" -msgstr "`%s' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n" +msgstr "`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" #: g10/import.c:204 #, c-format msgid "Total number processed: %lu\n" -msgstr "½èÍý¿ô¤Î¹ç·×: %lu\n" +msgstr " ½èÍý¿ô¤Î¹ç·×: %lu\n" #: g10/import.c:206 -#, fuzzy, c-format +#, c-format msgid " skipped new keys: %lu\n" -msgstr " ¿·¤¿¤ÊÉû¸°: %lu\n" +msgstr " ¥¹¥­¥Ã¥×¤·¤¿¿·¤·¤¤¸°: %lu\n" #: g10/import.c:209 #, c-format msgid " w/o user IDs: %lu\n" -msgstr " ¥æ¡¼¥¶ ID ¤Ê¤·: %lu\n" +msgstr " ¥æ¡¼¥¶¡¼ID¤Ê¤·: %lu\n" #: g10/import.c:211 #, c-format msgid " imported: %lu" -msgstr " Æɤ߹þ¤ß: %lu" +msgstr " Æɹþ¤ß: %lu" #: g10/import.c:217 #, c-format msgid " unchanged: %lu\n" -msgstr " Êѹ¹¤Ê¤·: %lu\n" +msgstr " Êѹ¹¤Ê¤·: %lu\n" #: g10/import.c:219 #, c-format msgid " new user IDs: %lu\n" -msgstr " ¿·¤¿¤Ê¥æ¡¼¥¶ ID: %lu\n" +msgstr " ¿·¤·¤¤¥æ¡¼¥¶¡¼ID: %lu\n" #: g10/import.c:221 #, c-format msgid " new subkeys: %lu\n" -msgstr " ¿·¤¿¤ÊÉû¸°: %lu\n" +msgstr " ¿·¤·¤¤Éû¸°: %lu\n" #: g10/import.c:223 #, c-format msgid " new signatures: %lu\n" -msgstr " ¿·¤¿¤Ê½ð̾: %lu\n" +msgstr " ¿·¤·¤¤½ð̾: %lu\n" #: g10/import.c:225 #, c-format msgid " new key revocations: %lu\n" -msgstr " ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n" +msgstr " ¿·¤·¤¤¸°¤ÎÇË´þ: %lu\n" #: g10/import.c:227 #, c-format msgid " secret keys read: %lu\n" -msgstr " ÈëÌ©¸°¤ÎÆɤ߽Ф·: %lu\n" +msgstr " ÈëÌ©¸°¤ÎÆɽФ·: %lu\n" #: g10/import.c:229 #, c-format msgid " secret keys imported: %lu\n" -msgstr " ÈëÌ©¸°¤ÎÆɤ߹þ¤ß: %lu\n" +msgstr " ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n" #: g10/import.c:231 #, c-format msgid " secret keys unchanged: %lu\n" -msgstr " Êѹ¹¤Î̵¤¤ÈëÌ©¸°: %lu\n" +msgstr " ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n" #: g10/import.c:391 g10/import.c:590 #, c-format msgid "key %08lX: no user ID\n" -msgstr "¸° %08lX: ¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/import.c:405 #, c-format msgid "key %08lX: no valid user IDs\n" -msgstr "¸° %08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¿®ÍѤǤ­¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/import.c:407 msgid "this may be caused by a missing self-signature\n" -msgstr "¼«¸Ê½ð̾¤¬¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¤Ç¤·¤ç¤¦\n" +msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n" #: g10/import.c:418 g10/import.c:657 #, c-format msgid "key %08lX: public key not found: %s\n" -msgstr "¸° %08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/import.c:423 -#, fuzzy, c-format +#, c-format msgid "key %08lX: new key - skipped\n" -msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" #: g10/import.c:431 msgid "no default public keyring\n" -msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸ø³«¸°¥ê¥ó¥°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "´ûÄê¤Î¸ø³«¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615 #, c-format msgid "writing to `%s'\n" -msgstr "`%s' ¤Ø¤Î½ñ¤­½Ð¤·\n" +msgstr "`%s'¤Ø¤Î½ñ½Ð¤·\n" #: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706 #, c-format msgid "can't lock keyring `%s': %s\n" -msgstr "¸°¥ê¥ó¥° `%s' ¤Î¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¸°ÎØ`%s'¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709 #, c-format msgid "error writing keyring `%s': %s\n" -msgstr "¸°¥ê¥ó¥° `%s' ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ: %s\n" +msgstr "¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" #: g10/import.c:446 #, c-format msgid "key %08lX: public key imported\n" -msgstr "¸° %08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%08lX: ¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" #: g10/import.c:463 #, c-format msgid "key %08lX: doesn't match our copy\n" -msgstr "¸° %08lX: ²æ¡¹¤ÎÊÝÍ­¤¹¤ë¸°¤È°Û¤Ê¤ê¤Þ¤¹\n" +msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n" #: g10/import.c:472 g10/import.c:665 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" -msgstr "¸° %08lX: ¥ª¥ê¥¸¥Ê¥ë¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ǥ­¤Þ¤»¤ó: %s\n" +msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/import.c:478 g10/import.c:671 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" -msgstr "¸° %08lX: ¥ª¥ê¥¸¥Ê¥ë¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤá¤Þ¤»¤ó: %s\n" +msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" #: g10/import.c:505 #, c-format msgid "key %08lX: 1 new user ID\n" -msgstr "¸° %08lX: ¿·¤¿¤Ê¥æ¡¼¥¶ ID ¤ò 1 ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n" #: g10/import.c:508 #, c-format msgid "key %08lX: %d new user IDs\n" -msgstr "¸° %08lX: ¿·¤¿¤Ê¥æ¡¼¥¶ ID ¤ò %d ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n" #: g10/import.c:511 #, c-format msgid "key %08lX: 1 new signature\n" -msgstr "¸° %08lX: ¿·¤¿¤Ê½ð̾¤ò 1 ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò1¸Ä\n" #: g10/import.c:514 #, c-format msgid "key %08lX: %d new signatures\n" -msgstr "¸° %08lX: ¿·¤¿¤Ê½ð̾¤ò %d ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤½ð̾¤ò%d¸Ä\n" #: g10/import.c:517 #, c-format msgid "key %08lX: 1 new subkey\n" -msgstr "¸° %08lX: ¿·¤¿¤ÊÉû¸°¤ò 1 ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò1¸Ä\n" #: g10/import.c:520 #, c-format msgid "key %08lX: %d new subkeys\n" -msgstr "¸° %08lX: ¿·¤¿¤ÊÉû¸°¤ò %d ¸Ä\n" +msgstr "¸°%08lX: ¿·¤·¤¤Éû¸°¤ò%d¸Ä\n" #: g10/import.c:530 #, c-format msgid "key %08lX: not changed\n" -msgstr "¸° %08lX: Êѹ¹¤Ê¤·\n" +msgstr "¸°%08lX: Êѹ¹¤Ê¤·\n" #: g10/import.c:613 #, c-format msgid "key %08lX: secret key imported\n" -msgstr "¸° %08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" #. we can't merge secret keys #: g10/import.c:617 #, c-format msgid "key %08lX: already in secret keyring\n" -msgstr "¸° %08lX: ´û¤ËÈëÌ©¸°¥ê¥ó¥°¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n" #: g10/import.c:622 #, c-format msgid "key %08lX: secret key not found: %s\n" -msgstr "¸° %08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/import.c:651 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" -msgstr "¸° %08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤ÎŬÍѤ¬¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ÇË´þ¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n" #: g10/import.c:682 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" -msgstr "¸° %08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈݤ·¤Þ¤·¤¿\n" +msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - µñÈÝ\n" #: g10/import.c:714 #, c-format msgid "key %08lX: revocation certificate imported\n" -msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" #: g10/import.c:756 #, c-format msgid "key %08lX: no user ID for signature\n" -msgstr "¸° %08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/import.c:763 g10/import.c:787 #, c-format msgid "key %08lX: unsupported public key algorithm\n" -msgstr "¸° %08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" +msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" #: g10/import.c:764 #, c-format msgid "key %08lX: invalid self-signature\n" -msgstr "¸° %08lX: ¼«¸Ê½ð̾¤¬Ìµ¸ú¤Ç¤¹\n" +msgstr "¸°%08lX: ̵¸ú¤Ê¼«¸Ê½ð̾¤Ç¤¹\n" #: g10/import.c:779 #, c-format msgid "key %08lX: no subkey for key binding\n" -msgstr "¸° %08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/import.c:788 #, c-format msgid "key %08lX: invalid subkey binding\n" -msgstr "¸° %08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n" +msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n" #: g10/import.c:815 #, c-format msgid "key %08lX: accepted non self-signed user ID '" -msgstr "¸° %08lX: ¼õ¤±Æþ¤ì¤¿¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶ ID '" +msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '" #: g10/import.c:844 #, c-format msgid "key %08lX: skipped user ID '" -msgstr "¸° %08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶ ID '" +msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '" #: g10/import.c:867 #, c-format msgid "key %08lX: skipped subkey\n" -msgstr "¸° %08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n" +msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n" #. here we violate the rfc a bit by still allowing #. * to import non-exportable signature when we have the @@ -1925,37 +1965,37 @@ msgstr " #: g10/import.c:892 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "¸° %08lX: ½ñ¤­½Ð¤·ÉԲĤʽð̾ (class %02x) - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n" #: g10/import.c:901 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤¬´Ö°ã¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" #: g10/import.c:909 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "¸° %08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ̵¸ú¤ÊÇË´þ¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n" #: g10/import.c:1009 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "¸° %08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶ ID ¤Î¸¡½Ð - ÄɲÃ\n" +msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n" #: g10/import.c:1060 #, c-format msgid "key %08lX: revocation certificate added\n" -msgstr "¸° %08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n" +msgstr "¸°%08lX: ÇË´þ¾ÚÌÀ½ñ¤ÎÄɲÃ\n" #: g10/import.c:1174 g10/import.c:1227 #, c-format msgid "key %08lX: our copy has no self-signature\n" -msgstr "¸° %08lX: ²æ¡¹¤Î¥³¥Ô¡¼¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤Ë¤Ï¼«¸Ê½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/delkey.c:64 g10/keyedit.c:94 #, c-format msgid "%s: user not found\n" -msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "%s: ¥æ¡¼¥¶¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:155 msgid "[revocation]" @@ -1967,64 +2007,64 @@ msgstr "[ #: g10/keyedit.c:220 msgid "1 bad signature\n" -msgstr "̵¸ú¤Ê½ð̾ 1 ¸Ä\n" +msgstr "̵¸ú¤Ê½ð̾1¸Ä\n" #: g10/keyedit.c:222 #, c-format msgid "%d bad signatures\n" -msgstr "̵¸ú¤Ê½ð̾ %d ¸Ä\n" +msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n" #: g10/keyedit.c:224 msgid "1 signature not checked due to a missing key\n" -msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç 1 ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¸°¤¬¤Ê¤¤¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n" #: g10/keyedit.c:226 #, c-format msgid "%d signatures not checked due to missing keys\n" -msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç %d ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¸°¤¬¤Ê¤¤¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n" #: g10/keyedit.c:228 msgid "1 signature not checked due to an error\n" -msgstr "¸°¤¬Ìµ¤¤¤Î¤Ç 1 ¸Ä¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¥¨¥é¡¼¤Î¤¿¤á1¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n" #: g10/keyedit.c:230 #, c-format msgid "%d signatures not checked due to errors\n" -msgstr "%d ¸Ä¤Î½ð̾¤Ï¥¨¥é¡¼¤Ë¤è¤ê¸¡¾Ú¤µ¤ì¤Þ¤»¤ó\n" +msgstr "¥¨¥é¡¼¤Î¤¿¤á%d¸Ä¤Î½ð̾¤ò¸¡¾Ú¤·¤Þ¤»¤ó\n" #: g10/keyedit.c:232 msgid "1 user ID without valid self-signature detected\n" -msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î̵¤¤¥æ¡¼¥¶ ID ¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹\n" +msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä¸¡½Ð\n" #: g10/keyedit.c:234 #, c-format msgid "%d user IDs without valid self-signatures detected\n" -msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î̵¤¤¥æ¡¼¥¶ ID ¤¬ %d ¸Ä¤¢¤ê¤Þ¤¹\n" +msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. #: g10/keyedit.c:316 #, c-format msgid "Already signed by key %08lX\n" -msgstr "¸° %08lX ¤Ë¤è¤Ã¤Æ´û¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" #: g10/keyedit.c:324 #, c-format msgid "Nothing to sign with key %08lX\n" -msgstr "¸° %08lX ¤Ë¤è¤Ã¤Æ½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:333 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" -msgstr "ËÜÅö¤Ë ¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤ÆÎɤ¤¤Ç¤¹¤«: \"" +msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \"" #: g10/keyedit.c:342 msgid "" "The signature will be marked as non-exportable.\n" "\n" msgstr "" -"½ð̾¤Ï½ñ¤­½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" +"½ð̾¤Ï½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" "\n" #: g10/keyedit.c:347 @@ -2041,9 +2081,8 @@ msgid "This key is not protected.\n" msgstr "¤³¤Î¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:431 -#, fuzzy msgid "Secret parts of primary key are not available.\n" -msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó" +msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:435 msgid "Key is protected.\n" @@ -2052,14 +2091,14 @@ msgstr " #: g10/keyedit.c:455 #, c-format msgid "Can't edit this key: %s\n" -msgstr "¤³¤Î¸°¤òÊÔ½¸¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¤³¤Î¸°¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/keyedit.c:460 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -"¤³¤ÎÈëÌ©¸°¤ËÂФ¹¤ë¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n" +"¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" #: g10/keyedit.c:472 @@ -2067,7 +2106,8 @@ msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤½¤ì¤Ï°­¤¤¹Í¤¨¤Ç¤¹!\n" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢\n" +"¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" "\n" #: g10/keyedit.c:475 @@ -2116,7 +2156,7 @@ msgstr "list" #: g10/keyedit.c:586 msgid "list key and user IDs" -msgstr "¸°¤È¥æ¡¼¥¶ ID ¤Î°ìÍ÷" +msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷" #: g10/keyedit.c:587 msgid "l" @@ -2128,7 +2168,7 @@ msgstr "uid" #: g10/keyedit.c:588 msgid "select user ID N" -msgstr "¥æ¡¼¥¶ ID N ¤ÎÁªÂò" +msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò" #: g10/keyedit.c:589 msgid "key" @@ -2136,7 +2176,7 @@ msgstr "key" #: g10/keyedit.c:589 msgid "select secondary key N" -msgstr "Éû¸° N ¤ÎÁªÂò" +msgstr "Éû¸°N¤ÎÁªÂò" #: g10/keyedit.c:590 msgid "check" @@ -2168,7 +2208,7 @@ msgstr "lsign" #: g10/keyedit.c:594 msgid "sign the key locally" -msgstr "¸°¤Ë½ñ¤­½Ð¤·ÉԲĤʽð̾" +msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" #: g10/keyedit.c:595 msgid "debug" @@ -2180,7 +2220,7 @@ msgstr "adduid" #: g10/keyedit.c:596 msgid "add a user ID" -msgstr "¥æ¡¼¥¶ ID ¤ÎÄɲÃ" +msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ" #: g10/keyedit.c:597 msgid "deluid" @@ -2188,7 +2228,7 @@ msgstr "deluid" #: g10/keyedit.c:597 msgid "delete user ID" -msgstr "¥æ¡¼¥¶ ID ¤Î¾Ãµî" +msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü" #: g10/keyedit.c:598 msgid "addkey" @@ -2228,7 +2268,7 @@ msgstr "toggle" #: g10/keyedit.c:602 msgid "toggle between secret and public key listing" -msgstr "ÈëÌ©¸°¤È¸ø³«¸°°ìÍ÷¤ÎÀÚ¤êÂؤ¨" +msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨" #: g10/keyedit.c:604 msgid "t" @@ -2256,7 +2296,7 @@ msgstr "trust" #: g10/keyedit.c:607 msgid "change the ownertrust" -msgstr "¼«¸Ê½ð̾¤ÎÊѹ¹" +msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹" #: g10/keyedit.c:608 msgid "revsig" @@ -2280,7 +2320,7 @@ msgstr "disable" #: g10/keyedit.c:610 msgid "disable a key" -msgstr "¸°¤ò»ÈÍÑÉԲĤˤ¹¤ë" +msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë" #: g10/keyedit.c:611 msgid "enable" @@ -2288,17 +2328,17 @@ msgstr "enable" #: g10/keyedit.c:611 msgid "enable a key" -msgstr "¸°¤ò»ÈÍѲĤˤ¹¤ë" +msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë" #: g10/delkey.c:110 g10/keyedit.c:631 msgid "can't do that in batchmode\n" -msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" #. check that they match #. fixme: check that they both match #: g10/keyedit.c:669 msgid "Secret key is available.\n" -msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹\n" +msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n" #: g10/keyedit.c:698 msgid "Command> " @@ -2306,19 +2346,19 @@ msgstr " #: g10/keyedit.c:728 msgid "Need the secret key to do this.\n" -msgstr "¤³¤ì¤ò¼Â¹Ô¤¹¤ë¤Ë¤ÏÈëÌ©¸°¤¬É¬ÍפǤ¹¡£\n" +msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n" #: g10/keyedit.c:732 msgid "Please use the command \"toggle\" first.\n" -msgstr "" +msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" #: g10/keyedit.c:779 msgid "Really sign all user IDs? " -msgstr "Á´¤Æ¤Î¥æ¡¼¥¶ ID ¤Ë ËÜÅö¤Ë ½ð̾¤·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? " #: g10/keyedit.c:780 msgid "Hint: Select the user IDs to sign\n" -msgstr "¥Ò¥ó¥È: ½ð̾¤¹¤ë¥æ¡¼¥¶ ID ¤òÁªÂò\n" +msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n" #: g10/keyedit.c:812 g10/keyedit.c:994 #, c-format @@ -2327,39 +2367,39 @@ msgstr " #: g10/keyedit.c:823 g10/keyedit.c:844 msgid "You must select at least one user ID.\n" -msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¥æ¡¼¥¶ ID ¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" +msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:825 msgid "You can't delete the last user ID!\n" -msgstr "ºÇ¸å¥æ¡¼¥¶ ID ¤Î½ð̾¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó\n" +msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n" #: g10/keyedit.c:828 msgid "Really remove all selected user IDs? " -msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " #: g10/keyedit.c:829 msgid "Really remove this user ID? " -msgstr "¤³¤Î¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " #: g10/keyedit.c:865 g10/keyedit.c:887 msgid "You must select at least one key.\n" -msgstr "¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" +msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:869 msgid "Do you really want to delete the selected keys? " -msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " #: g10/keyedit.c:870 msgid "Do you really want to delete this key? " -msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " #: g10/keyedit.c:891 msgid "Do you really want to revoke the selected keys? " -msgstr "ÁªÂò¤·¤¿¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " #: g10/keyedit.c:892 msgid "Do you really want to revoke this key? " -msgstr "¤³¤Î¸°¤ò ËÜÅö¤Ë ÇË´þ¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤òËÜÅö¤ËÇË´þ¤·¤Þ¤¹¤«? " #: g10/keyedit.c:958 msgid "Save changes? " @@ -2372,49 +2412,48 @@ msgstr " #: g10/keyedit.c:972 #, c-format msgid "update failed: %s\n" -msgstr "¹¹¿·¤Ë¼ºÇÔ: %s\n" +msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/keyedit.c:979 #, c-format msgid "update secret failed: %s\n" -msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ: %s\n" +msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/keyedit.c:986 msgid "Key not changed so no update needed.\n" -msgstr "¸°¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Î¤Ç¹¹¿·¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£\n" +msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:1001 msgid "Invalid command (try \"help\")\n" -msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (\"help\" ¤ò¸«¤è)\n" +msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n" #: g10/keyedit.c:1081 g10/keyedit.c:1107 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "" +msgstr "%s%c %4u%c/%08lX ºîÀ®: %s ´ü¸Â: %s" #: g10/keyedit.c:1090 #, c-format msgid " trust: %c/%c" -msgstr "" +msgstr " trust: %c/%c" #: g10/keyedit.c:1094 msgid "This key has been disabled" -msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" +msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" #: g10/keyedit.c:1123 -#, fuzzy, c-format +#, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n" +msgstr "rev! Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹: %s\n" #: g10/keyedit.c:1126 -#, fuzzy msgid "rev- faked revocation found\n" -msgstr " ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n" +msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤ÎÇË´þ¤òȯ¸«\n" #: g10/keyedit.c:1128 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "" +msgstr "rev? ÇË´þ³Îǧ¾ã³²: %s\n" #: g10/keyedit.c:1366 msgid "Delete this good signature? (y/N/q)" @@ -2426,21 +2465,21 @@ msgstr " #: g10/keyedit.c:1374 msgid "Delete this unknown signature? (y/N/q)" -msgstr "¤³¤ÎÉÔÌÀ¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" +msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" #: g10/keyedit.c:1380 msgid "Really delete this self-signature? (y/N)" -msgstr "¤³¤Î¼«¸Ê½ð̾¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? (y/N)" +msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" #: g10/keyedit.c:1394 #, c-format msgid "Deleted %d signature.\n" -msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" +msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" #: g10/keyedit.c:1395 #, c-format msgid "Deleted %d signatures.\n" -msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" +msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" #: g10/keyedit.c:1398 msgid "Nothing deleted.\n" @@ -2448,11 +2487,11 @@ msgstr " #: g10/keyedit.c:1467 msgid "Please remove selections from the secret keys.\n" -msgstr "ÈëÌ©¸°¤ÎÁªÂò¤òºï½ü¤·¤Æ²¼¤µ¤¤¡£\n" +msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:1473 msgid "Please select at most one secondary key.\n" -msgstr "¿¤¯¤Æ¤â 1 ¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" +msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:1477 msgid "Changing expiration time for a secondary key.\n" @@ -2464,25 +2503,25 @@ msgstr " #: g10/keyedit.c:1521 msgid "You can't change the expiration date of a v3 key\n" -msgstr "v3 ¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹\n" +msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" #: g10/keyedit.c:1537 msgid "No corresponding signature in secret ring\n" -msgstr "ÈëÌ©¸°¥ê¥ó¥°¤ËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:1598 #, c-format msgid "No user ID with index %d\n" -msgstr "%d È֤Υ桼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:1644 #, c-format msgid "No secondary key with index %d\n" -msgstr "%d ÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:1742 msgid "user ID: \"" -msgstr "¥æ¡¼¥¶ ID: \"" +msgstr "¥æ¡¼¥¶¡¼ID: \"" #: g10/keyedit.c:1745 #, c-format @@ -2491,82 +2530,80 @@ msgid "" "signed with your key %08lX at %s\n" msgstr "" "\"\n" -"¤¢¤Ê¤¿¤Î¸° %08lX ¤Ç %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +"¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #: g10/keyedit.c:1749 msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "¤³¤Î½ð̾¤ËÂФ¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N)" +msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N)" #. FIXME: detect duplicates here #: g10/keyedit.c:1773 msgid "You have signed these user IDs:\n" -msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤Þ¤·¤¿:\n" +msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n" #: g10/keyedit.c:1787 g10/keyedit.c:1822 #, c-format msgid " signed by %08lX at %s\n" -msgstr " %08lX ¤Ë¤è¤Ã¤Æ %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr " %08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #: g10/keyedit.c:1792 #, c-format msgid " revoked by %08lX at %s\n" -msgstr " %08lX ¤Ë¤è¤Ã¤Æ %s ¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr " %08lX¤Ç%s¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #: g10/keyedit.c:1812 msgid "You are about to revoke these signatures:\n" -msgstr "¤¢¤Ê¤¿¤Ï¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤¹¤ë¤«Ì¤äƤ¤¤Þ¤¹:\n" +msgstr "¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" #: g10/keyedit.c:1830 msgid "Really create the revocation certificates? (y/N)" -msgstr "ÇË´þ¾ÚÌÀ½ñ¤ò ËÜÅö¤Ë ºîÀ®¤·¤Þ¤¹¤«? (y/N)" +msgstr "ÇË´þ¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N)" #: g10/keyedit.c:1859 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/keylist.c:158 -#, fuzzy msgid "invalid" -msgstr "̵¸ú¤ÊÁõ¹Ã¤Ç¤¹" +msgstr "̵¸ú" #: g10/keylist.c:178 -#, fuzzy msgid "revoked" -msgstr "revkey" +msgstr "ÇË´þºÑ¤ß" #. of subkey #: g10/keylist.c:400 g10/mainproc.c:790 -#, fuzzy, c-format +#, c-format msgid " [expires: %s]" -msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n" +msgstr " [Í­¸ú´ü¸Â: %s]" #: g10/mainproc.c:240 #, c-format msgid "public key is %08lX\n" -msgstr "¸ø³«¸°¤Ï %08lX ¤Ç¤¹\n" +msgstr "¸ø³«¸°¤Ï%08lX¤Ç¤¹\n" #: g10/mainproc.c:284 msgid "public key encrypted data: good DEK\n" -msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤ DEK ¤Ç¤¹\n" +msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n" #: g10/mainproc.c:326 #, c-format msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" -msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿ %s\n" +msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %08lX¤Ç°Å¹æ²½%s¤Ë¤Ç¤­¤Þ¤·¤¿\n" #: g10/mainproc.c:336 #, c-format msgid "encrypted with %s key, ID %08lX\n" -msgstr "%s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n" +msgstr "%s¸°, ID %08lX¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n" #: g10/mainproc.c:342 msgid "no secret key for decryption available\n" -msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó\n" #: g10/mainproc.c:351 #, c-format msgid "public key decryption failed: %s\n" -msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ: %s\n" +msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/mainproc.c:388 msgid "decryption okay\n" @@ -2579,11 +2616,11 @@ msgstr " #: g10/mainproc.c:398 #, c-format msgid "decryption failed: %s\n" -msgstr "Éü¹æ¤Ë¼ºÇÔ: %s\n" +msgstr "Éü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/mainproc.c:417 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆɤ߽ª¤¨¤¿¤éºï½ü¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n" +msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n" #: g10/mainproc.c:419 #, c-format @@ -2608,17 +2645,17 @@ msgstr " #: g10/mainproc.c:1121 msgid "signature verification suppressed\n" -msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó\n" +msgstr "½ð̾¤Î¸¡¾Ú¤ò¾Êά\n" #: g10/mainproc.c:1158 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "%.*s ¤Î %s ¸° ID %08lX ¤Ë¤è¤ë½ð̾\n" +msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n" #. just in case that we have no userid #: g10/mainproc.c:1184 g10/mainproc.c:1195 msgid "BAD signature from \"" -msgstr "ÉÔÀµ¤Ê½ð̾: \"" +msgstr "ÉÔÀµ¤Ê ½ð̾: \"" #: g10/mainproc.c:1185 g10/mainproc.c:1196 msgid "Good signature from \"" @@ -2626,12 +2663,12 @@ msgstr " #: g10/mainproc.c:1187 msgid " aka \"" -msgstr " ÊÌ̾ \"" +msgstr " ÊÌ̾ \"" #: g10/mainproc.c:1243 #, c-format msgid "Can't check signature: %s\n" -msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "½ð̾¤ò¸¡¾Ú¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/mainproc.c:1318 #, c-format @@ -2640,16 +2677,16 @@ msgstr " #: g10/mainproc.c:1369 msgid "old style (PGP 2.x) signature\n" -msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Ë¤è¤ë½ð̾\n" +msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Î½ð̾\n" #: g10/mainproc.c:1374 msgid "invalid root packet detected in proc_tree()\n" -msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿\n" +msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n" #: g10/misc.c:97 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "¥³¥¢¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¥³¥¢¡¦¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/misc.c:207 msgid "Experimental algorithms should not be used!\n" @@ -2657,17 +2694,19 @@ msgstr " #: g10/misc.c:234 msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n" +msgstr "" +"¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +"¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n" #: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" -msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à %d ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" +msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" #: g10/parse-packet.c:991 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "subpacket of type %d has critical bit set\n" +msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" #: g10/passphrase.c:159 msgid "" @@ -2676,22 +2715,22 @@ msgid "" "user: \"" msgstr "" "\n" -"¼¡¤Î¥æ¡¼¥¶¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹\n" -"¥æ¡¼¥¶: \"" +"¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" #: g10/passphrase.c:168 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤¬ºîÀ®¤µ¤ì¤Þ¤·¤¿ %s" +msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s" #: g10/passphrase.c:173 #, c-format msgid " (main key ID %08lX)" -msgstr " (¼ç¸° ID %08lX)" +msgstr " (¼ç¸°ID %08lX)" #: g10/passphrase.c:190 msgid "can't query password in batchmode\n" -msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌ䤤¹ç¤ï¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" #: g10/passphrase.c:194 msgid "Enter passphrase: " @@ -2704,8 +2743,8 @@ msgstr " #: g10/plaintext.c:67 msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -"¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Êݸ¤¹¤ë¤Ë¤Ï \"--output\" " -"¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n" +"¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" +"Êݸ¤¹¤ë¤Ë¤Ï¡Ö--output¡×¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤\n" #: g10/plaintext.c:324 msgid "Detached signature.\n" @@ -2713,141 +2752,140 @@ msgstr "ʬΥ #: g10/plaintext.c:328 msgid "Please enter name of data file: " -msgstr "¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: " +msgstr "¥Ç¡¼¥¿¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: " #: g10/plaintext.c:349 msgid "reading stdin ...\n" -msgstr "ɸ½àÆþÎϤè¤êÆɤ߹þ¤ßÃæ ...\n" +msgstr "ɸ½àÆþÎϤè¤êÆɹþ¤ßÃæ ...\n" #: g10/plaintext.c:392 #, c-format msgid "can't open signed data `%s'\n" -msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿ `%s' ¤¬³«¤±¤Þ¤»¤ó\n" +msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:76 #, c-format msgid "anonymous receiver; trying secret key %08lX ...\n" -msgstr "ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸° %08lX ¤òÍѤ¤¤Þ¤¹ ...\n" +msgstr "ƿ̾¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸°%08lX¤òÍѤ¤¤Þ¤¹ ...\n" #: g10/pubkey-enc.c:82 msgid "okay, we are the anonymous recipient.\n" -msgstr "½ªÎ»¡£ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n" +msgstr "½ªÎ»¡£Æ¿Ì¾¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n" #: g10/pubkey-enc.c:134 msgid "old encoding of the DEK is not supported\n" -msgstr "DEK ¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "DEK¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:153 -#, fuzzy, c-format +#, c-format msgid "cipher algorithm %d is unknown or disabled\n" -msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "Êݸ¥ë¥´¥ê¥º¥à%d¤Ï̤ÃΤ«»ÈÍÑÉԲĤǤ¹\n" #: g10/pubkey-enc.c:192 #, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à %d ¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:198 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n" +msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" #: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s ...\n" -msgstr "" +msgstr "¸°%08lX¤ò%s¤ËÍ×µá ...\n" #: g10/hkp.c:85 -#, fuzzy, c-format +#, c-format msgid "can't get key from keyserver: %s\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à" +msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" #: g10/hkp.c:109 g10/hkp.c:148 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤Ï¤¢¤ê¤Þ¤»¤ó (--keyserver¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦)\n" #: g10/hkp.c:117 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid key ID\n" -msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%s: Àµ¤·¤¤¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n" #: g10/hkp.c:170 -#, fuzzy, c-format +#, c-format msgid "can't connect to `%s': %s\n" -msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/hkp.c:194 -#, fuzzy, c-format +#, c-format msgid "error sending to `%s': %s\n" -msgstr "`%s' ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: %s\n" +msgstr "`%s'¤Ø¤ÎÁ÷¿®¥¨¥é¡¼: %s\n" #: g10/hkp.c:206 #, c-format msgid "success sending to `%s' (status=%u)\n" -msgstr "" +msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n" #: g10/hkp.c:209 #, c-format msgid "failed sending to `%s': status=%u\n" -msgstr "" +msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n" #: g10/seckey-cert.c:53 -#, fuzzy msgid "secret key parts are not available\n" -msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó" +msgstr "ÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó\n" #: g10/seckey-cert.c:59 #, c-format msgid "protection algorithm %d is not supported\n" -msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "Êݸ¥ë¥´¥ê¥º¥à%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/seckey-cert.c:184 msgid "Invalid passphrase; please try again ...\n" -msgstr "̵¸ú¤Ê¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£ºÆÆþÎϤ·¤Æ²¼¤µ¤¤ ...\n" +msgstr "̵¸ú¤Ê¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ ...\n" #: g10/seckey-cert.c:240 msgid "WARNING: Weak key detected - please change passphrase again.\n" -msgstr "·Ù¹ð: ¼å¤¤¸°¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤·¤Æ²¼¤µ¤¤¡£\n" +msgstr "·Ù¹ð: ¼å¤¤¸°¤ò¸¡½Ð¤·¤Þ¤·¤¿¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/sig-check.c:199 msgid "assuming bad MDC due to an unknown critical bit\n" -msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢MDC ¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n" +msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢ÉÔÀµ¤ÊMDC¤È¤ß¤Ê¤·¤Þ¤¹\n" #: g10/sig-check.c:297 msgid "" "this is a PGP generated ElGamal key which is NOT secure for signatures!\n" msgstr "" -"¤³¤ì¤Ï PGP ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿ ElGamal " -"¸°¤Ç¤¹¡£¤³¤Î¸°¤Ï½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" +"¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n" +"½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\n" #: g10/sig-check.c:305 #, c-format msgid "public key is %lu second newer than the signature\n" -msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â%luÉøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #: g10/sig-check.c:306 #, c-format msgid "public key is %lu seconds newer than the signature\n" -msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â%luÉøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n" #: g10/sig-check.c:324 #, c-format msgid "NOTE: signature key expired %s\n" -msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n" +msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n" #: g10/sig-check.c:393 msgid "assuming bad signature due to an unknown critical bit\n" -msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n" +msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¤ß¤Ê¤·¤Þ¤¹\n" #: g10/sign.c:140 #, c-format msgid "%s signature from: %s\n" -msgstr "%s ½ð̾¡£½ð̾¼Ô: %s\n" +msgstr "%s½ð̾¡£½ð̾¼Ô: %s\n" #: g10/sign.c:290 g10/sign.c:610 #, c-format msgid "can't create %s: %s\n" -msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "%s¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/sign.c:388 msgid "signing:" @@ -2856,31 +2894,31 @@ msgstr " #: g10/sign.c:431 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "·Ù¹ð: `%s' ¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" +msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" #: g10/textfilter.c:134 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "%d ʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" +msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" #: g10/textfilter.c:231 #, c-format msgid "input line longer than %d characters\n" -msgstr "ÆþÎϹԤÎŤµ¤¬ %d ʸ»ú¤ò±Û¤¨¤Æ¤¤¤Þ¤¹\n" +msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n" #: g10/tdbio.c:116 g10/tdbio.c:1623 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É %lu: ¥·¡¼¥¯¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:122 g10/tdbio.c:1630 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É %lu: ½ñ¤­¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n" #: g10/tdbio.c:232 msgid "trustdb transaction too large\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n" #: g10/tdbio.c:424 #, c-format @@ -2900,12 +2938,12 @@ msgstr "%s: #: g10/tdbio.c:459 g10/tdbio.c:508 #, c-format msgid "%s: can't create lock\n" -msgstr "%s: ¥í¥Ã¥¯¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó\n" +msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n" #: g10/tdbio.c:473 #, c-format msgid "%s: failed to create version record: %s" -msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤ÎºîÀ®¤Ë¼ºÇÔ: %s" +msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" #: g10/tdbio.c:477 #, c-format @@ -2915,7 +2953,7 @@ msgstr "%s: ̵ #: g10/tdbio.c:480 #, c-format msgid "%s: trustdb created\n" -msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤òºîÀ®¤·¤Þ¤·¤¿\n" +msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/tdbio.c:517 #, c-format @@ -2925,193 +2963,193 @@ msgstr "%s: ̵ #: g10/tdbio.c:550 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n" +msgstr "%s: ¥Ï¥Ã¥·¥åɽ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:558 #, c-format msgid "%s: error updating version record: %s\n" -msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n" +msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î¹¹¿·¥¨¥é¡¼: %s\n" #: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665 #: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583 #, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n" +msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/tdbio.c:587 g10/tdbio.c:646 #, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¥ì¥³¡¼¥É¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s\n" +msgstr "%s: ¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" #: g10/tdbio.c:1235 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ¥·¡¼¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:1243 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Æɤ߽Ф·¤Ë¼ºÇÔ (n=%d): %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ (n=%d): %s\n" #: g10/tdbio.c:1264 #, c-format msgid "%s: not a trustdb file\n" -msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%s: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/tdbio.c:1280 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ %lu È֤ΥС¼¥¸¥ç¥ó¥ì¥³¡¼¥É\n" +msgstr "%s: ¥ì¥³¡¼¥ÉÈÖ¹æ%luÈ֤ΥС¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É\n" #: g10/tdbio.c:1285 #, c-format msgid "%s: invalid file version %d\n" -msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¥Ð¡¼¥¸¥ç¥ó %d\n" +msgstr "%s: ̵¸ú¤Ê¥Õ¥¡¥¤¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d\n" #: g10/tdbio.c:1589 #, c-format msgid "%s: error reading free record: %s\n" -msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n" +msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/tdbio.c:1597 #, c-format msgid "%s: error writing dir record: %s\n" -msgstr "%s: ¶õ¤­¥ì¥³¡¼¥É¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s\n" +msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" #: g10/tdbio.c:1607 #, c-format msgid "%s: failed to zero a record: %s\n" -msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ: %s\n" +msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:1637 #, c-format msgid "%s: failed to append a record: %s\n" -msgstr "%s: ¥ì¥³¡¼¥É¤Î½é´ü²½¤Ë¼ºÇÔ: %s\n" +msgstr "%s: ¥ì¥³¡¼¥É¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbio.c:1748 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£\"gpg --fix-trustdb\" ¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£\n" +"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ögpg --fix-trustdb¡×¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/trustdb.c:169 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É %lu, ¥ê¥¯¥¨¥¹¥È¥¿¥¤¥× %d: Æɤ߽Ф·¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥ê¥¯¥¨¥¹¥È¡¦¥¿¥¤¥×%d: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:184 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É %lu, ¥¿¥¤¥× %d: ½ñ¤­¹þ¤ß¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥¿¥¤¥×%d: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:198 #, c-format msgid "trust record %lu: delete failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É %lu: ºï½ü¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É%lu: ºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:212 #, c-format msgid "trustdb: sync failed: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ: %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: Ʊ´ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:377 #, c-format msgid "error reading dir record for LID %lu: %s\n" -msgstr "LID %lu ¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n" +msgstr "LID %lu¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/trustdb.c:384 #, c-format msgid "lid %lu: expected dir record, got type %d\n" -msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¡¢¥¿¥¤¥× %d\n" +msgstr "lid %lu: ´üÂÔ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¡¢¥¿¥¤¥×%d\n" #: g10/trustdb.c:389 #, c-format msgid "no primary key for LID %lu\n" -msgstr "LID %lu ¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "LID %lu¤Î¼ç¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/trustdb.c:394 #, c-format msgid "error reading primary key for LID %lu: %s\n" -msgstr "LID %lu ¤Î¼ç¸°¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n" +msgstr "LID %lu¤Î¼ç¸°¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/trustdb.c:433 #, c-format msgid "get_dir_record: search_record failed: %s\n" -msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ: %s\n" +msgstr "get_dir_record: search_record ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:474 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid long keyID\n" -msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "'%s' ¤ÏÀµ¤·¤¤Âç·¿¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n" #: g10/trustdb.c:501 #, c-format msgid "key %08lX: can't put it into the trustdb\n" -msgstr "¸° %08lX: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤Ç¤­¤Þ¤»¤ó\n" #: g10/trustdb.c:507 #, c-format msgid "key %08lX: query record failed\n" -msgstr "¸° %08lX: ¥¯¥¨¥ê¡¼¥ì¥³¡¼¥É¤Ë¼ºÇÔ\n" +msgstr "¸°%08lX: ¥ì¥³¡¼¥É¤ÎÌä¹ç¤»¤Ë¼ºÇÔ\n" #: g10/trustdb.c:516 #, c-format msgid "key %08lX: already in trusted key table\n" -msgstr "¸° %08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "¸°%08lX: ´û¤Ë¿®ÍѤ¹¤ë¸°¤Îɽ¤Ë¤¢¤ê¤Þ¤¹\n" #: g10/trustdb.c:519 #, c-format msgid "key %08lX: accepted as trusted key.\n" -msgstr "¸° %08lX: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤µ¤ì¤Þ¤·¤¿¡£\n" +msgstr "¸°%08lX: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤·¤Þ¤·¤¿¡£\n" #: g10/trustdb.c:546 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "¸° %08lX: rfc2440 ¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "¸° %08lX: ¿®ÍѤ¹¤ë¸°¤Î¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" #: g10/trustdb.c:565 #, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" -msgstr "Ãí°Õ: ÈëÌ©¸° %08lX ¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" +msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤ÏÊݸ¤ì¤Æ¤¤¤Þ ¤»¤ó¡£\n" #: g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" -msgstr "¸° %08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n" +msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n" #: g10/trustdb.c:584 #, c-format msgid "key %08lX: secret and public key don't match\n" -msgstr "¸° %08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "¸°%08lX: ÈëÌ©¸°¤È¸ø³«¸°¤¬Âбþ¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/trustdb.c:597 #, c-format msgid "enumerate secret keys failed: %s\n" -msgstr "ÈëÌ©¸°¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n" +msgstr "ÈëÌ©¸°¤ÎÎóµó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:987 #, c-format msgid "key %08lX.%lu: Good subkey binding\n" -msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n" +msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n" #: g10/trustdb.c:993 g10/trustdb.c:1028 #, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n" +msgstr "¸°%08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n" #: g10/trustdb.c:1005 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" -msgstr "¸° %08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇÑ»ß\n" +msgstr "¸°%08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇË´þ\n" #: g10/trustdb.c:1011 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" -msgstr "¸° %08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n" +msgstr "¸°%08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n" #: g10/trustdb.c:1022 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" -msgstr "¸° %08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n" +msgstr "¸°%08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n" #: g10/trustdb.c:1133 msgid "Good self-signature" @@ -3123,15 +3161,15 @@ msgstr "̵ #: g10/trustdb.c:1170 msgid "Valid user ID revocation skipped due to a newer self signature" -msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó" +msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó" #: g10/trustdb.c:1176 msgid "Valid user ID revocation" -msgstr "Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ" +msgstr "Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ" #: g10/trustdb.c:1181 msgid "Invalid user ID revocation" -msgstr "̵¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ" +msgstr "̵¸ú¤Ê¥æ¡¼¥¶¡¼ID¤ÎÇË´þ" #: g10/trustdb.c:1223 msgid "Valid certificate revocation" @@ -3152,26 +3190,26 @@ msgstr "̵ #: g10/trustdb.c:1270 g10/trustdb.c:1274 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" -msgstr "½ð̾¥ì¥³¡¼¥É %lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n" +msgstr "½ð̾¥ì¥³¡¼¥É%lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n" #: g10/trustdb.c:1333 msgid "duplicated certificate - deleted" -msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü¤·¤Þ¤·¤¿" +msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü" #: g10/trustdb.c:1650 #, c-format msgid "tdbio_search_dir failed: %s\n" -msgstr "tdbio_search_dir ¤Ë¼ºÇÔ: %s\n" +msgstr "tdbio_search_dir ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:1784 #, c-format msgid "lid ?: insert failed: %s\n" -msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ: %s\n" +msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:1789 #, c-format msgid "lid %lu: insert failed: %s\n" -msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ: %s\n" +msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:1795 #, c-format @@ -3181,47 +3219,47 @@ msgstr "lid %lu: #: g10/trustdb.c:1800 #, c-format msgid "error reading dir record: %s\n" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/trustdb.c:1808 g10/trustdb.c:1871 #, c-format msgid "%lu keys processed\n" -msgstr "%lu ¸°¤ò½èÍý¤·¤Þ¤·¤¿\n" +msgstr "%lu¸°¤ò½èÍý¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:1810 g10/trustdb.c:1877 #, c-format msgid "\t%lu keys with errors\n" -msgstr "\t%lu ¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "\t%lu¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n" #: g10/trustdb.c:1812 #, c-format msgid "\t%lu keys inserted\n" -msgstr "\t%lu ¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n" +msgstr "\t%lu¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:1815 #, c-format msgid "enumerate keyblocks failed: %s\n" -msgstr "¸°¥Ö¥í¥Ã¥¯¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n" +msgstr "¸°¥Ö¥í¥Ã¥¯¤Î°ìÍ÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:1863 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" -msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n" +msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n" #: g10/trustdb.c:1873 #, c-format msgid "\t%lu due to new pubkeys\n" -msgstr "\t%lu ¿·¤¿¤Ê¸ø³«¸°\n" +msgstr "\t%lu¿·¤·¤¤¸ø³«¸°\n" #: g10/trustdb.c:1875 #, c-format msgid "\t%lu keys skipped\n" -msgstr "\t%lu ¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n" +msgstr "\t%lu¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:1879 #, c-format msgid "\t%lu keys updated\n" -msgstr "\t%lu ¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n" +msgstr "\t%lu¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:2224 msgid "Ooops, no keys\n" @@ -3229,58 +3267,57 @@ msgstr " #: g10/trustdb.c:2228 msgid "Ooops, no user IDs\n" -msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/trustdb.c:2386 #, c-format msgid "check_trust: search dir record failed: %s\n" -msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ: %s\n" +msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡¦¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:2395 #, c-format msgid "key %08lX: insert trust record failed: %s\n" -msgstr "¸° %08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ: %s\n" +msgstr "¸°%08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:2399 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" -msgstr "¸° %08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n" +msgstr "¸°%08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:2407 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" -msgstr "" -"¸° %08lX.%lu: ̤Íè¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°%08lX.%lu: ̤Íè¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" #: g10/trustdb.c:2422 #, c-format msgid "key %08lX.%lu: expired at %s\n" -msgstr "¸° %08lX.%lu: %s ¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" +msgstr "¸°%08lX.%lu: %s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" #: g10/trustdb.c:2430 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" -msgstr "¸° %08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ: %s\n" +msgstr "¸°%08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:2581 #, c-format msgid "user '%s' not found: %s\n" -msgstr "¥æ¡¼¥¶ '%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¥æ¡¼¥¶¡¼'%s'¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/trustdb.c:2583 #, c-format msgid "problem finding '%s' in trustdb: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é '%s' ¤Î¸¡º÷¤Ë¾ã³²: %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é'%s'¤Î¸¡º÷¤Ë¾ã³²: %s\n" #: g10/trustdb.c:2586 #, c-format msgid "user '%s' not in trustdb - inserting\n" -msgstr "¥æ¡¼¥¶ '%s' ¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ¤·¤Þ¤·¤¿\n" +msgstr "¥æ¡¼¥¶¡¼'%s'¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ\n" #: g10/trustdb.c:2589 #, c-format msgid "failed to put '%s' into trustdb: %s\n" -msgstr "'%s' ¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ: %s\n" +msgstr "'%s'¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:2775 g10/trustdb.c:2805 msgid "WARNING: can't yet handle long pref records\n" @@ -3299,46 +3336,46 @@ msgstr "" #: g10/verify.c:147 #, c-format msgid "input line %u too long or missing LF\n" -msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹²á¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n" +msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹¤¹¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n" #: g10/ringedit.c:302 #, c-format msgid "%s: can't create keyring: %s\n" -msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/ringedit.c:319 g10/ringedit.c:1374 #, c-format msgid "%s: keyring created\n" -msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤·¤Þ¤·¤¿\n" +msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/ringedit.c:1551 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò»ý¤Ã¤¿ 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n" +msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò¤â¤Ã¤¿2¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n" #: g10/ringedit.c:1552 #, c-format msgid "%s is the unchanged one\n" -msgstr "%s ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤Êý¤Ç¤¹\n" +msgstr "%s¤ÏÊѹ¹¤Î¤Ê¤¤Êý¤Ç¤¹\n" #: g10/ringedit.c:1553 #, c-format msgid "%s is the new one\n" -msgstr "%s ¤Ï¿·¤·¤¤Êý¤Ç¤¹\n" +msgstr "%s¤Ï¿·¤·¤¤Êý¤Ç¤¹\n" #: g10/ringedit.c:1554 msgid "Please fix this possible security flaw\n" -msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ²¼¤µ¤¤\n" +msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" #: g10/skclist.c:88 g10/skclist.c:125 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -"¸°¤Ë¤Ï°ÂÁ´¤Ç¤Ê¤¤¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó - " -"µ¶ÊªÍð¿ôÀ¸À®ÁõÃ֤ˤÏÄɲäǤ­¤Þ¤»¤ó!\n" +"¤ä¤Ð¤¯¤Æ¤â¤¤¤¤¥Õ¥é¥°¤¬¸°¤Ë¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" +"µ¶ÊªÍð¿ôÀ¸À®»Ò¤È¤Ï¤¤¤Ã¤·¤ç¤Ë»È¤¨¤Þ¤»¤ó!\n" #: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" -msgstr "`%s' ¤ò¥¹¥­¥Ã¥×: %s\n" +msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n" #: g10/skclist.c:119 #, c-format @@ -3346,14 +3383,14 @@ msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"`%s' ¤ò¥¹¥­¥Ã¥×: ¤³¤ì¤Ï PGP ¤¬À¸À®¤·¤¿ ElGamal " -"¸°¤Ç¤¹¡£¤³¤Î¸°¤Ï½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" +"`%s'¤ò¥¹¥­¥Ã¥×: ¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n" +"½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" #. do not overwrite #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " -msgstr "¥Õ¥¡¥¤¥ë `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹¡£" +msgstr "¥Õ¥¡¥¤¥ë`%s'¤Ï´û¤Ë¸ºß¤·¤Þ¤¹¡£" #: g10/openfile.c:86 msgid "Overwrite (y/N)? " @@ -3362,11 +3399,11 @@ msgstr " #: g10/openfile.c:119 #, c-format msgid "%s: unknown suffix\n" -msgstr "%s: ÉÔÌÀ¤Ê³ÈÄ¥»Ò\n" +msgstr "%s: ̤ÃΤγÈÄ¥»Ò\n" #: g10/openfile.c:141 msgid "Enter new filename" -msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ²¼¤µ¤¤" +msgstr "¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/openfile.c:182 msgid "writing to stdout\n" @@ -3375,22 +3412,22 @@ msgstr "ɸ #: g10/openfile.c:261 #, c-format msgid "assuming signed data in `%s'\n" -msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬ `%s' ¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n" +msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬`%s'¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n" #: g10/openfile.c:311 #, c-format msgid "%s: new options file created\n" -msgstr "%s: ¿·¤·¤¤¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤·¤¿\n" +msgstr "%s: ¿·¤·¤¤¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/openfile.c:338 #, c-format msgid "%s: can't create directory: %s\n" -msgstr "%s: ¼­½ñ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "%s: ¼­½ñ¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/openfile.c:341 #, c-format msgid "%s: directory created\n" -msgstr "%s: ¼­½ñ¤òºîÀ®¤·¤Þ¤·¤¿\n" +msgstr "%s: ¼­½ñ¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/openfile.c:343 msgid "you have to start GnuPG again, so it can read the new options file\n" @@ -3399,47 +3436,46 @@ msgstr " #: g10/encr-data.c:66 #, c-format msgid "%s encrypted data\n" -msgstr "%s °Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n" +msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n" #: g10/encr-data.c:68 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "ÉÔÌÀ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n" +msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n" #: g10/encr-data.c:90 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" -msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤ÏÂоΰŹæË¡¤Î¼å¤¤¸°¤Ë¤è¤ê°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤ÏÂоΰŹæË¡¤Î¼å¤¤¸°¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" -msgstr "¼å¤¤¸°¤¬ºîÀ®¤µ¤ì¤Þ¤·¤¿ - ºÆ¼Â¹Ô¤·¤Þ¤¹\n" +msgstr "¼å¤¤¸°¤¬¤Ç¤­¤Þ¤·¤¿ - ºÆ¼Â¹Ô\n" #: g10/seskey.c:57 #, c-format msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" -msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d ²ó»î¤ß¤Þ¤·¤¿!\n" +msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d²ó»î¤ß¤Þ¤·¤¿!\n" #: g10/delkey.c:94 msgid "there is a secret key for this public key!\n" -msgstr "¤³¤Î¸ø³«¸°¤Î°Ù¤ÎÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹!\n" +msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹!\n" #: g10/delkey.c:96 msgid "use option \"--delete-secret-key\" to delete it first.\n" -msgstr "" -"¤Þ¤º¤³¤ì¤òºï½ü¤¹¤ë¤Ë¤Ï \"--delete-secret-key\" ¥ª¥×¥·¥ç¥ó ¤òÍѤ¤¤Æ²¼¤µ¤¤¡£\n" +msgstr "¤Þ¤º¡Ö--delete-secret-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤³¤ì¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/delkey.c:114 msgid "can't do that in batchmode without \"--yes\"\n" -msgstr "\"--yes\" ¤òȼ¤ï¤Ê¤¤¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¡Ö--yes¡×¤Î¤Ê¤¤¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" #: g10/delkey.c:136 msgid "Delete this key from the keyring? " -msgstr "¤³¤Î¸°¤ò¸°¥ê¥ó¥°¤«¤éºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹¤«? " #: g10/delkey.c:144 msgid "This is a secret key! - really delete? " -msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤¹! - ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤ì¤ÏÈëÌ©¸°¤Ç¤¹! ËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " #: g10/helptext.c:47 msgid "" @@ -3447,22 +3483,22 @@ msgid "" "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" "to do with the (implicitly created) web-of-certificates." msgstr "" -"¤³¤³¤ÇÀßÄꤷ¤¿Ãͤϡ¢Â礭¤¹¤®¤Þ¤¹¡£¤³¤ÎÃͤϷ褷¤ÆÂè»°¼Ô¤Ë¤ÏÄ󶡤µ¤ì¤Þ¤»¤ó¡£\n" -"¤½¤ì¤ò¹Ô¤¦¤Ë¤Ï¡¢²æ¡¹¤¬ web-of-trust ¤ò¼ÂÁõ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢\n" -"(°ÅÌÛŪ¤ËºîÀ®¤µ¤ì¤¿) web-of-certificates ¤¬Ìµ¤¯¤Æ¤Ï²¿¤â¤Ç¤­¤Þ¤»¤ó¡£" +"¤³¤ÎÃͤÎÀßÄê¤Ï¡¢¤¢¤Ê¤¿¼¡Âè¤Ç¤¹¡£¤³¤ÎÃͤϡ¢Âè»°¼Ô¤Ë·è¤·\n" +"¤ÆÄ󶡤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢web-of-trust ¤Î¼ÂÁõ¤ËɬÍפǡ¢\n" +"(°ÅÌÛŪ¤Ë¤Ç¤­¤¿) web-of-certificates ¤È¤Ï̵´Ø·¸¤Ç¤¹¡£" #: g10/helptext.c:53 msgid "If you want to use this revoked key anyway, answer \"yes\"." -msgstr "¤³¤ÎÇË´þ¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\"no\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£" +msgstr "¤³¤ÎÇË´þ¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:57 msgid "If you want to use this untrusted key anyway, answer \"yes\"." -msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\"no\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£" +msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:61 msgid "" "Enter the user ID of the addressee to whom you want to send the message." -msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ëÁê¼ê¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶ ID ¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£" +msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ëÁê¼ê¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:65 msgid "" @@ -3484,22 +3520,21 @@ msgid "" "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -"»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤ÎÁªÂò\n" +"»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" -"DSA (ÊÌ̾ DSS) ¤Ï¡¢½ð̾¤Ë¤Î¤ßÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ëÅŻҽð̾¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" -"DSA ½ð̾¤Ï ElGamal Ë¡¤è¤ê¤â¹â®¤Ë¸¡¾Ú¤Ç¤­¤ë¤Î¤Ç¡¢¤³¤ì¤Ï¿ä¾©¤¹¤ë¥¢¥ë¥´¥ê¥º¥à\n" -"¤Ç¤¹¡£\n" +"DSA (ÊÌ̾DSS) ¤Ï¡¢½ð̾¤Ë¤Î¤ßÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ëÅŻҽð̾¥¢¥ë¥´¥ê\n" +"¥º¥à¤Ç¤¹¡£DSA½ð̾¤ÏElGamalË¡¤è¤ê¤â¹â®¤Ë¸¡¾Ú¤Ç¤­¤ë¤Î¤Ç¡¢¤³¤ì¤Ï\n" +"¿ä¾©¤¹¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" "\n" -"ElGamal ¤Ï¡¢½ð̾¤È°Å¹æ²½¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" -"OpenPGP " -"¤Ç¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¡Ö°Å¹æ²½¤Î¤ß¡×¤È¡Ö½ð̾+°Å¹æ²½¡×¤Î£²¤Ä¤ÎÍÑË¡¤ò\n" -"¶èÊ̤·¤Æ¤¤¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¤ÏƱ¤¸¤Ç¤¹¡£¤·¤«¤·¡¢½ð̾ÍѤΰÂÁ´¤Ê¸°¤òÀ¸À®¤¹¤ë¤Ë¤Ï\n" -"¤¤¤¯¤Ä¤«¤ÎÊÑ¿ô¤òÆÃÊ̤ÊÊýË¡¤ÇÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥×¥í¥°¥é¥à¤Ç¤Ï¡¢\n" -"¤½¤ì¤Ï²Äǽ¤Ç¤¹¤¬¡¢OpenPGP " -"¤Î¾¤Î¼ÂÁõ¤Ç¤Ï¡Ö½ð̾+°Å¹æ²½¡×¤ÎÍÑË¡¤ò²ò¼á¤·¤Þ¤»¤ó¡£\n" +"ElGamal¤Ï¡¢½ð̾¤È°Å¹æ²½¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" +"OpenPGP¤Ç¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¡Ö°Å¹æ²½¤Î¤ß¡×¤È¡Ö½ð̾+°Å¹æ²½¡×\n" +"¤Î2¤Ä¤ÎÍÑË¡¤ò¶èÊ̤·¤Æ¤¤¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¤ÏƱ¤¸¤Ç¤¹¡£¤·¤«¤·¡¢½ð̾ÍÑ\n" +"¤Î°ÂÁ´¤Ê¸°¤òºî¤ë¤Ë¤Ï°ìÉô¤ÎÊÑ¿ô¤òÆÃÊ̤ÊÊýË¡¤ÇÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê\n" +"¤Þ¤»¤ó¡£¤³¤Î¥×¥í¥°¥é¥à¤Ç¤Ï¤½¤ì¤¬²Äǽ¤Ç¤¹¤¬¡¢Â¾¤ÎOpenPGP¤Î¼ÂÁõ¤Ç\n" +"¤Ï¡¢¡Ö½ð̾+°Å¹æ²½¡×¤ÎÍÑË¡¤ò²ò¼á¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" "\n" -"ºÇ½é¤Î¸°(¼ç¸°)¤Ï½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -"¤³¤Î¤³¤È¤¬¡Ö°Å¹æ²½¤Î¤ß¡×¤Î ElGamal ¸°¤¬¡¢¤³¤Î¥á¥Ë¥å¡¼¤Ë̵¤¤¤³¤È¤ÎÍýͳ¤Ç¤¹¡£" +"ºÇ½é¤Î¸°(¼ç¸°)¤Ï¡¢½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤ì¤¬\n" +"¤³¤Î¥á¥Ë¥å¡¼¤Ë¡Ö°Å¹æ²½¤Î¤ß¡×¤ÎElGamal¸°¤Î¤Ê¤¤Íýͳ¤Ç¤¹¡£" #: g10/helptext.c:85 msgid "" @@ -3507,18 +3542,18 @@ msgid "" "because they are not supported by all programs and signatures created\n" "with them are quite large and very slow to verify." msgstr "" -"¤³¤ì¤é¤Î¸°¤Ï RFC2440 ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤·¤Þ¤»¤ó¡£\n" -"²¿¸Î¤Ê¤é¡¢¤³¤ì¤é¤ÏÁ´¤Æ¤Î¥×¥í¥°¥é¥à¤Ë¤è¤Ã¤Æ¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¯¡¢\n" -"À¸À®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£" +"¤³¤ì¤é¤Î¸°¤ÏRFC2440¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤·¤Þ¤»¤ó¡£\n" +"¤Ê¤¼¤Ê¤é¡¢¤³¤ì¤é¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¢\n" +"ºîÀ®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£" #: g10/helptext.c:92 msgid "Enter the size of the key" -msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ²¼¤µ¤¤" +msgstr "¸°¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145 #: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160 msgid "Answer \"yes\" or \"no\"" -msgstr "\"yes\" ¤Þ¤¿¤Ï \"no\" ¤ÇÅú¤¨¤Æ²¼¤µ¤¤" +msgstr "¡Öyes¡×¤«¡Öno¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:106 msgid "" @@ -3527,22 +3562,22 @@ msgid "" "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -"¥×¥í¥ó¥×¥È¤Ë¼¨¤µ¤ì¤ë½ñ¼°¤ÇÃͤòÆþÎϤ·¤Æ²¼¤µ¤¤¡£\n" -"ISO ¤ÎÆüÉդνñ¼° (YYYY-MM-DD) ¤Ç¤âÆþÎϤǤ­¤Þ¤¹¤¬¡¢Àµ¤·¤¤¥¨¥é¡¼¤Ï\n" -"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦ - ¤½¤ÎÂå¤ï¤ê¤Ë¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´Ö³Ö¤ËÊÑ´¹¤¹¤ë\n" +"¥×¥í¥ó¥×¥È¤Ë¼¨¤¹½ñ¼°¤ÇÃͤòÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" +"ISO¤ÎÆüÉդνñ¼° (YYYY-MM-DD) ¤Ç¤âÆþÎϤǤ­¤Þ¤¹¤¬¡¢Àµ¤·¤¤¥¨¥é¡¼¤Ï\n" +"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹¤¹¤ë\n" "¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£" #: g10/helptext.c:118 msgid "Enter the name of the key holder" -msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ²¼¤µ¤¤" +msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" -msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹" +msgstr "¥ª¥×¥·¥ç¥ó¤Ç¤¹¤¬¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¶¯¤¯¿ä¾©¤·¤Þ¤¹" #: g10/helptext.c:127 msgid "Please enter an optional comment" -msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ²¼¤µ¤¤" +msgstr "¥ª¥×¥·¥ç¥ó¤Î¥³¥á¥ó¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:132 msgid "" @@ -3552,31 +3587,31 @@ msgid "" "O to continue with key generation.\n" "Q to to quit the key generation." msgstr "" -"N ̾Á°¤ÎÊѹ¹\n" -"C ¥³¥á¥ó¥È¤ÎÊѹ¹\n" -"E ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ÎÊѹ¹\n" -"O ¸°¤ÎÀ¸À®¤Î³¹Ô\n" -"Q ¸°¤ÎÀ¸À®¤ÎÃæ»ß" +"N ̾Á°¤ÎÊѹ¹¡£\n" +"C ¥³¥á¥ó¥È¤ÎÊѹ¹¡£\n" +"E ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤ÎÊѹ¹¡£\n" +"O ¸°¤ÎÀ¸À®¤Î³¹Ô¡£\n" +"Q ¸°¤ÎÀ¸À®¤ÎÃæ»ß¡£" #: g10/helptext.c:141 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢\"yes\" (¤Þ¤¿¤Ï¡¢Ã±¤Ë \"y\") ¤ÈÅú¤¨¤Æ²¼¤µ¤¤¡£" +msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢¡Öyes¡×(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Öy¡×) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" -msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤" +msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -"¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤ò ËÜÅö¤Ë ºï½ü¤·¤¿¤±¤ì¤Ð¡¢\"yes\" " -"¤ÈÅú¤¨¤Æ²¼¤µ¤¤Á´¤Æ¤Î¾ÚÌÀ½ñ¤âƱ»þ¤Ëºï½ü¤µ¤ì¤Þ¤¹!" +"¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" +"¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ëºï½ü¤·¤Þ¤¹!" #: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤" +msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:178 msgid "" @@ -3584,9 +3619,9 @@ msgid "" "to delete this signature because it may be important to establish a\n" "trust connection to the key or another key certified by this key." msgstr "" -"¤³¤ì¤Ï¸°¤ËÂФ¹¤ëÍ­¸ú¤Ê½ð̾¤Ç¤¹¡£Ä̾ï¤Ï¤³¤Î½ð̾¤Ïºï½ü¤·¤¿¤¯¤Ê¤¤¤Ç¤·¤ç¤¦¡£\n" -"²¿¸Î¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ\n" -"½ÅÍפÀ¤«¤é¤Ç¤¹¡£" +"¤³¤ì¤Ï¸°¤Ë¤¿¤¤¤¹¤ëÍ­¸ú¤Ê½ð̾¤Ç¤¹¡£ÉáÄ̤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Ù¤­¤Ç\n" +"¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Ï¡¢¸°¤Ø¤Î¿®ÍѤÎÎؤκîÀ®¤ä¡¢\n" +"¤³¤Î¸°¤Ë¤è¤ë¾ÚÌÀ¤Ë¤È¤Ã¤Æ½ÅÍפÀ¤«¤é¤Ç¤¹¡£" #: g10/helptext.c:183 msgid "" @@ -3596,17 +3631,17 @@ msgid "" "a trust connection through another already certified key." msgstr "" "¤³¤Î½ð̾¤È°ìÃפ¹¤ë¸°¤òÊÝÍ­¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤Î½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó¡£\n" -"¤¢¤Ê¤¿¤Ï¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n" -"²¿¸Î¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ë¤è¤Ã¤Æ¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n" -"ÃΤì¤Ê¤¤¤«¤é¤Ç¤¹¡£" +"¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤¢¤Ê¤¿¤Ï¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n" +"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n" +"¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£" #: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "" -"¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°¥ê¥ó¥°¤«¤éºï½ü¤¹¤Ù¤­¤À\n" -"¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£" +"¤³¤Î½ð̾¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¤³¤È¤Ï¡¢¤¢¤Ê¤¿¤Î¸°Îؤ«¤éºï½ü¤¹¤Ù¤­¤À\n" +"¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£" #: g10/helptext.c:193 msgid "" @@ -3616,38 +3651,38 @@ msgid "" "only if this self-signature is for some reason not valid and\n" "a second one is available." msgstr "" -"¤³¤ì¤Ï¡¢¸°¤Î¥æ¡¼¥¶ ID ¤ËÂбþ¤·¤¿½ð̾¤Ç¤¹¡£Ä̾¤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Î¤Ï\n" -"Îɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¼ÂºÝ¤Ë¤Ï¡¢GnuPG ¤Ï¤â¤Ï¤ä¤³¤Î¸°¤ò»È¤¨¤Ê¤¤¤Î¤«¤â\n" -"ÃΤì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n" -"ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ²¼¤µ¤¤¡£" +"¤³¤ì¤Ï¡¢¸°¤Î¥æ¡¼¥¶¡¼ID¤ËÂбþ¤·¤¿½ð̾¤Ç¤¹¡£Ä̾¤³¤Î½ð̾¤òºï½ü¤¹¤ë¤Î¤Ï\n" +"¤¤¤¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¼ÂºÝ¤Ë¤Ï¡¢GnuPG¤Ï¤â¤Ï¤ä¤³¤Î¸°¤ò»È¤¨¤Ê¤¤¤Î¤«¤â\n" +"¤·¤ì¤Þ¤»¤ó¡£¤è¤Ã¤Æ¡¢¤³¤Î¼«¸Ê½ð̾¤¬²¿¤é¤«¤ÎÍýͳ¤Ë¤è¤ê̵¸ú¤Ç¤¢¤Ã¤Æ¡¢\n" +"ÂåÂؤȤʤ븰¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¡¢ºï½ü¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹¡£\n" -" ¥Û¥²¥Û¥².... " +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤ÏÈëÌ©¤Îʸ¾Ï¤Î¤³¤È¤Ç¤¹¡£\n" +" ¤«¤¯¤«¤¯¤·¤«¤¸¤«¡¢¤¢¤ì¤³¤ì¡Ä " #: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr "ÆþÎϤ·¤¿¥Õ¥ì¡¼¥º¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë¡¢¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎϤ·¤Æ²¼¤µ¤¤¡£" +msgstr "ÆþÎϤ·¤¿¥Ñ¥¹¥Õ¥ì¡¼¥º¤Î³Îǧ¤Î¤¿¤á¡¢ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:213 msgid "Give the name of the file to which the signature applies" -msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òµ­½Ò¤·¤Æ²¼¤µ¤¤" +msgstr "½ð̾¤ò¹Ô¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:218 msgid "Answer \"yes\" if it is okay to overwrite the file" -msgstr "¾å½ñ¤­¤·¤Æ¤âÎɤ±¤ì¤Ð¡¢\"yes\" ¤ÈÅú¤¨¤Æ²¼¤µ¤¤" +msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:223 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤¹¤È¡¢\n" -"¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥¡¥¤¥ë̾ (³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿¤â¤Î) ¤¬»ÈÍѤµ¤ì¤Þ¤¹" +"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¡¦¥­¡¼¤ò²¡¤¹¤È¡¢\n" +"(³ç¸Ì¤Ç°Ï¤ó¤À) ´ûÄê¤Î¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ·¤Þ¤¹¡£" #: g10/helptext.c:229 msgid "" @@ -3664,6 +3699,19 @@ msgid "" " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" +"¾ÚÌÀ½ñ¤ËÍýͳ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Á°¸å´Ø·¸¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢\n" +"°Ê²¼¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" +" ¡Ö¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿¡×\n" +" ǧ¾Ú¤µ¤ì¤Æ¤¤¤Ê¤¤¿Í¤¬ÈëÌ©¸°¤Ø¤Î¥¢¥¯¥»¥¹¤òÆÀ¤¿¡¢¤È¿®¤º¤ë\n" +" ¤Ë­¤ëÍýͳ¤Î¤¢¤ë¤È¤­¤Ë¡¢¤³¤ì¤ò»È¤¤¤Þ¤¹¡£\n" +" ¡Ö¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹¡×\n" +" ¤³¤Î¸°¤ò¼«Ê¬¤Ç¿·¤·¤¤¸°¤È¤È¤ê¤«¤¨¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n" +" ¡Ö¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡×\n" +" ¤³¤Î¸°¤ò»È¤¦¤Î¤ò¤ä¤á¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n" +" ¡Ö¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó¡×\n" +" ¤â¤¦¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï»È¤¦¤Ù¤­¤Ç¤Ê¤¤¡¢¤È¤¤¤¦¤È¤­¤Ë»È¤¤\n" +" ¤Þ¤¹¡£¤³¤ì¤ÏÉáÄÌ¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¤È\n" +" ¤­¤Ë»È¤¤¤Þ¤¹¡£\n" #: g10/helptext.c:245 msgid "" @@ -3671,6 +3719,9 @@ msgid "" "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" +"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼ÇË´þ¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë¥Æ\n" +"¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n" #: g10/helptext.c:260 msgid "No help available" @@ -3679,33 +3730,4 @@ msgstr " #: g10/helptext.c:268 #, c-format msgid "No help available for `%s'" -msgstr "`%s' ¤Ø¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó" - -#~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" -#~ msgstr "" -#~ "RSA " -#~ "¸°¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£¿·¤·¤¤¸°¤òºîÀ®¤·¤Æº£¸å¤Ï¤½¤Î¸°¤òÍѤ¤¤ë¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤" -#~ "À¤µ¤¤\n" - -#~ msgid "set debugging flags" -#~ msgstr "¥Ç¥Ð¥Ã¥°¥Õ¥é¥°¤ò¥»¥Ã¥È¤¹¤ë" - -#~ msgid "enable full debugging" -#~ msgstr "Á´¤Æ¤Î¥Ç¥Ð¥Ã¥°¤òÍ­¸ú¤Ë¤¹¤ë" - -#~ msgid "do not write comment packets" -#~ msgstr "¥³¥á¥ó¥È¥Ñ¥±¥Ã¥È¤ò½ñ¤­½Ð¤µ¤Ê¤¤" - -#~ msgid "(default is 1)" -#~ msgstr "(¥Ç¥Õ¥©¥ë¥È¤Ï 1)" - -#~ msgid "(default is 3)" -#~ msgstr "(¥Ç¥Õ¥©¥ë¥È¤Ï 3)" - -#~ msgid " (%d) ElGamal in a v3 packet\n" -#~ msgstr " (%d) ElGamal in a v3 packet\n" - -#~ msgid "Key generation can only be used in interactive mode\n" -#~ msgstr "¸°¤ÎºîÀ®¤ÏÂÐÏå⡼¥É¤Ç¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" +msgstr "`%s'¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó" diff --git a/util/ChangeLog b/util/ChangeLog index 956387baf..3b9be0161 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,6 +1,29 @@ +2000-11-11 Paul Eggert + + * iobuf.c (iobuf_get_filelength): Now returns off_t, not u32. + Remove kludges to worry about large files; the callers check + for files that are too large, and they should already be doing + the right thing in an implementation-independent way. + (fopen, fstat): Remove macros. + + * iobuf.c (iobuf_set_limit, iobuf_tell, iobuf_seek): + Use off_t, not ulong, for file offsets. + (): Include if needed. + (LONG_MAX, LONG_MIN): Define a substitute if needed. + (fseeko): Define a substitute if needed. + + * iobuf.c (iobuf_seek): Do not use %lu to report file + +2000-11-09 Werner Koch + + * iobuf.c (iobuf_enable_special_filenames): New. + (check_special_filename): New. + (iobuf_open): check for special filenames. + (iobuf_create): Ditto. + 2000-10-23 Werner Koch - * secmem.c (lock_pool): Don't print warnbing for Windows. + * secmem.c (lock_pool): Don't print warning for Windows. 2000-10-16 Werner Koch diff --git a/util/iobuf.c b/util/iobuf.c index b52d88e22..7cf780f89 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -35,11 +36,6 @@ #include "util.h" #include "iobuf.h" -#if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64) - #define fopen(a,b) fopen64 ((a),(b)) - #define fstat(a,b) fstat64 ((a),(b)) -#endif - typedef struct { FILE *fp; /* open file handle */ @@ -65,6 +61,7 @@ typedef struct { int eof; } block_filter_ctx_t; +static int special_names_enabled; static int underflow(IOBUF a); @@ -573,6 +570,32 @@ iobuf_temp_with_content( const char *buffer, size_t length ) return a; } +void +iobuf_enable_special_filenames ( int yes ) +{ + special_names_enabled = yes; +} + +/* + * see whether the filename has the for "-&nnnn", where n is a + * non-zero number. + * Returns this number or -1 if it is not the case. + */ +static int +check_special_filename ( const char *fname ) +{ + if ( special_names_enabled + && fname && *fname == '-' && fname[1] == '&' ) { + int i; + + fname += 2; + for (i=0; isdigit (fname[i]); i++ ) + ; + if ( !fname[i] ) + return atoi (fname); + } + return -1; +} /**************** * Create a head iobuf for reading from a file @@ -586,6 +609,7 @@ iobuf_open( const char *fname ) file_filter_ctx_t *fcx; size_t len; int print_only = 0; + int fd; if( !fname || (*fname=='-' && !fname[1]) ) { fp = stdin; @@ -595,6 +619,8 @@ iobuf_open( const char *fname ) fname = "[stdin]"; print_only = 1; } + else if ( (fd = check_special_filename ( fname )) != -1 ) + return iobuf_fdopen ( fd, "rb" ); else if( !(fp = fopen(fname, "rb")) ) return NULL; a = iobuf_alloc(1, 8192 ); @@ -655,6 +681,7 @@ iobuf_create( const char *fname ) file_filter_ctx_t *fcx; size_t len; int print_only = 0; + int fd; if( !fname || (*fname=='-' && !fname[1]) ) { fp = stdout; @@ -664,6 +691,8 @@ iobuf_create( const char *fname ) fname = "[stdout]"; print_only = 1; } + else if ( (fd = check_special_filename ( fname )) != -1 ) + return iobuf_fdopen ( fd, "wb" ); else if( !(fp = fopen(fname, "wb")) ) return NULL; a = iobuf_alloc(2, 8192 ); @@ -686,6 +715,7 @@ iobuf_create( const char *fname ) /**************** * append to an iobuf; if the file does not exist, create it. * cannot be used for stdout. + * Note: This is not used. */ IOBUF iobuf_append( const char *fname ) @@ -1298,7 +1328,7 @@ iobuf_flush_temp( IOBUF temp ) * Setting the limit to 0 disables this feature. */ void -iobuf_set_limit( IOBUF a, unsigned long nlimit ) +iobuf_set_limit( IOBUF a, off_t nlimit ) { if( nlimit ) a->nofast |= 1; @@ -1314,25 +1344,16 @@ iobuf_set_limit( IOBUF a, unsigned long nlimit ) /**************** * Return the length of an open file */ -u32 +off_t iobuf_get_filelength( IOBUF a ) { -#if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64) - struct stat64 st; -#else struct stat st; -#endif if( a->directfp ) { FILE *fp = a->directfp; - if( !fstat(fileno(fp), &st) ) { - #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64) - if( st.st_size >= IOBUF_FILELENGTH_LIMIT ) - return IOBUF_FILELENGTH_LIMIT; - #endif - return (u32)st.st_size; - } + if( !fstat(fileno(fp), &st) ) + return st.st_size; log_error("fstat() failed: %s\n", strerror(errno) ); return 0; } @@ -1343,13 +1364,8 @@ iobuf_get_filelength( IOBUF a ) file_filter_ctx_t *b = a->filter_ov; FILE *fp = b->fp; - if( !fstat(fileno(fp), &st) ) { - #if defined (HAVE_FOPEN64) && defined (HAVE_FSTAT64) - if( st.st_size >= IOBUF_FILELENGTH_LIMIT ) - return IOBUF_FILELENGTH_LIMIT; - #endif + if( !fstat(fileno(fp), &st) ) return st.st_size; - } log_error("fstat() failed: %s\n", strerror(errno) ); break; } @@ -1360,27 +1376,55 @@ iobuf_get_filelength( IOBUF a ) /**************** * Tell the file position, where the next read will take place */ -ulong +off_t iobuf_tell( IOBUF a ) { return a->ntotal + a->nbytes; } +#if !defined(HAVE_FSEEKO) && !defined(fseeko) + +#ifdef HAVE_LIMITS_H +# include +#endif +#ifndef LONG_MAX +# define LONG_MAX ((long) ((unsigned long) -1 >> 1)) +#endif +#ifndef LONG_MIN +# define LONG_MIN (-1 - LONG_MAX) +#endif + +/**************** + * A substitute for fseeko, for hosts that don't have it. + */ +static int +fseeko( FILE *stream, off_t newpos, int whence ) +{ + while( newpos != (long) newpos ) { + long pos = newpos < 0 ? LONG_MIN : LONG_MAX; + if( fseek( stream, pos, whence ) != 0 ) + return -1; + newpos -= pos; + whence = SEEK_CUR; + } + return fseek( stream, (long)newpos, whence ); +} +#endif /**************** * This is a very limited implementation. It simply discards all internal * buffering and removes all filters but the first one. */ int -iobuf_seek( IOBUF a, ulong newpos ) +iobuf_seek( IOBUF a, off_t newpos ) { file_filter_ctx_t *b = NULL; if( a->directfp ) { FILE *fp = a->directfp; - if( fseek( fp, newpos, SEEK_SET ) ) { - log_error("can't seek to %lu: %s\n", newpos, strerror(errno) ); + if( fseeko( fp, newpos, SEEK_SET ) ) { + log_error("can't seek: %s\n", strerror(errno) ); return -1; } clearerr(fp); @@ -1394,8 +1438,8 @@ iobuf_seek( IOBUF a, ulong newpos ) } if( !a ) return -1; - if( fseek( b->fp, newpos, SEEK_SET ) ) { - log_error("can't seek to %lu: %s\n", newpos, strerror(errno) ); + if( fseeko( b->fp, newpos, SEEK_SET ) ) { + log_error("can't seek: %s\n", strerror(errno) ); return -1; } } -- cgit v1.2.3