aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--ChangeLog15
-rw-r--r--NEWS2
-rw-r--r--THANKS4
-rw-r--r--TODO16
-rw-r--r--VERSION2
-rw-r--r--acinclude.m482
-rw-r--r--configure.in12
-rw-r--r--doc/gpg.sgml8
-rw-r--r--g10/ChangeLog31
-rw-r--r--g10/Makefile.am1
-rw-r--r--g10/armor.c11
-rw-r--r--g10/g10.c15
-rw-r--r--g10/keydb.h2
-rw-r--r--g10/main.h3
-rw-r--r--g10/packet.h34
-rw-r--r--g10/parse-packet.c15
-rw-r--r--g10/pipemode.c231
-rw-r--r--g10/ringedit.c6
-rw-r--r--g10/verify.c1
-rw-r--r--include/ChangeLog6
-rw-r--r--include/iobuf.h15
-rw-r--r--po/ChangeLog6
-rw-r--r--po/ja.po1400
-rw-r--r--util/ChangeLog25
-rw-r--r--util/iobuf.c104
26 files changed, 1283 insertions, 769 deletions
diff --git a/AUTHORS b/AUTHORS
index 8b541fcac..03f37abc9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,9 @@ Niklas Hernaeus <[email protected]> Disclaimer
Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de> Assignment
(configure.in, cipher/rndlinux.c, FAQ)
+Paul Eggert <[email protected]>
+ (configuration macros for LFS)
+
Pedro Morais <[email protected]> Translations [pt_BR]
R�mi Guyomarch <[email protected]> Assignment
@@ -50,7 +53,7 @@ Walter Koch <[email protected]> Translations [de]
Werner Koch <[email protected]> Assignment
(started the whole thing)
-Yosiaki IIDA <[email protected]> Translations [ja]
+Yosiaki IIDA <[email protected]> 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 <[email protected]>
+
+ Actually Paul's patches are dated 2000-20-17; I applied them today
+ and merged some ChangeLog entries ([email protected]).
+
+ * 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 <[email protected]>
* 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 [email protected]
Daniel Koening [email protected]
Daniel Resare [email protected]
Dave Dykstra [email protected]
+David C Niemi [email protected]
David Champion [email protected]
David Ellement [email protected]
David Hallinan [email protected]
@@ -47,6 +48,7 @@ Frank Tobin [email protected]
Gabriel Rosenkoetter [email protected]
Ga�l Qu�ri [email protected]
Giampaolo Tomassoni [email protected]
+Gilbert Fernandes [email protected]
Greg Louis [email protected]
Greg Troxel [email protected]
Gregory Steuck [email protected]
@@ -147,7 +149,7 @@ Walter Koch [email protected]
Wayne Chapeskie [email protected]
Werner Koch [email protected]
Wim Vandeputte [email protected]
-Yosiaki IIDA [email protected]
+Yosiaki IIDA [email protected]
Yoshihiro Kajiki [email protected]
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 <[email protected]>.
+
+dnl Internal subroutine of AC_SYS_LARGEFILE.
+dnl AC_SYS_LARGEFILE_TEST_INCLUDES
+AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
+ [[#include <sys/types.h>
+ 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 <stdio.h>], [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 <stdio.h>], [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.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--enable-special-filenames</term>
+<listitem><para>
+This options enables a mode in which filenames of the form
+<filename>-&amp;n</>, where n is a non-negative decimal number,
+refer to the file descriptor n and not to a file with that name.
+</para></listitem></varlistentry>
+
</variablelist>
</refsect1>
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 <[email protected]>
+
+ 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 <[email protected]>
+
+ * g10.c (main): New option --enable-special-filenames.
+
+2000-11-07 Werner Koch <[email protected]>
+
+ * g10.c (main): New command --pipemode.
+ * pipemode.c: New.
+
2000-10-23 Werner Koch <[email protected]>
+ * 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 <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#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 <[email protected]>
+
+ * 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 <[email protected]>
* 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 <[email protected]>
+
+ * ja.po: Updated.
+
2000-10-19 Werner Koch <[email protected]>
Fixed a typo in all files.
@@ -19,7 +23,7 @@ Wed Jul 12 13:32:06 CEST 2000 Werner Koch <wk@>
Small English spelling correction in all files.
-Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@>
+Wed Jul 5 13:28:45 CEST 2000 Werner Koch <[email protected]>
* 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 <[email protected]>, 1999-2000.
+# Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+# IIDA Yosiaki <[email protected]>, 1999-2000.
# Yoshihiro Kajiki <[email protected]>, 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 <[email protected]>\n"
+"PO-Revision-Date: 2000-10-19 23:08+09:00\n"
+"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\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 "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
#: 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 <[email protected]>.\n"
-msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǥ�ݡ��Ȥ����äƲ�������\n"
+msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\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 "���ޥ�ɤξ���\n"
#: 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 "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
#: 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 "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
#: 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: �����٤�׻�������󤬤���ޤ���\n"
#: 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 "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
#: 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 "����: ���θ��ϴ����ڤ�Ǥ�!\n"
#: 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: �����å�: �������ϴ��ˤ���ޤ�\n"
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 "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
#: 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 ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
msgstr ""
-"���δ��¤���Ʋ�����\n"
+"���δ��¤���Ƥ���������\n"
" 0 = ̵����\n"
-" <n> = ͭ������ n ��\n"
+" <n> = ͭ������ n ����\n"
" <n>w = ͭ������ n ����\n"
-" <n>m = ͭ������ n ��\n"
-" <n>y = ͭ������ n ǯ\n"
+" <n>m = ͭ������ n �����\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 "����̵���¤Ǥ�\n"
#: 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) <[email protected]>\"\n"
"\n"
@@ -1449,32 +1491,32 @@ msgstr "̾����̵����ʸ��������ޤ�\n"
#: 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: �����ޤ���: %s\n"
#: 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: �ٹ�: ���Υե�����Ǥ�\n"
#: 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 "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
#: 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 "�� %08lX: �����åפ�������\n"
#: 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 "�����ݸ��Ƥ��ޤ���\n"
#: 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 "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
#: 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 "����̵���ʽ�̾�������ޤ���? (y/N/q)"
#: 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 "���������Ƥ��ޤ���\n"
#: 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 "�縰��ͭ�����¤��ѹ����ޤ���\n"
#: 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 "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
#: 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 "���饹0x%02x����Ω��̾\n"
#: 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 "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
#: 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 "ʬΥ��̾��\n"
#: 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: �����Ǥ��ޤ���: %s\n"
#: 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: ̵���ʿ��ѥǡ����١��������\n"
#: 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: ̵���ʿ��ѥǡ����١���\n"
#: 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: �������ޤ���\n"
#: 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 "���äȡ���������ޤ���\n"
#: 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 "��񤭤��ޤ��� (y/N)? "
#: 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 "ɸ����Ϥ˽񤭽Ф��ޤ�\n"
#: 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 "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
#: 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 <[email protected]>
+
+ * 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.
+ (<limits.h>): 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 <[email protected]>
+
+ * 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 <[email protected]>
- * 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 <[email protected]>
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 <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <ctype.h>
#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -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 <limits.h>
+#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;
}
}