-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message This is a patch file to create version 1.0.6 from 1.0.5. Please check the signature of this patch file: zcat somepath/gnupg-1.0.5-1.0.6.diff.gz | gpg --verify Change to directory gnupg-1.0.5 (or however you renamed it) and give this command: zcat somepath/gnupg-1.0.5-1.0.6.diff.gz | patch -p1 It is a good idea to rename your current directory to gnupg-1.0.6 now. Prereq: 1.0.5 diff -urN gnupg-1.0.5/VERSION gnupg-1.0.6/VERSION --- gnupg-1.0.5/VERSION Sun Apr 29 16:13:11 2001 +++ gnupg-1.0.6/VERSION Tue May 29 08:53:08 2001 @@ -1 +1 @@ -1.0.5 +1.0.6 diff -urN gnupg-1.0.5/intl/VERSION gnupg-1.0.6/intl/VERSION --- gnupg-1.0.5/intl/VERSION Tue Jan 25 18:44:12 2000 +++ gnupg-1.0.6/intl/VERSION Sat May 26 16:20:27 2001 @@ -1 +1 @@ -GNU gettext library from gettext-0.10.35 +GNU gettext library from gettext-0.10.38 diff -urN gnupg-1.0.5/intl/bindtextdom.c gnupg-1.0.6/intl/bindtextdom.c --- gnupg-1.0.5/intl/bindtextdom.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/bindtextdom.c Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,32 +19,39 @@ # include #endif -#if defined STDC_HEADERS || defined _LIBC -# include -#else -# ifdef HAVE_MALLOC_H -# include -# else -void free (); -# endif -#endif +#include +#include +#include -#if defined HAVE_STRING_H || defined _LIBC -# include +#ifdef _LIBC +# include #else -# include -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif +# include "libgnuintl.h" #endif +#include "gettextP.h" #ifdef _LIBC -# include +/* We have to handle multi-threaded applications. */ +# include #else -# include "libgettext.h" +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_dirname _nl_default_dirname__ +# define _nl_domain_bindings _nl_domain_bindings__ +#endif + +/* Some compilers, like SunOS4 cc, don't have offsetof in . */ +#ifndef offsetof +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) #endif -#include "gettext.h" -#include "gettextP.h" /* @@ end of prolog @@ */ @@ -54,6 +61,9 @@ /* List with bindings of specific domains. */ extern struct binding *_nl_domain_bindings; +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock) + /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source @@ -61,25 +71,48 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define BINDTEXTDOMAIN __bindtextdomain +# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset # ifndef strdup # define strdup(str) __strdup (str) # endif #else # define BINDTEXTDOMAIN bindtextdomain__ +# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__ #endif -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -char * -BINDTEXTDOMAIN (domainname, dirname) +/* Prototypes for local functions. */ +static void set_binding_values PARAMS ((const char *domainname, + const char **dirnamep, + const char **codesetp)); + +/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP + to be used for the DOMAINNAME message catalog. + If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not + modified, only the current value is returned. + If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither + modified nor returned. */ +static void +set_binding_values (domainname, dirnamep, codesetp) const char *domainname; - const char *dirname; + const char **dirnamep; + const char **codesetp; { struct binding *binding; + int modified; /* Some sanity checks. */ if (domainname == NULL || domainname[0] == '\0') - return NULL; + { + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + return; + } + + __libc_rwlock_wrlock (_nl_state_lock); + + modified = 0; for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) { @@ -95,83 +128,173 @@ } } - if (dirname == NULL) - /* The current binding has be to returned. */ - return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; - if (binding != NULL) { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - if (strcmp (dirname, binding->dirname) != 0) + if (dirnamep) { - char *new_dirname; + const char *dirname = *dirnamep; - if (strcmp (dirname, _nl_default_dirname) == 0) - new_dirname = (char *) _nl_default_dirname; + if (dirname == NULL) + /* The current binding has be to returned. */ + *dirnamep = binding->dirname; else { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->dirname; + if (strcmp (dirname, result) != 0) + { + if (strcmp (dirname, _nl_default_dirname) == 0) + result = (char *) _nl_default_dirname; + else + { #if defined _LIBC || defined HAVE_STRDUP - new_dirname = strdup (dirname); - if (new_dirname == NULL) - return NULL; -#else - size_t len = strlen (dirname) + 1; - new_dirname = (char *) malloc (len); - if (new_dirname == NULL) - return NULL; - - memcpy (new_dirname, dirname, len); + result = strdup (dirname); +#else + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, dirname, len); #endif + } + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->dirname != _nl_default_dirname) + free (binding->dirname); + + binding->dirname = result; + modified = 1; + } + } + *dirnamep = result; } + } - if (binding->dirname != _nl_default_dirname) - free (binding->dirname); + if (codesetp) + { + const char *codeset = *codesetp; - binding->dirname = new_dirname; + if (codeset == NULL) + /* The current binding has be to returned. */ + *codesetp = binding->codeset; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->codeset; + if (result == NULL || strcmp (codeset, result) != 0) + { +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (codeset); +#else + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, codeset, len); +#endif + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->codeset != NULL) + free (binding->codeset); + + binding->codeset = result; + binding->codeset_cntr++; + modified = 1; + } + } + *codesetp = result; + } } } + else if ((dirnamep == NULL || *dirnamep == NULL) + && (codesetp == NULL || *codesetp == NULL)) + { + /* Simply return the default values. */ + if (dirnamep) + *dirnamep = _nl_default_dirname; + if (codesetp) + *codesetp = NULL; + } else { /* We have to create a new binding. */ -#if !defined _LIBC && !defined HAVE_STRDUP - size_t len; -#endif + size_t len = strlen (domainname) + 1; struct binding *new_binding = - (struct binding *) malloc (sizeof (*new_binding)); + (struct binding *) malloc (offsetof (struct binding, domainname) + len); - if (new_binding == NULL) - return NULL; + if (__builtin_expect (new_binding == NULL, 0)) + goto failed; -#if defined _LIBC || defined HAVE_STRDUP - new_binding->domainname = strdup (domainname); - if (new_binding->domainname == NULL) - return NULL; -#else - len = strlen (domainname) + 1; - new_binding->domainname = (char *) malloc (len); - if (new_binding->domainname == NULL) - return NULL; memcpy (new_binding->domainname, domainname, len); -#endif - if (strcmp (dirname, _nl_default_dirname) == 0) - new_binding->dirname = (char *) _nl_default_dirname; + if (dirnamep) + { + const char *dirname = *dirnamep; + + if (dirname == NULL) + /* The default value. */ + dirname = _nl_default_dirname; + else + { + if (strcmp (dirname, _nl_default_dirname) == 0) + dirname = _nl_default_dirname; + else + { + char *result; +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (dirname); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; +#else + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; + memcpy (result, dirname, len); +#endif + dirname = result; + } + } + *dirnamep = dirname; + new_binding->dirname = (char *) dirname; + } else + /* The default value. */ + new_binding->dirname = (char *) _nl_default_dirname; + + new_binding->codeset_cntr = 0; + + if (codesetp) { + const char *codeset = *codesetp; + + if (codeset != NULL) + { + char *result; + #if defined _LIBC || defined HAVE_STRDUP - new_binding->dirname = strdup (dirname); - if (new_binding->dirname == NULL) - return NULL; -#else - len = strlen (dirname) + 1; - new_binding->dirname = (char *) malloc (len); - if (new_binding->dirname == NULL) - return NULL; - memcpy (new_binding->dirname, dirname, len); + result = strdup (codeset); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; +#else + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; + memcpy (result, codeset, len); #endif + codeset = result; + new_binding->codeset_cntr++; + } + *codesetp = codeset; + new_binding->codeset = (char *) codeset; } + else + new_binding->codeset = NULL; /* Now enqueue it. */ if (_nl_domain_bindings == NULL @@ -191,13 +314,55 @@ binding->next = new_binding; } - binding = new_binding; + modified = 1; + + /* Here we deal with memory allocation failures. */ + if (0) + { + failed_codeset: + if (new_binding->dirname != _nl_default_dirname) + free (new_binding->dirname); + failed_dirname: + free (new_binding); + failed: + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + } } - return binding->dirname; + /* If we modified any binding, we flush the caches. */ + if (modified) + ++_nl_msg_cat_cntr; + + __libc_rwlock_unlock (_nl_state_lock); +} + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +char * +BINDTEXTDOMAIN (domainname, dirname) + const char *domainname; + const char *dirname; +{ + set_binding_values (domainname, &dirname, NULL); + return (char *) dirname; +} + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +char * +BIND_TEXTDOMAIN_CODESET (domainname, codeset) + const char *domainname; + const char *codeset; +{ + set_binding_values (domainname, NULL, &codeset); + return (char *) codeset; } #ifdef _LIBC -/* Alias for function name in GNU C Library. */ +/* Aliases for function names in GNU C Library. */ weak_alias (__bindtextdomain, bindtextdomain); +weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); #endif diff -urN gnupg-1.0.5/intl/cat-compat.c gnupg-1.0.6/intl/cat-compat.c --- gnupg-1.0.5/intl/cat-compat.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/cat-compat.c Thu Jan 1 01:00:00 1970 @@ -1,262 +0,0 @@ -/* Compatibility code for gettext-using-catgets interface. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. - - This program 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, or (at your option) - any later version. - - This program 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. */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#ifdef STDC_HEADERS -# include -# include -#else -char *getenv (); -# ifdef HAVE_MALLOC_H -# include -# endif -#endif - -#ifdef HAVE_NL_TYPES_H -# include -#endif - -#include "libgettext.h" - -/* @@ end of prolog @@ */ - -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. And even worse: POSIX - defines this not at all. So we can use this feature only on selected - system (e.g. those using GNU C Library). */ -#ifdef _LIBC -# define HAVE_LOCALE_NULL -#endif - -/* The catalog descriptor. */ -static nl_catd catalog = (nl_catd) -1; - -/* Name of the default catalog. */ -static const char default_catalog_name[] = "messages"; - -/* Name of currently used catalog. */ -static const char *catalog_name = default_catalog_name; - -/* Get ID for given string. If not found return -1. */ -static int msg_to_cat_id PARAMS ((const char *msg)); - -/* Substitution for systems lacking this function in their C library. */ -#if !_LIBC && !HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -#endif - - -/* Set currently used domain/catalog. */ -char * -textdomain (domainname) - const char *domainname; -{ - nl_catd new_catalog; - char *new_name; - size_t new_name_len; - char *lang; - -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ - && defined HAVE_LOCALE_NULL - lang = setlocale (LC_MESSAGES, NULL); -#else - lang = getenv ("LC_ALL"); - if (lang == NULL || lang[0] == '\0') - { - lang = getenv ("LC_MESSAGES"); - if (lang == NULL || lang[0] == '\0') - lang = getenv ("LANG"); - } -#endif - if (lang == NULL || lang[0] == '\0') - lang = "C"; - - /* See whether name of currently used domain is asked. */ - if (domainname == NULL) - return (char *) catalog_name; - - if (domainname[0] == '\0') - domainname = default_catalog_name; - - /* Compute length of added path element. */ - new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) - + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 - + sizeof (".cat"); - - new_name = (char *) malloc (new_name_len); - if (new_name == NULL) - return NULL; - - strcpy (new_name, PACKAGE); - new_catalog = catopen (new_name, 0); - - if (new_catalog == (nl_catd) -1) - { - /* NLSPATH search didn't work, try absolute path */ - sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, - PACKAGE); - new_catalog = catopen (new_name, 0); - - if (new_catalog == (nl_catd) -1) - { - free (new_name); - return (char *) catalog_name; - } - } - - /* Close old catalog. */ - if (catalog != (nl_catd) -1) - catclose (catalog); - if (catalog_name != default_catalog_name) - free ((char *) catalog_name); - - catalog = new_catalog; - catalog_name = new_name; - - return (char *) catalog_name; -} - -char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; -{ -#if HAVE_SETENV || HAVE_PUTENV - char *old_val, *new_val, *cp; - size_t new_val_len; - - /* This does not make much sense here but to be compatible do it. */ - if (domainname == NULL) - return NULL; - - /* Compute length of added path element. If we use setenv we don't need - the first byts for NLSPATH=, but why complicate the code for this - peanuts. */ - new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) - + sizeof ("/%L/LC_MESSAGES/%N.cat"); - - old_val = getenv ("NLSPATH"); - if (old_val == NULL || old_val[0] == '\0') - { - old_val = NULL; - new_val_len += 1 + sizeof (LOCALEDIR) - 1 - + sizeof ("/%L/LC_MESSAGES/%N.cat"); - } - else - new_val_len += strlen (old_val); - - new_val = (char *) malloc (new_val_len); - if (new_val == NULL) - return NULL; - -# if HAVE_SETENV - cp = new_val; -# else - cp = stpcpy (new_val, "NLSPATH="); -# endif - - cp = stpcpy (cp, dirname); - cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); - - if (old_val == NULL) - { -# if __STDC__ - stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -# else - - cp = stpcpy (cp, LOCALEDIR); - stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -# endif - } - else - stpcpy (cp, old_val); - -# if HAVE_SETENV - setenv ("NLSPATH", new_val, 1); - free (new_val); -# else - putenv (new_val); - /* Do *not* free the environment entry we just entered. It is used - from now on. */ -# endif - -#endif - - return (char *) domainname; -} - -#undef gettext -char * -gettext (msg) - const char *msg; -{ - int msgid; - - if (msg == NULL || catalog == (nl_catd) -1) - return (char *) msg; - - /* Get the message from the catalog. We always use set number 1. - The message ID is computed by the function `msg_to_cat_id' - which works on the table generated by `po-to-tbl'. */ - msgid = msg_to_cat_id (msg); - if (msgid == -1) - return (char *) msg; - - return catgets (catalog, 1, msgid, (char *) msg); -} - -/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries - for the one equal to msg. If it is found return the ID. In case when - the string is not found return -1. */ -static int -msg_to_cat_id (msg) - const char *msg; -{ - int cnt; - - for (cnt = 0; cnt < _msg_tbl_length; ++cnt) - if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) - return _msg_tbl[cnt]._msg_number; - - return -1; -} - - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif diff -urN gnupg-1.0.5/intl/config.charset gnupg-1.0.6/intl/config.charset --- gnupg-1.0.5/intl/config.charset Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/config.charset Sat May 26 16:20:27 2001 @@ -0,0 +1,438 @@ +#! /bin/sh +# Output a system dependent table of character encoding aliases. +# +# Copyright (C) 2000-2001 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library 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. +# +# The table consists of lines of the form +# ALIAS CANONICAL +# +# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". +# ALIAS is compared in a case sensitive way. +# +# CANONICAL is the GNU canonical name for this character encoding. +# It must be an encoding supported by libiconv. Support by GNU libc is +# also desirable. CANONICAL is case insensitive. Usually an upper case +# MIME charset name is preferred. +# The current list of GNU canonical charset names is as follows. +# +# name used by which systems a MIME name? +# ASCII, ANSI_X3.4-1968 glibc solaris freebsd +# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes +# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes +# ISO-8859-3 glibc yes +# ISO-8859-4 osf solaris freebsd yes +# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes +# ISO-8859-6 glibc aix hpux solaris yes +# ISO-8859-7 glibc aix hpux irix osf solaris yes +# ISO-8859-8 glibc aix hpux osf solaris yes +# ISO-8859-9 glibc aix hpux irix osf solaris yes +# ISO-8859-13 glibc +# ISO-8859-15 glibc aix osf solaris freebsd +# KOI8-R glibc solaris freebsd yes +# KOI8-U glibc freebsd yes +# CP437 dos +# CP775 dos +# CP850 aix osf dos +# CP852 dos +# CP855 dos +# CP856 aix +# CP857 dos +# CP861 dos +# CP862 dos +# CP864 dos +# CP865 dos +# CP866 freebsd dos +# CP869 dos +# CP874 win32 dos +# CP922 aix +# CP932 aix win32 dos +# CP943 aix +# CP949 osf win32 dos +# CP950 win32 dos +# CP1046 aix +# CP1124 aix +# CP1129 aix +# CP1250 win32 +# CP1251 glibc win32 +# CP1252 aix win32 +# CP1253 win32 +# CP1254 win32 +# CP1255 win32 +# CP1256 win32 +# CP1257 win32 +# GB2312 glibc aix hpux irix solaris freebsd yes +# EUC-JP glibc aix hpux irix osf solaris freebsd yes +# EUC-KR glibc aix hpux irix osf solaris freebsd yes +# EUC-TW glibc aix hpux irix osf solaris +# BIG5 glibc aix hpux osf solaris freebsd yes +# BIG5HKSCS glibc +# GBK aix osf win32 dos +# GB18030 glibc +# SJIS hpux osf solaris freebsd +# JOHAB glibc win32 +# TIS-620 glibc aix hpux osf solaris +# VISCII glibc yes +# HP-ROMAN8 hpux +# HP-ARABIC8 hpux +# HP-GREEK8 hpux +# HP-HEBREW8 hpux +# HP-TURKISH8 hpux +# HP-KANA8 hpux +# DEC-KANJI osf +# DEC-HANYU osf +# UTF-8 glibc aix hpux osf solaris yes +# +# Note: Names which are not marked as being a MIME name should not be used in +# Internet protocols for information interchange (mail, news, etc.). +# +# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications +# must understand both names and treat them as equivalent. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM + +host="$1" +os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` +echo "# This file contains a table of character encoding aliases," +echo "# suitable for operating system '${os}'." +echo "# It was automatically generated from config.charset." +# List of references, updated during installation: +echo "# Packages using this file: " +case "$os" in + linux* | *-gnu*) + # With glibc-2.1 or newer, we don't need any canonicalization, + # because glibc has iconv and both glibc and libiconv support all + # GNU canonical names directly. Therefore, the Makefile does not + # need to install the alias file at all. + # The following applies only to glibc-2.0.x and older libcs. + echo "ISO_646.IRV:1983 ASCII" + ;; + aix*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-6 ISO-8859-6" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "IBM-850 CP850" + echo "IBM-856 CP856" + echo "IBM-921 ISO-8859-13" + echo "IBM-922 CP922" + echo "IBM-932 CP932" + echo "IBM-943 CP943" + echo "IBM-1046 CP1046" + echo "IBM-1124 CP1124" + echo "IBM-1129 CP1129" + echo "IBM-1252 CP1252" + echo "IBM-eucCN GB2312" + echo "IBM-eucJP EUC-JP" + echo "IBM-eucKR EUC-KR" + echo "IBM-eucTW EUC-TW" + echo "big5 BIG5" + echo "GBK GBK" + echo "TIS-620 TIS-620" + echo "UTF-8 UTF-8" + ;; + hpux*) + echo "iso88591 ISO-8859-1" + echo "iso88592 ISO-8859-2" + echo "iso88595 ISO-8859-5" + echo "iso88596 ISO-8859-6" + echo "iso88597 ISO-8859-7" + echo "iso88598 ISO-8859-8" + echo "iso88599 ISO-8859-9" + echo "iso885915 ISO-8859-15" + echo "roman8 HP-ROMAN8" + echo "arabic8 HP-ARABIC8" + echo "greek8 HP-GREEK8" + echo "hebrew8 HP-HEBREW8" + echo "turkish8 HP-TURKISH8" + echo "kana8 HP-KANA8" + echo "tis620 TIS-620" + echo "big5 BIG5" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "hp15CN GB2312" + #echo "ccdc ?" # what is this? + echo "SJIS SJIS" + echo "utf8 UTF-8" + ;; + irix*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-9 ISO-8859-9" + echo "eucCN GB2312" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + ;; + osf*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "cp850 CP850" + echo "big5 BIG5" + echo "dechanyu DEC-HANYU" + echo "dechanzi GB2312" + echo "deckanji DEC-KANJI" + echo "deckorean EUC-KR" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "GBK GBK" + echo "KSC5601 CP949" + echo "sdeckanji EUC-JP" + echo "SJIS SJIS" + echo "TACTIS TIS-620" + echo "UTF-8 UTF-8" + ;; + solaris*) + echo "646 ASCII" + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-6 ISO-8859-6" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "koi8-r KOI8-R" + echo "BIG5 BIG5" + echo "gb2312 GB2312" + echo "cns11643 EUC-TW" + echo "5601 EUC-KR" + echo "eucJP EUC-JP" + echo "PCK SJIS" + echo "TIS620.2533 TIS-620" + #echo "sun_eu_greek ?" # what is this? + echo "UTF-8 UTF-8" + ;; + freebsd*) + # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "C ASCII" + echo "US-ASCII ASCII" + for l in la_LN lt_LN; do + echo "$l.ASCII ASCII" + done + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ + lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do + echo "$l.ISO_8859-1 ISO-8859-1" + echo "$l.DIS_8859-15 ISO-8859-15" + done + for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do + echo "$l.ISO_8859-2 ISO-8859-2" + done + for l in la_LN lt_LT; do + echo "$l.ISO_8859-4 ISO-8859-4" + done + for l in ru_RU ru_SU; do + echo "$l.KOI8-R KOI8-R" + echo "$l.ISO_8859-5 ISO-8859-5" + echo "$l.CP866 CP866" + done + echo "uk_UA.KOI8-U KOI8-U" + echo "zh_TW.BIG5 BIG5" + echo "zh_TW.Big5 BIG5" + echo "zh_CN.EUC GB2312" + echo "ja_JP.EUC EUC-JP" + echo "ja_JP.SJIS SJIS" + echo "ja_JP.Shift_JIS SJIS" + echo "ko_KR.EUC EUC-KR" + ;; + beos*) + # BeOS has a single locale, and it has UTF-8 encoding. + echo "* UTF-8" + ;; + msdosdjgpp*) + # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "#" + echo "# The encodings given here may not all be correct." + echo "# If you find that the encoding given for your language and" + echo "# country is not the one your DOS machine actually uses, just" + echo "# correct it in this file, and send a mail to" + echo "# Juan Manuel Guerrero " + echo "# and Bruno Haible ." + echo "#" + echo "C ASCII" + # ISO-8859-1 languages + echo "ca CP850" + echo "ca_ES CP850" + echo "da CP865" # not CP850 ?? + echo "da_DK CP865" # not CP850 ?? + echo "de CP850" + echo "de_AT CP850" + echo "de_CH CP850" + echo "de_DE CP850" + echo "en CP850" + echo "en_AU CP850" # not CP437 ?? + echo "en_CA CP850" + echo "en_GB CP850" + echo "en_NZ CP437" + echo "en_US CP437" + echo "en_ZA CP850" # not CP437 ?? + echo "es CP850" + echo "es_AR CP850" + echo "es_BO CP850" + echo "es_CL CP850" + echo "es_CO CP850" + echo "es_CR CP850" + echo "es_CU CP850" + echo "es_DO CP850" + echo "es_EC CP850" + echo "es_ES CP850" + echo "es_GT CP850" + echo "es_HN CP850" + echo "es_MX CP850" + echo "es_NI CP850" + echo "es_PA CP850" + echo "es_PY CP850" + echo "es_PE CP850" + echo "es_SV CP850" + echo "es_UY CP850" + echo "es_VE CP850" + echo "et CP850" + echo "et_EE CP850" + echo "eu CP850" + echo "eu_ES CP850" + echo "fi CP850" + echo "fi_FI CP850" + echo "fr CP850" + echo "fr_BE CP850" + echo "fr_CA CP850" + echo "fr_CH CP850" + echo "fr_FR CP850" + echo "ga CP850" + echo "ga_IE CP850" + echo "gd CP850" + echo "gd_GB CP850" + echo "gl CP850" + echo "gl_ES CP850" + echo "id CP850" # not CP437 ?? + echo "id_ID CP850" # not CP437 ?? + echo "is CP861" # not CP850 ?? + echo "is_IS CP861" # not CP850 ?? + echo "it CP850" + echo "it_CH CP850" + echo "it_IT CP850" + echo "lt CP775" + echo "lt_LT CP775" + echo "lv CP775" + echo "lv_LV CP775" + echo "nb CP865" # not CP850 ?? + echo "nb_NO CP865" # not CP850 ?? + echo "nl CP850" + echo "nl_BE CP850" + echo "nl_NL CP850" + echo "nn CP865" # not CP850 ?? + echo "nn_NO CP865" # not CP850 ?? + echo "no CP865" # not CP850 ?? + echo "no_NO CP865" # not CP850 ?? + echo "pt CP850" + echo "pt_BR CP850" + echo "pt_PT CP850" + echo "sv CP850" + echo "sv_SE CP850" + # ISO-8859-2 languages + echo "cs CP852" + echo "cs_CZ CP852" + echo "hr CP852" + echo "hr_HR CP852" + echo "hu CP852" + echo "hu_HU CP852" + echo "pl CP852" + echo "pl_PL CP852" + echo "ro CP852" + echo "ro_RO CP852" + echo "sk CP852" + echo "sk_SK CP852" + echo "sl CP852" + echo "sl_SI CP852" + echo "sq CP852" + echo "sq_AL CP852" + echo "sr CP852" # CP852 or CP866 or CP855 ?? + echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? + # ISO-8859-3 languages + echo "mt CP850" + echo "mt_MT CP850" + # ISO-8859-5 languages + echo "be CP866" + echo "be_BE CP866" + echo "bg CP866" # not CP855 ?? + echo "bg_BG CP866" # not CP855 ?? + echo "mk CP866" # not CP855 ?? + echo "mk_MK CP866" # not CP855 ?? + echo "ru KOI8-R" # not CP866 ?? + echo "ru_RU KOI8-R" # not CP866 ?? + # ISO-8859-6 languages + echo "ar CP864" + echo "ar_AE CP864" + echo "ar_DZ CP864" + echo "ar_EG CP864" + echo "ar_IQ CP864" + echo "ar_IR CP864" + echo "ar_JO CP864" + echo "ar_KW CP864" + echo "ar_MA CP864" + echo "ar_OM CP864" + echo "ar_QA CP864" + echo "ar_SA CP864" + echo "ar_SY CP864" + # ISO-8859-7 languages + echo "el CP869" + echo "el_GR CP869" + # ISO-8859-8 languages + echo "he CP862" + echo "he_IL CP862" + # ISO-8859-9 languages + echo "tr CP857" + echo "tr_TR CP857" + # Japanese + echo "ja CP932" + echo "ja_JP CP932" + # Chinese + echo "zh_CN GBK" + echo "zh_TW CP950" # not CP938 ?? + # Korean + echo "kr CP949" # not CP934 ?? + echo "kr_KR CP949" # not CP934 ?? + # Thai + echo "th CP874" + echo "th_TH CP874" + # Other + echo "eo CP850" + echo "eo_EO CP850" + ;; +esac diff -urN gnupg-1.0.5/intl/dcgettext.c gnupg-1.0.6/intl/dcgettext.c --- gnupg-1.0.5/intl/dcgettext.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/dcgettext.c Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,220 +19,25 @@ # include #endif -#include - -#if defined __GNUC__ && !defined C_ALLOCA -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(val) errno = (val) -#endif - -#if defined STDC_HEADERS || defined _LIBC -# include -#else -char *getenv (); -# ifdef HAVE_MALLOC_H -# include -# else -void free (); -# endif -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include -#else -# include -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include #else -# include "libgettext.h" +# include "libgnuintl.h" #endif -#include "hash-string.h" /* @@ end of prolog @@ */ -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define getcwd __getcwd -# ifndef stpcpy -# define stpcpy __stpcpy -# endif -#else -# if !defined HAVE_GETCWD -char *getwd (); -# define getcwd(buf, max) getwd (buf) -# else -char *getcwd (); -# endif -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -#endif - -/* Amount to increase buffer size by in each try. */ -#define PATH_INCR 32 - -/* The following is from pathmax.h. */ -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define - PATH_MAX but might cause redefinition warnings when sys/param.h is - later included (as on MORE/BSD 4.3). */ -#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -# include -#endif - -#ifndef _POSIX_PATH_MAX -# define _POSIX_PATH_MAX 255 -#endif - -#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -#endif - -/* Don't include sys/param.h if it already has been. */ -#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -# include -#endif - -#if !defined(PATH_MAX) && defined(MAXPATHLEN) -# define PATH_MAX MAXPATHLEN -#endif - -#ifndef PATH_MAX -# define PATH_MAX _POSIX_PATH_MAX -#endif - -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. And even worse: POSIX - defines this not at all. So we can use this feature only on selected - system (e.g. those using GNU C Library). */ -#ifdef _LIBC -# define HAVE_LOCALE_NULL -#endif - -/* Name of the default domain used for gettext(3) prior any call to - textdomain(3). The default value for this is "messages". */ -const char _nl_default_default_domain[] = "messages"; - -/* Value used as the default domain for gettext(3). */ -const char *_nl_current_default_domain = _nl_default_default_domain; - -/* Contains the default location of the message catalogs. */ -const char _nl_default_dirname[] = GNULOCALEDIR; - -/* List with bindings of specific domains created by bindtextdomain() - calls. */ -struct binding *_nl_domain_bindings; - -/* Prototypes for local functions. */ -static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, - const char *msgid)) internal_function; -static const char *category_to_name PARAMS ((int category)) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) - internal_function; - - -/* For those loosing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ -#else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ - - /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source code is also used in GNU C Library where the names have a __ prefix. So we have to make a difference here. */ #ifdef _LIBC # define DCGETTEXT __dcgettext +# define DCIGETTEXT __dcigettext #else # define DCGETTEXT dcgettext__ -#endif - -/* Checking whether the binaries runs SUID must be done and glibc provides - easier methods therefore we make a difference here. */ -#ifdef _LIBC -# define ENABLE_SECURE __libc_enable_secure -# define DETERMINE_SECURE -#else -static int enable_secure; -# define ENABLE_SECURE (enable_secure == 1) -# define DETERMINE_SECURE \ - if (enable_secure == 0) \ - { \ - if (getuid () != geteuid () || getgid () != getegid ()) \ - enable_secure = 1; \ - else \ - enable_secure = -1; \ - } +# define DCIGETTEXT dcigettext__ #endif /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY @@ -243,413 +48,10 @@ const char *msgid; int category; { -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif - struct loaded_l10nfile *domain; - struct binding *binding; - const char *categoryname; - const char *categoryvalue; - char *dirname, *xdomainname; - char *single_locale; - char *retval; - int saved_errno = errno; - - /* If no real MSGID is given return NULL. */ - if (msgid == NULL) - return NULL; - - /* See whether this is a SUID binary or not. */ - DETERMINE_SECURE; - - /* If DOMAINNAME is NULL, we are interested in the default domain. If - CATEGORY is not LC_MESSAGES this might not make much sense but the - definition left this undefined. */ - if (domainname == NULL) - domainname = _nl_current_default_domain; - - /* First find matching binding. */ - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding == NULL) - dirname = (char *) _nl_default_dirname; - else if (binding->dirname[0] == '/') - dirname = binding->dirname; - else - { - /* We have a relative path. Make it absolute now. */ - size_t dirname_len = strlen (binding->dirname) + 1; - size_t path_max; - char *ret; - - path_max = (unsigned int) PATH_MAX; - path_max += 2; /* The getcwd docs say to do this. */ - - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - - __set_errno (0); - while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) - { - path_max += PATH_INCR; - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - __set_errno (0); - } - - if (ret == NULL) - { - /* We cannot get the current working directory. Don't signal an - error but simply return the default string. */ - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return (char *) msgid; - } - - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); - } - - /* Now determine the symbolic name of CATEGORY and its value. */ - categoryname = category_to_name (category); - categoryvalue = guess_category_value (category, categoryname); - - xdomainname = (char *) alloca (strlen (categoryname) - + strlen (domainname) + 5); - ADD_BLOCK (block_list, xdomainname); - - stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), - domainname), - ".mo"); - - /* Creating working area. */ - single_locale = (char *) alloca (strlen (categoryvalue) + 1); - ADD_BLOCK (block_list, single_locale); - - - /* Search for the given string. This is a loop because we perhaps - got an ordered list of languages to consider for the translation. */ - while (1) - { - /* Make CATEGORYVALUE point to the next element of the list. */ - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') - ++categoryvalue; - if (categoryvalue[0] == '\0') - { - /* The whole contents of CATEGORYVALUE has been searched but - no valid entry has been found. We solve this situation - by implicitly appending a "C" entry, i.e. no translation - will take place. */ - single_locale[0] = 'C'; - single_locale[1] = '\0'; - } - else - { - char *cp = single_locale; - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') - *cp++ = *categoryvalue++; - *cp = '\0'; - - /* When this is a SUID binary we must not allow accessing files - outside the dedicated directories. */ - if (ENABLE_SECURE - && (memchr (single_locale, '/', - _nl_find_language (single_locale) - single_locale) - != NULL)) - /* Ingore this entry. */ - continue; - } - - /* If the current locale value is C (or POSIX) we don't load a - domain. Return the MSGID. */ - if (strcmp (single_locale, "C") == 0 - || strcmp (single_locale, "POSIX") == 0) - { - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return (char *) msgid; - } - - - /* Find structure describing the message catalog matching the - DOMAINNAME and CATEGORY. */ - domain = _nl_find_domain (dirname, single_locale, xdomainname); - - if (domain != NULL) - { - retval = find_msg (domain, msgid); - - if (retval == NULL) - { - int cnt; - - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) - { - retval = find_msg (domain->successor[cnt], msgid); - - if (retval != NULL) - break; - } - } - - if (retval != NULL) - { - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return retval; - } - } - } - /* NOTREACHED */ + return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ weak_alias (__dcgettext, dcgettext); -#endif - - -static char * -internal_function -find_msg (domain_file, msgid) - struct loaded_l10nfile *domain_file; - const char *msgid; -{ - size_t act = 0; - size_t top, bottom; - struct loaded_domain *domain; - - if (domain_file->decided == 0) - _nl_load_domain (domain_file); - - if (domain_file->data == NULL) - return NULL; - - domain = (struct loaded_domain *) domain_file->data; - - /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) - { - /* Use the hashing table. */ - nls_uint32 len = strlen (msgid); - nls_uint32 hash_val = hash_string (msgid); - nls_uint32 idx = hash_val % domain->hash_size; - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); - nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); - - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len - && strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) == 0) - return (char *) domain->data + W (domain->must_swap, - domain->trans_tab[nstr - 1].offset); - - while (1) - { - if (idx >= domain->hash_size - incr) - idx -= domain->hash_size - incr; - else - idx += incr; - - nstr = W (domain->must_swap, domain->hash_tab[idx]); - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len - && strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) - == 0) - return (char *) domain->data - + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); - } - /* NOTREACHED */ - } - - /* Now we try the default method: binary search in the sorted - array of messages. */ - bottom = 0; - top = domain->nstrings; - while (bottom < top) - { - int cmp_val; - - act = (bottom + top) / 2; - cmp_val = strcmp (msgid, domain->data - + W (domain->must_swap, - domain->orig_tab[act].offset)); - if (cmp_val < 0) - top = act; - else if (cmp_val > 0) - bottom = act + 1; - else - break; - } - - /* If an translation is found return this. */ - return bottom >= top ? NULL : (char *) domain->data - + W (domain->must_swap, - domain->trans_tab[act].offset); -} - - -/* Return string representation of locale CATEGORY. */ -static const char * -internal_function -category_to_name (category) - int category; -{ - const char *retval; - - switch (category) - { -#ifdef LC_COLLATE - case LC_COLLATE: - retval = "LC_COLLATE"; - break; -#endif -#ifdef LC_CTYPE - case LC_CTYPE: - retval = "LC_CTYPE"; - break; -#endif -#ifdef LC_MONETARY - case LC_MONETARY: - retval = "LC_MONETARY"; - break; -#endif -#ifdef LC_NUMERIC - case LC_NUMERIC: - retval = "LC_NUMERIC"; - break; -#endif -#ifdef LC_TIME - case LC_TIME: - retval = "LC_TIME"; - break; -#endif -#ifdef LC_MESSAGES - case LC_MESSAGES: - retval = "LC_MESSAGES"; - break; -#endif -#ifdef LC_RESPONSE - case LC_RESPONSE: - retval = "LC_RESPONSE"; - break; -#endif -#ifdef LC_ALL - case LC_ALL: - /* This might not make sense but is perhaps better than any other - value. */ - retval = "LC_ALL"; - break; -#endif - default: - /* If you have a better idea for a default value let me know. */ - retval = "LC_XXX"; - } - - return retval; -} - -/* Guess value of current locale from value of the environment variables. */ -static const char * -internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; -{ - const char *retval; - - /* The highest priority value is the `LANGUAGE' environment - variable. This is a GNU extension. */ - retval = getenv ("LANGUAGE"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* `LANGUAGE' is not set. So we have to proceed with the POSIX - methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some - systems this can be done by the `setlocale' function itself. */ -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL - return setlocale (category, NULL); -#else - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Next comes the name of the desired category. */ - retval = getenv (categoryname); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* We use C as the default domain. POSIX says this is implementation - defined. */ - return "C"; -#endif -} - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif - - -#ifdef _LIBC -/* If we want to free all resources we have to do some work at - program's end. */ -static void __attribute__ ((unused)) -free_mem (void) -{ - struct binding *runp; - - for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) - { - free (runp->domainname); - if (runp->dirname != _nl_default_dirname) - /* Yes, this is a pointer comparison. */ - free (runp->dirname); - } - - if (_nl_current_default_domain != _nl_default_default_domain) - /* Yes, again a pointer comparison. */ - free ((char *) _nl_current_default_domain); -} - -text_set_element (__libc_subfreeres, free_mem); #endif diff -urN gnupg-1.0.5/intl/dcigettext.c gnupg-1.0.6/intl/dcigettext.c --- gnupg-1.0.5/intl/dcigettext.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/dcigettext.c Sat May 26 16:20:28 2001 @@ -0,0 +1,1257 @@ +/* Implementation of the internal dcigettext function. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +#endif + +#include +#ifndef errno +extern int errno; +#endif +#ifndef __set_errno +# define __set_errno(val) errno = (val) +#endif + +#include +#include + +#include +#if !HAVE_STRCHR && !defined _LIBC +# ifndef strchr +# define strchr index +# endif +#endif + +#if defined HAVE_UNISTD_H || defined _LIBC +# include +#endif + +#include + +#if defined HAVE_SYS_PARAM_H || defined _LIBC +# include +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif +#include "hash-string.h" + +/* Thread safetyness. */ +#ifdef _LIBC +# include +#else +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_lock_define_initialized(CLASS, NAME) +# define __libc_lock_lock(NAME) +# define __libc_lock_unlock(NAME) +# define __libc_rwlock_define_initialized(CLASS, NAME) +# define __libc_rwlock_rdlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* Alignment of types. */ +#if defined __GNUC__ && __GNUC__ >= 2 +# define alignof(TYPE) __alignof__ (TYPE) +#else +# define alignof(TYPE) \ + ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain _nl_default_default_domain__ +# define _nl_current_default_domain _nl_current_default_domain__ +# define _nl_default_dirname _nl_default_dirname__ +# define _nl_domain_bindings _nl_domain_bindings__ +#endif + +/* Some compilers, like SunOS4 cc, don't have offsetof in . */ +#ifndef offsetof +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) +#endif + +/* @@ end of prolog @@ */ + +#ifdef _LIBC +/* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ +# define getcwd __getcwd +# ifndef stpcpy +# define stpcpy __stpcpy +# endif +# define tfind __tfind +#else +# if !defined HAVE_GETCWD +char *getwd (); +# define getcwd(buf, max) getwd (buf) +# else +char *getcwd (); +# endif +# ifndef HAVE_STPCPY +static char *stpcpy PARAMS ((char *dest, const char *src)); +# endif +# ifndef HAVE_MEMPCPY +static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); +# endif +#endif + +/* Amount to increase buffer size by in each try. */ +#define PATH_INCR 32 + +/* The following is from pathmax.h. */ +/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define + PATH_MAX but might cause redefinition warnings when sys/param.h is + later included (as on MORE/BSD 4.3). */ +#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) +# include +#endif + +#ifndef _POSIX_PATH_MAX +# define _POSIX_PATH_MAX 255 +#endif + +#if !defined PATH_MAX && defined _PC_PATH_MAX +# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) +#endif + +/* Don't include sys/param.h if it already has been. */ +#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN +# include +#endif + +#if !defined PATH_MAX && defined MAXPATHLEN +# define PATH_MAX MAXPATHLEN +#endif + +#ifndef PATH_MAX +# define PATH_MAX _POSIX_PATH_MAX +#endif + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +#endif + +/* XPG3 defines the result of `setlocale (category, NULL)' as: + ``Directs `setlocale()' to query `category' and return the current + setting of `local'.'' + However it does not specify the exact format. Neither do SUSV2 and + ISO C 99. So we can use this feature only on selected systems (e.g. + those using GNU C Library). */ +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) +# define HAVE_LOCALE_NULL +#endif + +/* This is the type used for the search tree where known translations + are stored. */ +struct known_translation_t +{ + /* Domain in which to search. */ + char *domainname; + + /* The category. */ + int category; + + /* State of the catalog counter at the point the string was found. */ + int counter; + + /* Catalog where the string was found. */ + struct loaded_l10nfile *domain; + + /* And finally the translation. */ + const char *translation; + size_t translation_length; + + /* Pointer to the string in question. */ + char msgid[ZERO]; +}; + +/* Root of the search tree with known translations. We can use this + only if the system provides the `tsearch' function family. */ +#if defined HAVE_TSEARCH || defined _LIBC +# include + +static void *root; + +# ifdef _LIBC +# define tsearch __tsearch +# endif + +/* Function to compare two entries in the table of known translations. */ +static int transcmp PARAMS ((const void *p1, const void *p2)); +static int +transcmp (p1, p2) + const void *p1; + const void *p2; +{ + const struct known_translation_t *s1; + const struct known_translation_t *s2; + int result; + + s1 = (const struct known_translation_t *) p1; + s2 = (const struct known_translation_t *) p2; + + result = strcmp (s1->msgid, s2->msgid); + if (result == 0) + { + result = strcmp (s1->domainname, s2->domainname); + if (result == 0) + /* We compare the category last (though this is the cheapest + operation) since it is hopefully always the same (namely + LC_MESSAGES). */ + result = s1->category - s2->category; + } + + return result; +} +#endif + +/* Name of the default domain used for gettext(3) prior any call to + textdomain(3). The default value for this is "messages". */ +const char _nl_default_default_domain[] = "messages"; + +/* Value used as the default domain for gettext(3). */ +const char *_nl_current_default_domain = _nl_default_default_domain; + +/* Contains the default location of the message catalogs. */ +const char _nl_default_dirname[] = LOCALEDIR; + +/* List with bindings of specific domains created by bindtextdomain() + calls. */ +struct binding *_nl_domain_bindings; + +/* Prototypes for local functions. */ +static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain, + unsigned long int n, + const char *translation, + size_t translation_len)) + internal_function; +static unsigned long int plural_eval PARAMS ((struct expression *pexp, + unsigned long int n)) + internal_function; +static const char *category_to_name PARAMS ((int category)) internal_function; +static const char *guess_category_value PARAMS ((int category, + const char *categoryname)) + internal_function; + + +/* For those loosing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +/* Nothing has to be done. */ +# define ADD_BLOCK(list, address) /* nothing */ +# define FREE_BLOCKS(list) /* nothing */ +#else +struct block_list +{ + void *address; + struct block_list *next; +}; +# define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) +# define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old); \ + } \ + } while (0) +# undef alloca +# define alloca(size) (malloc (size)) +#endif /* have alloca */ + + +#ifdef _LIBC +/* List of blocks allocated for translations. */ +typedef struct transmem_list +{ + struct transmem_list *next; + char data[ZERO]; +} transmem_block_t; +static struct transmem_list *transmem_list; +#else +typedef unsigned char transmem_block_t; +#endif + + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DCIGETTEXT __dcigettext +#else +# define DCIGETTEXT dcigettext__ +#endif + +/* Lock variable to protect the global data in the gettext implementation. */ +#ifdef _LIBC +__libc_rwlock_define_initialized (, _nl_state_lock) +#endif + +/* Checking whether the binaries runs SUID must be done and glibc provides + easier methods therefore we make a difference here. */ +#ifdef _LIBC +# define ENABLE_SECURE __libc_enable_secure +# define DETERMINE_SECURE +#else +# ifndef HAVE_GETUID +# define getuid() 0 +# endif +# ifndef HAVE_GETGID +# define getgid() 0 +# endif +# ifndef HAVE_GETEUID +# define geteuid() getuid() +# endif +# ifndef HAVE_GETEGID +# define getegid() getgid() +# endif +static int enable_secure; +# define ENABLE_SECURE (enable_secure == 1) +# define DETERMINE_SECURE \ + if (enable_secure == 0) \ + { \ + if (getuid () != geteuid () || getgid () != getegid ()) \ + enable_secure = 1; \ + else \ + enable_secure = -1; \ + } +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current + CATEGORY locale and, if PLURAL is nonzero, search over string + depending on the plural form determined by N. */ +char * +DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) + const char *domainname; + const char *msgid1; + const char *msgid2; + int plural; + unsigned long int n; + int category; +{ +#ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; +#endif + struct loaded_l10nfile *domain; + struct binding *binding; + const char *categoryname; + const char *categoryvalue; + char *dirname, *xdomainname; + char *single_locale; + char *retval; + size_t retlen; + int saved_errno; +#if defined HAVE_TSEARCH || defined _LIBC + struct known_translation_t *search; + struct known_translation_t **foundp = NULL; + size_t msgid_len; +#endif + size_t domainname_len; + + /* If no real MSGID is given return NULL. */ + if (msgid1 == NULL) + return NULL; + + __libc_rwlock_rdlock (_nl_state_lock); + + /* If DOMAINNAME is NULL, we are interested in the default domain. If + CATEGORY is not LC_MESSAGES this might not make much sense but the + definition left this undefined. */ + if (domainname == NULL) + domainname = _nl_current_default_domain; + +#if defined HAVE_TSEARCH || defined _LIBC + msgid_len = strlen (msgid1) + 1; + + /* Try to find the translation among those which we found at + some time. */ + search = (struct known_translation_t *) + alloca (offsetof (struct known_translation_t, msgid) + msgid_len); + memcpy (search->msgid, msgid1, msgid_len); + search->domainname = (char *) domainname; + search->category = category; + + foundp = (struct known_translation_t **) tfind (search, &root, transcmp); + if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) + { + /* Now deal with plural. */ + if (plural) + retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation, + (*foundp)->translation_length); + else + retval = (char *) (*foundp)->translation; + + __libc_rwlock_unlock (_nl_state_lock); + return retval; + } +#endif + + /* Preserve the `errno' value. */ + saved_errno = errno; + + /* See whether this is a SUID binary or not. */ + DETERMINE_SECURE; + + /* First find matching binding. */ + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (binding == NULL) + dirname = (char *) _nl_default_dirname; + else if (IS_ABSOLUTE_PATH (binding->dirname)) + dirname = binding->dirname; + else + { + /* We have a relative path. Make it absolute now. */ + size_t dirname_len = strlen (binding->dirname) + 1; + size_t path_max; + char *ret; + + path_max = (unsigned int) PATH_MAX; + path_max += 2; /* The getcwd docs say to do this. */ + + for (;;) + { + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + + __set_errno (0); + ret = getcwd (dirname, path_max); + if (ret != NULL || errno != ERANGE) + break; + + path_max += path_max / 2; + path_max += PATH_INCR; + } + + if (ret == NULL) + { + /* We cannot get the current working directory. Don't signal an + error but simply return the default string. */ + FREE_BLOCKS (block_list); + __set_errno (saved_errno); + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); + } + + stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); + } + + /* Now determine the symbolic name of CATEGORY and its value. */ + categoryname = category_to_name (category); + categoryvalue = guess_category_value (category, categoryname); + + domainname_len = strlen (domainname); + xdomainname = (char *) alloca (strlen (categoryname) + + domainname_len + 5); + ADD_BLOCK (block_list, xdomainname); + + stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), + domainname, domainname_len), + ".mo"); + + /* Creating working area. */ + single_locale = (char *) alloca (strlen (categoryvalue) + 1); + ADD_BLOCK (block_list, single_locale); + + + /* Search for the given string. This is a loop because we perhaps + got an ordered list of languages to consider for the translation. */ + while (1) + { + /* Make CATEGORYVALUE point to the next element of the list. */ + while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') + ++categoryvalue; + if (categoryvalue[0] == '\0') + { + /* The whole contents of CATEGORYVALUE has been searched but + no valid entry has been found. We solve this situation + by implicitly appending a "C" entry, i.e. no translation + will take place. */ + single_locale[0] = 'C'; + single_locale[1] = '\0'; + } + else + { + char *cp = single_locale; + while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') + *cp++ = *categoryvalue++; + *cp = '\0'; + + /* When this is a SUID binary we must not allow accessing files + outside the dedicated directories. */ + if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) + /* Ingore this entry. */ + continue; + } + + /* If the current locale value is C (or POSIX) we don't load a + domain. Return the MSGID. */ + if (strcmp (single_locale, "C") == 0 + || strcmp (single_locale, "POSIX") == 0) + { + FREE_BLOCKS (block_list); + __libc_rwlock_unlock (_nl_state_lock); + __set_errno (saved_errno); + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); + } + + + /* Find structure describing the message catalog matching the + DOMAINNAME and CATEGORY. */ + domain = _nl_find_domain (dirname, single_locale, xdomainname, binding); + + if (domain != NULL) + { + retval = _nl_find_msg (domain, binding, msgid1, &retlen); + + if (retval == NULL) + { + int cnt; + + for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) + { + retval = _nl_find_msg (domain->successor[cnt], binding, + msgid1, &retlen); + + if (retval != NULL) + { + domain = domain->successor[cnt]; + break; + } + } + } + + if (retval != NULL) + { + /* Found the translation of MSGID1 in domain DOMAIN: + starting at RETVAL, RETLEN bytes. */ + FREE_BLOCKS (block_list); + __set_errno (saved_errno); +#if defined HAVE_TSEARCH || defined _LIBC + if (foundp == NULL) + { + /* Create a new entry and add it to the search tree. */ + struct known_translation_t *newp; + + newp = (struct known_translation_t *) + malloc (offsetof (struct known_translation_t, msgid) + + msgid_len + domainname_len + 1); + if (newp != NULL) + { + newp->domainname = + mempcpy (newp->msgid, msgid1, msgid_len); + memcpy (newp->domainname, domainname, domainname_len + 1); + newp->category = category; + newp->counter = _nl_msg_cat_cntr; + newp->domain = domain; + newp->translation = retval; + newp->translation_length = retlen; + + /* Insert the entry in the search tree. */ + foundp = (struct known_translation_t **) + tsearch (newp, &root, transcmp); + if (foundp == NULL + || __builtin_expect (*foundp != newp, 0)) + /* The insert failed. */ + free (newp); + } + } + else + { + /* We can update the existing entry. */ + (*foundp)->counter = _nl_msg_cat_cntr; + (*foundp)->domain = domain; + (*foundp)->translation = retval; + (*foundp)->translation_length = retlen; + } +#endif + /* Now deal with plural. */ + if (plural) + retval = plural_lookup (domain, n, retval, retlen); + + __libc_rwlock_unlock (_nl_state_lock); + return retval; + } + } + } + /* NOTREACHED */ +} + + +char * +internal_function +_nl_find_msg (domain_file, domainbinding, msgid, lengthp) + struct loaded_l10nfile *domain_file; + struct binding *domainbinding; + const char *msgid; + size_t *lengthp; +{ + struct loaded_domain *domain; + size_t act; + char *result; + size_t resultlen; + + if (domain_file->decided == 0) + _nl_load_domain (domain_file, domainbinding); + + if (domain_file->data == NULL) + return NULL; + + domain = (struct loaded_domain *) domain_file->data; + + /* Locate the MSGID and its translation. */ + if (domain->hash_size > 2 && domain->hash_tab != NULL) + { + /* Use the hashing table. */ + nls_uint32 len = strlen (msgid); + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); + + while (1) + { + nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); + + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + /* Compare msgid with the original string at index nstr-1. + We compare the lengths with >=, not ==, because plural entries + are represented by strings with an embedded NUL. */ + if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len + && (strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr - 1].offset)) + == 0)) + { + act = nstr - 1; + goto found; + } + + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + } + /* NOTREACHED */ + } + else + { + /* Try the default method: binary search in the sorted array of + messages. */ + size_t top, bottom; + + bottom = 0; + top = domain->nstrings; + while (bottom < top) + { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp (msgid, (domain->data + + W (domain->must_swap, + domain->orig_tab[act].offset))); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + goto found; + } + /* No translation was found. */ + return NULL; + } + + found: + /* The translation was found at index ACT. If we have to convert the + string to use a different character set, this is the time. */ + result = ((char *) domain->data + + W (domain->must_swap, domain->trans_tab[act].offset)); + resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; + +#if defined _LIBC || HAVE_ICONV + if (domain->codeset_cntr + != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) + { + /* The domain's codeset has changed through bind_textdomain_codeset() + since the message catalog was initialized or last accessed. We + have to reinitialize the converter. */ + _nl_free_domain_conv (domain); + _nl_init_domain_conv (domain_file, domain, domainbinding); + } + + if ( +# ifdef _LIBC + domain->conv != (__gconv_t) -1 +# else +# if HAVE_ICONV + domain->conv != (iconv_t) -1 +# endif +# endif + ) + { + /* We are supposed to do a conversion. First allocate an + appropriate table with the same structure as the table + of translations in the file, where we can put the pointers + to the converted strings in. + There is a slight complication with plural entries. They + are represented by consecutive NUL terminated strings. We + handle this case by converting RESULTLEN bytes, including + NULs. */ + + if (domain->conv_tab == NULL + && ((domain->conv_tab = (char **) calloc (domain->nstrings, + sizeof (char *))) + == NULL)) + /* Mark that we didn't succeed allocating a table. */ + domain->conv_tab = (char **) -1; + + if (__builtin_expect (domain->conv_tab == (char **) -1, 0)) + /* Nothing we can do, no more memory. */ + goto converted; + + if (domain->conv_tab[act] == NULL) + { + /* We haven't used this string so far, so it is not + translated yet. Do this now. */ + /* We use a bit more efficient memory handling. + We allocate always larger blocks which get used over + time. This is faster than many small allocations. */ + __libc_lock_define_initialized (static, lock) +# define INITIAL_BLOCK_SIZE 4080 + static unsigned char *freemem; + static size_t freemem_size; + + const unsigned char *inbuf; + unsigned char *outbuf; + int malloc_count; +# ifndef _LIBC + transmem_block_t *transmem_list = NULL; +# endif + + __libc_lock_lock (lock); + + inbuf = (const unsigned char *) result; + outbuf = freemem + sizeof (size_t); + + malloc_count = 0; + while (1) + { + transmem_block_t *newmem; +# ifdef _LIBC + size_t non_reversible; + int res; + + if (freemem_size < sizeof (size_t)) + goto resize_freemem; + + res = __gconv (domain->conv, + &inbuf, inbuf + resultlen, + &outbuf, + outbuf + freemem_size - sizeof (size_t), + &non_reversible); + + if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT) + break; + + if (res != __GCONV_FULL_OUTPUT) + { + __libc_lock_unlock (lock); + goto converted; + } + + inbuf = result; +# else +# if HAVE_ICONV + const char *inptr = (const char *) inbuf; + size_t inleft = resultlen; + char *outptr = (char *) outbuf; + size_t outleft; + + if (freemem_size < sizeof (size_t)) + goto resize_freemem; + + outleft = freemem_size - sizeof (size_t); + if (iconv (domain->conv, + (ICONV_CONST char **) &inptr, &inleft, + &outptr, &outleft) + != (size_t) (-1)) + { + outbuf = (unsigned char *) outptr; + break; + } + if (errno != E2BIG) + { + __libc_lock_unlock (lock); + goto converted; + } +# endif +# endif + + resize_freemem: + /* We must allocate a new buffer or resize the old one. */ + if (malloc_count > 0) + { + ++malloc_count; + freemem_size = malloc_count * INITIAL_BLOCK_SIZE; + newmem = (transmem_block_t *) realloc (transmem_list, + freemem_size); +# ifdef _LIBC + if (newmem != NULL) + transmem_list = transmem_list->next; + else + { + struct transmem_list *old = transmem_list; + + transmem_list = transmem_list->next; + free (old); + } +# endif + } + else + { + malloc_count = 1; + freemem_size = INITIAL_BLOCK_SIZE; + newmem = (transmem_block_t *) malloc (freemem_size); + } + if (__builtin_expect (newmem == NULL, 0)) + { + freemem = NULL; + freemem_size = 0; + __libc_lock_unlock (lock); + goto converted; + } + +# ifdef _LIBC + /* Add the block to the list of blocks we have to free + at some point. */ + newmem->next = transmem_list; + transmem_list = newmem; + + freemem = newmem->data; + freemem_size -= offsetof (struct transmem_list, data); +# else + transmem_list = newmem; + freemem = newmem; +# endif + + outbuf = freemem + sizeof (size_t); + } + + /* We have now in our buffer a converted string. Put this + into the table of conversions. */ + *(size_t *) freemem = outbuf - freemem - sizeof (size_t); + domain->conv_tab[act] = (char *) freemem; + /* Shrink freemem, but keep it aligned. */ + freemem_size -= outbuf - freemem; + freemem = outbuf; + freemem += freemem_size & (alignof (size_t) - 1); + freemem_size = freemem_size & ~ (alignof (size_t) - 1); + + __libc_lock_unlock (lock); + } + + /* Now domain->conv_tab[act] contains the translation of all + the plural variants. */ + result = domain->conv_tab[act] + sizeof (size_t); + resultlen = *(size_t *) domain->conv_tab[act]; + } + + converted: + /* The result string is converted. */ + +#endif /* _LIBC || HAVE_ICONV */ + + *lengthp = resultlen; + return result; +} + + +/* Look up a plural variant. */ +static char * +internal_function +plural_lookup (domain, n, translation, translation_len) + struct loaded_l10nfile *domain; + unsigned long int n; + const char *translation; + size_t translation_len; +{ + struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; + unsigned long int index; + const char *p; + + index = plural_eval (domaindata->plural, n); + if (index >= domaindata->nplurals) + /* This should never happen. It means the plural expression and the + given maximum value do not match. */ + index = 0; + + /* Skip INDEX strings at TRANSLATION. */ + p = translation; + while (index-- > 0) + { +#ifdef _LIBC + p = __rawmemchr (p, '\0'); +#else + p = strchr (p, '\0'); +#endif + /* And skip over the NUL byte. */ + p++; + + if (p >= translation + translation_len) + /* This should never happen. It means the plural expression + evaluated to a value larger than the number of variants + available for MSGID1. */ + return (char *) translation; + } + return (char *) p; +} + + +/* Function to evaluate the plural expression and return an index value. */ +static unsigned long int +internal_function +plural_eval (pexp, n) + struct expression *pexp; + unsigned long int n; +{ + switch (pexp->nargs) + { + case 0: + switch (pexp->operation) + { + case var: + return n; + case num: + return pexp->val.num; + default: + break; + } + /* NOTREACHED */ + break; + case 1: + { + /* pexp->operation must be lnot. */ + unsigned long int arg = plural_eval (pexp->val.args[0], n); + return ! arg; + } + case 2: + { + unsigned long int leftarg = plural_eval (pexp->val.args[0], n); + if (pexp->operation == lor) + return leftarg || plural_eval (pexp->val.args[1], n); + else if (pexp->operation == land) + return leftarg && plural_eval (pexp->val.args[1], n); + else + { + unsigned long int rightarg = plural_eval (pexp->val.args[1], n); + + switch (pexp->operation) + { + case mult: + return leftarg * rightarg; + case divide: + return leftarg / rightarg; + case module: + return leftarg % rightarg; + case plus: + return leftarg + rightarg; + case minus: + return leftarg - rightarg; + case less_than: + return leftarg < rightarg; + case greater_than: + return leftarg > rightarg; + case less_or_equal: + return leftarg <= rightarg; + case greater_or_equal: + return leftarg >= rightarg; + case equal: + return leftarg == rightarg; + case not_equal: + return leftarg != rightarg; + default: + break; + } + } + /* NOTREACHED */ + break; + } + case 3: + { + /* pexp->operation must be qmop. */ + unsigned long int boolarg = plural_eval (pexp->val.args[0], n); + return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); + } + } + /* NOTREACHED */ + return 0; +} + + +/* Return string representation of locale CATEGORY. */ +static const char * +internal_function +category_to_name (category) + int category; +{ + const char *retval; + + switch (category) + { +#ifdef LC_COLLATE + case LC_COLLATE: + retval = "LC_COLLATE"; + break; +#endif +#ifdef LC_CTYPE + case LC_CTYPE: + retval = "LC_CTYPE"; + break; +#endif +#ifdef LC_MONETARY + case LC_MONETARY: + retval = "LC_MONETARY"; + break; +#endif +#ifdef LC_NUMERIC + case LC_NUMERIC: + retval = "LC_NUMERIC"; + break; +#endif +#ifdef LC_TIME + case LC_TIME: + retval = "LC_TIME"; + break; +#endif +#ifdef LC_MESSAGES + case LC_MESSAGES: + retval = "LC_MESSAGES"; + break; +#endif +#ifdef LC_RESPONSE + case LC_RESPONSE: + retval = "LC_RESPONSE"; + break; +#endif +#ifdef LC_ALL + case LC_ALL: + /* This might not make sense but is perhaps better than any other + value. */ + retval = "LC_ALL"; + break; +#endif + default: + /* If you have a better idea for a default value let me know. */ + retval = "LC_XXX"; + } + + return retval; +} + +/* Guess value of current locale from value of the environment variables. */ +static const char * +internal_function +guess_category_value (category, categoryname) + int category; + const char *categoryname; +{ + const char *language; + const char *retval; + + /* The highest priority value is the `LANGUAGE' environment + variable. But we don't use the value if the currently selected + locale is the C locale. This is a GNU extension. */ + language = getenv ("LANGUAGE"); + if (language != NULL && language[0] == '\0') + language = NULL; + + /* We have to proceed with the POSIX methods of looking to `LC_ALL', + `LC_xxx', and `LANG'. On some systems this can be done by the + `setlocale' function itself. */ +#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL) + retval = setlocale (category, NULL); +#else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval == NULL || retval[0] == '\0') + { + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval == NULL || retval[0] == '\0') + { + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval == NULL || retval[0] == '\0') + /* We use C as the default domain. POSIX says this is + implementation defined. */ + return "C"; + } + } +#endif + + return language != NULL && strcmp (retval, "C") != 0 ? language : retval; +} + +/* @@ begin of epilog @@ */ + +/* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ +#if !_LIBC && !HAVE_STPCPY +static char * +stpcpy (dest, src) + char *dest; + const char *src; +{ + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; +} +#endif + +#if !_LIBC && !HAVE_MEMPCPY +static void * +mempcpy (dest, src, n) + void *dest; + const void *src; + size_t n; +{ + return (void *) ((char *) memcpy (dest, src, n) + n); +} +#endif + + +#ifdef _LIBC +/* If we want to free all resources we have to do some work at + program's end. */ +static void __attribute__ ((unused)) +free_mem (void) +{ + void *old; + + while (_nl_domain_bindings != NULL) + { + struct binding *oldp = _nl_domain_bindings; + _nl_domain_bindings = _nl_domain_bindings->next; + if (oldp->dirname != _nl_default_dirname) + /* Yes, this is a pointer comparison. */ + free (oldp->dirname); + free (oldp->codeset); + free (oldp); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); + + /* Remove the search tree with the known translations. */ + __tdestroy (root, free); + root = NULL; + + while (transmem_list != NULL) + { + old = transmem_list; + transmem_list = transmem_list->next; + free (old); + } +} + +text_set_element (__libc_subfreeres, free_mem); +#endif diff -urN gnupg-1.0.5/intl/dcngettext.c gnupg-1.0.6/intl/dcngettext.c --- gnupg-1.0.5/intl/dcngettext.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/dcngettext.c Sat May 26 16:20:28 2001 @@ -0,0 +1,59 @@ +/* Implementation of the dcngettext(3) function. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DCNGETTEXT __dcngettext +# define DCIGETTEXT __dcigettext +#else +# define DCNGETTEXT dcngettext__ +# define DCIGETTEXT dcigettext__ +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +char * +DCNGETTEXT (domainname, msgid1, msgid2, n, category) + const char *domainname; + const char *msgid1; + const char *msgid2; + unsigned long int n; + int category; +{ + return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__dcngettext, dcngettext); +#endif diff -urN gnupg-1.0.5/intl/dgettext.c gnupg-1.0.6/intl/dgettext.c --- gnupg-1.0.5/intl/dgettext.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/dgettext.c Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ -/* Implementation of the dgettext(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the dgettext(3) function. + Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,14 +19,13 @@ # include #endif -#if defined HAVE_LOCALE_H || defined _LIBC -# include -#endif +#include +#include "gettextP.h" #ifdef _LIBC # include #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ diff -urN gnupg-1.0.5/intl/dngettext.c gnupg-1.0.6/intl/dngettext.c --- gnupg-1.0.5/intl/dngettext.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/dngettext.c Sat May 26 16:20:28 2001 @@ -0,0 +1,60 @@ +/* Implementation of the dngettext(3) function. + Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DNGETTEXT __dngettext +# define DCNGETTEXT __dcngettext +#else +# define DNGETTEXT dngettext__ +# define DCNGETTEXT dcngettext__ +#endif + +/* Look up MSGID in the DOMAINNAME message catalog of the current + LC_MESSAGES locale and skip message according to the plural form. */ +char * +DNGETTEXT (domainname, msgid1, msgid2, n) + const char *domainname; + const char *msgid1; + const char *msgid2; + unsigned long int n; +{ + return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__dngettext, dngettext); +#endif diff -urN gnupg-1.0.5/intl/explodename.c gnupg-1.0.6/intl/explodename.c --- gnupg-1.0.5/intl/explodename.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/explodename.c Sat May 26 16:20:28 2001 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -19,15 +19,8 @@ # include #endif -#if defined STDC_HEADERS || defined _LIBC -# include -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# include -#else -# include -#endif +#include +#include #include #include "loadinfo.h" diff -urN gnupg-1.0.5/intl/finddomain.c gnupg-1.0.6/intl/finddomain.c --- gnupg-1.0.5/intl/finddomain.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/finddomain.c Sat May 26 16:20:28 2001 @@ -1,6 +1,6 @@ /* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,45 +20,20 @@ # include #endif -#include -#include #include #include - -#if defined STDC_HEADERS || defined _LIBC -# include -#else -# ifdef HAVE_MALLOC_H -# include -# else -void free (); -# endif -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# include -#else -# include -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif +#include +#include #if defined HAVE_UNISTD_H || defined _LIBC # include #endif -#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ @@ -71,10 +46,11 @@ established bindings. */ struct loaded_l10nfile * internal_function -_nl_find_domain (dirname, locale, domainname) +_nl_find_domain (dirname, locale, domainname, domainbinding) const char *dirname; char *locale; const char *domainname; + struct binding *domainbinding; { struct loaded_l10nfile *retval; const char *language; @@ -120,7 +96,7 @@ int cnt; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data != NULL) return retval; @@ -128,7 +104,7 @@ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; @@ -175,14 +151,14 @@ return NULL; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data == NULL) { int cnt; for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; } @@ -192,6 +168,10 @@ if (alias_value != NULL) free (locale); + /* The space for normalized_codeset is dynamically allocated. Free it. */ + if (mask & XPG_NORM_CODESET) + free ((void *) normalized_codeset); + return retval; } @@ -208,6 +188,7 @@ if (runp->data != NULL) _nl_unload_domain ((struct loaded_domain *) runp->data); runp = runp->next; + free ((char *) here->filename); free (here); } } diff -urN gnupg-1.0.5/intl/gettext.c gnupg-1.0.6/intl/gettext.c --- gnupg-1.0.5/intl/gettext.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/gettext.c Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,21 +23,14 @@ # define __need_NULL # include #else -# ifdef STDC_HEADERS -# include /* Just for NULL. */ -# else -# ifdef HAVE_STRING_H -# include -# else -# define NULL ((void *) 0) -# endif -# endif +# include /* Just for NULL. */ #endif +#include "gettextP.h" #ifdef _LIBC # include #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ @@ -48,10 +41,10 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define GETTEXT __gettext -# define DGETTEXT __dgettext +# define DCGETTEXT __dcgettext #else # define GETTEXT gettext__ -# define DGETTEXT dgettext__ +# define DCGETTEXT dcgettext__ #endif /* Look up MSGID in the current default message catalog for the current @@ -61,7 +54,7 @@ GETTEXT (msgid) const char *msgid; { - return DGETTEXT (NULL, msgid); + return DCGETTEXT (NULL, msgid, LC_MESSAGES); } #ifdef _LIBC diff -urN gnupg-1.0.5/intl/gettext.h gnupg-1.0.6/intl/gettext.h --- gnupg-1.0.5/intl/gettext.h Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/gettext.h Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ -/* Internal header for GNU gettext internationalization functions. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Description of GNU message catalog format: general file layout. + Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,16 +11,13 @@ 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 Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ #ifndef _GETTEXT_H #define _GETTEXT_H 1 -#include - #if HAVE_LIMITS_H || _LIBC # include #endif @@ -37,9 +34,8 @@ /* The following contortions are an attempt to use the C preprocessor to determine an unsigned integral type that is 32 bits wide. An alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but - doing that would require that the configure script compile and *run* - the resulting executable. Locally running cross-compiled executables - is usually not possible. */ + as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work + when cross-compiling. */ #if __STDC__ # define UINT_MAX_32_BITS 4294967295U diff -urN gnupg-1.0.5/intl/gettextP.h gnupg-1.0.6/intl/gettextP.h --- gnupg-1.0.5/intl/gettextP.h Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/gettextP.h Sat May 26 16:20:27 2001 @@ -1,6 +1,6 @@ -/* Header describing internals of gettext library - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. +/* Header describing internals of libintl library. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,8 +19,20 @@ #ifndef _GETTEXTP_H #define _GETTEXTP_H +#include /* Get size_t. */ + +#ifdef _LIBC +# include "../iconv/gconv_int.h" +#else +# if HAVE_ICONV +# include +# endif +#endif + #include "loadinfo.h" +#include "gettext.h" /* Get nls_uint32. */ + /* @@ end of prolog @@ */ #ifndef PARAMS @@ -35,6 +47,12 @@ # define internal_function #endif +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + #ifndef W # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif @@ -44,8 +62,6 @@ # include # define SWAP(i) bswap_32 (i) #else -static nls_uint32 SWAP PARAMS ((nls_uint32 i)); - static inline nls_uint32 SWAP (i) nls_uint32 i; @@ -55,6 +71,52 @@ #endif +/* This is the representation of the expressions to determine the + plural form. */ +struct expression +{ + int nargs; /* Number of arguments. */ + enum operator + { + /* Without arguments: */ + var, /* The variable "n". */ + num, /* Decimal number. */ + /* Unary operators: */ + lnot, /* Logical NOT. */ + /* Binary operators: */ + mult, /* Multiplication. */ + divide, /* Division. */ + module, /* Module operation. */ + plus, /* Addition. */ + minus, /* Subtraction. */ + less_than, /* Comparison. */ + greater_than, /* Comparison. */ + less_or_equal, /* Comparison. */ + greater_or_equal, /* Comparison. */ + equal, /* Comparision for equality. */ + not_equal, /* Comparision for inequality. */ + land, /* Logical AND. */ + lor, /* Logical OR. */ + /* Ternary operators: */ + qmop /* Question mark operator. */ + } operation; + union + { + unsigned long int num; /* Number value for `num'. */ + struct expression *args[3]; /* Up to three arguments. */ + } val; +}; + +/* This is the data structure to pass information to the parser and get + the result in a thread-safe way. */ +struct parse_args +{ + const char *cp; + struct expression *res; +}; + + +/* The representation of an opened message catalog. */ struct loaded_domain { const char *data; @@ -66,23 +128,123 @@ struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; + int codeset_cntr; +#ifdef _LIBC + __gconv_t conv; +#else +# if HAVE_ICONV + iconv_t conv; +# endif +#endif + char **conv_tab; + + struct expression *plural; + unsigned long int nplurals; }; +/* We want to allocate a string at the end of the struct. But ISO C + doesn't allow zero sized arrays. */ +#ifdef __GNUC__ +# define ZERO 0 +#else +# define ZERO 1 +#endif + +/* A set of settings bound to a message domain. Used to store settings + from bindtextdomain() and bind_textdomain_codeset(). */ struct binding { struct binding *next; - char *domainname; char *dirname; + int codeset_cntr; /* Incremented each time codeset changes. */ + char *codeset; + char domainname[ZERO]; }; +/* A counter which is incremented each time some previous translations + become invalid. + This variable is part of the external ABI of the GNU libintl. */ +extern int _nl_msg_cat_cntr; + struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, - const char *__domainname)) + const char *__domainname, + struct binding *__domainbinding)) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, + struct binding *__domainbinding)) internal_function; void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) internal_function; +const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding)) + internal_function; +void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) + internal_function; + +char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, + struct binding *domainbinding, + const char *msgid, size_t *lengthp)) + internal_function; + +#ifdef _LIBC +extern char *__gettext PARAMS ((const char *__msgid)); +extern char *__dgettext PARAMS ((const char *__domainname, + const char *__msgid)); +extern char *__dcgettext PARAMS ((const char *__domainname, + const char *__msgid, int __category)); +extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *__dngettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n)); +extern char *__dcngettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category)); +extern char *__dcigettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category)); +extern char *__textdomain PARAMS ((const char *__domainname)); +extern char *__bindtextdomain PARAMS ((const char *__domainname, + const char *__dirname)); +extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, + const char *__codeset)); +#else +extern char *gettext__ PARAMS ((const char *__msgid)); +extern char *dgettext__ PARAMS ((const char *__domainname, + const char *__msgid)); +extern char *dcgettext__ PARAMS ((const char *__domainname, + const char *__msgid, int __category)); +extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *dngettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *dcngettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category)); +extern char *dcigettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category)); +extern char *textdomain__ PARAMS ((const char *__domainname)); +extern char *bindtextdomain__ PARAMS ((const char *__domainname, + const char *__dirname)); +extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname, + const char *__codeset)); +#endif + +#ifdef _LIBC +extern void __gettext_free_exp PARAMS ((struct expression *exp)) + internal_function; +extern int __gettextparse PARAMS ((void *arg)); +#else +extern void gettext_free_exp__ PARAMS ((struct expression *exp)) + internal_function; +extern int gettextparse__ PARAMS ((void *arg)); +#endif /* @@ begin of epilog @@ */ diff -urN gnupg-1.0.5/intl/hash-string.h gnupg-1.0.6/intl/hash-string.h --- gnupg-1.0.5/intl/hash-string.h Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/hash-string.h Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ -/* Implements a string hashing function. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Description of GNU message catalog format: string hashing function. + Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,10 +11,9 @@ 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 Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ /* @@ end of prolog @@ */ diff -urN gnupg-1.0.5/intl/intl-compat.c gnupg-1.0.6/intl/intl-compat.c --- gnupg-1.0.5/intl/intl-compat.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/intl-compat.c Sat May 26 16:20:28 2001 @@ -1,6 +1,6 @@ /* intl-compat.c - Stub functions to call gettext functions from GNU gettext Library. - Copyright (C) 1995 Software Foundation, Inc. + Copyright (C) 1995, 2000, 2001 Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,24 +20,79 @@ # include #endif -#include "libgettext.h" +#include "libgnuintl.h" +#include "gettextP.h" /* @@ end of prolog @@ */ +/* This file redirects the gettext functions (without prefix or suffix) to + those defined in the included GNU gettext library (with "__" suffix). + It is compiled into libintl when the included GNU gettext library is + configured --with-included-gettext. + + This redirection works also in the case that the system C library or + the system libintl library contain gettext/textdomain/... functions. + If it didn't, we would need to add preprocessor level redirections to + libgnuintl.h of the following form: + +# define gettext gettext__ +# define dgettext dgettext__ +# define dcgettext dcgettext__ +# define ngettext ngettext__ +# define dngettext dngettext__ +# define dcngettext dcngettext__ +# define textdomain textdomain__ +# define bindtextdomain bindtextdomain__ +# define bind_textdomain_codeset bind_textdomain_codeset__ + + How does this redirection work? There are two cases. + A. When libintl.a is linked into an executable, it works because + functions defined in the executable always override functions in + the shared libraries. + B. When libintl.so is used, it works because + 1. those systems defining gettext/textdomain/... in the C library + (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are + ELF systems and define these symbols as weak, thus explicitly + letting other shared libraries override it. + 2. those systems defining gettext/textdomain/... in a standalone + libintl.so library (namely, Solaris 2.3 and newer) have this + shared library in /usr/lib, and the linker will search /usr/lib + *after* the directory where the GNU gettext library is installed. + + A third case, namely when libintl.a is linked into a shared library + whose name is not libintl.so, is not supported. In this case, on + Solaris, when -lintl precedes the linker option for the shared library + containing GNU gettext, the system's gettext would indeed override + the GNU gettext. Anyone doing this kind of stuff must be clever enough + to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker + command line. */ + #undef gettext #undef dgettext #undef dcgettext +#undef ngettext +#undef dngettext +#undef dcngettext #undef textdomain #undef bindtextdomain +#undef bind_textdomain_codeset char * -bindtextdomain (domainname, dirname) +gettext (msgid) + const char *msgid; +{ + return gettext__ (msgid); +} + + +char * +dgettext (domainname, msgid) const char *domainname; - const char *dirname; + const char *msgid; { - return bindtextdomain__ (domainname, dirname); + return dgettext__ (domainname, msgid); } @@ -52,19 +107,35 @@ char * -dgettext (domainname, msgid) +ngettext (msgid1, msgid2, n) + const char *msgid1; + const char *msgid2; + unsigned long int n; +{ + return ngettext__ (msgid1, msgid2, n); +} + + +char * +dngettext (domainname, msgid1, msgid2, n) const char *domainname; - const char *msgid; + const char *msgid1; + const char *msgid2; + unsigned long int n; { - return dgettext__ (domainname, msgid); + return dngettext__ (domainname, msgid1, msgid2, n); } char * -gettext (msgid) - const char *msgid; +dcngettext (domainname, msgid1, msgid2, n, category) + const char *domainname; + const char *msgid1; + const char *msgid2; + unsigned long int n; + int category; { - return gettext__ (msgid); + return dcngettext__ (domainname, msgid1, msgid2, n, category); } @@ -73,4 +144,22 @@ const char *domainname; { return textdomain__ (domainname); +} + + +char * +bindtextdomain (domainname, dirname) + const char *domainname; + const char *dirname; +{ + return bindtextdomain__ (domainname, dirname); +} + + +char * +bind_textdomain_codeset (domainname, codeset) + const char *domainname; + const char *codeset; +{ + return bind_textdomain_codeset__ (domainname, codeset); } diff -urN gnupg-1.0.5/intl/l10nflist.c gnupg-1.0.6/intl/l10nflist.c --- gnupg-1.0.5/intl/l10nflist.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/l10nflist.c Sat May 26 16:20:28 2001 @@ -1,5 +1,4 @@ -/* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -16,22 +15,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Tell glibc's to provide a prototype for stpcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + #ifdef HAVE_CONFIG_H # include #endif - -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include -#else -# include -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif +#include #if !HAVE_STRCHR && !defined _LIBC # ifndef strchr # define strchr index @@ -43,10 +38,7 @@ #endif #include #include - -#if defined STDC_HEADERS || defined _LIBC -# include -#endif +#include #include "loadinfo.h" @@ -224,7 +216,7 @@ /* Construct file name. */ memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, ':'); + __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); cp = abs_filename + (dirlist_len - 1); *cp++ = '/'; cp = stpcpy (cp, language); @@ -349,7 +341,8 @@ /* Normalize codeset name. There is no standard for the codeset names. Normalization allows the user to use any of the common - names. */ + names. The return value is dynamically allocated and has to be + freed by the caller. */ const char * _nl_normalize_codeset (codeset, name_len) const char *codeset; diff -urN gnupg-1.0.5/intl/libgettext.h gnupg-1.0.6/intl/libgettext.h --- gnupg-1.0.5/intl/libgettext.h Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/libgettext.h Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ -/* Message catalogs for internationalization. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Convenience header for conditional use of GNU . + Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,168 +15,34 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Because on some systems (e.g. Solaris) we sometimes have to include - the systems libintl.h as well as this file we have more complex - include protection above. But the systems header might perhaps also - define _LIBINTL_H and therefore we have to protect the definition here. */ - -#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -#ifndef _LIBINTL_H -# define _LIBINTL_H 1 -#endif -#define _LIBGETTEXT_H 1 - -/* We define an additional symbol to signal that we use the GNU - implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -#include - -#if HAVE_LOCALE_H -# include -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ || defined __cplusplus -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef NULL -# if !defined __cplusplus || defined __GNUC__ -# define NULL ((void *) 0) -# else -# define NULL (0) -# endif -#endif - -#if !HAVE_LC_MESSAGES -/* This value determines the behaviour of the gettext() and dgettext() - function. But some system does not have this defined. Define it - to a default value. */ -# define LC_MESSAGES (-1) -#endif - - -/* Declarations for gettext-using-catgets interface. Derived from - Jim Meyering's libintl.h. */ -struct _msg_ent -{ - const char *_msg; - int _msg_number; -}; - - -#if HAVE_CATGETS -/* These two variables are defined in the automatically by po-to-tbl.sed - generated file `cat-id-tbl.c'. */ -extern const struct _msg_ent _msg_tbl[]; -extern int _msg_tbl_length; -#endif - - -/* For automatical extraction of messages sometimes no real - translation is needed. Instead the string itself is the result. */ -#define gettext_noop(Str) (Str) - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -extern char *gettext PARAMS ((const char *__msgid)); -extern char *gettext__ PARAMS ((const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -extern char *dgettext__ PARAMS ((const char *__domainname, - const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, - int __category)); -extern char *dcgettext__ PARAMS ((const char *__domainname, - const char *__msgid, int __category)); - - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -extern char *textdomain PARAMS ((const char *__domainname)); -extern char *textdomain__ PARAMS ((const char *__domainname)); - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -extern char *bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *bindtextdomain__ PARAMS ((const char *__domainname, - const char *__dirname)); +#ifndef _LIBGETTEXT_H +#define _LIBGETTEXT_H 1 +/* NLS can be disabled through the configure --disable-nls option. */ #if ENABLE_NLS -/* Solaris 2.3 has the gettext function but dcgettext is missing. - So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 - has dcgettext. */ -# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) - -# define gettext(Msgid) \ - dgettext (NULL, Msgid) - -# define dgettext(Domainname, Msgid) \ - dcgettext (Domainname, Msgid, LC_MESSAGES) - -# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -/* This global variable is defined in loadmsgcat.c. We need a sign, - whether a new catalog was loaded, which can be associated with all - translations. */ -extern int _nl_msg_cat_cntr; - -# define dcgettext(Domainname, Msgid, Category) \ - (__extension__ \ - ({ \ - char *__result; \ - if (__builtin_constant_p (Msgid)) \ - { \ - static char *__translation__; \ - static int __catalog_counter__; \ - if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ - { \ - __translation__ = \ - dcgettext__ (Domainname, Msgid, Category); \ - __catalog_counter__ = _nl_msg_cat_cntr; \ - } \ - __result = __translation__; \ - } \ - else \ - __result = dcgettext__ (Domainname, Msgid, Category); \ - __result; \ - })) -# endif -# endif +/* Get declarations of GNU message catalog functions. */ +# include #else # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) ((char *) Domainname) -# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) +# define ngettext(Msgid1, Msgid2, N) \ + ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) +# define dngettext(Domainname, Msgid1, Msgid2, N) \ + ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ + ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2)) +# define textdomain(Domainname) ((char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset)) #endif -/* @@ begin of epilog @@ */ - -#ifdef __cplusplus -} -#endif +/* For automatical extraction of messages sometimes no real + translation is needed. Instead the string itself is the result. */ +#define gettext_noop(Str) (Str) -#endif +#endif /* _LIBGETTEXT_H */ diff -urN gnupg-1.0.5/intl/libgnuintl.h gnupg-1.0.6/intl/libgnuintl.h --- gnupg-1.0.5/intl/libgnuintl.h Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/libgnuintl.h Sat May 26 16:20:27 2001 @@ -0,0 +1,127 @@ +/* Message catalogs for internationalization. + Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +#ifndef _LIBINTL_H +#define _LIBINTL_H 1 + +#include + +/* The LC_MESSAGES locale category is the category used by the functions + gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. + On systems that don't define it, use an arbitrary value instead. + On Solaris, defines __LOCALE_H then includes (i.e. + this file!) and then only defines LC_MESSAGES. To avoid a redefinition + warning, don't define LC_MESSAGES in this case. */ +#if !defined LC_MESSAGES && !defined __LOCALE_H +# define LC_MESSAGES 1729 +#endif + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +/* Resolve a platform specific conflict on DJGPP. GNU gettext takes + precedence over _conio_gettext. */ +#ifdef __DJGPP__ +# undef gettext +# define gettext gettext +#endif + +#ifndef PARAMS +# if __STDC__ || defined __cplusplus +# define PARAMS(args) args +# else +# define PARAMS(args) () +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +extern char *gettext PARAMS ((const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, + int __category)); + + +/* Similar to `gettext' but select the plural form corresponding to the + number N. */ +extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2, + unsigned long int __n)); + +/* Similar to `dgettext' but select the plural form corresponding to the + number N. */ +extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n)); + +/* Similar to `dcgettext' but select the plural form corresponding to the + number N. */ +extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n, + int __category)); + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +extern char *textdomain PARAMS ((const char *__domainname)); + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +extern char *bindtextdomain PARAMS ((const char *__domainname, + const char *__dirname)); + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +extern char *bind_textdomain_codeset PARAMS ((const char *__domainname, + const char *__codeset)); + + +/* Optimized version of the functions above. */ +#if defined __OPTIMIZED +/* These are macros, but could also be inline functions. */ + +# define gettext(msgid) \ + dgettext (NULL, msgid) + +# define dgettext(domainname, msgid) \ + dcgettext (domainname, msgid, LC_MESSAGES) + +# define ngettext(msgid1, msgid2, n) \ + dngettext (NULL, msgid1, msgid2, n) + +# define dngettext(domainname, msgid1, msgid2, n) \ + dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES) + +#endif /* Optimizing. */ + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff -urN gnupg-1.0.5/intl/linux-msg.sed gnupg-1.0.6/intl/linux-msg.sed --- gnupg-1.0.5/intl/linux-msg.sed Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/linux-msg.sed Thu Jan 1 01:00:00 1970 @@ -1,100 +0,0 @@ -# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -# Copyright (C) 1995 Free Software Foundation, Inc. -# Ulrich Drepper , 1995. -# -# This program 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, or (at your option) -# any later version. -# -# This program 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. -# -# -# The first directive in the .msg should be the definition of the -# message set number. We use always set number 1. -# -1 { - i\ -$set 1 # Automatically created by po2msg.sed - h - s/.*/0/ - x -} -# -# Mitch's old catalog format does not allow comments. -# -# We copy the original message as a comment into the .msg file. -# -/^msgid/ { - s/msgid[ ]*"// -# -# This does not work now with the new format. -# /"$/! { -# s/\\$// -# s/$/ ... (more lines following)"/ -# } - x -# The following nice solution is by -# Bruno - td -# Increment a decimal number in pattern space. -# First hide trailing `9' digits. - :d - s/9\(_*\)$/_\1/ - td -# Assure at least one digit is available. - s/^\(_*\)$/0\1/ -# Increment the last digit. - s/8\(_*\)$/9\1/ - s/7\(_*\)$/8\1/ - s/6\(_*\)$/7\1/ - s/5\(_*\)$/6\1/ - s/4\(_*\)$/5\1/ - s/3\(_*\)$/4\1/ - s/2\(_*\)$/3\1/ - s/1\(_*\)$/2\1/ - s/0\(_*\)$/1\1/ -# Convert the hidden `9' digits to `0's. - s/_/0/g - x - G - s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -} -# -# The .msg file contains, other then the .po file, only the translations -# but each given a unique ID. Starting from 1 and incrementing by 1 for -# each message we assign them to the messages. -# It is important that the .po file used to generate the cat-id-tbl.c file -# (with po-to-tbl) is the same as the one used here. (At least the order -# of declarations must not be changed.) -# -/^msgstr/ { - s/msgstr[ ]*"\(.*\)"/# \1/ -# Clear substitution flag. - tb -# Append the next line. - :b - N -# Look whether second part is continuation line. - s/\(.*\n\)"\(.*\)"/\1\2/ -# Yes, then branch. - ta - P - D -# Note that D includes a jump to the start!! -# We found a continuation line. But before printing insert '\'. - :a - s/\(.*\)\(\n.*\)/\1\\\2/ - P -# We cannot use D here. - s/.*\n\(.*\)/\1/ - tb -} -d diff -urN gnupg-1.0.5/intl/loadinfo.h gnupg-1.0.6/intl/loadinfo.h --- gnupg-1.0.5/intl/loadinfo.h Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/loadinfo.h Sat May 26 16:20:27 2001 @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -16,6 +16,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _LOADINFO_H +#define _LOADINFO_H 1 + #ifndef PARAMS # if __STDC__ # define PARAMS(args) args @@ -24,6 +27,25 @@ # endif #endif +#ifndef internal_function +# define internal_function +#endif + +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + +/* Separator in PATH like lists of pathnames. */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define PATH_SEPARATOR ';' +#else + /* Unix */ +# define PATH_SEPARATOR ':' +#endif + /* Encoding of locale name parts. */ #define CEN_REVISION 1 #define CEN_SPONSOR 2 @@ -50,6 +72,10 @@ }; +/* Normalize codeset name. There is no standard for the codeset + names. Normalization allows the user to use any of the common + names. The return value is dynamically allocated and has to be + freed by the caller. */ extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, size_t name_len)); @@ -66,6 +92,8 @@ extern const char *_nl_expand_alias PARAMS ((const char *name)); +/* normalized_codeset is dynamically allocated and has to be freed by + the caller. */ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **modifier, const char **territory, @@ -76,3 +104,5 @@ const char **revision)); extern char *_nl_find_language PARAMS ((const char *name)); + +#endif /* loadinfo.h */ diff -urN gnupg-1.0.5/intl/loadmsgcat.c gnupg-1.0.6/intl/loadmsgcat.c --- gnupg-1.0.5/intl/loadmsgcat.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/loadmsgcat.c Sat May 26 16:20:28 2001 @@ -1,5 +1,5 @@ /* Load needed message catalogs. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,22 +15,52 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + #ifdef HAVE_CONFIG_H # include #endif +#include +#include #include #include #include -#if defined STDC_HEADERS || defined _LIBC -# include +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif #endif +#include +#include + #if defined HAVE_UNISTD_H || defined _LIBC # include #endif +#ifdef _LIBC +# include +# include +#endif + #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ || (defined _LIBC && defined _POSIX_MAPPED_FILES) # include @@ -43,6 +73,10 @@ #include "gettext.h" #include "gettextP.h" +#ifdef _LIBC +# include "../locale/localeinfo.h" +#endif + /* @@ end of prolog @@ */ #ifdef _LIBC @@ -56,29 +90,275 @@ # define munmap __munmap #endif +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define PLURAL_PARSE __gettextparse +#else +# define PLURAL_PARSE gettextparse__ +#endif + +/* For those losing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +# define freea(p) /* nothing */ +#else +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif + +/* For systems that distinguish between text and binary I/O. + O_BINARY is usually declared in . */ +#if !defined O_BINARY && defined _O_BINARY + /* For MSC-compatible compilers. */ +# define O_BINARY _O_BINARY +# define O_TEXT _O_TEXT +#endif +#ifdef __BEOS__ + /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +# undef O_BINARY +# undef O_TEXT +#endif +/* On reasonable systems, binary I/O is the default. */ +#ifndef O_BINARY +# define O_BINARY 0 +#endif + /* We need a sign, whether a new catalog was loaded, which can be associated with all translations. This is important if the translations are cached by one of GCC's features. */ -int _nl_msg_cat_cntr = 0; +int _nl_msg_cat_cntr; + +#if (defined __GNUC__ && !defined __APPLE_CC__) \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) + +/* These structs are the constant expression for the germanic plural + form determination. It represents the expression "n != 1". */ +static const struct expression plvar = +{ + .nargs = 0, + .operation = var, +}; +static const struct expression plone = +{ + .nargs = 0, + .operation = num, + .val = + { + .num = 1 + } +}; +static struct expression germanic_plural = +{ + .nargs = 2, + .operation = not_equal, + .val = + { + .args = + { + [0] = (struct expression *) &plvar, + [1] = (struct expression *) &plone + } + } +}; + +# define INIT_GERMANIC_PLURAL() + +#else + +/* For compilers without support for ISO C 99 struct/union initializers: + Initialization at run-time. */ + +static struct expression plvar; +static struct expression plone; +static struct expression germanic_plural; + +static void +init_germanic_plural () +{ + if (plone.val.num == 0) + { + plvar.nargs = 0; + plvar.operation = var; + + plone.nargs = 0; + plone.operation = num; + plone.val.num = 1; + + germanic_plural.nargs = 2; + germanic_plural.operation = not_equal; + germanic_plural.val.args[0] = &plvar; + germanic_plural.val.args[1] = &plone; + } +} + +# define INIT_GERMANIC_PLURAL() init_germanic_plural () + +#endif + + +/* Initialize the codeset dependent parts of an opened message catalog. + Return the header entry. */ +const char * +internal_function +_nl_init_domain_conv (domain_file, domain, domainbinding) + struct loaded_l10nfile *domain_file; + struct loaded_domain *domain; + struct binding *domainbinding; +{ + /* Find out about the character set the file is encoded with. + This can be found (in textual form) in the entry "". If this + entry does not exist or if this does not contain the `charset=' + information, we will assume the charset matches the one the + current locale and we don't have to perform any conversion. */ + char *nullentry; + size_t nullentrylen; + + /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ + domain->codeset_cntr = + (domainbinding != NULL ? domainbinding->codeset_cntr : 0); +#ifdef _LIBC + domain->conv = (__gconv_t) -1; +#else +# if HAVE_ICONV + domain->conv = (iconv_t) -1; +# endif +#endif + domain->conv_tab = NULL; + + /* Get the header entry. */ + nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); + + if (nullentry != NULL) + { +#if defined _LIBC || HAVE_ICONV + const char *charsetstr; + + charsetstr = strstr (nullentry, "charset="); + if (charsetstr != NULL) + { + size_t len; + char *charset; + const char *outcharset; + + charsetstr += strlen ("charset="); + len = strcspn (charsetstr, " \t\n"); + + charset = (char *) alloca (len + 1); +# if defined _LIBC || HAVE_MEMPCPY + *((char *) mempcpy (charset, charsetstr, len)) = '\0'; +# else + memcpy (charset, charsetstr, len); + charset[len] = '\0'; +# endif + + /* The output charset should normally be determined by the + locale. But sometimes the locale is not used or not correctly + set up, so we provide a possibility for the user to override + this. Moreover, the value specified through + bind_textdomain_codeset overrides both. */ + if (domainbinding != NULL && domainbinding->codeset != NULL) + outcharset = domainbinding->codeset; + else + { + outcharset = getenv ("OUTPUT_CHARSET"); + if (outcharset == NULL || outcharset[0] == '\0') + { +# ifdef _LIBC + outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; +# else +# if HAVE_ICONV + extern const char *locale_charset (void); + outcharset = locale_charset (); +# endif +# endif + } + } + +# ifdef _LIBC + /* We always want to use transliteration. */ + outcharset = norm_add_slashes (outcharset, "TRANSLIT"); + charset = norm_add_slashes (charset, NULL); + if (__gconv_open (outcharset, charset, &domain->conv, + GCONV_AVOID_NOCONV) + != __GCONV_OK) + domain->conv = (__gconv_t) -1; +# else +# if HAVE_ICONV + /* When using GNU libiconv, we want to use transliteration. */ +# if _LIBICONV_VERSION >= 0x0105 + len = strlen (outcharset); + { + char *tmp = (char *) alloca (len + 10 + 1); + memcpy (tmp, outcharset, len); + memcpy (tmp + len, "//TRANSLIT", 10 + 1); + outcharset = tmp; + } +# endif + domain->conv = iconv_open (outcharset, charset); +# if _LIBICONV_VERSION >= 0x0105 + freea (outcharset); +# endif +# endif +# endif + + freea (charset); + } +#endif /* _LIBC || HAVE_ICONV */ + } + + return nullentry; +} + +/* Frees the codeset dependent parts of an opened message catalog. */ +void +internal_function +_nl_free_domain_conv (domain) + struct loaded_domain *domain; +{ + if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) + free (domain->conv_tab); +#ifdef _LIBC + if (domain->conv != (__gconv_t) -1) + __gconv_close (domain->conv); +#else +# if HAVE_ICONV + if (domain->conv != (iconv_t) -1) + iconv_close (domain->conv); +# endif +#endif +} /* Load the message catalogs specified by FILENAME. If it is no valid message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file) +_nl_load_domain (domain_file, domainbinding) struct loaded_l10nfile *domain_file; + struct binding *domainbinding; { int fd; size_t size; +#ifdef _LIBC + struct stat64 st; +#else struct stat st; +#endif struct mo_file_header *data = (struct mo_file_header *) -1; int use_mmap = 0; struct loaded_domain *domain; + const char *nullentry; domain_file->decided = 1; domain_file->data = NULL; + /* Note that it would be useless to store domainbinding in domain_file + because domainbinding might be == NULL now but != NULL later (after + a call to bind_textdomain_codeset). */ + /* If the record does not represent a valid locale the FILENAME might be NULL. This can happen when according to the given specification the locale file name is different for XPG and CEN @@ -87,14 +367,19 @@ return; /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY); + fd = open (domain_file->filename, O_RDONLY | O_BINARY); if (fd == -1) return; /* We must know about the size of the file. */ - if (fstat (fd, &st) != 0 - || (size = (size_t) st.st_size) != st.st_size - || size < sizeof (struct mo_file_header)) + if ( +#ifdef _LIBC + __builtin_expect (fstat64 (fd, &st) != 0, 0) +#else + __builtin_expect (fstat (fd, &st) != 0, 0) +#endif + || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) + || __builtin_expect (size < sizeof (struct mo_file_header), 0)) { /* Something went wrong. */ close (fd); @@ -107,7 +392,7 @@ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - if (data != (struct mo_file_header *) -1) + if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) { /* mmap() call was successful. */ close (fd); @@ -131,12 +416,15 @@ do { long int nb = (long int) read (fd, read_ptr, to_read); - if (nb == -1) + if (nb <= 0) { +#ifdef EINTR + if (nb == -1 && errno == EINTR) + continue; +#endif close (fd); return; } - read_ptr += nb; to_read -= nb; } @@ -147,7 +435,8 @@ /* Using the magic number we can test whether it really is a message catalog file. */ - if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) + if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, + 0)) { /* The magic number is wrong: not a message catalog file. */ #ifdef HAVE_MMAP @@ -159,12 +448,11 @@ return; } - domain_file->data - = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain_file->data == NULL) + domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); + if (domain == NULL) return; + domain_file->data = domain; - domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; domain->use_mmap = use_mmap; domain->mmap_size = size; @@ -196,9 +484,62 @@ return; } - /* Show that one domain is changed. This might make some cached - translations invalid. */ - ++_nl_msg_cat_cntr; + /* Now initialize the character set converter from the character set + the file is encoded with (found in the header entry) to the domain's + specified character set or the locale's character set. */ + nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); + + /* Also look for a plural specification. */ + if (nullentry != NULL) + { + const char *plural; + const char *nplurals; + + plural = strstr (nullentry, "plural="); + nplurals = strstr (nullentry, "nplurals="); + if (plural == NULL || nplurals == NULL) + goto no_plural; + else + { + /* First get the number. */ + char *endp; + unsigned long int n; + struct parse_args args; + + nplurals += 9; + while (*nplurals != '\0' && isspace (*nplurals)) + ++nplurals; +#if defined HAVE_STRTOUL || defined _LIBC + n = strtoul (nplurals, &endp, 10); +#else + for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) + n = n * 10 + (*endp - '0'); +#endif + domain->nplurals = n; + if (nplurals == endp) + goto no_plural; + + /* Due to the restrictions bison imposes onto the interface of the + scanner function we have to put the input string and the result + passed up from the parser into the same structure which address + is passed down to the parser. */ + plural += 7; + args.cp = plural; + if (PLURAL_PARSE (&args) != 0) + goto no_plural; + domain->plural = args.res; + } + } + else + { + /* By default we are using the Germanic form: singular form only + for `one', the plural form otherwise. Yes, this is also what + English is using since English is a Germanic language. */ + no_plural: + INIT_GERMANIC_PLURAL (); + domain->plural = &germanic_plural; + domain->nplurals = 2; + } } @@ -208,11 +549,16 @@ _nl_unload_domain (domain) struct loaded_domain *domain; { -#ifdef _POSIX_MAPPED_FILES + if (domain->plural != &germanic_plural) + __gettext_free_exp (domain->plural); + + _nl_free_domain_conv (domain); + +# ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) munmap ((caddr_t) domain->data, domain->mmap_size); else -#endif /* _POSIX_MAPPED_FILES */ +# endif /* _POSIX_MAPPED_FILES */ free ((void *) domain->data); free (domain); diff -urN gnupg-1.0.5/intl/localcharset.c gnupg-1.0.6/intl/localcharset.c --- gnupg-1.0.5/intl/localcharset.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/localcharset.c Sat May 26 16:20:28 2001 @@ -0,0 +1,271 @@ +/* Determine a canonical name for the current locale's character encoding. + + Copyright (C) 2000-2001 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library 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. */ + +/* Written by Bruno Haible . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#if HAVE_STDDEF_H +# include +#endif + +#include +#if HAVE_STRING_H +# include +#else +# include +#endif +#if HAVE_STDLIB_H +# include +#endif + +#if defined _WIN32 || defined __WIN32__ +# undef WIN32 /* avoid warning on mingw32 */ +# define WIN32 +#endif + +#ifndef WIN32 +# if HAVE_LANGINFO_CODESET +# include +# else +# if HAVE_SETLOCALE +# include +# endif +# endif +#else /* WIN32 */ +# define WIN32_LEAN_AND_MEAN +# include +#endif + +#ifndef DIRECTORY_SEPARATOR +# define DIRECTORY_SEPARATOR '/' +#endif + +#ifndef ISSLASH +# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) +#endif + +/* The following static variable is declared 'volatile' to avoid a + possible multithread problem in the function get_charset_aliases. If we + are running in a threaded environment, and if two threads initialize + 'charset_aliases' simultaneously, both will produce the same value, + and everything will be ok if the two assignments to 'charset_aliases' + are atomic. But I don't know what will happen if the two assignments mix. */ +#if __STDC__ != 1 +# define volatile /* empty */ +#endif +/* Pointer to the contents of the charset.alias file, if it has already been + read, else NULL. Its format is: + ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ +static char * volatile charset_aliases; + +/* Return a pointer to the contents of the charset.alias file. */ +static const char * +get_charset_aliases () +{ + char *cp; + + cp = charset_aliases; + if (cp == NULL) + { +#ifndef WIN32 + FILE *fp; + const char *dir = LIBDIR; + const char *base = "charset.alias"; + char *file_name; + + /* Concatenate dir and base into freshly allocated file_name. */ + { + size_t dir_len = strlen (dir); + size_t base_len = strlen (base); + int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); + file_name = (char *) malloc (dir_len + add_slash + base_len + 1); + if (file_name != NULL) + { + memcpy (file_name, dir, dir_len); + if (add_slash) + file_name[dir_len] = DIRECTORY_SEPARATOR; + memcpy (file_name + dir_len + add_slash, base, base_len + 1); + } + } + + if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) + /* Out of memory or file not found, treat it as empty. */ + cp = ""; + else + { + /* Parse the file's contents. */ + int c; + char buf1[50+1]; + char buf2[50+1]; + char *res_ptr = NULL; + size_t res_size = 0; + size_t l1, l2; + + for (;;) + { + c = getc (fp); + if (c == EOF) + break; + if (c == '\n' || c == ' ' || c == '\t') + continue; + if (c == '#') + { + /* Skip comment, to end of line. */ + do + c = getc (fp); + while (!(c == EOF || c == '\n')); + if (c == EOF) + break; + continue; + } + ungetc (c, fp); + if (fscanf(fp, "%50s %50s", buf1, buf2) < 2) + break; + l1 = strlen (buf1); + l2 = strlen (buf2); + if (res_size == 0) + { + res_size = l1 + 1 + l2 + 1; + res_ptr = malloc (res_size + 1); + } + else + { + res_size += l1 + 1 + l2 + 1; + res_ptr = realloc (res_ptr, res_size + 1); + } + if (res_ptr == NULL) + { + /* Out of memory. */ + res_size = 0; + break; + } + strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); + strcpy (res_ptr + res_size - (l2 + 1), buf2); + } + fclose (fp); + if (res_size == 0) + cp = ""; + else + { + *(res_ptr + res_size) = '\0'; + cp = res_ptr; + } + } + + if (file_name != NULL) + free (file_name); + +#else /* WIN32 */ + + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ + + cp = "CP936" "\0" "GBK" "\0" + "CP1361" "\0" "JOHAB" "\0"; +#endif + + charset_aliases = cp; + } + + return cp; +} + +/* Determine the current locale's character encoding, and canonicalize it + into one of the canonical names listed in config.charset. + The result must not be freed; it is statically allocated. + If the canonical name cannot be determined, the result is a non-canonical + name. */ + +#ifdef STATIC +STATIC +#endif +const char * +locale_charset () +{ + const char *codeset; + const char *aliases; + +#ifndef WIN32 + +# if HAVE_LANGINFO_CODESET + + /* Most systems support nl_langinfo (CODESET) nowadays. */ + codeset = nl_langinfo (CODESET); + +# else + + /* On old systems which lack it, use setlocale or getenv. */ + const char *locale = NULL; + + /* But most old systems don't have a complete set of locales. Some + (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't + use setlocale here; it would return "C" when it doesn't support the + locale name the user has set. */ +# if HAVE_SETLOCALE && 0 + locale = setlocale (LC_CTYPE, NULL); +# endif + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_ALL"); + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_CTYPE"); + if (locale == NULL || locale[0] == '\0') + locale = getenv ("LANG"); + } + } + + /* On some old systems, one used to set locale = "iso8859_1". On others, + you set it to "language_COUNTRY.charset". In any case, we resolve it + through the charset.alias file. */ + codeset = locale; + +# endif + +#else /* WIN32 */ + + static char buf[2 + 10 + 1]; + + /* Win32 has a function returning the locale's codepage as a number. */ + sprintf (buf, "CP%u", GetACP ()); + codeset = buf; + +#endif + + if (codeset == NULL) + /* The canonical name cannot be determined. */ + codeset = ""; + + /* Resolve alias. */ + for (aliases = get_charset_aliases (); + *aliases != '\0'; + aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) + if (strcmp (codeset, aliases) == 0 + || (aliases[0] == '*' && aliases[1] == '\0')) + { + codeset = aliases + strlen (aliases) + 1; + break; + } + + return codeset; +} diff -urN gnupg-1.0.5/intl/locale.alias gnupg-1.0.6/intl/locale.alias --- gnupg-1.0.5/intl/locale.alias Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/locale.alias Sat May 26 16:20:27 2001 @@ -0,0 +1,77 @@ +# Locale name alias data base. +# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +# +# This program 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, or (at your option) +# any later version. +# +# This program 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. + +# The format of this file is the same as for the corresponding file of +# the X Window System, which normally can be found in +# /usr/lib/X11/locale/locale.alias +# A single line contains two fields: an alias and a substitution value. +# All entries are case independent. + +# Note: This file is far from being complete. If you have a value for +# your own site which you think might be useful for others too, share +# it with the rest of us. Send it using the `glibcbug' script to +# bugs@gnu.org. + +# Packages using this file: + +bokmal no_NO.ISO-8859-1 +bokmål no_NO.ISO-8859-1 +catalan ca_ES.ISO-8859-1 +croatian hr_HR.ISO-8859-2 +czech cs_CZ.ISO-8859-2 +danish da_DK.ISO-8859-1 +dansk da_DK.ISO-8859-1 +deutsch de_DE.ISO-8859-1 +dutch nl_NL.ISO-8859-1 +eesti et_EE.ISO-8859-1 +estonian et_EE.ISO-8859-1 +finnish fi_FI.ISO-8859-1 +français fr_FR.ISO-8859-1 +french fr_FR.ISO-8859-1 +galego gl_ES.ISO-8859-1 +galician gl_ES.ISO-8859-1 +german de_DE.ISO-8859-1 +greek el_GR.ISO-8859-7 +hebrew iw_IL.ISO-8859-8 +hrvatski hr_HR.ISO-8859-2 +hungarian hu_HU.ISO-8859-2 +icelandic is_IS.ISO-8859-1 +italian it_IT.ISO-8859-1 +japanese ja_JP.eucJP +japanese.euc ja_JP.eucJP +ja_JP ja_JP.eucJP +ja_JP.ujis ja_JP.eucJP +japanese.sjis ja_JP.SJIS +korean ko_KR.eucKR +korean.euc ko_KR.eucKR +ko_KR ko_KR.eucKR +lithuanian lt_LT.ISO-8859-13 +nb_NO no_NO.ISO-8859-1 +nb_NO.ISO-8859-1 no_NO.ISO-8859-1 +norwegian no_NO.ISO-8859-1 +nynorsk nn_NO.ISO-8859-1 +polish pl_PL.ISO-8859-2 +portuguese pt_PT.ISO-8859-1 +romanian ro_RO.ISO-8859-2 +russian ru_RU.ISO-8859-5 +slovak sk_SK.ISO-8859-2 +slovene sl_SI.ISO-8859-2 +slovenian sl_SI.ISO-8859-2 +spanish es_ES.ISO-8859-1 +swedish sv_SE.ISO-8859-1 +thai th_TH.TIS-620 +turkish tr_TR.ISO-8859-9 diff -urN gnupg-1.0.5/intl/localealias.c gnupg-1.0.6/intl/localealias.c --- gnupg-1.0.5/intl/localealias.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/localealias.c Sat May 26 16:20:28 2001 @@ -1,6 +1,5 @@ /* Handle aliases for locale names. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,6 +15,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + #ifdef HAVE_CONFIG_H # include #endif @@ -41,35 +47,15 @@ # endif #endif -#if defined STDC_HEADERS || defined _LIBC -# include -#else -char *getenv (); -# ifdef HAVE_MALLOC_H -# include -# else -void free (); -# endif -#endif +#include -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include -#else -# include -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif +#include #if !HAVE_STRCHR && !defined _LIBC # ifndef strchr # define strchr index # endif #endif -#include "gettext.h" #include "gettextP.h" /* @@ end of prolog @@ */ @@ -95,40 +81,14 @@ # define internal_function #endif -/* For those loosing systems which don't have `alloca' we have to add +/* For those losing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ +# define freea(p) /* nothing */ #else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED # undef fgets @@ -147,18 +107,18 @@ }; -static char *string_space = NULL; -static size_t string_space_act = 0; -static size_t string_space_max = 0; +static char *string_space; +static size_t string_space_act; +static size_t string_space_max; static struct alias_map *map; -static size_t nmap = 0; -static size_t maxmap = 0; +static size_t nmap; +static size_t maxmap; /* Prototypes for local functions. */ static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) internal_function; -static void extend_alias_table PARAMS ((void)); +static int extend_alias_table PARAMS ((void)); static int alias_compare PARAMS ((const struct alias_map *map1, const struct alias_map *map2)); @@ -204,11 +164,12 @@ { const char *start; - while (locale_alias_path[0] == ':') + while (locale_alias_path[0] == PATH_SEPARATOR) ++locale_alias_path; start = locale_alias_path; - while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') + while (locale_alias_path[0] != '\0' + && locale_alias_path[0] != PATH_SEPARATOR) ++locale_alias_path; if (start < locale_alias_path) @@ -231,16 +192,12 @@ const char *fname; int fname_len; { -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif FILE *fp; char *full_fname; size_t added; static const char aliasfile[] = "/locale.alias"; full_fname = (char *) alloca (fname_len + sizeof aliasfile); - ADD_BLOCK (block_list, full_fname); #ifdef HAVE_MEMPCPY mempcpy (mempcpy (full_fname, fname, fname_len), aliasfile, sizeof aliasfile); @@ -250,11 +207,9 @@ #endif fp = fopen (full_fname, "r"); + freea (full_fname); if (fp == NULL) - { - FREE_BLOCKS (block_list); - return 0; - } + return 0; added = 0; while (!feof (fp)) @@ -326,7 +281,8 @@ *cp++ = '\0'; if (nmap >= maxmap) - extend_alias_table (); + if (__builtin_expect (extend_alias_table (), 0)) + return added; alias_len = strlen (alias) + 1; value_len = strlen (value) + 1; @@ -339,10 +295,19 @@ ? alias_len + value_len : 1024)); char *new_pool = (char *) realloc (string_space, new_size); if (new_pool == NULL) + return added; + + if (__builtin_expect (string_space != new_pool, 0)) { - FREE_BLOCKS (block_list); - return added; + size_t i; + + for (i = 0; i < nmap; i++) + { + map[i].alias += new_pool - string_space; + map[i].value += new_pool - string_space; + } } + string_space = new_pool; string_space_max = new_size; } @@ -369,12 +334,11 @@ qsort (map, nmap, sizeof (struct alias_map), (int (*) PARAMS ((const void *, const void *))) alias_compare); - FREE_BLOCKS (block_list); return added; } -static void +static int extend_alias_table () { size_t new_size; @@ -385,10 +349,11 @@ * sizeof (struct alias_map))); if (new_map == NULL) /* Simply don't extend: we don't have any more core. */ - return; + return -1; map = new_map; maxmap = new_size; + return 0; } diff -urN gnupg-1.0.5/intl/ngettext.c gnupg-1.0.6/intl/ngettext.c --- gnupg-1.0.5/intl/ngettext.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/ngettext.c Sat May 26 16:20:28 2001 @@ -0,0 +1,67 @@ +/* Implementation of ngettext(3) function. + Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef _LIBC +# define __need_NULL +# include +#else +# include /* Just for NULL. */ +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +#include + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define NGETTEXT __ngettext +# define DCNGETTEXT __dcngettext +#else +# define NGETTEXT ngettext__ +# define DCNGETTEXT dcngettext__ +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +char * +NGETTEXT (msgid1, msgid2, n) + const char *msgid1; + const char *msgid2; + unsigned long int n; +{ + return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__ngettext, ngettext); +#endif diff -urN gnupg-1.0.5/intl/plural.c gnupg-1.0.6/intl/plural.c --- gnupg-1.0.5/intl/plural.c Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/plural.c Sun May 27 12:28:21 2001 @@ -0,0 +1,1325 @@ + +/* A Bison parser, made from plural.y + by GNU Bison version 1.28 */ + +#define YYBISON 1 /* Identify Bison output. */ + +#define yyparse __gettextparse +#define yylex __gettextlex +#define yyerror __gettexterror +#define yylval __gettextlval +#define yychar __gettextchar +#define yydebug __gettextdebug +#define yynerrs __gettextnerrs +#define EQUOP2 257 +#define CMPOP2 258 +#define ADDOP2 259 +#define MULOP2 260 +#define NUMBER 261 + +#line 1 "plural.y" + +/* Expression parsing for plural form selection. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper , 2000. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +/* The bison generated parser uses alloca. AIX 3 forces us to put this + declaration at the beginning of the file. The declaration in bison's + skeleton file comes too late. This must come before + because may include arbitrary system headers. */ +#if defined _AIX && !defined __GNUC__ + #pragma alloca +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include "gettextP.h" + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define FREE_EXPRESSION __gettext_free_exp +#else +# define FREE_EXPRESSION gettext_free_exp__ +# define __gettextparse gettextparse__ +#endif + +#define YYLEX_PARAM &((struct parse_args *) arg)->cp +#define YYPARSE_PARAM arg + +#line 52 "plural.y" +typedef union { + unsigned long int num; + enum operator op; + struct expression *exp; +} YYSTYPE; +#line 58 "plural.y" + +/* Prototypes for local functions. */ +static struct expression *new_exp PARAMS ((int nargs, enum operator op, + struct expression * const *args)); +static inline struct expression *new_exp_0 PARAMS ((enum operator op)); +static inline struct expression *new_exp_1 PARAMS ((enum operator op, + struct expression *right)); +static struct expression *new_exp_2 PARAMS ((enum operator op, + struct expression *left, + struct expression *right)); +static inline struct expression *new_exp_3 PARAMS ((enum operator op, + struct expression *bexp, + struct expression *tbranch, + struct expression *fbranch)); +static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); +static void yyerror PARAMS ((const char *str)); + +/* Allocation of expressions. */ + +static struct expression * +new_exp (nargs, op, args) + int nargs; + enum operator op; + struct expression * const *args; +{ + int i; + struct expression *newp; + + /* If any of the argument could not be malloc'ed, just return NULL. */ + for (i = nargs - 1; i >= 0; i--) + if (args[i] == NULL) + goto fail; + + /* Allocate a new expression. */ + newp = (struct expression *) malloc (sizeof (*newp)); + if (newp != NULL) + { + newp->nargs = nargs; + newp->operation = op; + for (i = nargs - 1; i >= 0; i--) + newp->val.args[i] = args[i]; + return newp; + } + + fail: + for (i = nargs - 1; i >= 0; i--) + FREE_EXPRESSION (args[i]); + + return NULL; +} + +static inline struct expression * +new_exp_0 (op) + enum operator op; +{ + return new_exp (0, op, NULL); +} + +static inline struct expression * +new_exp_1 (op, right) + enum operator op; + struct expression *right; +{ + struct expression *args[1]; + + args[0] = right; + return new_exp (1, op, args); +} + +static struct expression * +new_exp_2 (op, left, right) + enum operator op; + struct expression *left; + struct expression *right; +{ + struct expression *args[2]; + + args[0] = left; + args[1] = right; + return new_exp (2, op, args); +} + +static inline struct expression * +new_exp_3 (op, bexp, tbranch, fbranch) + enum operator op; + struct expression *bexp; + struct expression *tbranch; + struct expression *fbranch; +{ + struct expression *args[3]; + + args[0] = bexp; + args[1] = tbranch; + args[2] = fbranch; + return new_exp (3, op, args); +} + +#include + +#ifndef __cplusplus +#ifndef __STDC__ +#define const +#endif +#endif + + + +#define YYFINAL 27 +#define YYFLAG -32768 +#define YYNTBASE 16 + +#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18) + +static const char yytranslate[] = { 0, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 10, 2, 2, 2, 2, 5, 2, 14, + 15, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 12, 2, 2, + 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 13, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 4, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 1, 6, 7, 8, 9, + 11 +}; + +#if YYDEBUG != 0 +static const short yyprhs[] = { 0, + 0, 2, 8, 12, 16, 20, 24, 28, 32, 35, + 37, 39 +}; + +static const short yyrhs[] = { 17, + 0, 17, 3, 17, 12, 17, 0, 17, 4, 17, + 0, 17, 5, 17, 0, 17, 6, 17, 0, 17, + 7, 17, 0, 17, 8, 17, 0, 17, 9, 17, + 0, 10, 17, 0, 13, 0, 11, 0, 14, 17, + 15, 0 +}; + +#endif + +#if YYDEBUG != 0 +static const short yyrline[] = { 0, + 177, 185, 189, 193, 197, 201, 205, 209, 213, 217, + 221, 226 +}; +#endif + + +#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) + +static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'", +"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'", +"start","exp", NULL +}; +#endif + +static const short yyr1[] = { 0, + 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17 +}; + +static const short yyr2[] = { 0, + 1, 5, 3, 3, 3, 3, 3, 3, 2, 1, + 1, 3 +}; + +static const short yydefact[] = { 0, + 0, 11, 10, 0, 1, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 12, 0, 3, 4, 5, 6, + 7, 8, 0, 2, 0, 0, 0 +}; + +static const short yydefgoto[] = { 25, + 5 +}; + +static const short yypact[] = { -9, + -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9, + -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26, + -3,-32768, -9, 34, 21, 53,-32768 +}; + +static const short yypgoto[] = {-32768, + -1 +}; + + +#define YYLAST 53 + + +static const short yytable[] = { 6, + 1, 2, 7, 3, 4, 14, 16, 17, 18, 19, + 20, 21, 22, 8, 9, 10, 11, 12, 13, 14, + 26, 24, 12, 13, 14, 15, 8, 9, 10, 11, + 12, 13, 14, 13, 14, 23, 8, 9, 10, 11, + 12, 13, 14, 10, 11, 12, 13, 14, 11, 12, + 13, 14, 27 +}; + +static const short yycheck[] = { 1, + 10, 11, 4, 13, 14, 9, 8, 9, 10, 11, + 12, 13, 14, 3, 4, 5, 6, 7, 8, 9, + 0, 23, 7, 8, 9, 15, 3, 4, 5, 6, + 7, 8, 9, 8, 9, 12, 3, 4, 5, 6, + 7, 8, 9, 5, 6, 7, 8, 9, 6, 7, + 8, 9, 0 +}; +#define YYPURE 1 + +/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ +#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" +/* This file comes from bison-1.28. */ + +/* Skeleton output parser for bison, + Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ +#ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca +#else /* not GNU C. */ +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA +#include +#else /* not sparc */ +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ +#include +#endif +#else /* not MSDOS, or __TURBOC__ */ +#if defined(_AIX) +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include */ + #pragma alloca +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca +#endif /* __hpux */ +#endif +#endif /* not _AIX */ +#endif /* not MSDOS, or __TURBOC__ */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ + +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc +#endif + +/* Note: there must be only one dollar sign in this file. + It is replaced by the list of actions, each action + as one case of the switch. */ + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY -2 +#define YYEOF 0 +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrlab1 +/* Like YYERROR except do call yyerror. + This remains here temporarily to ease the + transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ +#define YYFAIL goto yyerrlab +#define YYRECOVERING() (!!yyerrstatus) +#define YYBACKUP(token, value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { yychar = (token), yylval = (value); \ + yychar1 = YYTRANSLATE (yychar); \ + YYPOPSTACK; \ + goto yybackup; \ + } \ + else \ + { yyerror ("syntax error: cannot back up"); YYERROR; } \ +while (0) + +#define YYTERROR 1 +#define YYERRCODE 256 + +#ifndef YYPURE +#define YYLEX yylex() +#endif + +#ifdef YYPURE +#ifdef YYLSP_NEEDED +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval, &yylloc) +#endif +#else /* not YYLSP_NEEDED */ +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval) +#endif +#endif /* not YYLSP_NEEDED */ +#endif + +/* If nonreentrant, generate the variables here */ + +#ifndef YYPURE + +int yychar; /* the lookahead symbol */ +YYSTYPE yylval; /* the semantic value of the */ + /* lookahead symbol */ + +#ifdef YYLSP_NEEDED +YYLTYPE yylloc; /* location data for the lookahead */ + /* symbol */ +#endif + +int yynerrs; /* number of parse errors so far */ +#endif /* not YYPURE */ + +#if YYDEBUG != 0 +int yydebug; /* nonzero means print parse trace */ +/* Since this is uninitialized, it does not stop multiple parsers + from coexisting. */ +#endif + +/* YYINITDEPTH indicates the initial size of the parser's stacks */ + +#ifndef YYINITDEPTH +#define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH is the maximum size the stacks can grow to + (effective only if the built-in stack extension method is used). */ + +#if YYMAXDEPTH == 0 +#undef YYMAXDEPTH +#endif + +#ifndef YYMAXDEPTH +#define YYMAXDEPTH 10000 +#endif + +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + +#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ +#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) +#else /* not GNU C or C++ */ +#ifndef __cplusplus + +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (to, from, count) + char *to; + char *from; + unsigned int count; +{ + register char *f = from; + register char *t = to; + register int i = count; + + while (i-- > 0) + *t++ = *f++; +} + +#else /* __cplusplus */ + +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (char *to, char *from, unsigned int count) +{ + register char *t = to; + register char *f = from; + register int i = count; + + while (i-- > 0) + *t++ = *f++; +} + +#endif +#endif + +#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" + +/* The user can define YYPARSE_PARAM as the name of an argument to be passed + into yyparse. The argument should have type void *. + It should actually point to an object. + Grammar actions can access the variable by casting it + to the proper pointer type. */ + +#ifdef YYPARSE_PARAM +#ifdef __cplusplus +#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +#define YYPARSE_PARAM_DECL +#else /* not __cplusplus */ +#define YYPARSE_PARAM_ARG YYPARSE_PARAM +#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +#endif /* not __cplusplus */ +#else /* not YYPARSE_PARAM */ +#define YYPARSE_PARAM_ARG +#define YYPARSE_PARAM_DECL +#endif /* not YYPARSE_PARAM */ + +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM +int yyparse (void *); +#else +int yyparse (void); +#endif +#endif + +int +yyparse(YYPARSE_PARAM_ARG) + YYPARSE_PARAM_DECL +{ + register int yystate; + register int yyn; + register short *yyssp; + register YYSTYPE *yyvsp; + int yyerrstatus; /* number of tokens to shift before error messages enabled */ + int yychar1 = 0; /* lookahead token as an internal (translated) token number */ + + short yyssa[YYINITDEPTH]; /* the state stack */ + YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ + + short *yyss = yyssa; /* refer to the stacks thru separate pointers */ + YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ + +#ifdef YYLSP_NEEDED + YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ + YYLTYPE *yyls = yylsa; + YYLTYPE *yylsp; + +#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +#else +#define YYPOPSTACK (yyvsp--, yyssp--) +#endif + + int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; + +#ifdef YYPURE + int yychar; + YYSTYPE yylval; + int yynerrs; +#ifdef YYLSP_NEEDED + YYLTYPE yylloc; +#endif +#endif + + YYSTYPE yyval; /* the variable used to return */ + /* semantic values from the action */ + /* routines */ + + int yylen; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Starting parse\n"); +#endif + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + + yyssp = yyss - 1; + yyvsp = yyvs; +#ifdef YYLSP_NEEDED + yylsp = yyls; +#endif + +/* Push a new state, which is found in yystate . */ +/* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. */ +yynewstate: + + *++yyssp = yystate; + + if (yyssp >= yyss + yystacksize - 1) + { + /* Give user a chance to reallocate the stack */ + /* Use copies of these so that the &'s don't force the real ones into memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; +#ifdef YYLSP_NEEDED + YYLTYPE *yyls1 = yyls; +#endif + + /* Get the current used size of the three stacks, in elements. */ + int size = yyssp - yyss + 1; + +#ifdef yyoverflow + /* Each stack pointer address is followed by the size of + the data in use in that stack, in bytes. */ +#ifdef YYLSP_NEEDED + /* This used to be a conditional around just the two extra args, + but that might be undefined if yyoverflow is a macro. */ + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yyls1, size * sizeof (*yylsp), + &yystacksize); +#else + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yystacksize); +#endif + + yyss = yyss1; yyvs = yyvs1; +#ifdef YYLSP_NEEDED + yyls = yyls1; +#endif +#else /* no yyoverflow */ + /* Extend the stack our own way. */ + if (yystacksize >= YYMAXDEPTH) + { + yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 2; + } + yystacksize *= 2; + if (yystacksize > YYMAXDEPTH) + yystacksize = YYMAXDEPTH; +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); +#ifdef YYLSP_NEEDED + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); +#endif +#endif /* no yyoverflow */ + + yyssp = yyss + size - 1; + yyvsp = yyvs + size - 1; +#ifdef YYLSP_NEEDED + yylsp = yyls + size - 1; +#endif + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Stack size increased to %d\n", yystacksize); +#endif + + if (yyssp >= yyss + yystacksize - 1) + YYABORT; + } + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Entering state %d\n", yystate); +#endif + + goto yybackup; + yybackup: + +/* Do appropriate processing given the current state. */ +/* Read a lookahead token if we need one and don't already have one. */ +/* yyresume: */ + + /* First try to decide what to do without reference to lookahead token. */ + + yyn = yypact[yystate]; + if (yyn == YYFLAG) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* yychar is either YYEMPTY or YYEOF + or a valid token in external form. */ + + if (yychar == YYEMPTY) + { +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Reading a token: "); +#endif + yychar = YYLEX; + } + + /* Convert token to internal form (in yychar1) for indexing tables with */ + + if (yychar <= 0) /* This means end of input. */ + { + yychar1 = 0; + yychar = YYEOF; /* Don't call YYLEX any more */ + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Now at end of input.\n"); +#endif + } + else + { + yychar1 = YYTRANSLATE(yychar); + +#if YYDEBUG != 0 + if (yydebug) + { + fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); + /* Give the individual parser a way to print the precise meaning + of a token, for further debugging info. */ +#ifdef YYPRINT + YYPRINT (stderr, yychar, yylval); +#endif + fprintf (stderr, ")\n"); + } +#endif + } + + yyn += yychar1; + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + goto yydefault; + + yyn = yytable[yyn]; + + /* yyn is what to do for this token type in this state. + Negative => reduce, -yyn is rule number. + Positive => shift, yyn is new state. + New state is final state => don't bother to shift, + just return success. + 0, or most negative number => error. */ + + if (yyn < 0) + { + if (yyn == YYFLAG) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + else if (yyn == 0) + goto yyerrlab; + + if (yyn == YYFINAL) + YYACCEPT; + + /* Shift the lookahead token. */ + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); +#endif + + /* Discard the token being shifted unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + + *++yyvsp = yylval; +#ifdef YYLSP_NEEDED + *++yylsp = yylloc; +#endif + + /* count tokens shifted since error; after three, turn off error status. */ + if (yyerrstatus) yyerrstatus--; + + yystate = yyn; + goto yynewstate; + +/* Do the default action for the current state. */ +yydefault: + + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + +/* Do a reduction. yyn is the number of a rule to reduce with. */ +yyreduce: + yylen = yyr2[yyn]; + if (yylen > 0) + yyval = yyvsp[1-yylen]; /* implement default value of the action */ + +#if YYDEBUG != 0 + if (yydebug) + { + int i; + + fprintf (stderr, "Reducing via rule %d (line %d), ", + yyn, yyrline[yyn]); + + /* Print the symbols being reduced, and their result. */ + for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) + fprintf (stderr, "%s ", yytname[yyrhs[i]]); + fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); + } +#endif + + + switch (yyn) { + +case 1: +#line 178 "plural.y" +{ + if (yyvsp[0].exp == NULL) + YYABORT; + ((struct parse_args *) arg)->res = yyvsp[0].exp; + ; + break;} +case 2: +#line 186 "plural.y" +{ + yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 3: +#line 190 "plural.y" +{ + yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 4: +#line 194 "plural.y" +{ + yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 5: +#line 198 "plural.y" +{ + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 6: +#line 202 "plural.y" +{ + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 7: +#line 206 "plural.y" +{ + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 8: +#line 210 "plural.y" +{ + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + ; + break;} +case 9: +#line 214 "plural.y" +{ + yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); + ; + break;} +case 10: +#line 218 "plural.y" +{ + yyval.exp = new_exp_0 (var); + ; + break;} +case 11: +#line 222 "plural.y" +{ + if ((yyval.exp = new_exp_0 (num)) != NULL) + yyval.exp->val.num = yyvsp[0].num; + ; + break;} +case 12: +#line 227 "plural.y" +{ + yyval.exp = yyvsp[-1].exp; + ; + break;} +} + /* the action file gets copied in in place of this dollarsign */ +#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" + + yyvsp -= yylen; + yyssp -= yylen; +#ifdef YYLSP_NEEDED + yylsp -= yylen; +#endif + +#if YYDEBUG != 0 + if (yydebug) + { + short *ssp1 = yyss - 1; + fprintf (stderr, "state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); + } +#endif + + *++yyvsp = yyval; + +#ifdef YYLSP_NEEDED + yylsp++; + if (yylen == 0) + { + yylsp->first_line = yylloc.first_line; + yylsp->first_column = yylloc.first_column; + yylsp->last_line = (yylsp-1)->last_line; + yylsp->last_column = (yylsp-1)->last_column; + yylsp->text = 0; + } + else + { + yylsp->last_line = (yylsp+yylen-1)->last_line; + yylsp->last_column = (yylsp+yylen-1)->last_column; + } +#endif + + /* Now "shift" the result of the reduction. + Determine what state that goes to, + based on the state we popped back to + and the rule number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTBASE] + *yyssp; + if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTBASE]; + + goto yynewstate; + +yyerrlab: /* here on detecting error */ + + if (! yyerrstatus) + /* If not already recovering from an error, report this error. */ + { + ++yynerrs; + +#ifdef YYERROR_VERBOSE + yyn = yypact[yystate]; + + if (yyn > YYFLAG && yyn < YYLAST) + { + int size = 0; + char *msg; + int x, count; + + count = 0; + /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) + size += strlen(yytname[x]) + 15, count++; + msg = (char *) malloc(size + 15); + if (msg != 0) + { + strcpy(msg, "parse error"); + + if (count < 5) + { + count = 0; + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) + { + strcat(msg, count == 0 ? ", expecting `" : " or `"); + strcat(msg, yytname[x]); + strcat(msg, "'"); + count++; + } + } + yyerror(msg); + free(msg); + } + else + yyerror ("parse error; also virtual memory exceeded"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror("parse error"); + } + + goto yyerrlab1; +yyerrlab1: /* here on error raised explicitly by an action */ + + if (yyerrstatus == 3) + { + /* if just tried and failed to reuse lookahead token after an error, discard it. */ + + /* return failure if at end of input */ + if (yychar == YYEOF) + YYABORT; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); +#endif + + yychar = YYEMPTY; + } + + /* Else will try to reuse lookahead token + after shifting the error token. */ + + yyerrstatus = 3; /* Each real token shifted decrements this */ + + goto yyerrhandle; + +yyerrdefault: /* current state does not do anything special for the error token. */ + +#if 0 + /* This is wrong; only states that explicitly want error tokens + should shift them. */ + yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ + if (yyn) goto yydefault; +#endif + +yyerrpop: /* pop the current state because it cannot handle the error token */ + + if (yyssp == yyss) YYABORT; + yyvsp--; + yystate = *--yyssp; +#ifdef YYLSP_NEEDED + yylsp--; +#endif + +#if YYDEBUG != 0 + if (yydebug) + { + short *ssp1 = yyss - 1; + fprintf (stderr, "Error: state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); + } +#endif + +yyerrhandle: + + yyn = yypact[yystate]; + if (yyn == YYFLAG) + goto yyerrdefault; + + yyn += YYTERROR; + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) + goto yyerrdefault; + + yyn = yytable[yyn]; + if (yyn < 0) + { + if (yyn == YYFLAG) + goto yyerrpop; + yyn = -yyn; + goto yyreduce; + } + else if (yyn == 0) + goto yyerrpop; + + if (yyn == YYFINAL) + YYACCEPT; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting error token, "); +#endif + + *++yyvsp = yylval; +#ifdef YYLSP_NEEDED + *++yylsp = yylloc; +#endif + + yystate = yyn; + goto yynewstate; + + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; + + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 1; +} +#line 232 "plural.y" + + +void +internal_function +FREE_EXPRESSION (exp) + struct expression *exp; +{ + if (exp == NULL) + return; + + /* Handle the recursive case. */ + switch (exp->nargs) + { + case 3: + FREE_EXPRESSION (exp->val.args[2]); + /* FALLTHROUGH */ + case 2: + FREE_EXPRESSION (exp->val.args[1]); + /* FALLTHROUGH */ + case 1: + FREE_EXPRESSION (exp->val.args[0]); + /* FALLTHROUGH */ + default: + break; + } + + free (exp); +} + + +static int +yylex (lval, pexp) + YYSTYPE *lval; + const char **pexp; +{ + const char *exp = *pexp; + int result; + + while (1) + { + if (exp[0] == '\0') + { + *pexp = exp; + return YYEOF; + } + + if (exp[0] != ' ' && exp[0] != '\t') + break; + + ++exp; + } + + result = *exp++; + switch (result) + { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + { + unsigned long int n = result - '0'; + while (exp[0] >= '0' && exp[0] <= '9') + { + n *= 10; + n += exp[0] - '0'; + ++exp; + } + lval->num = n; + result = NUMBER; + } + break; + + case '=': + if (exp[0] == '=') + { + ++exp; + lval->op = equal; + result = EQUOP2; + } + else + result = YYERRCODE; + break; + + case '!': + if (exp[0] == '=') + { + ++exp; + lval->op = not_equal; + result = EQUOP2; + } + break; + + case '&': + case '|': + if (exp[0] == result) + ++exp; + else + result = YYERRCODE; + break; + + case '<': + if (exp[0] == '=') + { + ++exp; + lval->op = less_or_equal; + } + else + lval->op = less_than; + result = CMPOP2; + break; + + case '>': + if (exp[0] == '=') + { + ++exp; + lval->op = greater_or_equal; + } + else + lval->op = greater_than; + result = CMPOP2; + break; + + case '*': + lval->op = mult; + result = MULOP2; + break; + + case '/': + lval->op = divide; + result = MULOP2; + break; + + case '%': + lval->op = module; + result = MULOP2; + break; + + case '+': + lval->op = plus; + result = ADDOP2; + break; + + case '-': + lval->op = minus; + result = ADDOP2; + break; + + case 'n': + case '?': + case ':': + case '(': + case ')': + /* Nothing, just return the character. */ + break; + + case ';': + case '\n': + case '\0': + /* Be safe and let the user call this function again. */ + --exp; + result = YYEOF; + break; + + default: + result = YYERRCODE; +#if YYDEBUG != 0 + --exp; +#endif + break; + } + + *pexp = exp; + + return result; +} + + +static void +yyerror (str) + const char *str; +{ + /* Do nothing. We don't print error messages here. */ +} diff -urN gnupg-1.0.5/intl/plural.y gnupg-1.0.6/intl/plural.y --- gnupg-1.0.5/intl/plural.y Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/plural.y Sat May 26 16:20:28 2001 @@ -0,0 +1,412 @@ +%{ +/* Expression parsing for plural form selection. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper , 2000. + + This program 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, or (at your option) + any later version. + + This program 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. */ + +/* The bison generated parser uses alloca. AIX 3 forces us to put this + declaration at the beginning of the file. The declaration in bison's + skeleton file comes too late. This must come before + because may include arbitrary system headers. */ +#if defined _AIX && !defined __GNUC__ + #pragma alloca +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include "gettextP.h" + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define FREE_EXPRESSION __gettext_free_exp +#else +# define FREE_EXPRESSION gettext_free_exp__ +# define __gettextparse gettextparse__ +#endif + +#define YYLEX_PARAM &((struct parse_args *) arg)->cp +#define YYPARSE_PARAM arg +%} +%pure_parser +%expect 10 + +%union { + unsigned long int num; + enum operator op; + struct expression *exp; +} + +%{ +/* Prototypes for local functions. */ +static struct expression *new_exp PARAMS ((int nargs, enum operator op, + struct expression * const *args)); +static inline struct expression *new_exp_0 PARAMS ((enum operator op)); +static inline struct expression *new_exp_1 PARAMS ((enum operator op, + struct expression *right)); +static struct expression *new_exp_2 PARAMS ((enum operator op, + struct expression *left, + struct expression *right)); +static inline struct expression *new_exp_3 PARAMS ((enum operator op, + struct expression *bexp, + struct expression *tbranch, + struct expression *fbranch)); +static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); +static void yyerror PARAMS ((const char *str)); + +/* Allocation of expressions. */ + +static struct expression * +new_exp (nargs, op, args) + int nargs; + enum operator op; + struct expression * const *args; +{ + int i; + struct expression *newp; + + /* If any of the argument could not be malloc'ed, just return NULL. */ + for (i = nargs - 1; i >= 0; i--) + if (args[i] == NULL) + goto fail; + + /* Allocate a new expression. */ + newp = (struct expression *) malloc (sizeof (*newp)); + if (newp != NULL) + { + newp->nargs = nargs; + newp->operation = op; + for (i = nargs - 1; i >= 0; i--) + newp->val.args[i] = args[i]; + return newp; + } + + fail: + for (i = nargs - 1; i >= 0; i--) + FREE_EXPRESSION (args[i]); + + return NULL; +} + +static inline struct expression * +new_exp_0 (op) + enum operator op; +{ + return new_exp (0, op, NULL); +} + +static inline struct expression * +new_exp_1 (op, right) + enum operator op; + struct expression *right; +{ + struct expression *args[1]; + + args[0] = right; + return new_exp (1, op, args); +} + +static struct expression * +new_exp_2 (op, left, right) + enum operator op; + struct expression *left; + struct expression *right; +{ + struct expression *args[2]; + + args[0] = left; + args[1] = right; + return new_exp (2, op, args); +} + +static inline struct expression * +new_exp_3 (op, bexp, tbranch, fbranch) + enum operator op; + struct expression *bexp; + struct expression *tbranch; + struct expression *fbranch; +{ + struct expression *args[3]; + + args[0] = bexp; + args[1] = tbranch; + args[2] = fbranch; + return new_exp (3, op, args); +} + +%} + +/* This declares that all operators have the same associativity and the + precedence order as in C. See [Harbison, Steele: C, A Reference Manual]. + There is no unary minus and no bitwise operators. + Operators with the same syntactic behaviour have been merged into a single + token, to save space in the array generated by bison. */ +%right '?' /* ? */ +%left '|' /* || */ +%left '&' /* && */ +%left EQUOP2 /* == != */ +%left CMPOP2 /* < > <= >= */ +%left ADDOP2 /* + - */ +%left MULOP2 /* * / % */ +%right '!' /* ! */ + +%token EQUOP2 CMPOP2 ADDOP2 MULOP2 +%token NUMBER +%type exp + +%% + +start: exp + { + if ($1 == NULL) + YYABORT; + ((struct parse_args *) arg)->res = $1; + } + ; + +exp: exp '?' exp ':' exp + { + $$ = new_exp_3 (qmop, $1, $3, $5); + } + | exp '|' exp + { + $$ = new_exp_2 (lor, $1, $3); + } + | exp '&' exp + { + $$ = new_exp_2 (land, $1, $3); + } + | exp EQUOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp CMPOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp ADDOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp MULOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | '!' exp + { + $$ = new_exp_1 (lnot, $2); + } + | 'n' + { + $$ = new_exp_0 (var); + } + | NUMBER + { + if (($$ = new_exp_0 (num)) != NULL) + $$->val.num = $1; + } + | '(' exp ')' + { + $$ = $2; + } + ; + +%% + +void +internal_function +FREE_EXPRESSION (exp) + struct expression *exp; +{ + if (exp == NULL) + return; + + /* Handle the recursive case. */ + switch (exp->nargs) + { + case 3: + FREE_EXPRESSION (exp->val.args[2]); + /* FALLTHROUGH */ + case 2: + FREE_EXPRESSION (exp->val.args[1]); + /* FALLTHROUGH */ + case 1: + FREE_EXPRESSION (exp->val.args[0]); + /* FALLTHROUGH */ + default: + break; + } + + free (exp); +} + + +static int +yylex (lval, pexp) + YYSTYPE *lval; + const char **pexp; +{ + const char *exp = *pexp; + int result; + + while (1) + { + if (exp[0] == '\0') + { + *pexp = exp; + return YYEOF; + } + + if (exp[0] != ' ' && exp[0] != '\t') + break; + + ++exp; + } + + result = *exp++; + switch (result) + { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + { + unsigned long int n = result - '0'; + while (exp[0] >= '0' && exp[0] <= '9') + { + n *= 10; + n += exp[0] - '0'; + ++exp; + } + lval->num = n; + result = NUMBER; + } + break; + + case '=': + if (exp[0] == '=') + { + ++exp; + lval->op = equal; + result = EQUOP2; + } + else + result = YYERRCODE; + break; + + case '!': + if (exp[0] == '=') + { + ++exp; + lval->op = not_equal; + result = EQUOP2; + } + break; + + case '&': + case '|': + if (exp[0] == result) + ++exp; + else + result = YYERRCODE; + break; + + case '<': + if (exp[0] == '=') + { + ++exp; + lval->op = less_or_equal; + } + else + lval->op = less_than; + result = CMPOP2; + break; + + case '>': + if (exp[0] == '=') + { + ++exp; + lval->op = greater_or_equal; + } + else + lval->op = greater_than; + result = CMPOP2; + break; + + case '*': + lval->op = mult; + result = MULOP2; + break; + + case '/': + lval->op = divide; + result = MULOP2; + break; + + case '%': + lval->op = module; + result = MULOP2; + break; + + case '+': + lval->op = plus; + result = ADDOP2; + break; + + case '-': + lval->op = minus; + result = ADDOP2; + break; + + case 'n': + case '?': + case ':': + case '(': + case ')': + /* Nothing, just return the character. */ + break; + + case ';': + case '\n': + case '\0': + /* Be safe and let the user call this function again. */ + --exp; + result = YYEOF; + break; + + default: + result = YYERRCODE; +#if YYDEBUG != 0 + --exp; +#endif + break; + } + + *pexp = exp; + + return result; +} + + +static void +yyerror (str) + const char *str; +{ + /* Do nothing. We don't print error messages here. */ +} diff -urN gnupg-1.0.5/intl/po2tbl.sed.in gnupg-1.0.6/intl/po2tbl.sed.in --- gnupg-1.0.5/intl/po2tbl.sed.in Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/po2tbl.sed.in Thu Jan 1 01:00:00 1970 @@ -1,102 +0,0 @@ -# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -# Copyright (C) 1995 Free Software Foundation, Inc. -# Ulrich Drepper , 1995. -# -# This program 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, or (at your option) -# any later version. -# -# This program 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. -# -1 { - i\ -/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -\ -#if HAVE_CONFIG_H\ -# include \ -#endif\ -\ -#include "libgettext.h"\ -\ -const struct _msg_ent _msg_tbl[] = { - h - s/.*/0/ - x -} -# -# Write msgid entries in C array form. -# -/^msgid/ { - s/msgid[ ]*\(".*"\)/ {\1/ - tb -# Append the next line - :b - N -# Look whether second part is continuation line. - s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -# Yes, then branch. - ta -# Because we assume that the input file correctly formed the line -# just read cannot be again be a msgid line. So it's safe to ignore -# it. - s/\(.*\)\n.*/\1/ - bc -# We found a continuation line. But before printing insert '\'. - :a - s/\(.*\)\(\n.*\)/\1\\\2/ - P -# We cannot use D here. - s/.*\n\(.*\)/\1/ -# Some buggy seds do not clear the `successful substitution since last ``t''' -# flag on `N', so we do a `t' here to clear it. - tb -# Not reached - :c - x -# The following nice solution is by -# Bruno - td -# Increment a decimal number in pattern space. -# First hide trailing `9' digits. - :d - s/9\(_*\)$/_\1/ - td -# Assure at least one digit is available. - s/^\(_*\)$/0\1/ -# Increment the last digit. - s/8\(_*\)$/9\1/ - s/7\(_*\)$/8\1/ - s/6\(_*\)$/7\1/ - s/5\(_*\)$/6\1/ - s/4\(_*\)$/5\1/ - s/3\(_*\)$/4\1/ - s/2\(_*\)$/3\1/ - s/1\(_*\)$/2\1/ - s/0\(_*\)$/1\1/ -# Convert the hidden `9' digits to `0's. - s/_/0/g - x - G - s/\(.*\)\n\([0-9]*\)/\1, \2},/ - s/\(.*\)"$/\1/ - p -} -# -# Last line. -# -$ { - i\ -};\ - - g - s/0*\(.*\)/int _msg_tbl_length = \1;/p -} -d diff -urN gnupg-1.0.5/intl/ref-add.sin gnupg-1.0.6/intl/ref-add.sin --- gnupg-1.0.5/intl/ref-add.sin Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/ref-add.sin Sat May 26 16:20:27 2001 @@ -0,0 +1,31 @@ +# Add this package to a list of references stored in a text file. +# +# Copyright (C) 2000 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library 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. +# +# Written by Bruno Haible . +# +/^# Packages using this file: / { + s/# Packages using this file:// + ta + :a + s/ @PACKAGE@ / @PACKAGE@ / + tb + s/ $/ @PACKAGE@ / + :b + s/^/# Packages using this file:/ +} diff -urN gnupg-1.0.5/intl/ref-del.sin gnupg-1.0.6/intl/ref-del.sin --- gnupg-1.0.5/intl/ref-del.sin Thu Jan 1 01:00:00 1970 +++ gnupg-1.0.6/intl/ref-del.sin Sat May 26 16:20:27 2001 @@ -0,0 +1,26 @@ +# Remove this package from a list of references stored in a text file. +# +# Copyright (C) 2000 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library 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. +# +# Written by Bruno Haible . +# +/^# Packages using this file: / { + s/# Packages using this file:// + s/ @PACKAGE@ / / + s/^/# Packages using this file:/ +} diff -urN gnupg-1.0.5/intl/textdomain.c gnupg-1.0.6/intl/textdomain.c --- gnupg-1.0.5/intl/textdomain.c Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/textdomain.c Sat May 26 16:20:28 2001 @@ -1,6 +1,5 @@ /* Implementation of the textdomain(3) function. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,23 +19,32 @@ # include #endif -#if defined STDC_HEADERS || defined _LIBC -# include -#endif +#include +#include -#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -# include +#ifdef _LIBC +# include #else -# include -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif +# include "libgnuintl.h" #endif +#include "gettextP.h" #ifdef _LIBC -# include +/* We have to handle multi-threaded applications. */ +# include #else -# include "libgettext.h" +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain _nl_default_default_domain__ +# define _nl_current_default_domain _nl_current_default_domain__ #endif /* @@ end of prolog @@ */ @@ -61,6 +69,9 @@ # define TEXTDOMAIN textdomain__ #endif +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock) + /* Set the current default message catalog to DOMAINNAME. If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */ @@ -68,38 +79,60 @@ TEXTDOMAIN (domainname) const char *domainname; { - char *old; + char *new_domain; + char *old_domain; /* A NULL pointer requests the current setting. */ if (domainname == NULL) return (char *) _nl_current_default_domain; - old = (char *) _nl_current_default_domain; + __libc_rwlock_wrlock (_nl_state_lock); + + old_domain = (char *) _nl_current_default_domain; /* If domain name is the null string set to default domain "messages". */ if (domainname[0] == '\0' || strcmp (domainname, _nl_default_default_domain) == 0) - _nl_current_default_domain = _nl_default_default_domain; + { + _nl_current_default_domain = _nl_default_default_domain; + new_domain = (char *) _nl_current_default_domain; + } + else if (strcmp (domainname, old_domain) == 0) + /* This can happen and people will use it to signal that some + environment variable changed. */ + new_domain = old_domain; else { /* If the following malloc fails `_nl_current_default_domain' will be NULL. This value will be returned and so signals we are out of core. */ #if defined _LIBC || defined HAVE_STRDUP - _nl_current_default_domain = strdup (domainname); + new_domain = strdup (domainname); #else size_t len = strlen (domainname) + 1; - char *cp = (char *) malloc (len); - if (cp != NULL) - memcpy (cp, domainname, len); - _nl_current_default_domain = cp; + new_domain = (char *) malloc (len); + if (new_domain != NULL) + memcpy (new_domain, domainname, len); #endif + + if (new_domain != NULL) + _nl_current_default_domain = new_domain; + } + + /* We use this possibility to signal a change of the loaded catalogs + since this is most likely the case and there is no other easy we + to do it. Do it only when the call was successful. */ + if (new_domain != NULL) + { + ++_nl_msg_cat_cntr; + + if (old_domain != new_domain && old_domain != _nl_default_default_domain) + free (old_domain); } - if (old != _nl_default_default_domain) - free (old); + __libc_rwlock_unlock (_nl_state_lock); - return (char *) _nl_current_default_domain; + return new_domain; } #ifdef _LIBC diff -urN gnupg-1.0.5/intl/xopen-msg.sed gnupg-1.0.6/intl/xopen-msg.sed --- gnupg-1.0.5/intl/xopen-msg.sed Tue Jan 25 18:44:13 2000 +++ gnupg-1.0.6/intl/xopen-msg.sed Thu Jan 1 01:00:00 1970 @@ -1,104 +0,0 @@ -# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -# Copyright (C) 1995 Free Software Foundation, Inc. -# Ulrich Drepper , 1995. -# -# This program 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, or (at your option) -# any later version. -# -# This program 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. -# -# -# The first directive in the .msg should be the definition of the -# message set number. We use always set number 1. -# -1 { - i\ -$set 1 # Automatically created by po2msg.sed - h - s/.*/0/ - x -} -# -# We copy all comments into the .msg file. Perhaps they can help. -# -/^#/ s/^#[ ]*/$ /p -# -# We copy the original message as a comment into the .msg file. -# -/^msgid/ { -# Does not work now -# /"$/! { -# s/\\$// -# s/$/ ... (more lines following)"/ -# } - s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ - p -} -# -# The .msg file contains, other then the .po file, only the translations -# but each given a unique ID. Starting from 1 and incrementing by 1 for -# each message we assign them to the messages. -# It is important that the .po file used to generate the cat-id-tbl.c file -# (with po-to-tbl) is the same as the one used here. (At least the order -# of declarations must not be changed.) -# -/^msgstr/ { - s/msgstr[ ]*"\(.*\)"/\1/ - x -# The following nice solution is by -# Bruno - td -# Increment a decimal number in pattern space. -# First hide trailing `9' digits. - :d - s/9\(_*\)$/_\1/ - td -# Assure at least one digit is available. - s/^\(_*\)$/0\1/ -# Increment the last digit. - s/8\(_*\)$/9\1/ - s/7\(_*\)$/8\1/ - s/6\(_*\)$/7\1/ - s/5\(_*\)$/6\1/ - s/4\(_*\)$/5\1/ - s/3\(_*\)$/4\1/ - s/2\(_*\)$/3\1/ - s/1\(_*\)$/2\1/ - s/0\(_*\)$/1\1/ -# Convert the hidden `9' digits to `0's. - s/_/0/g - x -# Bring the line in the format ` ' - G - s/^[^\n]*$/& / - s/\(.*\)\n\([0-9]*\)/\2 \1/ -# Clear flag from last substitution. - tb -# Append the next line. - :b - N -# Look whether second part is a continuation line. - s/\(.*\n\)"\(.*\)"/\1\2/ -# Yes, then branch. - ta - P - D -# Note that `D' includes a jump to the start!! -# We found a continuation line. But before printing insert '\'. - :a - s/\(.*\)\(\n.*\)/\1\\\2/ - P -# We cannot use the sed command `D' here - s/.*\n\(.*\)/\1/ - tb -} -d --- gnupg-1.0.5/mpi/ChangeLog Tue Apr 17 18:21:40 2001 +++ gnupg-1.0.6/mpi/ChangeLog Mon May 28 10:55:24 2001 @@ -1,3 +1,12 @@ +2001-05-27 Werner Koch + + * hppa/, hppa1.1/, pa7100/ : Use .label command instead of labels + because there syntax changed. By Matthew Wilcox. + +2001-05-06 Werner Koch + + * longlong.h: Fixes for ARM by Phil Blundell. + 2001-04-17 Werner Koch Updated copyright notices. diff -urN gnupg-1.0.5/ABOUT-NLS gnupg-1.0.6/ABOUT-NLS --- gnupg-1.0.5/ABOUT-NLS Tue Jan 25 18:44:19 2000 +++ gnupg-1.0.6/ABOUT-NLS Sat May 26 16:20:36 2001 @@ -8,7 +8,7 @@ If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do *not* +itself available at your nearest GNU archive site. But you do _not_ need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. @@ -22,8 +22,8 @@ `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -One advise in advance -===================== +Quick configuration advice +========================== If you want to exploit the full power of internationalization, you should configure it using @@ -34,13 +34,14 @@ package, despite the existence of internationalizing capabilities in the operating system where this package is being installed. So far, only the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias or message inheritance) as the -implementation here. It is also not possible to offer this additional -functionality on top of a `catgets' implementation. Future versions of -GNU `gettext' will very likely convey even more functionality. So it -might be a good idea to change to GNU `gettext' as soon as possible. +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. - So you need not provide this option if you are using GNU libc 2 or + So you need _not_ provide this option if you are using GNU libc 2 or you have installed a recent copy of the GNU gettext package with the included `libintl'. @@ -53,23 +54,20 @@ ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system provides -usable `catgets' (if using this is selected by the installer) or -`gettext' functions. If neither is available, the GNU `gettext' own +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the GNU `gettext' own library will be used. This library is wholly contained within this package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is *not* required. Installers may use +the GNU `gettext' package is _not_ required. Installers may use special options at configuration time for changing the default behaviour. The commands: ./configure --with-included-gettext - ./configure --with-catgets ./configure --disable-nls -will respectively bypass any pre-existing `catgets' or `gettext' to use -the internationalizing routines provided within this package, enable -the use of the `catgets' functions (if found on the locale system), or -else, *totally* disable translation of messages. +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will @@ -83,18 +81,10 @@ to prevent auto-detection. - By default the configuration process will not test for the `catgets' -function and therefore they will not be used. The reasons are already -given above: the emulation on top of `catgets' cannot provide all the -extensions provided by the GNU `gettext' library. If you nevertheless -want to use the `catgets' functions use - - ./configure --with-catgets - -to enable the test for `catgets' (this causes no harm if `catgets' is -not available on your system). If you really select this option we -would like to hear about the reasons because we cannot think of any -good one ourself. + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -110,22 +100,35 @@ As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -ISO 639 `LL' two-letter code prior to using the programs in the -package. For example, let's suppose that you speak German. At the -shell prompt, merely execute `setenv LANG de' (in `csh'), -`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This -can be done from your `.login' or `.profile' file, once and for all. - - An operating system might already offer message localization for -many of its programs, while other programs have been installed locally -with the full capabilities of GNU `gettext'. Just using `gettext' -extended syntax for `LANG' would break proper localization of already -available operating system programs. In this case, users should set -both `LANGUAGE' and `LANG' variables in their environment, as programs -using GNU `gettext' give preference to `LANGUAGE'. For example, some -Swedish users would rather read translations in German than English for -when Swedish is not available. This is easily accomplished by setting -`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. Translating Teams ================= @@ -133,33 +136,21 @@ For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. -Each translation team has its own mailing list, courtesy of Linux -International. You may reach your translation team at the address -`LL@li.org', replacing LL by the two-letter ISO 639 code for your -language. Language codes are *not* the same as the country codes given -in ISO 3166. The following translation teams exist, as of December -1997: - - Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', - Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian - `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', - Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish - `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', - Swedish `sv', and Turkish `tr'. +Each translation team has its own mailing list. The up-to-date list of +teams can be found at the Free Translation Project's homepage, +`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" +area. -For example, you may reach the Chinese translation team by writing to -`zh@li.org'. - - If you'd like to volunteer to *work* at translating messages, you + If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. -The subscribing address is *not* the same as the list itself, it has +The subscribing address is _not_ the same as the list itself, it has `-request' appended. For example, speakers of Swedish can send a message to `sv-request@li.org', having this message body: subscribe Keep in mind that team members are expected to participate -*actively* in translations, or at solving translational difficulties, +_actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to get started, please write to `translation@iro.umontreal.ca' to reach the @@ -173,42 +164,102 @@ ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of December -1997. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination. - - Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv - .----------------------------------------------------. - bash | [] [] [] | 3 - bison | [] [] [] | 3 - clisp | [] [] [] [] | 4 - cpio | [] [] [] [] [] [] | 6 - diffutils | [] [] [] [] [] | 5 - enscript | [] [] [] [] [] [] | 6 - fileutils | [] [] [] [] [] [] [] [] [] [] | 10 - findutils | [] [] [] [] [] [] [] [] [] | 9 - flex | [] [] [] [] | 4 - gcal | [] [] [] [] [] | 5 - gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 - grep | [] [] [] [] [] [] [] [] [] [] | 10 - hello | [] [] [] [] [] [] [] [] [] [] [] | 11 - id-utils | [] [] [] | 3 - indent | [] [] [] [] [] | 5 - libc | [] [] [] [] [] [] [] | 7 - m4 | [] [] [] [] [] [] | 6 - make | [] [] [] [] [] [] | 6 - music | [] [] | 2 - ptx | [] [] [] [] [] [] [] [] | 8 - recode | [] [] [] [] [] [] [] [] [] | 9 - sh-utils | [] [] [] [] [] [] [] [] | 8 - sharutils | [] [] [] [] [] [] | 6 - tar | [] [] [] [] [] [] [] [] [] [] [] | 11 - texinfo | [] [] [] | 3 - textutils | [] [] [] [] [] [] [] [] [] | 9 - wdiff | [] [] [] [] [] [] [] [] | 8 - `----------------------------------------------------' - 17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv - 27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 +matrix shows the current state of internationalization, as of May 2001. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files bg cs da de el en eo es et fi fr gl hr id it + +----------------------------------------------+ + a2ps | [] [] | + bash | [] [] [] [] | + bison | [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] | + fileutils | [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + gawk | | + gcal | | + gcc | [] | + gettext | [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] | + grep | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | | + lynx | [] [] [] | + m4 | [] [] [] [] [] [] [] | + make | [] [] [] [] | + parted | [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] [] | + util-linux | [] | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] [] | + +----------------------------------------------+ + bg cs da de el en eo es et fi fr gl hr id it + 0 14 21 27 10 1 8 20 13 1 28 17 0 9 11 + + ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh + +----------------------------------------------+ + a2ps | [] [] [] | 5 + bash | | 4 + bison | [] [] [] | 7 + clisp | [] | 5 + cpio | [] [] [] [] [] | 9 + diffutils | [] [] [] | 10 + enscript | [] [] [] | 5 + error | | 1 + fileutils | [] [] [] [] [] [] [] [] [] | 16 + findutils | [] [] [] [] [] [] | 14 + flex | [] [] [] | 6 + gawk | | 0 + gcal | | 0 + gcc | [] | 2 + gettext | [] [] [] [] [] [] [] [] [] [] | 19 + gnupg | [] [] [] | 8 + grep | | 3 + hello | [] [] [] [] [] [] [] [] | 17 + id-utils | [] [] [] | 5 + indent | [] [] [] [] [] [] [] | 12 + libc | [] [] [] [] [] [] [] | 15 + lilypond | [] | 1 + lynx | [] [] [] [] [] | 8 + m4 | [] [] [] [] [] | 12 + make | [] [] [] [] [] | 9 + parted | [] [] [] | 5 + ptx | [] [] [] [] [] [] | 13 + python | | 0 + recode | [] [] [] | 11 + sed | [] [] [] [] [] [] [] | 16 + sh-utils | [] [] [] [] [] [] [] [] [] [] | 19 + sharutils | [] [] [] [] | 11 + soundtracker | | 0 + sp | | 0 + tar | [] [] [] [] [] [] [] [] | 16 + texinfo | [] [] | 6 + textutils | [] [] [] [] [] [] [] [] | 15 + util-linux | [] | 2 + wdiff | [] [] [] [] [] | 12 + wget | [] [] [] [] [] [] [] [] | 17 + +----------------------------------------------+ + 29 teams ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh + 40 domains 18 8 0 23 6 16 1 15 26 9 9 20 2 3 336 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -221,6 +272,25 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If December 1997 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. + If May 2001 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + +Using `gettext' in new packages +=============================== + + If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course the GNU Public License applies to your sources from +then if you include `gettext' directly in your distribution on but +since you are writing free software anyway this is no restriction. + + Once the sources are change appropriately and the setup can handle to +use of `gettext' the only thing missing are the translations. The Free +Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. diff -urN gnupg-1.0.5/ChangeLog gnupg-1.0.6/ChangeLog --- gnupg-1.0.5/ChangeLog Sat Apr 28 19:56:07 2001 +++ gnupg-1.0.6/ChangeLog Tue May 29 08:53:31 2001 @@ -1,3 +1,15 @@ +2001-05-29 Werner Koch + + Released version 1.0.6. + +2001-05-28 Werner Koch + + * configure.in (BUILD_INCLUDED_LIBINTL): Set to no for W32. + +2001-04-29 Werner Koch + + Released version 1.0.5. + 2001-04-28 Werner Koch Updated all copyright notices. diff -urN gnupg-1.0.5/Makefile.in gnupg-1.0.6/Makefile.in --- gnupg-1.0.5/Makefile.in Sun Apr 29 16:38:50 2001 +++ gnupg-1.0.6/Makefile.in Tue May 29 08:58:03 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ @CROSS_COMPILING_TRUE@checks = @CROSS_COMPILING_FALSE@checks = checks diff -urN gnupg-1.0.5/NEWS gnupg-1.0.6/NEWS --- gnupg-1.0.5/NEWS Sun Apr 29 16:19:29 2001 +++ gnupg-1.0.6/NEWS Tue May 29 08:51:25 2001 @@ -1,3 +1,18 @@ +Noteworthy changes in version 1.0.6 (2001-05-29) +------------------------------------------------ + + * Security fix for a format string bug in the tty code. + + * Fixed format string bugs in all PO files. + + * Removed Russian translation due to too many bugs. The FTP + server has an unofficial but better translation in the contrib + directory. + + * Fixed expire time calculation and keyserver access. + + * The usual set of minor bug fixes and enhancements. + Noteworthy changes in version 1.0.5 (2001-04-29) ------------------------------------------------ diff -urN gnupg-1.0.5/THANKS gnupg-1.0.6/THANKS --- gnupg-1.0.5/THANKS Sun Apr 29 16:17:39 2001 +++ gnupg-1.0.6/THANKS Tue May 29 08:33:39 2001 @@ -12,6 +12,7 @@ Bodo Moeller Bodo_Moeller@public.uni-hamburg.de Brendan O'Dea bod@debian.org Brenno de Winter brenno@dewinter.com +Brian M. Carlson karlsson@hal-pc.org Brian Moore bem@cmc.net Brian Warner warner@lothar.com Bryan Fullerton bryanf@samurai.com @@ -34,6 +35,7 @@ David Hallinan hallinan@rtd.com David Hollenberg dhollen@ISI.EDU David Mathog MATHOG@seqaxp.bio.caltech.edu +David R. Bergstein dbergstein@home.com Detlef Lannert lannert@lannert.rz.uni-duesseldorf.de Dimitri dmitri@advantrix.com Dirk Lattermann dlatt@t-online.de @@ -44,6 +46,7 @@ Ernst Molitor ernst.molitor@uni-bonn.de Fabio Coatti cova@ferrara.linux.it Felix von Leitner leitner@amdiv.de +fish stiqz fish@analog.org Florian Weimer Florian.Weimer@rus.uni-stuttgart.de Frank Donahoe fdonahoe@wilkes1.wilkes.edu Frank Heckenbach heckenb@mi.uni-erlangen.de @@ -96,6 +99,7 @@ Keith Clayton keith@claytons.org Kevin Ryde user42@zip.com.au Klaus Singvogel ks@caldera.de +Kurt Garloff garloff@suse.de Lars Kellogg-Stedman lars@bu.edu L. Sassaman rabbi@quickie.net M Taylor mctaylor@privacy.nb.ca @@ -109,6 +113,7 @@ Martin Schulte schulte@thp.uni-koeln.de Matt Kraai kraai@alumni.carnegiemellon.edu Matthew Skala mskala@ansuz.sooke.bc.ca +Matthew Wilcox matthew@wil.cx Matthias Urlichs smurf@noris.de Max Valianskiy maxcom@maxcom.ml.org Michael Fischer v. Mollard mfvm@gmx.de @@ -125,6 +130,7 @@ Oskari Jääskeläinen f33003a@cc.hut.fi Paul D. Smith psmith@baynetworks.com Per Cederqvist ceder@lysator.liu.se +Phil Blundell pb@debian.org Philippe Laliberte arsphl@oeil.qc.ca Peter Fales psfales@lucent.com Peter Gutmann pgut001@cs.auckland.ac.nz @@ -137,6 +143,7 @@ Rémi Guyomarch rguyom@mail.dotcom.fr Reuben Sumner rasumner@wisdom.weizmann.ac.il Richard Outerbridge outer@interlog.com +Robert Joop rj@rainbow.in-berlin.de Roddy Strachan roddy@satlink.com.au Roger Sondermann r.so@bigfoot.com Roland Rosenfeld roland@spinnaker.rhein.de diff -urN gnupg-1.0.5/TODO gnupg-1.0.6/TODO --- gnupg-1.0.5/TODO Wed Apr 25 12:01:08 2001 +++ gnupg-1.0.6/TODO Tue May 29 08:56:32 2001 @@ -1,4 +1,8 @@ + * check all mpi_read() for error returns. + + * --preserve-perms so that permissions set on a secring don't get changed. + * Check that no secret temporary results are stored in the result parameter of the mpi functions. We have already done this for mpi-mul.c @@ -51,6 +55,10 @@ * Replace the printing of the user name by [self-signature] when appropriate so that a key listing does not get clobbered. + + * "Michael T. Babcock" suggested to write + an even log so that other software can display a key history or + alike with GnuPG results. This should be connected to the keyrings. Scheduled for 1.1 diff -urN gnupg-1.0.5/aclocal.m4 gnupg-1.0.6/aclocal.m4 --- gnupg-1.0.5/aclocal.m4 Sat Apr 28 19:55:31 2001 +++ gnupg-1.0.6/aclocal.m4 Tue May 29 08:33:42 2001 @@ -983,6 +983,24 @@ ] ) +#serial 1 +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # @@ -991,9 +1009,37 @@ # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 5 +# serial 9 -AC_DEFUN(AM_WITH_NLS, +dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). +dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). Otherwise, a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. +dnl LIBDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -1002,11 +1048,15 @@ AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no + INTLLIBS= dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -1017,86 +1067,74 @@ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. CATOBJEXT=NONE + dnl Add a version number to the cache macros. + define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) + define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) + AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include ], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)], - gt_cv_func_gettext_libintl=no)]) + [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +extern int _nl_msg_cat_cntr;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $LIBICONV" + AC_TRY_LINK([#include +extern int _nl_msg_cat_cntr;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + LIBS="$gt_save_LIBS"]) fi - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + dnl If iconv() is in a separate libiconv library, then anyone + dnl linking with libintl{.a,.so} also needs to link with + dnl libiconv. + INTLLIBS="-lintl $LIBICONV" + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + LIBS="$gt_save_LIBS" + + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + fi - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi - fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + + CATOBJEXT=.gmo + fi + ]) if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. + dnl GNU gettext is not found in the C library. dnl Fall back on GNU gettext library. nls_cv_use_gnu_gettext=yes fi @@ -1111,15 +1149,11 @@ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) AC_SUBST(MSGFMT) + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi dnl Test whether we really found GNU xgettext. @@ -1135,25 +1169,73 @@ fi fi - # We need to process the po/ directory. + dnl We need to process the po/ directory. POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h fi - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) + [for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + echo creating "$ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + echo creating "$ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done]) - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: fi dnl These rules are solely for the distribution goal. While doing this @@ -1165,22 +1247,38 @@ done dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) AC_SUBST(INTLLIBS) AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) ]) -AC_DEFUN(AM_GNU_GETTEXT, +dnl Usage: Just like AM_WITH_NLS, which see. +AC_DEFUN([AM_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl @@ -1190,21 +1288,18 @@ AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + AM_ICONV + AM_LANGINFO_CODESET AM_LC_MESSAGES - AM_WITH_NLS + AM_WITH_NLS([$1],[$2],[$3]) if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then @@ -1212,10 +1307,21 @@ else AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) @@ -1227,47 +1333,8 @@ fi fi - dnl The reference to in the installed file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl Try to locate is. MKINSTALLDIRS= if test -n "$ac_aux_dir"; then @@ -1278,25 +1345,9 @@ fi AC_SUBST(MKINSTALLDIRS) - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) # Search path for a program which passes the given test. @@ -1311,7 +1362,7 @@ dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, +AC_DEFUN([AM_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) @@ -1347,6 +1398,121 @@ AC_SUBST($1)dnl ]) +#serial 2 + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) + +#serial AM2 + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + AC_ARG_WITH([libiconv-prefix], +[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + ]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then + LIBICONV="-liconv" + fi + AC_SUBST(LIBICONV) +]) + +#serial AM1 + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi +]) + # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. # @@ -1355,15 +1521,16 @@ # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 1 +# serial 2 -AC_DEFUN(AM_LC_MESSAGES, +AC_DEFUN([AM_LC_MESSAGES], [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) fi fi]) diff -urN gnupg-1.0.5/checks/ChangeLog gnupg-1.0.6/checks/ChangeLog --- gnupg-1.0.5/checks/ChangeLog Sat Apr 28 21:40:29 2001 +++ gnupg-1.0.6/checks/ChangeLog Mon Apr 30 09:21:01 2001 @@ -1,3 +1,7 @@ +2001-04-30 Werner Koch + + * multisig.test: Add an set +x to avoid ksh problems + 2001-04-28 Werner Koch * run-gpg.patterns: a v3 test key expired yesterday, suppress the diff -urN gnupg-1.0.5/checks/Makefile.in gnupg-1.0.6/checks/Makefile.in --- gnupg-1.0.5/checks/Makefile.in Sun Apr 29 16:39:46 2001 +++ gnupg-1.0.6/checks/Makefile.in Tue May 29 08:59:13 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ GPG_DEARMOR = ../g10/gpg --no-options --no-greeting --batch --quiet --yes --dearmor GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import diff -urN gnupg-1.0.5/checks/multisig.test gnupg-1.0.6/checks/multisig.test --- gnupg-1.0.5/checks/multisig.test Thu Apr 5 13:36:55 2001 +++ gnupg-1.0.6/checks/multisig.test Mon Apr 30 09:19:01 2001 @@ -130,19 +130,15 @@ # echo "$i" | $srcdir/run-gpg --dearmor >x # ../g10/gpg --homedir . --verify /dev/null || error "valid is invalid" #done + +# without the +e ksh seems to terminate the for loop +set +e for i in "$sig_1lsls_invalid" "$sig_lsls_invalid" \ "$sig_lss_invalid" "$sig_slsl_invalid" ; do echo "$i" | $srcdir/run-gpg --dearmor >x ../g10/gpg --homedir . --verify /dev/null && error "invalid is valid" done IFS="${save_IFS}" - - - - - - - diff -urN gnupg-1.0.5/cipher/Makefile.in gnupg-1.0.6/cipher/Makefile.in --- gnupg-1.0.5/cipher/Makefile.in Sun Apr 29 16:39:07 2001 +++ gnupg-1.0.6/cipher/Makefile.in Tue May 29 08:58:22 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -95,15 +96,15 @@ DYNLINK_LDFLAGS = @DYNLINK_LDFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -122,7 +123,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl diff -urN gnupg-1.0.5/config.h.in gnupg-1.0.6/config.h.in --- gnupg-1.0.5/config.h.in Thu Mar 8 15:26:26 2001 +++ gnupg-1.0.6/config.h.in Sun May 27 12:32:46 2001 @@ -58,9 +58,6 @@ /* Define to `long' if doesn't define. */ #undef off_t -/* Define if you need to in order for stat and other things to work. */ -#undef _POSIX_SOURCE - /* Define as the return type of signal handlers (int or void). */ #undef RETSIGTYPE @@ -87,20 +84,6 @@ #undef PRINTABLE_OS_NAME #undef IS_DEVELOPMENT_VERSION -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS - -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT - -#undef HAVE_STPCPY - #undef HAVE_MLOCK #undef BIG_ENDIAN_HOST @@ -188,12 +171,27 @@ /* Define if you have the dlopen function. */ #undef HAVE_DLOPEN +/* Define if you have the feof_unlocked function. */ +#undef HAVE_FEOF_UNLOCKED + +/* Define if you have the fgets_unlocked function. */ +#undef HAVE_FGETS_UNLOCKED + /* Define if you have the fseeko function. */ #undef HAVE_FSEEKO /* Define if you have the getcwd function. */ #undef HAVE_GETCWD +/* Define if you have the getegid function. */ +#undef HAVE_GETEGID + +/* Define if you have the geteuid function. */ +#undef HAVE_GETEUID + +/* Define if you have the getgid function. */ +#undef HAVE_GETGID + /* Define if you have the gethrtime function. */ #undef HAVE_GETHRTIME @@ -206,12 +204,18 @@ /* Define if you have the gettimeofday function. */ #undef HAVE_GETTIMEOFDAY +/* Define if you have the getuid function. */ +#undef HAVE_GETUID + /* Define if you have the memicmp function. */ #undef HAVE_MEMICMP /* Define if you have the memmove function. */ #undef HAVE_MEMMOVE +/* Define if you have the mempcpy function. */ +#undef HAVE_MEMPCPY + /* Define if you have the mlock function. */ #undef HAVE_MLOCK @@ -278,6 +282,9 @@ /* Define if you have the tcgetattr function. */ #undef HAVE_TCGETATTR +/* Define if you have the tsearch function. */ +#undef HAVE_TSEARCH + /* Define if you have the wait4 function. */ #undef HAVE_WAIT4 @@ -311,6 +318,12 @@ /* Define if you have the header file. */ #undef HAVE_NL_TYPES_H +/* Define if you have the header file. */ +#undef HAVE_STDDEF_H + +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H + /* Define if you have the header file. */ #undef HAVE_STRING_H @@ -350,9 +363,6 @@ /* Define if you have the gdbm library (-lgdbm). */ #undef HAVE_LIBGDBM -/* Define if you have the i library (-li). */ -#undef HAVE_LIBI - /* Define if you have the nsl library (-lnsl). */ #undef HAVE_LIBNSL @@ -379,6 +389,25 @@ /* define if compiled symbols have a leading underscore */ #undef WITH_SYMBOL_UNDERSCORE + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if translation of program messages to the user's native language + is requested. */ +#undef ENABLE_NLS + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT #include "g10defs.h" diff -urN gnupg-1.0.5/configure gnupg-1.0.6/configure --- gnupg-1.0.5/configure Sun Apr 29 16:38:16 2001 +++ gnupg-1.0.6/configure Tue May 29 08:57:37 2001 @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.103.2.33 +# From configure.in Revision: 1.103.2.34 CDPATH= @@ -114,6 +114,19 @@ +#serial 1 +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + + + + + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # @@ -122,7 +135,7 @@ # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 5 +# serial 9 @@ -140,6 +153,23 @@ +#serial 2 + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + + + +#serial AM2 + + + + +#serial AM1 + + + + # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. # @@ -148,7 +178,7 @@ # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 1 +# serial 2 @@ -185,11 +215,11 @@ ac_help="$ac_help --disable-largefile omit support for large files" ac_help="$ac_help + --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" +ac_help="$ac_help --disable-nls do not use Native Language Support" ac_help="$ac_help --with-included-gettext use the GNU gettext library included here" -ac_help="$ac_help - --with-catgets use catgets functions if available" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -750,7 +780,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:754: checking host system type" >&5 +echo "configure:784: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -771,7 +801,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:775: checking target system type" >&5 +echo "configure:805: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -789,7 +819,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:793: checking build system type" >&5 +echo "configure:823: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -823,7 +853,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:827: checking for a BSD compatible install" >&5 +echo "configure:857: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -876,7 +906,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:880: checking whether build environment is sane" >&5 +echo "configure:910: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -933,7 +963,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:967: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -979,7 +1009,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:983: checking for working aclocal" >&5 +echo "configure:1013: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -992,7 +1022,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:996: checking for working autoconf" >&5 +echo "configure:1026: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1005,7 +1035,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1009: checking for working automake" >&5 +echo "configure:1039: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1018,7 +1048,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1022: checking for working autoheader" >&5 +echo "configure:1052: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1031,7 +1061,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1035: checking for working makeinfo" >&5 +echo "configure:1065: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1046,7 +1076,7 @@ -ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT ru sv tr" +ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT sv tr" static_modules="sha1 md5 rmd160" static_random_module="" @@ -1055,7 +1085,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1059: checking for $ac_word" >&5 +echo "configure:1089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,7 +1120,7 @@ echo $ac_n "checking which static random module to use""... $ac_c" 1>&6 -echo "configure:1094: checking which static random module to use" >&5 +echo "configure:1124: checking which static random module to use" >&5 # Check whether --enable-static-rnd or --disable-static-rnd was given. if test "${enable_static_rnd+set}" = set; then enableval="$enable_static_rnd" @@ -1130,7 +1160,7 @@ echo $ac_n "checking whether use of /dev/random is requested""... $ac_c" 1>&6 -echo "configure:1134: checking whether use of /dev/random is requested" >&5 +echo "configure:1164: checking whether use of /dev/random is requested" >&5 # Check whether --enable-dev-random or --disable-dev-random was given. if test "${enable_dev_random+set}" = set; then enableval="$enable_dev_random" @@ -1144,7 +1174,7 @@ echo $ac_n "checking whether use of extensions is requested""... $ac_c" 1>&6 -echo "configure:1148: checking whether use of extensions is requested" >&5 +echo "configure:1178: checking whether use of extensions is requested" >&5 # Check whether --enable-dynload or --disable-dynload was given. if test "${enable_dynload+set}" = set; then enableval="$enable_dynload" @@ -1156,7 +1186,7 @@ echo "$ac_t""$try_dynload" 1>&6 echo $ac_n "checking whether assembler modules are requested""... $ac_c" 1>&6 -echo "configure:1160: checking whether assembler modules are requested" >&5 +echo "configure:1190: checking whether assembler modules are requested" >&5 # Check whether --enable-asm or --disable-asm was given. if test "${enable_asm+set}" = set; then enableval="$enable_asm" @@ -1168,7 +1198,7 @@ echo "$ac_t""$try_asm_modules" 1>&6 echo $ac_n "checking whether memory guard is requested""... $ac_c" 1>&6 -echo "configure:1172: checking whether memory guard is requested" >&5 +echo "configure:1202: checking whether memory guard is requested" >&5 # Check whether --enable-m-guard or --disable-m-guard was given. if test "${enable_m_guard+set}" = set; then enableval="$enable_m_guard" @@ -1187,7 +1217,7 @@ echo $ac_n "checking whether included zlib is requested""... $ac_c" 1>&6 -echo "configure:1191: checking whether included zlib is requested" >&5 +echo "configure:1221: checking whether included zlib is requested" >&5 # Check whether --with-included-zlib or --without-included-zlib was given. if test "${with_included_zlib+set}" = set; then withval="$with_included_zlib" @@ -1200,7 +1230,7 @@ echo $ac_n "checking whether use of capabilities is requested""... $ac_c" 1>&6 -echo "configure:1204: checking whether use of capabilities is requested" >&5 +echo "configure:1234: checking whether use of capabilities is requested" >&5 # Check whether --with-capabilities or --without-capabilities was given. if test "${with_capabilities+set}" = set; then withval="$with_capabilities" @@ -1216,7 +1246,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1220: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1250: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1269,7 +1299,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1273: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1303: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1296,7 +1326,7 @@ fi echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:1300: checking whether build environment is sane" >&5 +echo "configure:1330: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1335,7 +1365,7 @@ echo "$ac_t""yes" 1>&6 missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1339: checking for working aclocal" >&5 +echo "configure:1369: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1348,7 +1378,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1352: checking for working autoconf" >&5 +echo "configure:1382: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1361,7 +1391,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1365: checking for working automake" >&5 +echo "configure:1395: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1374,7 +1404,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1378: checking for working autoheader" >&5 +echo "configure:1408: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1387,7 +1417,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1391: checking for working makeinfo" >&5 +echo "configure:1421: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1402,7 +1432,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1406: checking for $ac_word" >&5 +echo "configure:1436: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1432,7 +1462,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1436: checking for $ac_word" >&5 +echo "configure:1466: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1483,7 +1513,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1487: checking for $ac_word" >&5 +echo "configure:1517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1515,7 +1545,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1519: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1549: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1526,12 +1556,12 @@ cat > conftest.$ac_ext << EOF -#line 1530 "configure" +#line 1560 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1557,12 +1587,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1561: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1591: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1566: checking whether we are using GNU C" >&5 +echo "configure:1596: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1571,7 +1601,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1590,7 +1620,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1594: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1624: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1622,7 +1652,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1626: checking how to run the C preprocessor" >&5 +echo "configure:1656: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1637,13 +1667,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1654,13 +1684,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1671,13 +1701,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1701,27 +1731,49 @@ fi echo "$ac_t""$CPP" 1>&6 -echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1706: checking for POSIXized ISC" >&5 -if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 -then - echo "$ac_t""yes" 1>&6 - ISC=yes # If later tests want to check for ISC. - cat >> confdefs.h <<\EOF -#define _POSIX_SOURCE 1 + + echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 +echo "configure:1737: checking for strerror in -lcposix" >&5 +ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcposix $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - if test "$GCC" = yes; then - CC="$CC -posix" - else - CC="$CC -Xp" - fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lcposix" else echo "$ac_t""no" 1>&6 - ISC= fi + + # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then enableval="$enable_largefile" @@ -1731,7 +1783,7 @@ if test "$enable_largefile" != no; then echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6 -echo "configure:1735: checking for special C compiler options needed for large files" >&5 +echo "configure:1787: checking for special C compiler options needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1740,7 +1792,7 @@ # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1749,7 +1801,7 @@ ; return 0; } EOF -if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1758,7 +1810,7 @@ ac_save_CC="$CC" CC="$CC -n32" cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1767,7 +1819,7 @@ ; return 0; } EOF -if { (eval echo configure:1771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_largefile_CC=' -n32' else @@ -1787,13 +1839,13 @@ fi echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 -echo "configure:1791: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo "configure:1843: checking for _FILE_OFFSET_BITS value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_file_offset_bits=no cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1804,14 +1856,14 @@ ; return 0; } EOF -if { (eval echo configure:1808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1823,7 +1875,7 @@ ; return 0; } EOF -if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_file_offset_bits=64 else @@ -1843,13 +1895,13 @@ fi echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6 -echo "configure:1847: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +echo "configure:1899: checking for _LARGEFILE_SOURCE value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_largefile_source=no cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1860,14 +1912,14 @@ return !ftello; ; return 0; } EOF -if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1879,7 +1931,7 @@ return !ftello; ; return 0; } EOF -if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_largefile_source=1 else @@ -1899,13 +1951,13 @@ fi echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6 -echo "configure:1903: checking for _LARGE_FILES value needed for large files" >&5 +echo "configure:1955: checking for _LARGE_FILES value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_large_files=no cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1916,14 +1968,14 @@ ; return 0; } EOF -if { (eval echo configure:1920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1935,7 +1987,7 @@ ; return 0; } EOF -if { (eval echo configure:1939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_large_files=1 else @@ -1955,13 +2007,13 @@ fi echo $ac_n "checking for _XOPEN_SOURCE value needed for large files""... $ac_c" 1>&6 -echo "configure:1959: checking for _XOPEN_SOURCE value needed for large files" >&5 +echo "configure:2011: checking for _XOPEN_SOURCE value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_sys_xopen_source=no cat > conftest.$ac_ext < int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; @@ -1972,14 +2024,14 @@ return !ftello; ; return 0; } EOF -if { (eval echo configure:1976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1991,7 +2043,7 @@ return !ftello; ; return 0; } EOF -if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_xopen_source=500 else @@ -2024,7 +2076,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2028: checking for a BSD compatible install" >&5 +echo "configure:2080: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2081,7 +2133,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2085: checking for $ac_word" >&5 +echo "configure:2137: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2113,7 +2165,7 @@ # Extract the first word of "docbook-to-man", so it can be a program name with args. set dummy docbook-to-man; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2117: checking for $ac_word" >&5 +echo "configure:2169: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DOCBOOK_TO_MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2150,7 +2202,7 @@ HAVE_DOCBOOK_TO_MAN_FALSE= fi echo $ac_n "checking for faqprog.pl""... $ac_c" 1>&6 -echo "configure:2154: checking for faqprog.pl" >&5 +echo "configure:2206: checking for faqprog.pl" >&5 if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then working_faqprog=yes FAQPROG="faqprog.pl" @@ -2175,7 +2227,7 @@ # Extract the first word of "docbook2texi", so it can be a program name with args. set dummy docbook2texi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2179: checking for $ac_word" >&5 +echo "configure:2231: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DOCBOOK_TO_TEXI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2203,7 +2255,7 @@ fi echo $ac_n "checking for sgml to texi tools""... $ac_c" 1>&6 -echo "configure:2207: checking for sgml to texi tools" >&5 +echo "configure:2259: checking for sgml to texi tools" >&5 working_sgmltotexi=no if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then @@ -2306,7 +2358,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2310: checking for BSD-compatible nm" >&5 +echo "configure:2362: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2342,7 +2394,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2346: checking command to parse $NM output" >&5 +echo "configure:2398: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2405,10 +2457,10 @@ #endif int main(){nm_test_var='a';nm_test_func;return 0;} EOF -if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2412: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:2464: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # Try sorting and uniquifying the output. if sort "$ac_nlist" | uniq > "$ac_nlist"T; then @@ -2466,7 +2518,7 @@ ac_save_CFLAGS="$CFLAGS" LIBS="conftestm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_pipe_works=yes else echo "configure: failed program was:" >&5 @@ -2517,7 +2569,7 @@ if test "$tmp_do_check" = "yes"; then echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:2521: checking for _ prefix in compiled symbols" >&5 +echo "configure:2573: checking for _ prefix in compiled symbols" >&5 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2526,10 +2578,10 @@ void nm_test_func(){} int main(){nm_test_func;return 0;} EOF -if { (eval echo configure:2530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. ac_nlist=conftest.nm - if { (eval echo configure:2533: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + if { (eval echo configure:2585: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then # See whether the symbols have a leading underscore. if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then ac_cv_sys_symbol_underscore=yes @@ -2553,7 +2605,7 @@ else echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:2557: checking for _ prefix in compiled symbols" >&5 +echo "configure:2609: checking for _ prefix in compiled symbols" >&5 fi echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6 if test x$ac_cv_sys_symbol_underscore = xyes; then @@ -2564,7 +2616,7 @@ fi echo $ac_n "checking for option to create PIC""... $ac_c" 1>&6 -echo "configure:2568: checking for option to create PIC" >&5 +echo "configure:2620: checking for option to create PIC" >&5 CFLAGS_PIC= NO_PIC=no if test "$cross_compiling" = yes; then @@ -2629,7 +2681,7 @@ fi echo $ac_n "checking how to specify -export-dynamic""... $ac_c" 1>&6 -echo "configure:2633: checking how to specify -export-dynamic" >&5 +echo "configure:2685: checking how to specify -export-dynamic" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assume none" 1>&6 CFLAGS_EXPORTDYNAMIC="" @@ -2639,7 +2691,7 @@ else if { ac_try='${CC-cc} $CFLAGS -Wl,--version 2>&1 | - grep "GNU ld" >/dev/null'; { (eval echo configure:2643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + grep "GNU ld" >/dev/null'; { (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then # using gnu's linker gnupg_cv_export_dynamic="-Wl,-export-dynamic" else @@ -2742,7 +2794,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2746: checking for $ac_word" >&5 +echo "configure:2798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2770,12 +2822,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2774: checking for ANSI C header files" >&5 +echo "configure:2826: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2783,7 +2835,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2800,7 +2852,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2818,7 +2870,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2839,7 +2891,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2850,7 +2902,7 @@ exit (0); } EOF -if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2874,12 +2926,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2878: checking for working const" >&5 +echo "configure:2930: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2949,21 +3001,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2953: checking for inline" >&5 +echo "configure:3005: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2989,12 +3041,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2993: checking for off_t" >&5 +echo "configure:3045: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3022,12 +3074,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3026: checking for size_t" >&5 +echo "configure:3078: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3057,19 +3109,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:3061: checking for working alloca.h" >&5 +echo "configure:3113: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -3090,12 +3142,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3094: checking for alloca" >&5 +echo "configure:3146: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3155,12 +3207,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3159: checking whether alloca needs Cray hooks" >&5 +echo "configure:3211: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3189: checking for $ac_func" >&5 +echo "configure:3241: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3240,7 +3292,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3244: checking stack direction for C alloca" >&5 +echo "configure:3296: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3248,7 +3300,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3292,17 +3344,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3296: checking for $ac_hdr" >&5 +echo "configure:3348: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3331,12 +3383,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3335: checking for $ac_func" >&5 +echo "configure:3387: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3384,7 +3436,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3388: checking for working mmap" >&5 +echo "configure:3440: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3392,7 +3444,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3554,23 +3606,60 @@ fi - - for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h + + echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 +echo "configure:3612: checking whether we are using the GNU C Library 2.1 or newer" >&5 +if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "Lucky GNU user" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_gnu_library_2_1=yes +else + rm -rf conftest* + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + + +fi + +echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 + + GLIBC21="$ac_cv_gnu_library_2_1" + + + + for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3564: checking for $ac_hdr" >&5 +echo "configure:3653: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3596,16 +3685,17 @@ fi done - for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next + for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3604: checking for $ac_func" >&5 +echo "configure:3694: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3653,85 +3743,184 @@ done - if test "${ac_cv_func_stpcpy+set}" != "set"; then - for ac_func in stpcpy -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3661: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + + + # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then + withval="$with_libiconv_prefix" + + for dir in `echo "$withval" | tr : ' '`; do + if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi + if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi + done + +fi + + + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +echo "configure:3762: checking for iconv" >&5 +if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - +#include +#include +int main() { +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); +; return 0; } +EOF +if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_func_iconv=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS -liconv" + cat > conftest.$ac_ext < +#include int main() { +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); +; return 0; } +EOF +if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + LIBS="$am_save_LIBS" + fi + +fi -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me +echo "$ac_t""$am_cv_func_iconv" 1>&6 + if test "$am_cv_func_iconv" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ICONV 1 +EOF + + echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 +echo "configure:3823: checking for iconv declaration" >&5 + if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else -$ac_func(); +size_t iconv(); #endif +int main() { + ; return 0; } EOF -if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + am_cv_proto_iconv_arg1="" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + am_cv_proto_iconv_arg1="const" fi rm -f conftest* + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 + cat >> confdefs.h <&6 +echo "configure:3877: checking for nl_langinfo and CODESET" >&5 +if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$ac_t""no" 1>&6 + cat > conftest.$ac_ext < +int main() { +char* cs = nl_langinfo(CODESET); +; return 0; } +EOF +if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_langinfo_codeset=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_langinfo_codeset=no +fi +rm -f conftest* + fi -done - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_STPCPY 1 +echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 + if test $am_cv_langinfo_codeset = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LANGINFO_CODESET 1 EOF - fi + fi if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3723: checking for LC_MESSAGES" >&5 +echo "configure:3912: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3752,7 +3941,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3756: checking whether NLS is requested" >&5 +echo "configure:3945: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3764,7 +3953,9 @@ echo "$ac_t""$USE_NLS" 1>&6 + BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no + INTLLIBS= if test "$USE_NLS" = "yes"; then cat >> confdefs.h <<\EOF @@ -3772,7 +3963,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3776: checking whether included gettext is requested" >&5 +echo "configure:3967: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3785,23 +3976,24 @@ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE + CATOBJEXT=NONE + + + ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3795: checking for libintl.h" >&5 +echo "configure:3987: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3817,134 +4009,144 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3822: checking for gettext in libc" >&5 -if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then + echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 +echo "configure:4014: checking for GNU gettext in libc" >&5 +if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +extern int _nl_msg_cat_cntr; int main() { -return (int) gettext ("") +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - gt_cv_func_gettext_libc=yes + gt_cv_func_gnugettext1_libc=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - gt_cv_func_gettext_libc=no + gt_cv_func_gnugettext1_libc=no fi rm -f conftest* fi -echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 +echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 - if test "$gt_cv_func_gettext_libc" != "yes"; then - echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3850: checking for bindtextdomain in -lintl" >&5 -ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 +echo "configure:4044: checking for GNU gettext in libintl" >&5 +if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lintl $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < +extern int _nl_msg_cat_cntr; int main() { -bindtextdomain() +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + gt_cv_func_gnugettext1_libintl=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + gt_cv_func_gnugettext1_libintl=no fi rm -f conftest* -LIBS="$ac_save_LIBS" - + LIBS="$gt_save_LIBS" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3885: checking for gettext in libintl" >&5 -if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3890: checking for gettext in -lintl" >&5 -ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + +echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6 + fi + + if test "$gt_cv_func_gnugettext1_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl $LIBICONV" + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + for ac_func in dcgettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:4093: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lintl $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettext(); +char $ac_func(); int main() { -gettext() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - gt_cv_func_gettext_libintl=yes -else - echo "$ac_t""no" 1>&6 -gt_cv_func_gettext_libintl=no fi -fi - -echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF + LIBS="$gt_save_LIBS" - # Extract the first word of "msgfmt", so it can be a program name with args. + # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3948: checking for $ac_word" >&5 +echo "configure:4150: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3974,66 +4176,11 @@ else echo "$ac_t""no" 1>&6 fi - if test "$MSGFMT" != "no"; then - for ac_func in dcgettext -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3982: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -fi -done - - # Extract the first word of "gmsgfmt", so it can be a program name with args. + if test "$MSGFMT" != "no"; then + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4037: checking for $ac_word" >&5 +echo "configure:4184: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4066,10 +4213,12 @@ echo "$ac_t""no" 1>&6 fi - # Extract the first word of "xgettext", so it can be a program name with args. + fi + + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4073: checking for $ac_word" >&5 +echo "configure:4222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4100,30 +4249,9 @@ echo "$ac_t""no" 1>&6 fi - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - CATOBJEXT=.gmo - DATADIRNAME=share -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo - DATADIRNAME=lib -fi -rm -f conftest* - INSTOBJEXT=.mo - fi - fi + CATOBJEXT=.gmo + fi else echo "$ac_t""no" 1>&6 @@ -4131,270 +4259,6 @@ if test "$CATOBJEXT" = "NONE"; then - echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:4136: checking whether catgets can be used" >&5 - # Check whether --with-catgets or --without-catgets was given. -if test "${with_catgets+set}" = set; then - withval="$with_catgets" - nls_cv_use_catgets=$withval -else - nls_cv_use_catgets=no -fi - - echo "$ac_t""$nls_cv_use_catgets" 1>&6 - - if test "$nls_cv_use_catgets" = "yes"; then - echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:4149: checking for main in -li" >&5 -ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-li $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:4192: checking for catgets" >&5 -if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char catgets(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_catgets) || defined (__stub___catgets) -choke me -#else -catgets(); -#endif - -; return 0; } -EOF -if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_catgets=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_catgets=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_CATGETS 1 -EOF - - INTLOBJS="\$(CATOBJS)" - # Extract the first word of "gencat", so it can be a program name with args. -set dummy gencat; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4242: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GENCAT" in - /*) - ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GENCAT="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no" - ;; -esac -fi -GENCAT="$ac_cv_path_GENCAT" -if test -n "$GENCAT"; then - echo "$ac_t""$GENCAT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - if test "$GENCAT" != "no"; then - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4278: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GMSGFMT" in - /*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" - ;; -esac -fi -GMSGFMT="$ac_cv_path_GMSGFMT" -if test -n "$GMSGFMT"; then - echo "$ac_t""$GMSGFMT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test "$GMSGFMT" = "no"; then - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4315: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GMSGFMT" in - /*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no" - ;; -esac -fi -GMSGFMT="$ac_cv_path_GMSGFMT" -if test -n "$GMSGFMT"; then - echo "$ac_t""$GMSGFMT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4350: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test -n "$XGETTEXT"; then - echo "$ac_t""$XGETTEXT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi -else - echo "$ac_t""no" 1>&6 -fi - - fi - fi - - if test "$CATOBJEXT" = "NONE"; then nls_cv_use_gnu_gettext=yes fi fi @@ -4404,7 +4268,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4408: checking for $ac_word" >&5 +echo "configure:4272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4438,7 +4302,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4442: checking for $ac_word" >&5 +echo "configure:4306: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4474,7 +4338,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4478: checking for $ac_word" >&5 +echo "configure:4342: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4506,15 +4370,11 @@ fi + BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi if test "$XGETTEXT" != ":"; then @@ -4526,22 +4386,65 @@ fi fi - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + POSUB=po fi - - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi + + for ac_prog in bison +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:4404: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_INTLBISON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +INTLBISON="$ac_cv_prog_INTLBISON" +if test -n "$INTLBISON"; then + echo "$ac_t""$INTLBISON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$INTLBISON" && break +done + + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + echo $ac_n "checking version of bison""... $ac_c" 1>&6 +echo "configure:4437: checking version of bison" >&5 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + echo "$ac_t""$ac_prog_version" 1>&6 + fi + if test $ac_verc_fail = yes; then + INTLBISON=: fi for lang in $ALL_LINGUAS; do @@ -4558,7 +4461,17 @@ + + nls_cv_header_intl= + nls_cv_header_libgt= + + DATADIRNAME=share + + INSTOBJEXT=.mo + + + GENCAT=gencat @@ -4567,12 +4480,23 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4571: checking for catalogs to be installed" >&5 +echo "configure:4484: checking for catalogs to be installed" >&5 NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi done LINGUAS=$NEW_LINGUAS echo "$ac_t""$LINGUAS" 1>&6 @@ -4583,66 +4507,6 @@ fi fi - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - - - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4599: checking for linux/version.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - msgformat=linux -else - echo "$ac_t""no" 1>&6 -msgformat=xopen -fi - - - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - - - MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" @@ -4652,26 +4516,14 @@ fi - l= + INTL_LIBTOOL_SUFFIX_PREFIX= - - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES else USE_NLS=no USE_INCLUDED_LIBINTL=no +BUILD_INCLUDED_LIBINTL=no + fi @@ -4681,17 +4533,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4685: checking for $ac_hdr" >&5 +echo "configure:4537: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4719,7 +4571,7 @@ if test "$ac_cv_header_gdbm_h" = yes ; then echo $ac_n "checking for gdbm_firstkey in -lgdbm""... $ac_c" 1>&6 -echo "configure:4723: checking for gdbm_firstkey in -lgdbm" >&5 +echo "configure:4575: checking for gdbm_firstkey in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_firstkey | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4727,7 +4579,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4774,7 +4626,7 @@ ;; *) echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4778: checking for gethostbyname in -lnsl" >&5 +echo "configure:4630: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4782,7 +4634,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4821,7 +4673,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:4825: checking for socket in -lsocket" >&5 +echo "configure:4677: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4829,7 +4681,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4866,7 +4718,7 @@ fi if test x$ac_try_nsl = x1; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4870: checking for gethostbyname in -lnsl" >&5 +echo "configure:4722: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4874,7 +4726,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4916,7 +4768,7 @@ if test "$try_dynload" = yes ; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4920: checking for dlopen in -ldl" >&5 +echo "configure:4772: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4924,7 +4776,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4977,12 +4829,12 @@ for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4981: checking for $ac_func" >&5 +echo "configure:4833: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5042,7 +4894,7 @@ use_gnupg_extensions=yes else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:5046: checking for shl_load in -ldld" >&5 +echo "configure:4898: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5050,7 +4902,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5104,7 +4956,7 @@ fi else echo $ac_n "checking for dynamic loading""... $ac_c" 1>&6 -echo "configure:5108: checking for dynamic loading" >&5 +echo "configure:4960: checking for dynamic loading" >&5 DYNLINK_LDFLAGS= DYNLINK_MOD_CFLAGS= use_gnupg_extensions=no @@ -5125,12 +4977,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5129: checking for ANSI C header files" >&5 +echo "configure:4981: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5138,7 +4990,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5155,7 +5007,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5173,7 +5025,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5194,7 +5046,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5205,7 +5057,7 @@ exit (0); } EOF -if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5232,17 +5084,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5236: checking for $ac_hdr" >&5 +echo "configure:5088: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5271,12 +5123,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5275: checking for working const" >&5 +echo "configure:5127: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5346,21 +5198,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5350: checking for inline" >&5 +echo "configure:5202: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5386,12 +5238,12 @@ esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5390: checking for size_t" >&5 +echo "configure:5242: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5419,12 +5271,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5423: checking return type of signal handlers" >&5 +echo "configure:5275: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5441,7 +5293,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5460,12 +5312,12 @@ echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:5464: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:5316: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5477,7 +5329,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:5481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -5502,14 +5354,14 @@ echo "configure: warning: cross compiling; assuming little endianess" 1>&2 fi echo $ac_n "checking endianess""... $ac_c" 1>&6 -echo "configure:5506: checking endianess" >&5 +echo "configure:5358: checking endianess" >&5 if eval "test \"`echo '$''{'gnupg_cv_c_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gnupg_cv_c_endian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -5520,11 +5372,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:5524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -5535,7 +5387,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:5539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_c_endian=big else @@ -5556,7 +5408,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_c_endian=little else @@ -5601,12 +5453,12 @@ echo $ac_n "checking for byte typedef""... $ac_c" 1>&6 -echo "configure:5605: checking for byte typedef" >&5 +echo "configure:5457: checking for byte typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_byte'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5618,7 +5470,7 @@ ; return 0; } EOF -if { (eval echo configure:5622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_byte=yes else @@ -5639,12 +5491,12 @@ fi echo $ac_n "checking for ushort typedef""... $ac_c" 1>&6 -echo "configure:5643: checking for ushort typedef" >&5 +echo "configure:5495: checking for ushort typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_ushort'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5656,7 +5508,7 @@ ; return 0; } EOF -if { (eval echo configure:5660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ushort=yes else @@ -5677,12 +5529,12 @@ fi echo $ac_n "checking for ulong typedef""... $ac_c" 1>&6 -echo "configure:5681: checking for ulong typedef" >&5 +echo "configure:5533: checking for ulong typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5694,7 +5546,7 @@ ; return 0; } EOF -if { (eval echo configure:5698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_ulong=yes else @@ -5715,12 +5567,12 @@ fi echo $ac_n "checking for u16 typedef""... $ac_c" 1>&6 -echo "configure:5719: checking for u16 typedef" >&5 +echo "configure:5571: checking for u16 typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_u16'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5732,7 +5584,7 @@ ; return 0; } EOF -if { (eval echo configure:5736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u16=yes else @@ -5753,12 +5605,12 @@ fi echo $ac_n "checking for u32 typedef""... $ac_c" 1>&6 -echo "configure:5757: checking for u32 typedef" >&5 +echo "configure:5609: checking for u32 typedef" >&5 if eval "test \"`echo '$''{'gnupg_cv_typedef_u32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5770,7 +5622,7 @@ ; return 0; } EOF -if { (eval echo configure:5774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_typedef_u32=yes else @@ -5792,7 +5644,7 @@ echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:5796: checking size of unsigned short" >&5 +echo "configure:5648: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5800,7 +5652,7 @@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < #include @@ -5812,7 +5664,7 @@ exit(0); } EOF -if { (eval echo configure:5816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -5832,7 +5684,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:5836: checking size of unsigned int" >&5 +echo "configure:5688: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5840,7 +5692,7 @@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < #include @@ -5852,7 +5704,7 @@ exit(0); } EOF -if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -5872,7 +5724,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:5876: checking size of unsigned long" >&5 +echo "configure:5728: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5880,7 +5732,7 @@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < #include @@ -5892,7 +5744,7 @@ exit(0); } EOF -if { (eval echo configure:5896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -5912,7 +5764,7 @@ echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:5916: checking size of unsigned long long" >&5 +echo "configure:5768: checking size of unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5920,7 +5772,7 @@ ac_cv_sizeof_unsigned_long_long=0 else cat > conftest.$ac_ext < #include @@ -5932,7 +5784,7 @@ exit(0); } EOF -if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long_long=`cat conftestval` else @@ -5961,12 +5813,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5965: checking for vprintf" >&5 +echo "configure:5817: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -6013,12 +5865,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:6017: checking for _doprnt" >&5 +echo "configure:5869: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -6068,12 +5920,12 @@ for ac_func in strerror stpcpy strlwr stricmp tcgetattr rand strtoul mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6072: checking for $ac_func" >&5 +echo "configure:5924: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6123,12 +5975,12 @@ for ac_func in memmove gettimeofday getrusage gethrtime setrlimit clock_gettime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6127: checking for $ac_func" >&5 +echo "configure:5979: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6178,12 +6030,12 @@ for ac_func in memicmp atexit raise getpagesize strftime nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6182: checking for $ac_func" >&5 +echo "configure:6034: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6233,12 +6085,12 @@ for ac_func in waitpid wait4 sigaction sigprocmask fseeko do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6237: checking for $ac_func" >&5 +echo "configure:6089: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6289,12 +6141,12 @@ for ac_func in mlock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6293: checking for $ac_func" >&5 +echo "configure:6145: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6346,17 +6198,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6350: checking for $ac_hdr" >&5 +echo "configure:6202: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6385,7 +6237,7 @@ if test "$ac_cv_header_sys_mman_h" = "yes"; then # Add librt to LIBS: echo $ac_n "checking for memlk in -lrt""... $ac_c" 1>&6 -echo "configure:6389: checking for memlk in -lrt" >&5 +echo "configure:6241: checking for memlk in -lrt" >&5 ac_lib_var=`echo rt'_'memlk | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6393,7 +6245,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6432,12 +6284,12 @@ fi echo $ac_n "checking whether mlock is in sys/mman.h""... $ac_c" 1>&6 -echo "configure:6436: checking whether mlock is in sys/mman.h" >&5 +echo "configure:6288: checking whether mlock is in sys/mman.h" >&5 if eval "test \"`echo '$''{'gnupg_cv_mlock_is_in_sys_mman'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6462,7 +6314,7 @@ ; return 0; } EOF -if { (eval echo configure:6466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gnupg_cv_mlock_is_in_sys_mman=yes else @@ -6485,7 +6337,7 @@ fi if test "$ac_cv_func_mlock" = "yes"; then echo $ac_n "checking whether mlock is broken""... $ac_c" 1>&6 -echo "configure:6489: checking whether mlock is broken" >&5 +echo "configure:6341: checking whether mlock is broken" >&5 if eval "test \"`echo '$''{'gnupg_cv_have_broken_mlock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6494,7 +6346,7 @@ else cat > conftest.$ac_ext < @@ -6524,7 +6376,7 @@ EOF -if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_have_broken_mlock="no" else @@ -6558,17 +6410,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6562: checking for $ac_hdr" >&5 +echo "configure:6414: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6595,12 +6447,12 @@ done echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:6599: checking if mkdir takes one argument" >&5 +echo "configure:6451: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gnupg_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6617,7 +6469,7 @@ mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:6621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_mkdir_takes_one_arg=no else @@ -6644,17 +6496,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6648: checking for $ac_hdr" >&5 +echo "configure:6500: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6682,7 +6534,7 @@ if test "$ac_cv_header_sys_capability_h" = "yes" ; then echo $ac_n "checking for cap_init in -lcap""... $ac_c" 1>&6 -echo "configure:6686: checking for cap_init in -lcap" >&5 +echo "configure:6538: checking for cap_init in -lcap" >&5 ac_lib_var=`echo cap'_'cap_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6690,7 +6542,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6749,17 +6601,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6753: checking for $ac_hdr" >&5 +echo "configure:6605: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6787,7 +6639,7 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then echo $ac_n "checking whether IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6 -echo "configure:6791: checking whether IPC_RMID allowes subsequent attaches" >&5 +echo "configure:6643: checking whether IPC_RMID allowes subsequent attaches" >&5 if eval "test \"`echo '$''{'gnupg_cv_ipc_rmid_deferred_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6795,7 +6647,7 @@ gnupg_cv_ipc_rmid_deferred_release="assume-no" else cat > conftest.$ac_ext < @@ -6821,7 +6673,7 @@ } EOF -if { (eval echo configure:6825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gnupg_cv_ipc_rmid_deferred_release="yes" else @@ -6851,12 +6703,12 @@ fi echo $ac_n "checking whether SHM_LOCK is available""... $ac_c" 1>&6 -echo "configure:6855: checking whether SHM_LOCK is available" >&5 +echo "configure:6707: checking whether SHM_LOCK is available" >&5 if eval "test \"`echo '$''{'gnupg_cv_ipc_have_shm_lock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6868,7 +6720,7 @@ ; return 0; } EOF -if { (eval echo configure:6872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gnupg_cv_ipc_have_shm_lock="yes" else @@ -6902,7 +6754,7 @@ if test "$try_dev_random" = yes ; then echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:6906: checking for random device" >&5 +echo "configure:6758: checking for random device" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6919,7 +6771,7 @@ fi else echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:6923: checking for random device" >&5 +echo "configure:6775: checking for random device" >&5 ac_cv_have_dev_random=no echo "$ac_t""has been disabled" 1>&6 fi @@ -6929,17 +6781,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6933: checking for $ac_hdr" >&5 +echo "configure:6785: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6966,7 +6818,7 @@ done echo $ac_n "checking for random device ioctl""... $ac_c" 1>&6 -echo "configure:6970: checking for random device ioctl" >&5 +echo "configure:6822: checking for random device ioctl" >&5 if eval "test \"`echo '$''{'ac_cv_have_dev_random_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7120,7 +6972,7 @@ echo $ac_n "checking for mpi assembler functions""... $ac_c" 1>&6 -echo "configure:7124: checking for mpi assembler functions" >&5 +echo "configure:6976: checking for mpi assembler functions" >&5 if test -f $srcdir/mpi/config.links ; then . $srcdir/mpi/config.links if test "x$wk_link_files_src" = "x"; then @@ -7162,17 +7014,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7166: checking for $ac_hdr" >&5 +echo "configure:7018: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7200,7 +7052,7 @@ if test "$ac_cv_header_zlib_h" = yes ; then echo $ac_n "checking for deflateInit2_ in -lz""... $ac_c" 1>&6 -echo "configure:7204: checking for deflateInit2_ in -lz" >&5 +echo "configure:7056: checking for deflateInit2_ in -lz" >&5 ac_lib_var=`echo z'_'deflateInit2_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7208,7 +7060,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7536,27 +7388,27 @@ s%@NM@%$NM%g s%@RANLIB@%$RANLIB%g s%@ALLOCA@%$ALLOCA%g +s%@GLIBC21@%$GLIBC21%g +s%@LIBICONV@%$LIBICONV%g s%@USE_NLS@%$USE_NLS%g s%@MSGFMT@%$MSGFMT%g s%@GMSGFMT@%$GMSGFMT%g s%@XGETTEXT@%$XGETTEXT%g -s%@GENCAT@%$GENCAT%g +s%@INTLBISON@%$INTLBISON%g +s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g s%@CATALOGS@%$CATALOGS%g s%@CATOBJEXT@%$CATOBJEXT%g -s%@DATADIRNAME@%$DATADIRNAME%g s%@GMOFILES@%$GMOFILES%g -s%@INSTOBJEXT@%$INSTOBJEXT%g -s%@INTLDEPS@%$INTLDEPS%g s%@INTLLIBS@%$INTLLIBS%g s%@INTLOBJS@%$INTLOBJS%g s%@POFILES@%$POFILES%g s%@POSUB@%$POSUB%g -s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g -s%@GT_NO@%$GT_NO%g -s%@GT_YES@%$GT_YES%g +s%@DATADIRNAME@%$DATADIRNAME%g +s%@INSTOBJEXT@%$INSTOBJEXT%g +s%@GENCAT@%$GENCAT%g s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g -s%@l@%$l%g +s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g s%@ENABLE_GNUPG_EXTENSIONS_TRUE@%$ENABLE_GNUPG_EXTENSIONS_TRUE%g s%@ENABLE_GNUPG_EXTENSIONS_FALSE@%$ENABLE_GNUPG_EXTENSIONS_FALSE%g s%@DYNLINK_LDFLAGS@%$DYNLINK_LDFLAGS%g @@ -7792,8 +7644,8 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -7849,9 +7701,32 @@ EOF cat >> $CONFIG_STATUS <<\EOF test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac +for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + echo creating "$ac_dir/POTFILES" + sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" + echo creating "$ac_dir/Makefile" + sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + fi + ;; + esac + done cat >g10defs.tmp < + -- James Troup , Horsforth, UK diff -urN gnupg-1.0.5/debian/changelog gnupg-1.0.6/debian/changelog --- gnupg-1.0.5/debian/changelog Thu Mar 8 19:31:02 2001 +++ gnupg-1.0.6/debian/changelog Sun May 6 12:53:04 2001 @@ -1,3 +1,30 @@ +gnupg (1.0.5-1) unstable; urgency=low + + * New upstream version. + * debian/README.Debian: fix spelling and update URL. + * debian/rules (binary): remove the new info files. + * scripts/config.{guess,sub}: sync with subversions, closes: #95729. + + -- James Troup Mon, 30 Apr 2001 02:12:38 +0100 + +gnupg (1.0.4-4) unstable; urgency=low + + * po/ru.po: patch by Ilya Martynov to replace German + entries and add missing translations, closes: #93987. + * g10/revoke.c (ask_revocation_reason): typo fix (s/non longer/no + longer/g); noticed by Colin Watson , closes: + #93664. + + * Deprecated depreciated; noticed by Vincent Broman + . + + * Following two patches are from Vincent Broman. + * g10/mainproc.c (proc_tree): use iobuf_get_real_fname() in preference + to iobuf_get_fname(). + * g10/openfile.c (open_sigfile): handle .sign prefixed files correctly. + + -- James Troup Fri, 20 Apr 2001 23:32:44 +0100 + gnupg (1.0.4-3) unstable; urgency=medium * debian/rules (binary): make gpg binary suid, closes: #86433. diff -urN gnupg-1.0.5/debian/copyright gnupg-1.0.6/debian/copyright --- gnupg-1.0.5/debian/copyright Mon Oct 16 17:43:42 2000 +++ gnupg-1.0.6/debian/copyright Sun May 6 12:53:04 2001 @@ -3,14 +3,14 @@ This package was put together by me, James Troup , from the sources, which I obtained from -ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.3.tar.gz. The changes +ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.5.tar.gz. The changes were minimal, namely: - adding support for the Debian package maintenance scheme, by adding various debian/* files. -Program Copyright (C) 1998, 1999 Free Software Foundation, Inc. -Modifications for Debian Copyright (C) 1998, 1999, 2000 James Troup. +Program Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +Modifications for Debian Copyright (C) 1998, 1999, 2000, 2001 James Troup. 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 diff -urN gnupg-1.0.5/debian/rules gnupg-1.0.6/debian/rules --- gnupg-1.0.5/debian/rules Thu Mar 8 19:31:02 2001 +++ gnupg-1.0.6/debian/rules Sun May 6 12:53:04 2001 @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# debian/rules file - for GNUPG (1.0.3) +# debian/rules file - for GNUPG (1.0.5) # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 1994,1995 by Ian Jackson. # Copyright 1998 James Troup @@ -34,8 +34,10 @@ $(checkdir) -rm -rf debian/tmp install -d debian/tmp/DEBIAN/ - install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/ + install -m 755 debian/preinst debian/prerm debian/postinst debian/tmp/DEBIAN/ $(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install + # copies of the manpage which can't be grokked by install-info + rm debian/tmp/usr/info/* $(STRIP) debian/tmp/usr/bin/* chmod 4755 debian/tmp/usr/bin/gpg chmod 644 debian/tmp/usr/lib/gnupg/* diff -urN gnupg-1.0.5/doc/DETAILS gnupg-1.0.6/doc/DETAILS --- gnupg-1.0.5/doc/DETAILS Thu Apr 19 12:01:02 2001 +++ gnupg-1.0.6/doc/DETAILS Sun May 27 16:46:15 2001 @@ -11,6 +11,7 @@ sec = secret key ssb = secret subkey (secondary key) uid = user id (only field 10 is used). + sig = signature fpr = fingerprint: (fingerprint is in field 10) pkd = public key data (special field format, see below) @@ -47,7 +48,9 @@ information may follow in some future versions. 10. Field: User-ID. The value is quoted like a C string to avoid control characters (the colon is quoted "\x3a"). -11. Field: Signature class +11. Field: Signature class. This is a 2 digit hexnumber followed by + either the letter 'x' for an exportable signature or the + letter 'l' for a local-only signature. 12. Field: Key capabilities: e = encrypt s = sign @@ -56,9 +59,12 @@ addition to these letters, uppercase version of the letter to denote the _usable_ capabilities of the entire key. -All dates are displayed in the format yyyy-mm-dd unless you use the option ---fixed-list-mode in which case they are dispplay as seconds since epoch. -More fields may be added later. +All dates are displayed in the format yyyy-mm-dd unless you use the +option --fixed-list-mode in which case they are displayed as seconds +since Epoch. More fields may be added later, so parsers should be +prepared for this. When parsing a number the parser should stop at the +first non-number character so that additional information can later be +added. If field 1 has the tag "pkd", a listing looks like this: pkd:0:1024:B665B1435F4C2 .... FF26ABB: diff -urN gnupg-1.0.5/doc/FAQ gnupg-1.0.6/doc/FAQ --- gnupg-1.0.5/doc/FAQ Fri Apr 20 20:19:40 2001 +++ gnupg-1.0.6/doc/FAQ Mon May 28 14:42:02 2001 @@ -57,6 +57,8 @@ 4.13) How can I used GnuPG in an automated environment? 4.14) Which email-client can I use with GnuPG? 4.15) Can't we have a gpg library? + 4.16) I have successfully generated a revocation certificate, but I don't + understand how to send it to the key servers. 5. COMPATIBILITY ISSUES 5.1) How can I encrypt a message with GnuPG so that PGP is able to decrypt it? @@ -443,6 +445,17 @@ do the trick. You'll find it at ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme + +4.16) I have successfully generated a revocation certificate, but I don't + understand how to send it to the key servers. + + Most keyservers don't accept a 'bare' revocation certificate. You + have to import the certificate into gpg first: + gpg --import my-revocation.asc + then send the revoked key to the keyservers: + gpg --keyserver certserver.pgp.com --send-keys mykeyid + (or use a keyserver web interface for this). + 5. COMPATIBILITY ISSUES @@ -504,8 +517,9 @@ 5.5) Why is PGP 5.x not able to verify my messages? PGP 5.x does not accept V4 signatures for data material but OpenPGP - requires generation of V4 signatures for all kind of data. Use the - option "--force-v3-sigs" to generate V3 signatures for data. + requests generation of V4 signatures for all kind of data, that's why + GnuPG defaults to them. Use the option "--force-v3-sigs" to generate + V3 signatures for data. 5.6) How do I transfer owner trust values from PGP to GnuPG? diff -urN gnupg-1.0.5/doc/Makefile.in gnupg-1.0.6/doc/Makefile.in --- gnupg-1.0.5/doc/Makefile.in Sun Apr 29 16:39:42 2001 +++ gnupg-1.0.6/doc/Makefile.in Tue May 29 08:59:09 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ AUTOMAKE_OPTIONS = no-texinfo.tex diff -urN gnupg-1.0.5/doc/README.W32 gnupg-1.0.6/doc/README.W32 --- gnupg-1.0.5/doc/README.W32 Mon Apr 23 19:02:44 2001 +++ gnupg-1.0.6/doc/README.W32 Mon May 28 12:56:46 2001 @@ -1,18 +1,10 @@ This is a binary version of GnuPG for MS-Windows 95, 98, WNT and W2000. - -PLEASE READ THE FOLLOWING PARAGRAPH CAREFULLY: - -If you have a bug report, please post it to the mailing list -. Please don't send me private mail -regarding this version of GnuPG; I am already spending too much -time on answering the same and same questions over and over. -I can improve GnuPG much faster if I don't have to answer -questions in private mail. You can post to the mailing list -without prior subscribing (but please request to CC you if you want -to get an answer). - - +A FAQ comes with this package and a probably more recent one can be +found online at http://www.gnupg.org/faq.html. See +http://www.gnupg.org/docs-mls.html for a list of mailing lists. In +particular the list gnupg-users@gnupg.org might be useful to answer +questions - but please read the FAQ first. Installation instructions: -------------------------- @@ -34,7 +26,7 @@ ----------------------------- 1. Decide where to store the translation files for your language. Here we assume the directory "c:/gnu/locale/fr" - 2. Set the directory with the translations into the Registry under the key: + 2. Set the directory with the translations into the Registry under the key: \\HKEY_CURRENT_USER\Control Panel\Mingw32\NLS\MODir (Example entry: "c:/gnu/locale/fr") 3. Select which language to use and copy the currect translation file @@ -53,7 +45,13 @@ This version has been build with the Mingw32/CPD kit using the latest stable version of GnuPG. -First get the source: It is available at +First get the source: It has to be available at the same location you +found this binary package - if not you should have received a written +offer to get the source delivered to you See the file COPYING (section +3) for details. + +If you got this package from its canonical place (ftp.gnupg.org), the +source is available at: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.0.n.tar.gz @@ -64,7 +62,7 @@ this is the same source as for the Unix version. If your binary version of GnuPG is called something like gnupg-w32-1.0.4-1.zip, you should find a patch file named gnupg-w32-1.0.4-1.0.4-1.diff.gz at the -same location, which has to ne applied to the stock gpg source file. +same location, which has to be applied to the stock gpg source file. Instructions are at the top of this file. To build it, you need the MingW32/CPD kit, which is available at diff -urN gnupg-1.0.5/doc/faq.html gnupg-1.0.6/doc/faq.html --- gnupg-1.0.5/doc/faq.html Fri Apr 20 20:19:40 2001 +++ gnupg-1.0.6/doc/faq.html Mon May 28 14:42:02 2001 @@ -85,6 +85,9 @@
  • 4.15) Can't we have a gpg library? +
  • 4.16) I have successfully generated a revocation certificate, but I don't + understand how to send it to the key servers. +

    5. COMPATIBILITY ISSUES

  • 5.1) How can I encrypt a message with GnuPG so that PGP is able to decrypt it? @@ -570,6 +573,23 @@ do the trick. You'll find it at ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme

    +

    +

    +4.16) I have successfully generated a revocation certificate, but I don't + understand how to send it to the key servers. +

    +

    +Most keyservers don't accept a 'bare' revocation certificate. You +have to import the certificate into gpg first: +

    +gpg --import my-revocation.asc
+
    +then send the revoked key to the keyservers: +
    +gpg --keyserver certserver.pgp.com --send-keys mykeyid
+
    +(or use a keyserver web interface for this). +

    5. COMPATIBILITY ISSUES

    @@ -644,8 +664,9 @@

    PGP 5.x does not accept V4 signatures for data material but OpenPGP -requires generation of V4 signatures for all kind of data. Use the -option "--force-v3-sigs" to generate V3 signatures for data. +requests generation of V4 signatures for all kind of data, that's why +GnuPG defaults to them. Use the option "--force-v3-sigs" to generate +V3 signatures for data.

    5.6) How do I transfer owner trust values from PGP to GnuPG? diff -urN gnupg-1.0.5/doc/faq.raw gnupg-1.0.6/doc/faq.raw --- gnupg-1.0.5/doc/faq.raw Fri Apr 20 16:13:17 2001 +++ gnupg-1.0.6/doc/faq.raw Mon May 28 14:42:00 2001 @@ -397,6 +397,21 @@ do the trick. You'll find it at [H a href=ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme]ftp://ftp.guug.de/pub/gcrypt/alpha/gpgme[H /a] + + I have successfully generated a revocation certificate, but I don't + understand how to send it to the key servers. + + Most keyservers don't accept a 'bare' revocation certificate. You + have to import the certificate into gpg first: + [H pre] + gpg --import my-revocation.asc + [H /pre] + then send the revoked key to the keyservers: + [H pre] + gpg --keyserver certserver.pgp.com --send-keys mykeyid + [H /pre] + (or use a keyserver web interface for this). + COMPATIBILITY ISSUES @@ -460,8 +475,9 @@ Why is PGP 5.x not able to verify my messages? PGP 5.x does not accept V4 signatures for data material but OpenPGP - requires generation of V4 signatures for all kind of data. Use the - option "--force-v3-sigs" to generate V3 signatures for data. + requests generation of V4 signatures for all kind of data, that's why + GnuPG defaults to them. Use the option "--force-v3-sigs" to generate + V3 signatures for data. How do I transfer owner trust values from PGP to GnuPG? diff -urN gnupg-1.0.5/g10/ChangeLog gnupg-1.0.6/g10/ChangeLog --- gnupg-1.0.5/g10/ChangeLog Sat Apr 28 20:16:28 2001 +++ gnupg-1.0.6/g10/ChangeLog Tue May 29 08:33:15 2001 @@ -1,3 +1,52 @@ +2001-05-29 Werner Koch + + * keygen.c (generate_subkeypair): Print a warning if a subkey is + created on a v3 key. Suggested by Brian M. Carlson. + +2001-05-27 Werner Koch + + * keyid.c (get_lsign_letter): New. + * keylist.c (list_keyblock_colon): Use it here. + * mainproc.c (list_node): and here. + + * getkey.c, packet.h, free-packet.c: Removed that useless key + created field; I dunno why I introducded this at all - the + creation time is always bound to the key packet and subject to + fingerprint calculation etc. + + * getkey.c (fixup_uidnode): Add keycreated arg and use this + instead of the signature timestamp to calculate the + help_key_expire. Bug reported by David R. Bergstein. + (merge_selfsigs_main): Correct key expiration time calculation. + (merge_selfsigs_subkey): Ditto. + +2001-05-25 Werner Koch + + * revoke.c (gen_revoke): Add a cast to a tty_printf arg. + * delkey.c (do_delete_key): Ditto. + * keyedit.c (print_and_check_one_sig): Ditto. + (ask_revoke_sig): Ditto. + (menu_revsig): Ditto. + (check_all_keysigs): Removed unused arg. + +2001-05-23 Werner Koch + + * g10.c (opts): Typo fix by Robert C. Ames. + +2001-05-06 Werner Koch + + * revoke.c: Small typo fix + +2001-05-04 Werner Koch + + * passphrase.c (passphrase_clear_cache): Shortcut if agent usage + is not enabled. + +2001-05-01 Werner Koch + + * passphrase.c (writen): Replaced ssize_t by int. Thanks to + to Robert Joop for reporting that SunOS 4.1.4 does not have it. + 2001-04-28 Werner Koch * getkey.c (merge_public_with_secret): pkttype was not set to subkey. @@ -314,7 +363,7 @@ 2001-02-08 Werner Koch - * getkey.c (key_byname): I can happe that we have both, sk and pk + * getkey.c (key_byname): It can happen that we have both, sk and pk NULL, fix for that. * parse-packet.c (parse_one_sig_subpkt): Add support for diff -urN gnupg-1.0.5/g10/Makefile.in gnupg-1.0.6/g10/Makefile.in --- gnupg-1.0.5/g10/Makefile.in Sun Apr 29 16:39:17 2001 +++ gnupg-1.0.6/g10/Makefile.in Tue May 29 08:58:31 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl EXTRA_DIST = OPTIONS pubring.asc options.skel diff -urN gnupg-1.0.5/g10/delkey.c gnupg-1.0.6/g10/delkey.c --- gnupg-1.0.5/g10/delkey.c Thu Mar 8 15:00:37 2001 +++ gnupg-1.0.6/g10/delkey.c Fri May 25 08:56:26 2001 @@ -120,12 +120,12 @@ tty_printf("sec %4u%c/%08lX %s ", nbits_from_sk( sk ), pubkey_letter( sk->pubkey_algo ), - keyid[1], datestr_from_sk(sk) ); + (ulong)keyid[1], datestr_from_sk(sk) ); else tty_printf("pub %4u%c/%08lX %s ", nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), - keyid[1], datestr_from_pk(pk) ); + (ulong)keyid[1], datestr_from_pk(pk) ); p = get_user_id( keyid, &n ); tty_print_utf8_string( p, n ); m_free(p); diff -urN gnupg-1.0.5/g10/free-packet.c gnupg-1.0.6/g10/free-packet.c --- gnupg-1.0.5/g10/free-packet.c Thu Mar 8 15:02:01 2001 +++ gnupg-1.0.6/g10/free-packet.c Sun May 27 16:09:49 2001 @@ -151,7 +151,6 @@ sk->expiredate = pk->expiredate; sk->pubkey_algo = pk->pubkey_algo; sk->pubkey_usage= pk->pubkey_usage; - sk->created = pk->created; sk->req_usage = pk->req_usage; sk->req_algo = pk->req_algo; sk->has_expired = pk->has_expired; diff -urN gnupg-1.0.5/g10/g10.c gnupg-1.0.6/g10/g10.c --- gnupg-1.0.5/g10/g10.c Tue Mar 27 16:53:39 2001 +++ gnupg-1.0.6/g10/g10.c Mon May 28 09:02:14 2001 @@ -307,7 +307,7 @@ { oCompletesNeeded, "completes-needed", 1, "@"}, { oMarginalsNeeded, "marginals-needed", 1, "@"}, { oMaxCertDepth, "max-cert-depth", 1, "@" }, - { oTrustedKey, "trusted-key", 2, N_("|KEYID|ulimately trust this key")}, + { oTrustedKey, "trusted-key", 2, N_("|KEYID|ultimately trust this key")}, { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")}, { oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")}, { oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")}, diff -urN gnupg-1.0.5/g10/getkey.c gnupg-1.0.6/g10/getkey.c --- gnupg-1.0.5/g10/getkey.c Sat Apr 28 12:21:42 2001 +++ gnupg-1.0.6/g10/getkey.c Sun May 27 16:08:33 2001 @@ -1400,7 +1400,7 @@ static void -fixup_uidnode ( KBNODE uidnode, KBNODE signode ) +fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated ) { PKT_user_id *uid = uidnode->pkt->pkt.user_id; PKT_signature *sig = signode->pkt->pkt.signature; @@ -1429,8 +1429,8 @@ /* ditto or the key expiration */ uid->help_key_expire = 0; p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL); - if ( p ) { - uid->help_key_expire = sig->timestamp + buffer_to_u32(p); + if ( p ) { + uid->help_key_expire = keycreated + buffer_to_u32(p); } /* Set the primary user ID flag - we will later wipe out some @@ -1456,6 +1456,7 @@ KBNODE signode, uidnode, uidnode2; u32 curtime = make_timestamp (); unsigned int key_usage = 0; + u32 keytimestamp = 0; u32 key_expire = 0; int key_expire_seen = 0; @@ -1463,7 +1464,8 @@ if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY ) BUG (); pk = keyblock->pkt->pkt.public_key; - pk->created = 0; + keytimestamp = pk->timestamp; + keyid_from_pk( pk, kid ); pk->main_keyid[0] = kid[0]; pk->main_keyid[1] = kid[1]; @@ -1536,13 +1538,11 @@ p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL); if ( p ) { - key_expire = sig->timestamp + buffer_to_u32(p); + key_expire = keytimestamp + buffer_to_u32(p); key_expire_seen = 1; } } - /* and set the created field */ - pk->created = sigdate; - /* and mark that key as valid: one direct key signature should + /* mark that key as valid: one direct key signature should * render a key as valid */ pk->is_valid = 1; } @@ -1556,7 +1556,7 @@ if ( k->pkt->pkttype == PKT_USER_ID || k->pkt->pkttype == PKT_PHOTO_ID ) { if ( uidnode && signode ) - fixup_uidnode ( uidnode, signode ); + fixup_uidnode ( uidnode, signode, keytimestamp ); uidnode = k; signode = NULL; if ( sigdate > uiddate ) @@ -1593,24 +1593,12 @@ } } if ( uidnode && signode ) { - fixup_uidnode ( uidnode, signode ); + fixup_uidnode ( uidnode, signode, keytimestamp ); pk->is_valid = 1; } if ( sigdate > uiddate ) uiddate = sigdate; - /* if we do not have a direct key signature, take the key creation date - * from the latest user ID. Hmmm, another possibilty would be to take - * it from the latest primary user ID - but we don't implement it for - * now */ - if ( !pk->created ) - pk->created = uiddate; - if ( !pk->created ) { - /* oops, still no creation date: use the timestamp */ - if (DBG_CACHE) - log_debug( "merge_selfsigs_main: " - "using timestamp as creation date\n"); - pk->created = pk->timestamp; - } + /* Now that we had a look at all user IDs we can now get some information * from those user IDs. @@ -1712,6 +1700,7 @@ KBNODE signode; u32 curtime = make_timestamp (); unsigned int key_usage = 0; + u32 keytimestamp = 0; u32 key_expire = 0; const byte *p; size_t n; @@ -1723,6 +1712,8 @@ return; /* (actually this should never happen) */ keyid_from_pk( mainpk, mainkid ); subpk = subnode->pkt->pkt.public_key; + keytimestamp = subpk->timestamp; + subpk->is_valid = 0; subpk->main_keyid[0] = mainpk->main_keyid[0]; subpk->main_keyid[1] = mainpk->main_keyid[1]; @@ -1760,12 +1751,10 @@ } if ( !signode ) { - subpk->created = subpk->timestamp; return; /* no valid key binding */ } subpk->is_valid = 1; - subpk->created = sigdate; sig = signode->pkt->pkt.signature; p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n ); @@ -1789,7 +1778,7 @@ p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL); if ( p ) - key_expire = sig->timestamp + buffer_to_u32(p); + key_expire = keytimestamp + buffer_to_u32(p); else key_expire = 0; subpk->has_expired = key_expire >= curtime? 0 : key_expire; @@ -2150,8 +2139,8 @@ if (DBG_CACHE) log_debug( "\tsubkey looks fine\n"); - if ( pk->created > latest_date ) { - latest_date = pk->created; + if ( pk->timestamp > latest_date ) { + latest_date = pk->timestamp; latest_key = k; } } @@ -2186,7 +2175,7 @@ if (DBG_CACHE) log_debug( "\tprimary key may be used\n"); latest_key = keyblock; - latest_date = pk->created; + latest_date = pk->timestamp; } } diff -urN gnupg-1.0.5/g10/keydb.h gnupg-1.0.6/g10/keydb.h --- gnupg-1.0.5/g10/keydb.h Thu Apr 19 11:31:09 2001 +++ gnupg-1.0.6/g10/keydb.h Sun May 27 16:30:28 2001 @@ -174,6 +174,7 @@ /*-- keyid.c --*/ int pubkey_letter( int algo ); +int get_lsign_letter ( PKT_signature *sig ); u32 keyid_from_sk( PKT_secret_key *sk, u32 *keyid ); u32 keyid_from_pk( PKT_public_key *pk, u32 *keyid ); u32 keyid_from_sig( PKT_signature *sig, u32 *keyid ); diff -urN gnupg-1.0.5/g10/keyedit.c gnupg-1.0.6/g10/keyedit.c --- gnupg-1.0.5/g10/keyedit.c Wed Apr 25 11:56:49 2001 +++ gnupg-1.0.6/g10/keyedit.c Fri May 25 08:58:51 2001 @@ -147,7 +147,7 @@ if( sigrc != '?' || print_without_key ) { tty_printf("%s%c %08lX %s ", is_rev? "rev":"sig", - sigrc, sig->keyid[1], datestr_from_sig(sig)); + sigrc, (ulong)sig->keyid[1], datestr_from_sig(sig)); if( sigrc == '%' ) tty_printf("[%s] ", g10_errstr(rc) ); else if( sigrc == '?' ) @@ -218,7 +218,7 @@ if( !has_selfsig ) mis_selfsig++; if( inv_sigs == 1 ) - tty_printf(_("1 bad signature\n"), inv_sigs ); + tty_printf(_("1 bad signature\n") ); else if( inv_sigs ) tty_printf(_("%d bad signatures\n"), inv_sigs ); if( no_key == 1 ) @@ -1797,7 +1797,7 @@ tty_print_utf8_string( unode->pkt->pkt.user_id->name, unode->pkt->pkt.user_id->len ); tty_printf(_("\"\nsigned with your key %08lX at %s\n"), - sig->keyid[1], datestr_from_sig(sig) ); + (ulong)sig->keyid[1], datestr_from_sig(sig) ); if( cpr_get_answer_is_yes("ask_revoke_sig.one", _("Create a revocation certificate for this signature? (y/N)")) ) { @@ -1839,12 +1839,12 @@ !seckey_available( sig->keyid ) ) ) { if( (sig->sig_class&~3) == 0x10 ) { tty_printf(_(" signed by %08lX at %s\n"), - sig->keyid[1], datestr_from_sig(sig) ); + (ulong)sig->keyid[1], datestr_from_sig(sig) ); node->flag |= NODFLG_SELSIG; } else if( sig->sig_class == 0x30 ) { tty_printf(_(" revoked by %08lX at %s\n"), - sig->keyid[1], datestr_from_sig(sig) ); + (ulong)sig->keyid[1], datestr_from_sig(sig) ); } } } @@ -1874,7 +1874,7 @@ else if( node->pkt->pkttype == PKT_SIGNATURE ) { sig = node->pkt->pkt.signature; tty_printf(_(" signed by %08lX at %s\n"), - sig->keyid[1], datestr_from_sig(sig) ); + (ulong)sig->keyid[1], datestr_from_sig(sig) ); } } if( !any ) diff -urN gnupg-1.0.5/g10/keygen.c gnupg-1.0.6/g10/keygen.c --- gnupg-1.0.5/g10/keygen.c Tue Mar 27 12:59:06 2001 +++ gnupg-1.0.6/g10/keygen.c Tue May 29 08:32:11 2001 @@ -1755,6 +1755,9 @@ } } + if (sk->version < 4) + log_info (_("NOTE: creating subkeys for v3 keys " + "is not OpenPGP compliant\n")); /* unprotect to get the passphrase */ switch( is_secret_key_protected( sk ) ) { diff -urN gnupg-1.0.5/g10/keyid.c gnupg-1.0.6/g10/keyid.c --- gnupg-1.0.5/g10/keyid.c Thu Apr 19 11:49:48 2001 +++ gnupg-1.0.6/g10/keyid.c Sun May 27 16:42:20 2001 @@ -48,6 +48,17 @@ } } +int +get_lsign_letter ( PKT_signature *sig ) +{ + const char *p; + + if (!sig) + return '?'; + p = parse_sig_subpkt2( sig, SIGSUBPKT_EXPORTABLE, NULL ); + return (p && !*p)? 'l':'x'; +} + static MD_HANDLE do_fingerprint_md( PKT_public_key *pk ) diff -urN gnupg-1.0.5/g10/keylist.c gnupg-1.0.6/g10/keylist.c --- gnupg-1.0.5/g10/keylist.c Sat Apr 28 12:06:06 2001 +++ gnupg-1.0.6/g10/keylist.c Sun May 27 16:31:07 2001 @@ -603,7 +603,8 @@ else if( sig->sig_class == 0x18 ) sigstr = "sig"; else { - printf("sig::::::::::%02x:\n",sig->sig_class ); + printf ("sig::::::::::%02x%c:\n", + sig->sig_class, get_lsign_letter (sig) ); continue; } if( opt.check_sigs ) { @@ -638,7 +639,7 @@ print_string( stdout, p, n, ':' ); m_free(p); } - printf(":%02x:\n", sig->sig_class ); + printf(":%02x%c:\n", sig->sig_class, get_lsign_letter (sig) ); /* fixme: check or list other sigs here */ } } diff -urN gnupg-1.0.5/g10/mainproc.c gnupg-1.0.6/g10/mainproc.c --- gnupg-1.0.5/g10/mainproc.c Thu Apr 19 11:34:18 2001 +++ gnupg-1.0.6/g10/mainproc.c Sun May 27 16:32:03 2001 @@ -988,7 +988,7 @@ m_free(p); } if( opt.with_colons ) - printf(":%02x:", sig->sig_class ); + printf(":%02x%c:", sig->sig_class, get_lsign_letter (sig) ); putchar('\n'); } else diff -urN gnupg-1.0.5/g10/packet.h gnupg-1.0.6/g10/packet.h --- gnupg-1.0.5/g10/packet.h Thu Apr 5 11:48:20 2001 +++ gnupg-1.0.6/g10/packet.h Sun May 27 16:08:48 2001 @@ -130,7 +130,6 @@ byte version; byte pubkey_algo; /* algorithm used for public key scheme */ byte pubkey_usage; /* for now only used to pass it to getkey() */ - u32 created; /* according to the self-signature */ byte req_usage; /* hack to pass a request to getkey() */ byte req_algo; /* Ditto */ u32 has_expired; /* set to the expiration date if expired */ @@ -150,7 +149,6 @@ byte version; byte pubkey_algo; /* algorithm used for public key scheme */ byte pubkey_usage; - u32 created; /* according to the self-signature */ byte req_usage; byte req_algo; u32 has_expired; /* set to the expiration date if expired */ diff -urN gnupg-1.0.5/g10/passphrase.c gnupg-1.0.6/g10/passphrase.c --- gnupg-1.0.5/g10/passphrase.c Thu Mar 8 15:08:01 2001 +++ gnupg-1.0.6/g10/passphrase.c Fri May 4 11:25:47 2001 @@ -158,7 +158,7 @@ writen ( int fd, const void *buf, size_t nbytes ) { size_t nleft = nbytes; - ssize_t nwritten; + int nwritten; while( nleft > 0 ) { nwritten = write( fd, buf, nleft ); @@ -435,13 +435,17 @@ int fd = -1; int nread; u32 reply; - PKT_public_key *pk = m_alloc_clear ( sizeof *pk ); + PKT_public_key *pk; byte fpr[MAX_FINGERPRINT_LEN]; #if MAX_FINGERPRINT_LEN < 20 #error agent needs a 20 byte fingerprint #endif + if (!opt.use_agent) + return; + + pk = m_alloc_clear ( sizeof *pk ); memset (fpr, 0, MAX_FINGERPRINT_LEN ); if( !keyid || get_pubkey( pk, keyid ) ) { log_debug ("oops, no key in passphrase_clear_cache\n"); diff -urN gnupg-1.0.5/g10/revoke.c gnupg-1.0.6/g10/revoke.c --- gnupg-1.0.5/g10/revoke.c Thu Mar 8 15:09:12 2001 +++ gnupg-1.0.6/g10/revoke.c Fri May 25 08:58:52 2001 @@ -130,7 +130,7 @@ tty_printf("\nsec %4u%c/%08lX %s ", nbits_from_sk( sk ), pubkey_letter( sk->pubkey_algo ), - sk_keyid[1], datestr_from_sk(sk) ); + (ulong)sk_keyid[1], datestr_from_sk(sk) ); { size_t n; char *p = get_user_id( sk_keyid, &n ); @@ -243,7 +243,7 @@ const char *text_1 = _("Key has been compromised"); const char *text_2 = _("Key is superseded"); const char *text_3 = _("Key is no longer used"); - const char *text_4 = _("User ID is non longer valid"); + const char *text_4 = _("User ID is no longer valid"); const char *code_text = NULL; do { @@ -293,7 +293,7 @@ code_text = text_3; } else if( cert_rev && n == 4 ) { - code = 0x20; /* uid is non longer valid */ + code = 0x20; /* uid is no longer valid */ code_text = text_4; } else diff -urN gnupg-1.0.5/include/ChangeLog gnupg-1.0.6/include/ChangeLog --- gnupg-1.0.5/include/ChangeLog Mon Apr 23 13:25:49 2001 +++ gnupg-1.0.6/include/ChangeLog Fri May 25 08:47:06 2001 @@ -1,3 +1,7 @@ +2001-05-25 Werner Koch + + * ttyio.h (tty_printf): Add printf attribute. + 2001-04-23 Werner Koch * http.h: New flag HTTP_FLAG_NO_SHUTDOWN. diff -urN gnupg-1.0.5/include/ttyio.h gnupg-1.0.6/include/ttyio.h --- gnupg-1.0.5/include/ttyio.h Sat Apr 28 19:51:35 2001 +++ gnupg-1.0.6/include/ttyio.h Fri May 25 08:42:50 2001 @@ -21,7 +21,11 @@ #define G10_TTYIO_H int tty_batchmode( int onoff ); -void tty_printf( const char *fmt, ... ); +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) + void tty_printf (const char *fmt, ... ) __attribute__ ((format (printf,1,2))); +#else + void tty_printf const char *fmt, ... ); +#endif void tty_print_string( byte *p, size_t n ); void tty_print_utf8_string( byte *p, size_t n ); void tty_print_utf8_string2( byte *p, size_t n, size_t max_n ); diff -urN gnupg-1.0.5/intl/ChangeLog gnupg-1.0.6/intl/ChangeLog --- gnupg-1.0.5/intl/ChangeLog Tue Jan 25 18:44:12 2000 +++ gnupg-1.0.6/intl/ChangeLog Sat May 26 16:20:27 2001 @@ -1,1086 +1,4 @@ -1998-04-29 Ulrich Drepper +2001-05-23 GNU - * intl/localealias.c (read_alias_file): Use unsigned char for - local variables. Remove unused variable tp. - * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * - for type of codeset. For loosing Solaris systems. - * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. - * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable - len if not needed. - Patches by Jim Meyering. + * Version 0.10.38 released. -1998-04-28 Ulrich Drepper - - * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if - mmap is not supported. - - * hash-string.h: Don't include . - -1998-04-27 Ulrich Drepper - - * textdomain.c: Use strdup is available. - - * localealias.c: Define HAVE_MEMPCPY so that we can use this - function. Define and use semapahores to protect modfication of - global objects when compiling for glibc. Add code to allow - freeing alias table. - - * l10nflist.c: Don't assume stpcpy not being a macro. - - * gettextP.h: Define internal_function macri if not already done. - Use glibc byte-swap macros instead of defining SWAP when compiled - for glibc. - (struct loaded_domain): Add elements to allow unloading. - - * Makefile.in (distclean): Don't remove libintl.h here. - - * bindtextdomain.c: Carry over changes from glibc. Use strdup if - available. - - * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal - functions. Add memory freeing code for glibc. - - * dgettext.c: Update copyright. - - * explodename.c: Include stdlib.h and string.h only if they exist. - Use strings.h eventually. - - * finddomain.c: Mark internal functions. Use strdup if available. - Add memory freeing code for glibc. - -1997-10-10 20:00 Ulrich Drepper - - * libgettext.h: Fix dummy textdomain and bindtextdomain macros. - They should return reasonable values. - Reported by Tom Tromey . - -1997-09-16 03:33 Ulrich Drepper - - * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. - * intlh.inst.in: Likewise. - Reported by Jean-Marc Lasgouttes . - - * libintl.glibc: Update from current glibc version. - -1997-09-06 02:10 Ulrich Drepper - - * intlh.inst.in: Reformat copyright. - -1997-08-19 15:22 Ulrich Drepper - - * dcgettext.c (DCGETTEXT): Remove wrong comment. - -1997-08-16 00:13 Ulrich Drepper - - * Makefile.in (install-data): Don't change directory to install. - -1997-08-01 14:30 Ulrich Drepper - - * cat-compat.c: Fix copyright. - - * localealias.c: Don't define strchr unless !HAVE_STRCHR. - - * loadmsgcat.c: Update copyright. Fix typos. - - * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. - (_nl_make_l10nflist): Handle sponsor and revision correctly. - - * gettext.c: Update copyright. - * gettext.h: Likewise. - * hash-string.h: Likewise. - - * finddomain.c: Remoave dead code. Define strchr only if - !HAVE_STRCHR. - - * explodename.c: Include . - - * explodename.c: Reformat copyright text. - (_nl_explode_name): Fix typo. - - * dcgettext.c: Define and use __set_errno. - (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is - not defined. - - * bindtextdom.c: Pretty printing. - -1997-05-01 02:25 Ulrich Drepper - - * dcgettext.c (guess_category_value): Don't depend on - HAVE_LC_MESSAGES. We don't need the macro here. - Patch by Bruno Haible . - - * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL - macro. Instead use HAVE_LOCALE_NULL and define it when using - glibc, as in dcgettext.c. - Patch by Bruno Haible . - - * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois - Pinard. - -Mon Mar 10 06:51:17 1997 Ulrich Drepper - - * Makefile.in: Implement handling of libtool. - - * gettextP.h: Change data structures for use of generic lowlevel - i18n file handling. - -Wed Dec 4 20:21:18 1996 Ulrich Drepper - - * textdomain.c: Put parentheses around arguments of memcpy macro - definition. - * localealias.c: Likewise. - * l10nflist.c: Likewise. - * finddomain.c: Likewise. - * bindtextdom.c: Likewise. - Reported by Thomas Esken. - -Mon Nov 25 22:57:51 1996 Ulrich Drepper - - * textdomain.c: Move definition of `memcpy` macro to right - position. - -Fri Nov 22 04:01:58 1996 Ulrich Drepper - - * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using - bcopy if not already defined. Reported by Thomas Esken. - * bindtextdom.c: Likewise. - * l10nflist.c: Likewise. - * localealias.c: Likewise. - * textdomain.c: Likewise. - -Tue Oct 29 11:10:27 1996 Ulrich Drepper - - * Makefile.in (libdir): Change to use exec_prefix instead of - prefix. Reported by Knut-HåvardAksnes . - -Sat Aug 31 03:07:09 1996 Ulrich Drepper - - * l10nflist.c (_nl_normalize_codeset): We convert to lower case, - so don't prepend uppercase `ISO' for only numeric arg. - -Fri Jul 19 00:15:46 1996 Ulrich Drepper - - * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after - definition of _GNU_SOURCE. Patch by Roland McGrath. - - * Makefile.in (uninstall): Fix another bug with `for' loop and - empty arguments. Patch by Jim Meyering. Correct name os - uninstalled files: no intl- prefix anymore. - - * Makefile.in (install-data): Again work around shells which - cannot handle mpty for list. Reported by Jim Meyering. - -Sat Jul 13 18:11:35 1996 Ulrich Drepper - - * Makefile.in (install): Split goal. Now depend on install-exec - and install-data. - (install-exec, install-data): New goals. Created from former - install goal. - Reported by Karl Berry. - -Sat Jun 22 04:58:14 1996 Ulrich Drepper - - * Makefile.in (MKINSTALLDIRS): New variable. Path to - mkinstalldirs script. - (install): use MKINSTALLDIRS variable or if the script is not present - try to find it in the $top_scrdir). - -Wed Jun 19 02:56:56 1996 Ulrich Drepper - - * l10nflist.c: Linux libc *partly* includes the argz_* functions. - Grr. Work around by renaming the static version and use macros - for renaming. - -Tue Jun 18 20:11:17 1996 Ulrich Drepper - - * l10nflist.c: Correct presence test macros of __argz_* functions. - - * l10nflist.c: Include based on test of it instead when - __argz_* functions are available. - Reported by Andreas Schwab. - -Thu Jun 13 15:17:44 1996 Ulrich Drepper - - * explodename.c, l10nflist.c: Define NULL for dumb systems. - -Tue Jun 11 17:05:13 1996 Ulrich Drepper - - * intlh.inst.in, libgettext.h (dcgettext): Rename local variable - result to __result to prevent name clash. - - * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to - get prototype for stpcpy and strcasecmp. - - * intlh.inst.in, libgettext.h: Move declaration of - `_nl_msg_cat_cntr' outside __extension__ block to prevent warning - from gcc's -Wnested-extern option. - -Fri Jun 7 01:58:00 1996 Ulrich Drepper - - * Makefile.in (install): Remove comment. - -Thu Jun 6 17:28:17 1996 Ulrich Drepper - - * Makefile.in (install): Work around for another Buglix stupidity. - Always use an `else' close for `if's. Reported by Nelson Beebe. - - * Makefile.in (intlh.inst): Correct typo in phony rule. - Reported by Nelson Beebe. - -Thu Jun 6 01:49:52 1996 Ulrich Drepper - - * dcgettext.c (read_alias_file): Rename variable alloca_list to - block_list as the macro calls assume. - Patch by Eric Backus. - - * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using - malloc. - (read_alias_file): Rename varriabe alloca_list to block_list as the - macro calls assume. - Patch by Eric Backus. - - * l10nflist.c: Correct conditional for inclusion. - Reported by Roland McGrath. - - * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not - all-@USE_NLS@. - - * Makefile.in (install): intlh.inst comes from local dir, not - $(srcdir). - - * Makefile.in (intlh.inst): Special handling of this goal. If - used in gettext, this is really a rul to construct this file. If - used in any other package it is defined as a .PHONY rule with - empty body. - - * finddomain.c: Extract locale file information handling into - l10nfile.c. Rename local stpcpy__ function to stpcpy. - - * dcgettext.c (stpcpy): Add local definition. - - * l10nflist.c: Solve some portability problems. Patches partly by - Thomas Esken. Add local definition of stpcpy. - -Tue Jun 4 02:47:49 1996 Ulrich Drepper - - * intlh.inst.in: Don't depend including on - HAVE_LOCALE_H. Instead configure must rewrite this fiile - depending on the result of the configure run. - - * Makefile.in (install): libintl.inst is now called intlh.inst. - Add rules for updating intlh.inst from intlh.inst.in. - - * libintl.inst: Renamed to intlh.inst.in. - - * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 - because gcc has __buitlin_alloca. - Reported by Roland McGrath. - -Mon Jun 3 00:32:16 1996 Ulrich Drepper - - * Makefile.in (installcheck): New goal to fulfill needs of - automake's distcheck. - - * Makefile.in (install): Reorder commands so that VERSION is - found. - - * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in - @datadir@/gettext. - (COMSRCS): Add l10nfile.c. - (OBJECTS): Add l10nfile.o. - (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). - (DISTFILE.gettext): Remove $(DISTFILES.common). - (all-gettext): Remove goal. - (install): If $(PACKAGE) = gettext install, otherwose do nothing. No - package but gettext itself should install libintl.h + headers. - (dist): Extend goal to work for gettext, too. - (dist-gettext): Remove goal. - - * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. - -Sun Jun 2 17:33:06 1996 Ulrich Drepper - - * loadmsgcat.c (_nl_load_domain): Parameter is now comes from - find_l10nfile. - -Sat Jun 1 02:23:03 1996 Ulrich Drepper - - * l10nflist.c (__argz_next): Add definition. - - * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca - code. Use new l10nfile handling. - - * localealias.c [!HAVE_ALLOCA]: Add code for handling missing - alloca code. - - * l10nflist.c: Initial revision. - -Tue Apr 2 18:51:18 1996 Ulrich Drepper - - * Makefile.in (all-gettext): New goal. Same as all-yes. - -Thu Mar 28 23:01:22 1996 Karl Eichwalder - - * Makefile.in (gettextsrcdir): Define using @datadir@. - -Tue Mar 26 12:39:14 1996 Ulrich Drepper - - * finddomain.c: Include . Reported by Roland McGrath. - -Sat Mar 23 02:00:35 1996 Ulrich Drepper - - * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing - with external declaration. - -Sat Mar 2 00:47:09 1996 Ulrich Drepper - - * Makefile.in (all-no): Rename from all_no. - -Sat Feb 17 00:25:59 1996 Ulrich Drepper - - * gettextP.h [loaded_domain]: Array `successor' must now contain up - to 63 elements (because of codeset name normalization). - - * finddomain.c: Implement codeset name normalization. - -Thu Feb 15 04:39:09 1996 Ulrich Drepper - - * Makefile.in (all): Define to `all-@USE_NLS@'. - (all-yes, all_no): New goals. `all-no' is noop, `all-yes' - is former all. - -Mon Jan 15 21:46:01 1996 Howard Gayle - - * localealias.c (alias_compare): Increment string pointers in loop - of strcasecmp replacement. - -Fri Dec 29 21:16:34 1995 Ulrich Drepper - - * Makefile.in (install-src): Who commented this goal out ? :-) - -Fri Dec 29 15:08:16 1995 Ulrich Drepper - - * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls - should not effect it because a missing catalog is no error. - Reported by Harald Knig . - -Tue Dec 19 22:09:13 1995 Ulrich Drepper - - * Makefile.in (Makefile): Explicitly use $(SHELL) for running - shell scripts. - -Fri Dec 15 17:34:59 1995 Andreas Schwab - - * Makefile.in (install-src): Only install library and header when - we use the own implementation. Don't do it when using the - system's gettext or catgets functions. - - * dcgettext.c (find_msg): Must not swap domain->hash_size here. - -Sat Dec 9 16:24:37 1995 Ulrich Drepper - - * localealias.c, libintl.inst, libgettext.h, hash-string.h, - gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: - Use PARAMS instead of __P. Suggested by Roland McGrath. - -Tue Dec 5 11:39:14 1995 Larry Schwimmer - - * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if - !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. - -Mon Dec 4 15:42:07 1995 Ulrich Drepper - - * Makefile.in (install-src): - Install libintl.inst instead of libintl.h.install. - -Sat Dec 2 22:51:38 1995 Marcus Daniels - - * cat-compat.c (textdomain): - Reverse order in which files are tried you load. First - try local file, when this failed absolute path. - -Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe - - * cat-compat.c (bindtextdomain): Add missing { }. - -Sun Nov 26 18:21:41 1995 Ulrich Drepper - - * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. - - * Makefile.in: - Add dummy `all' and `dvi' goals. Reported by Tom Tromey. - -Sat Nov 25 16:12:01 1995 Franc,ois Pinard - - * hash-string.h: Capitalize arguments of macros. - -Sat Nov 25 12:01:36 1995 Ulrich Drepper - - * Makefile.in (DISTFILES): Prevent files names longer than 13 - characters. libintl.h.glibc->libintl.glibc, - libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. - -Sat Nov 25 11:31:12 1995 Eric Backus - - * dcgettext.c: Fix bug in preprocessor conditionals. - -Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe - - * libgettext.h: Solaris cc does not understand - #if !SYMBOL1 && !SYMBOL2. Sad but true. - -Thu Nov 23 16:22:14 1995 Ulrich Drepper - - * hash-string.h (hash_string): - Fix for machine with >32 bit `unsigned long's. - - * dcgettext.c (DCGETTEXT): - Fix horrible bug in loop for alternative translation. - -Thu Nov 23 01:45:29 1995 Ulrich Drepper - - * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: - Some further simplifications in message number generation. - -Mon Nov 20 21:08:43 1995 Ulrich Drepper - - * libintl.h.glibc: Use __const instead of const in prototypes. - - * Makefile.in (install-src): - Install libintl.h.install instead of libintl.h. This - is a stripped-down version. Suggested by Peter Miller. - - * libintl.h.install, libintl.h.glibc: Initial revision. - - * localealias.c (_nl_expand_alias, read_alias_file): - Protect prototypes in type casts by __P. - -Tue Nov 14 16:43:58 1995 Ulrich Drepper - - * hash-string.h: Correct prototype for hash_string. - -Sun Nov 12 12:42:30 1995 Ulrich Drepper - - * hash-string.h (hash_string): Add prototype. - - * gettextP.h: Fix copyright. - (SWAP): Add prototype. - -Wed Nov 8 22:56:33 1995 Ulrich Drepper - - * localealias.c (read_alias_file): Forgot sizeof. - Avoid calling *printf function. This introduces a big overhead. - Patch by Roland McGrath. - -Tue Nov 7 14:21:08 1995 Ulrich Drepper - - * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. - - * finddomain.c (stpcpy): - Define substitution function local. The macro was to flaky. - - * cat-compat.c: Fix typo. - - * xopen-msg.sed, linux-msg.sed: - While bringing message number to right place only accept digits. - - * linux-msg.sed, xopen-msg.sed: Now that the counter does not have - leading 0s we don't need to remove them. Reported by Marcus - Daniels. - - * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in - dependency. Reported by Marcus Daniels. - - * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. - Generally cleanup using #if instead of #ifndef. - - * Makefile.in: Correct typos in comment. By Franc,ois Pinard. - -Mon Nov 6 00:27:02 1995 Ulrich Drepper - - * Makefile.in (install-src): Don't install libintl.h and libintl.a - if we use an available gettext implementation. - -Sun Nov 5 22:02:08 1995 Ulrich Drepper - - * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported - by Franc,ois Pinard. - - * libgettext.h: Use #if instead of #ifdef/#ifndef. - - * finddomain.c: - Comments describing what has to be done should start with FIXME. - -Sun Nov 5 19:38:01 1995 Ulrich Drepper - - * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. - DISTFILES.common names the files common to both dist goals. - DISTFILES.gettext are the files only distributed in GNU gettext. - -Sun Nov 5 17:32:54 1995 Ulrich Drepper - - * dcgettext.c (DCGETTEXT): Correct searching in derived locales. - This was necessary since a change in _nl_find_msg several weeks - ago. I really don't know this is still not fixed. - -Sun Nov 5 12:43:12 1995 Ulrich Drepper - - * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This - might mark a special condition. - - * finddomain.c (make_entry_rec): Don't make illegal entry as decided. - - * Makefile.in (dist): Suppress error message when ln failed. - Get files from $(srcdir) explicitly. - - * libgettext.h (gettext_const): Rename to gettext_noop. - -Fri Nov 3 07:36:50 1995 Ulrich Drepper - - * finddomain.c (make_entry_rec): - Protect against wrong locale names by testing mask. - - * libgettext.h (gettext_const): Add macro definition. - Capitalize macro arguments. - -Thu Nov 2 23:15:51 1995 Ulrich Drepper - - * finddomain.c (_nl_find_domain): - Test for pointer != NULL before accessing value. - Reported by Tom Tromey. - - * gettext.c (NULL): - Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. - -Mon Oct 30 21:28:52 1995 Ulrich Drepper - - * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. - -Sat Oct 28 23:20:47 1995 Ulrich Drepper - - * libgettext.h: Disable dcgettext optimization for Solaris 2.3. - - * localealias.c (alias_compare): - Peter Miller reported that tolower in some systems is - even dumber than I thought. Protect call by `isupper'. - -Fri Oct 27 22:22:51 1995 Ulrich Drepper - - * Makefile.in (libdir, includedir): New variables. - (install-src): Install libintl.a and libintl.h in correct dirs. - -Fri Oct 27 22:07:29 1995 Ulrich Drepper - - * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. - - * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. - - * localealias.c: - Fix typo and superflous test. Reported by Christian von Roques. - -Fri Oct 6 11:52:05 1995 Ulrich Drepper - - * finddomain.c (_nl_find_domain): - Correct some remainder from the pre-CEN syntax. Now - we don't have a constant number of successors anymore. - -Wed Sep 27 21:41:13 1995 Ulrich Drepper - - * Makefile.in (DISTFILES): Add libintl.h.glibc. - - * Makefile.in (dist-libc): Add goal for packing sources for glibc. - (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. - - * loadmsgcat.c: Forget to continue #if line. - - * localealias.c: - [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name - space clean. - - * dcgettext.c, finddomain.c: Better comment to last change. - - * loadmsgcat.c: - [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to - __fstat, __open, __close, __read, __mmap, and __munmap resp - to keep ANSI C name space clean. - - * finddomain.c: - [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. - - * dcgettext.c: - [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to - keep ANSI C name space clean. - - * libgettext.h: - Include sys/types.h for those old SysV systems out there. - Reported by Francesco Potorti`. - - * loadmsgcat.c (use_mmap): Define if compiled for glibc. - - * bindtextdom.c: Include all those standard headers - unconditionally if _LIBC is defined. - - * finddomain.c: Fix 2 times defiend -> defined. - - * textdomain.c: Include libintl.h instead of libgettext.h when - compiling for glibc. Include all those standard headers - unconditionally if _LIBC is defined. - - * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. - - * gettext.c: - Include libintl.h instead of libgettext.h when compiling for glibc. - Get NULL from stddef.h if we compile for glibc. - - * finddomain.c: Include libintl.h instead of libgettext.h when - compiling for glibc. Include all those standard headers - unconditionally if _LIBC is defined. - - * dcgettext.c: Include all those standard headers unconditionally - if _LIBC is defined. - - * dgettext.c: If compiled in glibc include libintl.h instead of - libgettext.h. - (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. - - * dcgettext.c: If compiled in glibc include libintl.h instead of - libgettext.h. - (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. - - * bindtextdom.c: - If compiled in glibc include libintl.h instead of libgettext.h. - -Mon Sep 25 22:23:06 1995 Ulrich Drepper - - * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. - Reported by Marcus Daniels. - - * cat-compat.c (bindtextdomain): - String used in putenv must not be recycled. - Reported by Marcus Daniels. - - * libgettext.h (__USE_GNU_GETTEXT): - Additional symbol to signal that we use GNU gettext - library. - - * cat-compat.c (bindtextdomain): - Fix bug with the strange stpcpy replacement. - Reported by Nelson Beebe. - -Sat Sep 23 08:23:51 1995 Ulrich Drepper - - * cat-compat.c: Include for stpcpy prototype. - - * localealias.c (read_alias_file): - While expand strdup code temporary variable `cp' hided - higher level variable with same name. Rename to `tp'. - - * textdomain.c (textdomain): - Avoid warning by using temporary variable in strdup code. - - * finddomain.c (_nl_find_domain): Remove unused variable `application'. - -Thu Sep 21 15:51:44 1995 Ulrich Drepper - - * localealias.c (alias_compare): - Use strcasecmp() only if available. Else use - implementation in place. - - * intl-compat.c: - Wrapper functions now call *__ functions instead of __*. - - * libgettext.h: Declare prototypes for *__ functions instead for __*. - - * cat-compat.c, loadmsgcat.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - - * bindtextdom.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - Rename to bindtextdomain__ if not used in GNU C Library. - - * dgettext.c: - Rename function to dgettext__ if not used in GNU C Library. - - * gettext.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - Functions now called gettext__ if not used in GNU C Library. - - * dcgettext.c, localealias.c, textdomain.c, finddomain.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - -Sun Sep 17 23:14:49 1995 Ulrich Drepper - - * finddomain.c: Correct some bugs in handling of CEN standard - locale definitions. - -Thu Sep 7 01:49:28 1995 Ulrich Drepper - - * finddomain.c: Implement CEN syntax. - - * gettextP.h (loaded_domain): Extend number of successors to 31. - -Sat Aug 19 19:25:29 1995 Ulrich Drepper - - * Makefile.in (aliaspath): Remove path to X11 locale dir. - - * Makefile.in: Make install-src depend on install. This helps - gettext to install the sources and other packages can use the - install goal. - -Sat Aug 19 15:19:33 1995 Ulrich Drepper - - * Makefile.in (uninstall): Remove stuff installed by install-src. - -Tue Aug 15 13:13:53 1995 Ulrich Drepper - - * VERSION.in: Initial revision. - - * Makefile.in (DISTFILES): - Add VERSION file. This is not necessary for gettext, but - for other packages using this library. - -Tue Aug 15 06:16:44 1995 Ulrich Drepper - - * gettextP.h (_nl_find_domain): - New prototype after changing search strategy. - - * finddomain.c (_nl_find_domain): - We now try only to find a specified catalog. Fall back to other - catalogs listed in the locale list is now done in __dcgettext. - - * dcgettext.c (__dcgettext): - Now we provide message fall back even to different languages. - I.e. if a message is not available in one language all the other - in the locale list a tried. Formerly fall back was only possible - within one language. Implemented by moving one loop from - _nl_find_domain to here. - -Mon Aug 14 23:45:50 1995 Ulrich Drepper - - * Makefile.in (gettextsrcdir): - Directory where source of GNU gettext library are made - available. - (INSTALL, INSTALL_DATA): Programs used for installing sources. - (gettext-src): New. Rule to install GNU gettext sources for use in - gettextize shell script. - -Sun Aug 13 14:40:48 1995 Ulrich Drepper - - * loadmsgcat.c (_nl_load_domain): - Use mmap for loading only when munmap function is - also available. - - * Makefile.in (install): Depend on `all' goal. - -Wed Aug 9 11:04:33 1995 Ulrich Drepper - - * localealias.c (read_alias_file): - Do not overwrite '\n' when terminating alias value string. - - * localealias.c (read_alias_file): - Handle long lines. Ignore the rest not fitting in - the buffer after the initial `fgets' call. - -Wed Aug 9 00:54:29 1995 Ulrich Drepper - - * gettextP.h (_nl_load_domain): - Add prototype, replacing prototype for _nl_load_msg_cat. - - * finddomain.c (_nl_find_domain): - Remove unneeded variable filename and filename_len. - (expand_alias): Remove prototype because functions does not - exist anymore. - - * localealias.c (read_alias_file): - Change type of fname_len parameter to int. - (xmalloc): Add prototype. - - * loadmsgcat.c: Better prototypes for xmalloc. - -Tue Aug 8 22:30:39 1995 Ulrich Drepper - - * finddomain.c (_nl_find_domain): - Allow alias name to be constructed from the four components. - - * Makefile.in (aliaspath): New variable. Set to preliminary value. - (SOURCES): Add localealias.c. - (OBJECTS): Add localealias.o. - - * gettextP.h: Add prototype for _nl_expand_alias. - - * finddomain.c: Aliasing handled in intl/localealias.c. - - * localealias.c: Aliasing for locale names. - - * bindtextdom.c: Better prototypes for xmalloc and xstrdup. - -Mon Aug 7 23:47:42 1995 Ulrich Drepper - - * Makefile.in (DISTFILES): gettext.perl is now found in misc/. - - * cat-compat.c (bindtextdomain): - Correct implementation. dirname parameter was not used. - Reported by Marcus Daniels. - - * gettextP.h (loaded_domain): - New fields `successor' and `decided' for oo, lazy - message handling implementation. - - * dcgettext.c: - Adopt for oo, lazy message handliing. - Now we can inherit translations from less specific locales. - (find_msg): New function. - - * loadmsgcat.c, finddomain.c: - Complete rewrite. Implement oo, lazy message handling :-). - We now have an additional environment variable `LANGUAGE' with - a higher priority than LC_ALL for the LC_MESSAGE locale. - Here we can set a colon separated list of specifications each - of the form `language[_territory[.codeset]][@modifier]'. - -Sat Aug 5 09:55:42 1995 Ulrich Drepper - - * finddomain.c (unistd.h): - Include to get _PC_PATH_MAX defined on system having it. - -Fri Aug 4 22:42:00 1995 Ulrich Drepper - - * finddomain.c (stpcpy): Include prototype. - - * Makefile.in (dist): Remove `copying instead' message. - -Wed Aug 2 18:52:03 1995 Ulrich Drepper - - * Makefile.in (ID, TAGS): Do not use $^. - -Tue Aug 1 20:07:11 1995 Ulrich Drepper - - * Makefile.in (TAGS, ID): Use $^ as command argument. - (TAGS): Give etags -o option t write to current directory, - not $(srcdir). - (ID): Use $(srcdir) instead os $(top_srcdir)/src. - (distclean): Remove ID. - -Sun Jul 30 11:51:46 1995 Ulrich Drepper - - * Makefile.in (gnulocaledir): - New variable, always using share/ for data directory. - (DEFS): Add GNULOCALEDIR, used in finddomain.c. - - * finddomain.c (_nl_default_dirname): - Set to GNULOCALEDIR, because it always has to point - to the directory where GNU gettext Library writes it to. - - * intl-compat.c (textdomain, bindtextdomain): - Undefine macros before function definition. - -Sat Jul 22 01:10:02 1995 Ulrich Drepper - - * libgettext.h (_LIBINTL_H): - Protect definition in case where this file is included as - libgettext.h on Solaris machines. Add comment about this. - -Wed Jul 19 02:36:42 1995 Ulrich Drepper - - * intl-compat.c (textdomain): Correct typo. - -Wed Jul 19 01:51:35 1995 Ulrich Drepper - - * dcgettext.c (dcgettext): Function now called __dcgettext. - - * dgettext.c (dgettext): Now called __dgettext and calls - __dcgettext. - - * gettext.c (gettext): - Function now called __gettext and calls __dgettext. - - * textdomain.c (textdomain): Function now called __textdomain. - - * bindtextdom.c (bindtextdomain): Function now called - __bindtextdomain. - - * intl-compat.c: Initial revision. - - * Makefile.in (SOURCES): Add intl-compat.c. - (OBJECTS): We always compile the GNU gettext library functions. - OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, - and intl-compat.o. - (GETTOBJS): Contains now only intl-compat.o. - - * libgettext.h: - Re-include protection matches dualistic character of libgettext.h. - For all functions in GNU gettext library define __ counter part. - - * finddomain.c (strchr): Define as index if not found in C library. - (_nl_find_domain): For relative paths paste / in between. - -Tue Jul 18 16:37:45 1995 Ulrich Drepper - - * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. - - * xopen-msg.sed: Fix bug with `msgstr ""' lines. - A little bit better comments. - -Tue Jul 18 01:18:27 1995 Ulrich Drepper - - * Makefile.in: - po-mode.el, makelinks, combine-sh are now found in ../misc. - - * po-mode.el, makelinks, combine-sh, elisp-comp: - Moved to ../misc/. - - * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. - -Sun Jul 16 22:33:02 1995 Ulrich Drepper - - * Makefile.in (INSTALL, INSTALL_DATA): New variables. - (install-data, uninstall): Install/uninstall .elc file. - - * po-mode.el (Installation comment): - Add .pox as possible extension of .po files. - -Sun Jul 16 13:23:27 1995 Ulrich Drepper - - * elisp-comp: Complete new version by Franc,ois: This does not - fail when not compiling in the source directory. - -Sun Jul 16 00:12:17 1995 Ulrich Drepper - - * Makefile.in (../po/cat-id-tbl.o): - Use $(MAKE) instead of make for recursive make. - - * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. - (install-exec): Add missing dummy goal. - (install-data, uninstall): @ in multi-line shell command at - beginning, not in front of echo. Reported by Eric Backus. - -Sat Jul 15 00:21:28 1995 Ulrich Drepper - - * Makefile.in (DISTFILES): - Rename libgettext.perl to gettext.perl to fit in 14 chars - file systems. - - * gettext.perl: - Rename to gettext.perl to fit in 14 chars file systems. - -Thu Jul 13 23:17:20 1995 Ulrich Drepper - - * cat-compat.c: If !STDC_HEADERS try to include malloc.h. - -Thu Jul 13 20:55:02 1995 Ulrich Drepper - - * po2tbl.sed.in: Pretty printing. - - * linux-msg.sed, xopen-msg.sed: - Correct bugs with handling substitute flags in branches. - - * hash-string.h (hash_string): - Old K&R compilers don't under stand `unsigned char'. - - * gettext.h (nls_uint32): - Some old K&R compilers (eg HP) don't understand `unsigned int'. - - * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. - -Thu Jul 13 01:34:33 1995 Ulrich Drepper - - * Makefile.in (ELCFILES): New variable. - (DISTFILES): Add elisp-comp. - Add implicit rule for .el -> .elc compilation. - (install-data): install $ELCFILES - (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. - - * elisp-comp: Initial revision - -Wed Jul 12 16:14:52 1995 Ulrich Drepper - - * Makefile.in: - cat-id-tbl.c is now found in po/. This enables us to use an identical - intl/ directory in all packages. - - * dcgettext.c (dcgettext): hashing does not work for table size <= 2. - - * textdomain.c: fix typo (#if def -> #if defined) - -Tue Jul 11 18:44:43 1995 Ulrich Drepper - - * Makefile.in (stamp-cat-id): use top_srcdir to address source files - (DISTFILES,distclean): move tupdate.perl to src/ - - * po-to-tbl.sed.in: - add additional jump to clear change flag to recognize multiline strings - -Tue Jul 11 01:32:50 1995 Ulrich Drepper - - * textdomain.c: Protect inclusion of stdlib.h and string.h. - - * loadmsgcat.c: Protect inclusion of stdlib.h. - - * libgettext.h: Protect inclusion of locale.h. - Allow use in C++ programs. - Define NULL is not happened already. - - * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of - po-to-tbl.sed. - (distclean): remove po-to-tbl.sed and tupdate.perl. - - * tupdate.perl.in: Substitute Perl path even in exec line. - Don't include entries without translation from old .po file. - -Tue Jul 4 00:41:51 1995 Ulrich Drepper - - * tupdate.perl.in: use "Updated: " in msgid "". - - * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). - Define getenv if !__STDC__. - - * bindtextdom.c: Protect stdlib.h and string.h inclusion. - Define free if !__STDC__. - - * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. - Define free if !__STDC__. - - * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. - -Mon Jul 3 23:56:30 1995 Ulrich Drepper - - * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. - Remove unneeded $(srcdir) from Makefile.in dependency. - - * makelinks: Add copyright and short description. - - * po-mode.el: Last version for 0.7. - - * tupdate.perl.in: Fix die message. - - * dcgettext.c: Protect include of string.h. - - * gettext.c: Protect include of stdlib.h and further tries to get NULL. - - * finddomain.c: Some corrections in includes. - - * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. - - * po-to-tbl.sed: Adopt for new .po file format. - - * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. - -Sun Jul 2 23:55:03 1995 Ulrich Drepper - - * tupdate.perl.in: Complete rewrite for new .po file format. - -Sun Jul 2 02:06:50 1995 Ulrich Drepper - - * First official release. This directory contains all the code - needed to internationalize own packages. It provides functions - which allow to use the X/Open catgets function with an interface - like the Uniforum gettext function. For system which does not - have neither of those a complete implementation is provided. diff -urN gnupg-1.0.5/intl/Makefile.in gnupg-1.0.6/intl/Makefile.in --- gnupg-1.0.5/intl/Makefile.in Tue Jan 25 18:44:12 2000 +++ gnupg-1.0.6/intl/Makefile.in Sat May 26 16:20:27 2001 @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,75 +28,106 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ -libdir = $(exec_prefix)/lib -includedir = $(prefix)/include -datadir = $(prefix)/@DATADIRNAME@ +libdir = @libdir@ +includedir = @includedir@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = @datadir@/gettext/intl -aliaspath = $(localedir):. +gettextsrcdir = $(datadir)/gettext/intl +aliaspath = $(localedir) subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` -l = @l@ +l = @INTL_LIBTOOL_SUFFIX_PREFIX@ AR = ar CC = @CC@ LIBTOOL = @LIBTOOL@ RANLIB = @RANLIB@ +YACC = @INTLBISON@ -y -d +YFLAGS = --name-prefix=__gettext -DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ --DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ +DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ +-DLIBDIR=\"$(libdir)\" @DEFS@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgettext.h loadinfo.h +HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c cat-compat.c +SOURCES = $(COMSRCS) intl-compat.c COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c +explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +localcharset.c OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo -CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo +explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ +plural.$lo localcharset.$lo GETTOBJS = intl-compat.$lo -DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -xopen-msg.sed $(HEADERS) $(SOURCES) +DISTFILES.common = Makefile.in \ +config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) +DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc intlh.inst.in +DISTFILES.gettext = libintl.glibc +DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c + +# Libtool's library version information for libintl. +# Before making a gettext release, the gettext maintainer must change this +# according to the libtool documentation, section "Library interface versions". +# Maintainers of other packages that include the intl directory must *not* +# change these values. +LTV_CURRENT=1 +LTV_REVISION=1 +LTV_AGE=0 .SUFFIXES: -.SUFFIXES: .c .o .lo +.SUFFIXES: .c .y .o .lo .sin .sed .c.o: $(COMPILE) $< .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) $< -INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h + +.sin.sed: + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ + mv t-$@ $@ -all: all-@USE_INCLUDED_LIBINTL@ +INCLUDES = -I.. -I. -I$(top_srcdir)/intl -all-yes: libintl.$la intlh.inst -all-no: +all: all-@USE_INCLUDED_LIBINTL@ +all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +all-no: all-no-@BUILD_INCLUDED_LIBINTL@ +all-no-yes: libgnuintl.$la +all-no-no: -libintl.a: $(OBJECTS) +libintl.a libgnuintl.a: $(OBJECTS) rm -f $@ $(AR) cru $@ $(OBJECTS) $(RANLIB) $@ -libintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ - -version-info 1:0 -rpath $(libdir) - -../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot - cd ../po && $(MAKE) cat-id-tbl.$lo +libintl.la libgnuintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link \ + $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ + $(OBJECTS) @LIBICONV@ \ + -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ + -rpath $(libdir) \ + -no-undefined + +libintl.h: libgnuintl.h + cp $(srcdir)/libgnuintl.h libintl.h + +charset.alias: config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ + mv t-$@ $@ check: all @@ -104,36 +135,70 @@ # only use the library should use install instead. # We must not install the libintl.h/libintl.a files if we are on a -# system which has the gettext() function in its C library or in a -# separate library or use the catgets interface. A special case is -# where configure found a previously installed GNU gettext library. +# system which has the GNU gettext() function in its C library or in a +# separate library. # If you want to use the one which comes with this version of the # package, you have to use `configure --with-included-gettext'. install: install-exec install-data install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(libdir) $(includedir); \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + orig=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ else \ - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + if test @GLIBC21@ = no; then \ + orig=charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + fi; \ fi; \ - $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ - $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ + || orig=$(srcdir)/locale.alias; \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ else \ : ; \ fi install-data: all if test "$(PACKAGE)" = "gettext"; then \ - if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ - else \ - $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ + $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ dists="$(DISTFILES.common)"; \ for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ + dists="$(DISTFILES.generated)"; \ + for file in $$dists; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + dists="$(DISTFILES.obsolete)"; \ + for file in $$dists; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ : ; \ @@ -143,14 +208,51 @@ installcheck: uninstall: - dists="$(DISTFILES.common)"; \ - for file in $$dists; do \ - rm -f $(gettextsrcdir)/$$file; \ - done + if test "$(PACKAGE)" = "gettext" \ + && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + rm -f $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + if test -f $(DESTDIR)$(localedir)/locale.alias; then \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext"; then \ + for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi info dvi: -$(OBJECTS): ../config.h libgettext.h +$(OBJECTS): ../config.h libgnuintl.h bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h @@ -166,12 +268,19 @@ mostlyclean: - rm -f *.a *.o *.lo core core.* + rm -f *.a *.la *.o *.lo core core.* + rm -f libintl.h charset.alias ref-add.sed ref-del.sed + rm -f -r .libs _libs clean: mostlyclean distclean: clean - rm -f Makefile ID TAGS po2msg.sed po2tbl.sed + rm -f Makefile ID TAGS + if test "$(PACKAGE)" = gettext; then \ + rm -f ChangeLog.inst $(DISTFILES.normal); \ + else \ + : ; \ + fi maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -181,33 +290,22 @@ # GNU gettext needs not contain the file `VERSION' but contains some # other files which should not be distributed in other packages. distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: Makefile $(DISTFILES) +dist distdir: Makefile if test "$(PACKAGE)" = gettext; then \ additional="$(DISTFILES.gettext)"; \ else \ additional="$(DISTFILES.normal)"; \ fi; \ - for file in $(DISTFILES.common) $$additional; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + ln $$dir/$$file $(distdir) 2> /dev/null \ + || cp -p $$dir/$$file $(distdir); \ done -dist-libc: - tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc - Makefile: Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -# The dependency for intlh.inst is different in gettext and all other -# packages. Because we cannot you GNU make features we have to solve -# the problem while rewriting Makefile.in. -@GT_YES@intlh.inst: intlh.inst.in ../config.status -@GT_YES@ cd .. \ -@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -@GT_YES@ $(SHELL) ./config.status -@GT_NO@.PHONY: intlh.inst -@GT_NO@intlh.inst: # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. + + * hppa/, hppa1.1/, pa7100/ : Use .label command instead of labels + because there syntax changed. By Matthew Wilcox. + +2001-05-06 Werner Koch + + * longlong.h: Fixes for ARM by Phil Blundell. + 2001-04-17 Werner Koch Updated copyright notices. diff -urN gnupg-1.0.5/mpi/Makefile.in gnupg-1.0.6/mpi/Makefile.in --- gnupg-1.0.5/mpi/Makefile.in Sun Apr 29 16:39:03 2001 +++ gnupg-1.0.6/mpi/Makefile.in Tue May 29 08:58:17 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@ diff -urN gnupg-1.0.5/mpi/hppa/mpih-add1.S gnupg-1.0.6/mpi/hppa/mpih-add1.S --- gnupg-1.0.5/mpi/hppa/mpih-add1.S Sun Apr 29 15:01:47 2001 +++ gnupg-1.0.6/mpi/hppa/mpih-add1.S Sun May 27 10:08:27 2001 @@ -45,7 +45,7 @@ .code .export mpihelp_add_n -mpihelp_add_n + .label mpihelp_add_n .proc .callinfo frame=0,no_calls .entry @@ -56,13 +56,15 @@ addib,= -1,%r23,L$end ; check for (SIZE == 1) add %r20,%r19,%r28 ; add first limbs ignoring cy -L$loop ldws,ma 4(0,%r25),%r20 + .label L$loop + ldws,ma 4(0,%r25),%r20 ldws,ma 4(0,%r24),%r19 stws,ma %r28,4(0,%r26) addib,<> -1,%r23,L$loop addc %r20,%r19,%r28 -L$end stws %r28,0(0,%r26) + .label L$end + stws %r28,0(0,%r26) bv 0(%r2) addc %r0,%r0,%r28 diff -urN gnupg-1.0.5/mpi/hppa/mpih-lshift.S gnupg-1.0.6/mpi/hppa/mpih-lshift.S --- gnupg-1.0.5/mpi/hppa/mpih-lshift.S Sun Apr 29 15:03:26 2001 +++ gnupg-1.0.6/mpi/hppa/mpih-lshift.S Sun May 27 10:08:27 2001 @@ -32,7 +32,7 @@ .code .export mpihelp_lshift -mpihelp_lshift + .label mpihelp_lshift .proc .callinfo frame=64,no_calls .entry @@ -48,7 +48,8 @@ addib,= -1,%r24,L$0002 vshd %r22,%r29,%r20 -L$loop ldws,mb -4(0,%r25),%r22 + .label L$loop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) addib,= -1,%r24,L$0003 vshd %r29,%r22,%r20 @@ -57,12 +58,15 @@ addib,<> -1,%r24,L$loop vshd %r22,%r29,%r20 -L$0002 stws,mb %r20,-4(0,%r26) + .label L$0002 + stws,mb %r20,-4(0,%r26) vshd %r29,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) -L$0003 stws,mb %r20,-4(0,%r26) -L$0004 vshd %r22,%r0,%r20 + .label L$0003 + stws,mb %r20,-4(0,%r26) + .label L$0004 + vshd %r22,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) diff -urN gnupg-1.0.5/mpi/hppa/mpih-rshift.S gnupg-1.0.6/mpi/hppa/mpih-rshift.S --- gnupg-1.0.5/mpi/hppa/mpih-rshift.S Sun Apr 29 15:03:43 2001 +++ gnupg-1.0.6/mpi/hppa/mpih-rshift.S Sun May 27 10:08:27 2001 @@ -33,7 +33,7 @@ .code .export mpihelp_rshift -mpihelp_rshift + .label mpihelp_rshift .proc .callinfo frame=64,no_calls .entry @@ -46,7 +46,8 @@ addib,= -1,%r24,L$r002 vshd %r29,%r22,%r20 -L$roop ldws,ma 4(0,%r25),%r22 + .label L$roop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) addib,= -1,%r24,L$r003 vshd %r22,%r29,%r20 @@ -55,12 +56,15 @@ addib,<> -1,%r24,L$roop vshd %r29,%r22,%r20 -L$r002 stws,ma %r20,4(0,%r26) + .label L$r002 + stws,ma %r20,4(0,%r26) vshd %r0,%r29,%r20 bv 0(%r2) stw %r20,0(0,%r26) -L$r003 stws,ma %r20,4(0,%r26) -L$r004 vshd %r0,%r22,%r20 + .label L$r003 + stws,ma %r20,4(0,%r26) + .label L$r004 + vshd %r0,%r22,%r20 bv 0(%r2) stw %r20,0(0,%r26) diff -urN gnupg-1.0.5/mpi/hppa/mpih-sub1.S gnupg-1.0.6/mpi/hppa/mpih-sub1.S --- gnupg-1.0.5/mpi/hppa/mpih-sub1.S Sun Apr 29 15:03:55 2001 +++ gnupg-1.0.6/mpi/hppa/mpih-sub1.S Sun May 27 10:08:27 2001 @@ -49,7 +49,7 @@ .code .export mpihelp_sub_n -mpihelp_sub_n + .label mpihelp_sub_n .proc .callinfo frame=0,no_calls .entry @@ -60,13 +60,15 @@ addib,= -1,%r23,L$end ; check for (SIZE == 1) sub %r20,%r19,%r28 ; subtract first limbs ignoring cy -L$loop ldws,ma 4(0,%r25),%r20 + .label L$loop + ldws,ma 4(0,%r25),%r20 ldws,ma 4(0,%r24),%r19 stws,ma %r28,4(0,%r26) addib,<> -1,%r23,L$loop subb %r20,%r19,%r28 -L$end stws %r28,0(0,%r26) + .label L$end + stws %r28,0(0,%r26) addc %r0,%r0,%r28 bv 0(%r2) subi 1,%r28,%r28 diff -urN gnupg-1.0.5/mpi/hppa/udiv-qrnnd.S gnupg-1.0.6/mpi/hppa/udiv-qrnnd.S --- gnupg-1.0.5/mpi/hppa/udiv-qrnnd.S Sun Apr 29 14:37:57 2001 +++ gnupg-1.0.6/mpi/hppa/udiv-qrnnd.S Sun May 27 10:08:27 2001 @@ -43,7 +43,7 @@ .code .export __udiv_qrnnd -__udiv_qrnnd + .label __udiv_qrnnd .proc .callinfo frame=0,no_calls .entry @@ -121,7 +121,7 @@ bv 0(%r2) addc %r28,%r28,%r28 -L$largedivisor + .label L$largedivisor extru %r24,31,1,%r19 ; r19 = n0 & 1 bb,< %r23,31,L$odd extru %r23,30,31,%r22 ; r22 = d >> 1 @@ -200,7 +200,8 @@ bv 0(%r2) addc %r24,%r24,%r28 -L$odd addib,sv,n 1,%r22,L$FF.. ; r22 = (d / 2 + 1) + .label L$odd + addib,sv,n 1,%r22,L$FF.. ; r22 = (d / 2 + 1) shd %r25,%r24,1,%r24 ; r24 = new n0 extru %r25,30,31,%r25 ; r25 = new n1 sub %r0,%r22,%r21 @@ -285,7 +286,8 @@ ; This is just a special case of the code above. ; We come here when d == 0xFFFFFFFF -L$FF.. add,uv %r25,%r24,%r24 + .label L$FF.. + add,uv %r25,%r24,%r24 sub,<< %r24,%r23,%r0 ldo 1(%r24),%r24 stws %r24,0(0,%r26) diff -urN gnupg-1.0.5/mpi/hppa1.1/mpih-mul1.S gnupg-1.0.6/mpi/hppa1.1/mpih-mul1.S --- gnupg-1.0.5/mpi/hppa1.1/mpih-mul1.S Sun Apr 29 15:04:09 2001 +++ gnupg-1.0.6/mpi/hppa1.1/mpih-mul1.S Sun May 27 10:08:27 2001 @@ -59,7 +59,7 @@ .code .export mpihelp_mul_1 -mpihelp_mul_1 + .label mpihelp_mul_1 .proc .callinfo frame=64,no_calls .entry @@ -82,7 +82,8 @@ ldw -12(%r30),%r1 ; Main loop -L$loop fldws,ma 4(%r25),%fr5 + .label L$loop + fldws,ma 4(%r25),%fr5 stws,ma %r19,4(%r26) addc %r28,%r1,%r19 xmpyu %fr4,%fr5,%fr6 @@ -91,7 +92,8 @@ addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end stws,ma %r19,4(%r26) + .label L$end + stws,ma %r19,4(%r26) addc %r28,%r1,%r19 ldw -16(%r30),%r28 stws,ma %r19,4(%r26) @@ -99,7 +101,7 @@ bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 fstds %fr6,-16(%r30) ldw -16(%r30),%r28 diff -urN gnupg-1.0.5/mpi/hppa1.1/mpih-mul2.S gnupg-1.0.6/mpi/hppa1.1/mpih-mul2.S --- gnupg-1.0.5/mpi/hppa1.1/mpih-mul2.S Sun Apr 29 15:04:22 2001 +++ gnupg-1.0.6/mpi/hppa1.1/mpih-mul2.S Sun May 27 10:08:27 2001 @@ -49,7 +49,7 @@ .code .export mpihelp_addmul_1 -mpihelp_addmul_1 + .label mpihelp_addmul_1 .proc .callinfo frame=64,no_calls .entry @@ -72,7 +72,8 @@ ldw -12(%r30),%r1 ; Main loop -L$loop ldws 0(%r26),%r29 + .label L$loop + ldws 0(%r26),%r29 fldws,ma 4(%r25),%fr5 add %r29,%r19,%r19 stws,ma %r19,4(%r26) @@ -84,7 +85,8 @@ addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end ldw 0(%r26),%r29 + .label L$end + ldw 0(%r26),%r29 add %r29,%r19,%r19 stws,ma %r19,4(%r26) addc %r28,%r1,%r19 @@ -97,7 +99,7 @@ bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 ldw 0(%r26),%r29 fstds %fr6,-16(%r30) diff -urN gnupg-1.0.5/mpi/hppa1.1/mpih-mul3.S gnupg-1.0.6/mpi/hppa1.1/mpih-mul3.S --- gnupg-1.0.5/mpi/hppa1.1/mpih-mul3.S Sun Apr 29 15:04:32 2001 +++ gnupg-1.0.6/mpi/hppa1.1/mpih-mul3.S Sun May 27 10:08:27 2001 @@ -56,7 +56,7 @@ .code .export mpihelp_submul_1 -mpihelp_submul_1 + .label mpihelp_submul_1 .proc .callinfo frame=64,no_calls .entry @@ -79,7 +79,8 @@ ldw -12(%r30),%r1 ; Main loop -L$loop ldws 0(%r26),%r29 + .label L$loop + ldws 0(%r26),%r29 fldws,ma 4(%r25),%fr5 sub %r29,%r19,%r22 add %r22,%r19,%r0 @@ -92,7 +93,8 @@ addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end ldw 0(%r26),%r29 + .label L$end + ldw 0(%r26),%r29 sub %r29,%r19,%r22 add %r22,%r19,%r0 stws,ma %r22,4(%r26) @@ -107,7 +109,7 @@ bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 ldw 0(%r26),%r29 fstds %fr6,-16(%r30) diff -urN gnupg-1.0.5/mpi/hppa1.1/udiv-qrnnd.S gnupg-1.0.6/mpi/hppa1.1/udiv-qrnnd.S --- gnupg-1.0.5/mpi/hppa1.1/udiv-qrnnd.S Sun Apr 29 15:04:42 2001 +++ gnupg-1.0.6/mpi/hppa1.1/udiv-qrnnd.S Sun May 27 10:08:27 2001 @@ -39,10 +39,11 @@ */ .code -L$0000 .word 0x43f00000 + .label L$0000 + .word 0x43f00000 .word 0x0 .export __udiv_qrnnd -__udiv_qrnnd + .label __udiv_qrnnd .proc .callinfo frame=64,no_calls .entry @@ -58,7 +59,7 @@ fcnvxf,dbl,dbl %fr5,%fr5 fldds 0(0,%r19),%fr4 fadd,dbl %fr4,%fr5,%fr5 -L$1 + .label L$1 fcpy,sgl %fr0,%fr6L fldws -12(0,%r30),%fr6R fcnvxf,dbl,dbl %fr6,%fr4 @@ -79,7 +80,8 @@ add %r22,%r23,%r22 ldo -1(%r28),%r28 -L$2 bv 0(%r2) + .label L$2 + bv 0(%r2) stws %r22,0(0,%r26) .exit diff -urN gnupg-1.0.5/mpi/longlong.h gnupg-1.0.6/mpi/longlong.h --- gnupg-1.0.5/mpi/longlong.h Sun Apr 29 13:37:02 2001 +++ gnupg-1.0.6/mpi/longlong.h Mon May 28 10:55:34 2001 @@ -2,7 +2,7 @@ Note: I added some stuff for use with gnupg Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998, - 2000 Free Software Foundation, Inc. + 2000, 2001 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -200,28 +200,27 @@ "rI" ((USItype)(bh)), \ "r" ((USItype)(al)), \ "rI" ((USItype)(bl))) -#ifdef __ARM_ARCH_3__ -/* SAM This does not work on arm4 */ +#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__ #define umul_ppmm(xh, xl, a, b) \ __asm__ ("%@ Inlined umul_ppmm - mov %|r0, %2, lsr #16 - mov %|r2, %3, lsr #16 - bic %|r1, %2, %|r0, lsl #16 - bic %|r2, %3, %|r2, lsl #16 - mul %1, %|r1, %|r2 - mul %|r2, %|r0, %|r2 - mul %|r1, %0, %|r1 - mul %0, %|r0, %0 - adds %|r1, %|r2, %|r1 - addcs %0, %0, #65536 - adds %1, %1, %|r1, lsl #16 - adc %0, %0, %|r1, lsr #16" \ + mov %|r0, %2, lsr #16 @ AAAA + mov %|r2, %3, lsr #16 @ BBBB + bic %|r1, %2, %|r0, lsl #16 @ aaaa + bic %0, %3, %|r2, lsl #16 @ bbbb + mul %1, %|r1, %|r2 @ aaaa * BBBB + mul %|r2, %|r0, %|r2 @ AAAA * BBBB + mul %|r1, %0, %|r1 @ aaaa * bbbb + mul %0, %|r0, %0 @ AAAA * bbbb + adds %|r0, %1, %0 @ central sum + addcs %|r2, %|r2, #65536 + adds %1, %|r1, %|r0, lsl #16 + adc %0, %|r2, %|r0, lsr #16" \ : "=&r" ((USItype)(xh)), \ "=r" ((USItype)(xl)) \ : "r" ((USItype)(a)), \ "r" ((USItype)(b)) \ : "r0", "r1", "r2") -#elif __ARM_ARCH_4__ +#else #define umul_ppmm(xh, xl, a, b) \ __asm__ ("%@ Inlined umul_ppmm umull %r1, %r0, %r2, %r3" \ @@ -230,8 +229,6 @@ : "r" ((USItype)(a)), \ "r" ((USItype)(b)) \ : "r0", "r1") -#else -#error Untested architecture #endif #define UMUL_TIME 20 #define UDIV_TIME 100 diff -urN gnupg-1.0.5/mpi/pa7100/mpih-lshift.S gnupg-1.0.6/mpi/pa7100/mpih-lshift.S --- gnupg-1.0.5/mpi/pa7100/mpih-lshift.S Sun Apr 29 15:09:52 2001 +++ gnupg-1.0.6/mpi/pa7100/mpih-lshift.S Sun May 27 10:08:27 2001 @@ -1,5 +1,5 @@ /* hppa lshift - * optimized for the PA7100, where is runs at 3.25 cycles/limb + * optimized for the PA7100, where it runs at 3.25 cycles/limb * * Copyright (C) 1992, 1994, 1998, * 2001 Free Software Foundation, Inc. @@ -33,7 +33,7 @@ .code .export mpihelp_lshift -mpihelp_lshift + .label mpihelp_lshift .proc .callinfo frame=64,no_calls .entry @@ -49,7 +49,8 @@ addib,<= -5,%r24,L$rest vshd %r22,%r29,%r20 -L$loop ldws,mb -4(0,%r25),%r22 + .label L$loop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) vshd %r29,%r22,%r20 ldws,mb -4(0,%r25),%r29 @@ -63,9 +64,11 @@ addib,> -4,%r24,L$loop vshd %r22,%r29,%r20 -L$rest addib,= 4,%r24,L$end1 + .label L$rest + addib,= 4,%r24,L$end1 nop -L$eloop ldws,mb -4(0,%r25),%r22 + .label L$eloop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) addib,<= -1,%r24,L$end2 vshd %r29,%r22,%r20 @@ -74,12 +77,15 @@ addib,> -1,%r24,L$eloop vshd %r22,%r29,%r20 -L$end1 stws,mb %r20,-4(0,%r26) + .label L$end1 + stws,mb %r20,-4(0,%r26) vshd %r29,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) -L$end2 stws,mb %r20,-4(0,%r26) -L$0004 vshd %r22,%r0,%r20 + .label L$end2 + stws,mb %r20,-4(0,%r26) + .label L$0004 + vshd %r22,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) diff -urN gnupg-1.0.5/mpi/pa7100/mpih-rshift.S gnupg-1.0.6/mpi/pa7100/mpih-rshift.S --- gnupg-1.0.5/mpi/pa7100/mpih-rshift.S Sun Apr 29 15:09:59 2001 +++ gnupg-1.0.6/mpi/pa7100/mpih-rshift.S Sun May 27 10:08:27 2001 @@ -1,5 +1,5 @@ /* hppa rshift - * optimized for the PA7100, where is runs at 3.25 cycles/limb + * optimized for the PA7100, where it runs at 3.25 cycles/limb * * Copyright (C) 1992, 1994, 1998, * 2001 Free Software Foundation, Inc. @@ -33,7 +33,7 @@ .code .export mpihelp_rshift -mpihelp_rshift + .label mpihelp_rshift .proc .callinfo frame=64,no_calls .entry @@ -46,7 +46,8 @@ addib,<= -5,%r24,L$rrest vshd %r29,%r22,%r20 -L$roop ldws,ma 4(0,%r25),%r22 + .label L$roop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) vshd %r22,%r29,%r20 ldws,ma 4(0,%r25),%r29 @@ -60,9 +61,11 @@ addib,> -4,%r24,L$roop vshd %r29,%r22,%r20 -L$rrest addib,= 4,%r24,L$rend1 + .label L$rrest + addib,= 4,%r24,L$rend1 nop -L$eroop ldws,ma 4(0,%r25),%r22 + .label L$eroop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) addib,<= -1,%r24,L$rend2 vshd %r22,%r29,%r20 @@ -71,12 +74,15 @@ addib,> -1,%r24,L$eroop vshd %r29,%r22,%r20 -L$rend1 stws,ma %r20,4(0,%r26) + .label L$rend1 + stws,ma %r20,4(0,%r26) vshd %r0,%r29,%r20 bv 0(%r2) stw %r20,0(0,%r26) -L$rend2 stws,ma %r20,4(0,%r26) -L$r004 vshd %r0,%r22,%r20 + .label L$rend2 + stws,ma %r20,4(0,%r26) + .label L$r004 + vshd %r0,%r22,%r20 bv 0(%r2) stw %r20,0(0,%r26) diff -urN gnupg-1.0.5/po/ChangeLog gnupg-1.0.6/po/ChangeLog --- gnupg-1.0.5/po/ChangeLog Fri Apr 27 14:32:29 2001 +++ gnupg-1.0.6/po/ChangeLog Mon May 28 11:50:06 2001 @@ -1,3 +1,28 @@ +2001-05-28 Werner Koch + + * ru.po: Removed - too many format string bugs. + +2001-05-27 gettextize + + * Makefile.in.in: Upgrade to gettext-0.10.38. + * cat-id-tbl.c: Remove file. + * stamp-cat-id: Remove file. + +2001-05-27 Werner Koch + + * tr.po: New copy from the TP Robot. + * da.po, de.po, eo.po, es_ES.po, et.po, id.po, ja.po, nl.po, + pt_BR.po, sv.po: Fixes to format string errors by Kurt Garloff. + It is not cleare whether they are all correct but at least they + won't give segv and minimize the risk of format string exploits. + * ru.po: Fixed the header entry. + + Fixed some fuzzy entries in all files. + +2001-05-06 Werner Koch + + * id.po: Updated + 2001-04-27 Werner Koch * de.po: Removed an extra "%s". diff -urN gnupg-1.0.5/po/Makefile.in.in gnupg-1.0.6/po/Makefile.in.in --- gnupg-1.0.5/po/Makefile.in.in Tue Jan 25 18:44:18 2000 +++ gnupg-1.0.6/po/Makefile.in.in Sat May 26 16:20:34 2001 @@ -1,5 +1,5 @@ # Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper # # This file file be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License @@ -9,6 +9,10 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + SHELL = /bin/sh @SET_MAKE@ @@ -18,22 +22,20 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/gettext/po -subdir = po +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../src:$$PATH msgmerge +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -43,20 +45,17 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) +$(POFILES) $(GMOFILES) POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .c.o: $(COMPILE) $< @@ -70,19 +69,19 @@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< all: all-@USE_NLS@ -all-yes: cat-id-tbl.c $(CATALOGS) +all-yes: $(CATALOGS) all-no: -$(srcdir)/$(PACKAGE).pot: $(POTFILES) +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ @@ -90,78 +89,35 @@ || ( rm -f $(srcdir)/$(PACKAGE).pot \ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: -$(srcdir)/stamp-cat-id: $(PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ - | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(datadir); \ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ + : ; \ fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ fi; \ done - if test "$(PACKAGE)" = "gettext"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi # Define this as empty until I found a useful application. installcheck: @@ -170,76 +126,68 @@ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done - rm -f $(gettextsrcdir)/po-Makefile.in.in + if test "$(PACKAGE)" = "gettext"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi check: all -cat-id-tbl.o: ../intl/libgettext.h - dvi info tags TAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f $(GMOFILES) -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) dists="$(DISTFILES)"; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done update-po: Makefile $(MAKE) $(PACKAGE).pot - PATH=`pwd`/../src:$$PATH; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ + catalogs='$(GMOFILES)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - mv $$lang.po $$lang.old.po; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ - rm -f $$lang.old.po; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ else \ echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ - mv $$lang.old.po $$lang.po; \ + rm -f $$lang.new.po; \ fi; \ done + $(MAKE) update-gmo -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) +update-gmo: Makefile $(GMOFILES) + @: -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ +Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status diff -urN gnupg-1.0.5/po/cat-id-tbl.c gnupg-1.0.6/po/cat-id-tbl.c --- gnupg-1.0.5/po/cat-id-tbl.c Sat Apr 28 19:58:18 2001 +++ gnupg-1.0.6/po/cat-id-tbl.c Thu Jan 1 01:00:00 1970 @@ -1,973 +0,0 @@ -/* Automatically generated by po2tbl.sed from gnupg.pot. */ - -#if HAVE_CONFIG_H -# include -#endif - -#include "libgettext.h" - -const struct _msg_ent _msg_tbl[] = { - {"", 1}, - {"Warning: using insecure memory!\n", 2}, - {"operation is not possible without initialized secure memory\n", 3}, - {"(you may have used the wrong program for this task)\n", 4}, - {"yes", 5}, - {"yY", 6}, - {"no", 7}, - {"nN", 8}, - {"quit", 9}, - {"qQ", 10}, - {"general error", 11}, - {"unknown packet type", 12}, - {"unknown version", 13}, - {"unknown pubkey algorithm", 14}, - {"unknown digest algorithm", 15}, - {"bad public key", 16}, - {"bad secret key", 17}, - {"bad signature", 18}, - {"checksum error", 19}, - {"bad passphrase", 20}, - {"public key not found", 21}, - {"unknown cipher algorithm", 22}, - {"can't open the keyring", 23}, - {"invalid packet", 24}, - {"invalid armor", 25}, - {"no such user id", 26}, - {"secret key not available", 27}, - {"wrong secret key used", 28}, - {"not supported", 29}, - {"bad key", 30}, - {"file read error", 31}, - {"file write error", 32}, - {"unknown compress algorithm", 33}, - {"file open error", 34}, - {"file create error", 35}, - {"invalid passphrase", 36}, - {"unimplemented pubkey algorithm", 37}, - {"unimplemented cipher algorithm", 38}, - {"unknown signature class", 39}, - {"trust database error", 40}, - {"bad MPI", 41}, - {"resource limit", 42}, - {"invalid keyring", 43}, - {"bad certificate", 44}, - {"malformed user id", 45}, - {"file close error", 46}, - {"file rename error", 47}, - {"file delete error", 48}, - {"unexpected data", 49}, - {"timestamp conflict", 50}, - {"unusable pubkey algorithm", 51}, - {"file exists", 52}, - {"weak key", 53}, - {"invalid argument", 54}, - {"bad URI", 55}, - {"unsupported URI", 56}, - {"network error", 57}, - {"not encrypted", 58}, - {"not processed", 59}, - {"unusable public key", 60}, - {"unusable secret key", 61}, - {"... this is a bug (%s:%d:%s)\n", 62}, - {"you found a bug ... (%s:%d)\n", 63}, - {"can't open `%s': %s\n", 64}, - {"can't stat `%s': %s\n", 65}, - {"`%s' is not a regular file - ignored\n", 66}, - {"note: random_seed file is empty\n", 67}, - {"warning: invalid size of random_seed file - not used\n", 68}, - {"can't read `%s': %s\n", 69}, - {"note: random_seed file not updated\n", 70}, - {"can't create `%s': %s\n", 71}, - {"can't write `%s': %s\n", 72}, - {"can't close `%s': %s\n", 73}, - {"too many random bits requested; the limit is %d\n", 74}, - {"WARNING: using insecure random number generator!!\n", 75}, - {"\ -The random number generator is only a kludge to let\n\ -it run - it is in no way a strong RNG!\n\ -\n\ -DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n\ -\n", 76}, - {"\ -\n\ -Not enough random bytes available. Please do some other work to give\n\ -the OS a chance to collect more entropy! (Need %d more bytes)\n", 77}, - {"\ -@Commands:\n\ - ", 78}, - {"|[file]|make a signature", 79}, - {"|[file]|make a clear text signature", 80}, - {"make a detached signature", 81}, - {"encrypt data", 82}, - {"encryption only with symmetric cipher", 83}, - {"store only", 84}, - {"decrypt data (default)", 85}, - {"verify a signature", 86}, - {"list keys", 87}, - {"list keys and signatures", 88}, - {"check key signatures", 89}, - {"list keys and fingerprints", 90}, - {"list secret keys", 91}, - {"generate a new key pair", 92}, - {"remove key from the public keyring", 93}, - {"remove key from the secret keyring", 94}, - {"sign a key", 95}, - {"sign a key locally", 96}, - {"sign or edit a key", 97}, - {"generate a revocation certificate", 98}, - {"export keys", 99}, - {"export keys to a key server", 100}, - {"import keys from a key server", 101}, - {"import/merge keys", 102}, - {"list only the sequence of packets", 103}, - {"export the ownertrust values", 104}, - {"import ownertrust values", 105}, - {"update the trust database", 106}, - {"|[NAMES]|check the trust database", 107}, - {"fix a corrupted trust database", 108}, - {"De-Armor a file or stdin", 109}, - {"En-Armor a file or stdin", 110}, - {"|algo [files]|print message digests", 111}, - {"\ -@\n\ -Options:\n\ - ", 112}, - {"create ascii armored output", 113}, - {"|NAME|encrypt for NAME", 114}, - {"|NAME|use NAME as default recipient", 115}, - {"use the default key as default recipient", 116}, - {"use this user-id to sign or decrypt", 117}, - {"|N|set compress level N (0 disables)", 118}, - {"use canonical text mode", 119}, - {"use as output file", 120}, - {"verbose", 121}, - {"be somewhat more quiet", 122}, - {"don't use the terminal at all", 123}, - {"force v3 signatures", 124}, - {"always use a MDC for encryption", 125}, - {"do not make any changes", 126}, - {"use the gpg-agent", 127}, - {"batch mode: never ask", 128}, - {"assume yes on most questions", 129}, - {"assume no on most questions", 130}, - {"add this keyring to the list of keyrings", 131}, - {"add this secret keyring to the list", 132}, - {"|NAME|use NAME as default secret key", 133}, - {"|HOST|use this keyserver to lookup keys", 134}, - {"|NAME|set terminal charset to NAME", 135}, - {"read options from file", 136}, - {"|FD|write status info to this FD", 137}, - {"|KEYID|ulimately trust this key", 138}, - {"|FILE|load extension module FILE", 139}, - {"emulate the mode described in RFC1991", 140}, - {"set all packet, cipher and digest options to OpenPGP behavior", 141}, - {"|N|use passphrase mode N", 142}, - {"|NAME|use message digest algorithm NAME for passphrases", 143}, - {"|NAME|use cipher algorithm NAME for passphrases", 144}, - {"|NAME|use cipher algorithm NAME", 145}, - {"|NAME|use message digest algorithm NAME", 146}, - {"|N|use compress algorithm N", 147}, - {"throw keyid field of encrypted packets", 148}, - {"|NAME=VALUE|use this notation data", 149}, - {"\ -@\n\ -(See the man page for a complete listing of all commands and options)\n", 150}, - {"\ -@\n\ -Examples:\n\ -\n\ - -se -r Bob [file] sign and encrypt for user Bob\n\ - --clearsign [file] make a clear text signature\n\ - --detach-sign [file] make a detached signature\n\ - --list-keys [names] show keys\n\ - --fingerprint [names] show fingerprints\n", 151}, - {"Please report bugs to .\n", 152}, - {"Usage: gpg [options] [files] (-h for help)", 153}, - {"\ -Syntax: gpg [options] [files]\n\ -sign, check, encrypt or decrypt\n\ -default operation depends on the input data\n", 154}, - {"\ -\n\ -Supported algorithms:\n", 155}, - {"usage: gpg [options] ", 156}, - {"conflicting commands\n", 157}, - {"NOTE: no default option file `%s'\n", 158}, - {"option file `%s': %s\n", 159}, - {"reading options from `%s'\n", 160}, - {"%s is not a valid character set\n", 161}, - {"WARNING: program may create a core file!\n", 162}, - {"NOTE: %s is not for normal use!\n", 163}, - {"%s not allowed with %s!\n", 164}, - {"%s makes no sense with %s!\n", 165}, - {"selected cipher algorithm is invalid\n", 166}, - {"selected digest algorithm is invalid\n", 167}, - {"the given policy URL is invalid\n", 168}, - {"compress algorithm must be in range %d..%d\n", 169}, - {"completes-needed must be greater than 0\n", 170}, - {"marginals-needed must be greater than 1\n", 171}, - {"max-cert-depth must be in range 1 to 255\n", 172}, - {"NOTE: simple S2K mode (0) is strongly discouraged\n", 173}, - {"invalid S2K mode; must be 0, 1 or 3\n", 174}, - {"failed to initialize the TrustDB: %s\n", 175}, - {"--store [filename]", 176}, - {"--symmetric [filename]", 177}, - {"--encrypt [filename]", 178}, - {"--sign [filename]", 179}, - {"--sign --encrypt [filename]", 180}, - {"--clearsign [filename]", 181}, - {"--decrypt [filename]", 182}, - {"--sign-key user-id", 183}, - {"--lsign-key user-id", 184}, - {"--edit-key user-id [commands]", 185}, - {"--delete-secret-key user-id", 186}, - {"--delete-key user-id", 187}, - {"--delete-secret-and-public-key user-id", 188}, - {"can't open %s: %s\n", 189}, - {"-k[v][v][v][c] [user-id] [keyring]", 190}, - {"dearmoring failed: %s\n", 191}, - {"enarmoring failed: %s\n", 192}, - {"invalid hash algorithm `%s'\n", 193}, - {"[filename]", 194}, - {"Go ahead and type your message ...\n", 195}, - {"can't open `%s'\n", 196}, - {"\ -the first character of a notation name must be a letter or an underscore\n", 197}, - {"\ -a notation name must have only letters, digits, dots or underscores and end \ -with an '='\n", 198}, - {"dots in a notation name must be surrounded by other characters\n", 199}, - {"a notation value must not use any control characters\n", 200}, - {"armor: %s\n", 201}, - {"invalid armor header: ", 202}, - {"armor header: ", 203}, - {"invalid clearsig header\n", 204}, - {"nested clear text signatures\n", 205}, - {"invalid dash escaped line: ", 206}, - {"unexpected armor:", 207}, - {"invalid radix64 character %02x skipped\n", 208}, - {"premature eof (no CRC)\n", 209}, - {"premature eof (in CRC)\n", 210}, - {"malformed CRC\n", 211}, - {"CRC error; %06lx - %06lx\n", 212}, - {"premature eof (in Trailer)\n", 213}, - {"error in trailer line\n", 214}, - {"For info see http://www.gnupg.org", 215}, - {"no valid OpenPGP data found.\n", 216}, - {"invalid armor: line longer than %d characters\n", 217}, - {"\ -quoted printable character in armor - probably a buggy MTA has been used\n", 218}, - {" Fingerprint:", 219}, - {"Fingerprint:", 220}, - {"No reason specified", 221}, - {"Key is superseded", 222}, - {"Key has been compromised", 223}, - {"Key is no longer used", 224}, - {"User ID is no longer valid", 225}, - {"Reason for revocation: ", 226}, - {"Revocation comment: ", 227}, - {"sSmMqQ", 228}, - {"\ -No trust value assigned to %lu:\n\ -%4u%c/%08lX %s \"", 229}, - {"\ -Please decide how far you trust this user to correctly\n\ -verify other users' keys (by looking at passports,\n\ -checking fingerprints from different sources...)?\n\ -\n\ - 1 = Don't know\n\ - 2 = I do NOT trust\n\ - 3 = I trust marginally\n\ - 4 = I trust fully\n\ - s = please show me more information\n", 230}, - {" m = back to the main menu\n", 231}, - {" q = quit\n", 232}, - {"Your decision? ", 233}, - {"Certificates leading to an ultimately trusted key:\n", 234}, - {"\ -Could not find a valid trust path to the key. Let's see whether we\n\ -can assign some missing owner trust values.\n\ -\n", 235}, - {"\ -No path leading to one of our keys found.\n\ -\n", 236}, - {"\ -No certificates with undefined trust found.\n\ -\n", 237}, - {"\ -No trust values changed.\n\ -\n", 238}, - {"key %08lX: key has been revoked!\n", 239}, - {"Use this key anyway? ", 240}, - {"key %08lX: subkey has been revoked!\n", 241}, - {"%08lX: key has expired\n", 242}, - {"%08lX: no info to calculate a trust probability\n", 243}, - {"%08lX: We do NOT trust this key\n", 244}, - {"\ -%08lX: It is not sure that this key really belongs to the owner\n\ -but it is accepted anyway\n", 245}, - {"This key probably belongs to the owner\n", 246}, - {"This key belongs to us\n", 247}, - {"\ -It is NOT certain that the key belongs to its owner.\n\ -If you *really* know what you are doing, you may answer\n\ -the next question with yes\n\ -\n", 248}, - {"WARNING: Using untrusted key!\n", 249}, - {"WARNING: This key has been revoked by its owner!\n", 250}, - {" This could mean that the signature is forgery.\n", 251}, - {"WARNING: This subkey has been revoked by its owner!\n", 252}, - {"Note: This key has expired!\n", 253}, - {"WARNING: This key is not certified with a trusted signature!\n", 254}, - {"\ - There is no indication that the signature belongs to the owner.\n", 255}, - {"WARNING: We do NOT trust this key!\n", 256}, - {" The signature is probably a FORGERY.\n", 257}, - {"\ -WARNING: This key is not certified with sufficiently trusted signatures!\n", 258}, - {" It is not certain that the signature belongs to the owner.\n", 259}, - {"%s: skipped: %s\n", 260}, - {"%s: skipped: public key already present\n", 261}, - {"\ -You did not specify a user ID. (you may use \"-r\")\n\ -\n", 262}, - {"Enter the user ID: ", 263}, - {"No such user ID.\n", 264}, - {"skipped: public key already set as default recipient\n", 265}, - {"Public key is disabled.\n", 266}, - {"skipped: public key already set with --encrypt-to\n", 267}, - {"unknown default recipient `%s'\n", 268}, - {"%s: error checking key: %s\n", 269}, - {"%s: skipped: public key is disabled\n", 270}, - {"no valid addressees\n", 271}, - {"writing self signature\n", 272}, - {"writing key binding signature\n", 273}, - {"keysize invalid; using %u bits\n", 274}, - {"keysize rounded up to %u bits\n", 275}, - {"Please select what kind of key you want:\n", 276}, - {" (%d) DSA and ElGamal (default)\n", 277}, - {" (%d) DSA (sign only)\n", 278}, - {" (%d) ElGamal (encrypt only)\n", 279}, - {" (%d) ElGamal (sign and encrypt)\n", 280}, - {" (%d) RSA (sign and encrypt)\n", 281}, - {"Your selection? ", 282}, - {"Do you really want to create a sign and encrypt key? ", 283}, - {"The use of this algorithm is deprecated - create anyway? ", 284}, - {"Invalid selection.\n", 285}, - {"\ -About to generate a new %s keypair.\n\ - minimum keysize is 768 bits\n\ - default keysize is 1024 bits\n\ - highest suggested keysize is 2048 bits\n", 286}, - {"What keysize do you want? (1024) ", 287}, - {"DSA only allows keysizes from 512 to 1024\n", 288}, - {"keysize too small; 768 is smallest value allowed.\n", 289}, - {"keysize too small; 1024 is smallest value allowed for RSA.\n", 290}, - {"keysize too large; %d is largest value allowed.\n", 291}, - {"\ -Keysizes larger than 2048 are not suggested because\n\ -computations take REALLY long!\n", 292}, - {"Are you sure that you want this keysize? ", 293}, - {"\ -Okay, but keep in mind that your monitor and keyboard radiation is also very \ -vulnerable to attacks!\n", 294}, - {"Do you really need such a large keysize? ", 295}, - {"Requested keysize is %u bits\n", 296}, - {"rounded up to %u bits\n", 297}, - {"\ -Please specify how long the key should be valid.\n\ - 0 = key does not expire\n\ - = key expires in n days\n\ - w = key expires in n weeks\n\ - m = key expires in n months\n\ - y = key expires in n years\n", 298}, - {"Key is valid for? (0) ", 299}, - {"invalid value\n", 300}, - {"Key does not expire at all\n", 301}, - {"Key expires at %s\n", 302}, - {"\ -Your system can't display dates beyond 2038.\n\ -However, it will be correctly handled up to 2106.\n", 303}, - {"Is this correct (y/n)? ", 304}, - {"\ -\n\ -You need a User-ID to identify your key; the software constructs the user \ -id\n\ -from Real Name, Comment and Email Address in this form:\n\ - \"Heinrich Heine (Der Dichter) \"\n\ -\n", 305}, - {"Real name: ", 306}, - {"Invalid character in name\n", 307}, - {"Name may not start with a digit\n", 308}, - {"Name must be at least 5 characters long\n", 309}, - {"Email address: ", 310}, - {"Not a valid email address\n", 311}, - {"Comment: ", 312}, - {"Invalid character in comment\n", 313}, - {"You are using the `%s' character set.\n", 314}, - {"\ -You selected this USER-ID:\n\ - \"%s\"\n\ -\n", 315}, - {"Please don't put the email address into the real name or the comment\n", 316}, - {"NnCcEeOoQq", 317}, - {"Change (N)ame, (C)omment, (E)mail or (Q)uit? ", 318}, - {"Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? ", 319}, - {"Please correct the error first\n", 320}, - {"\ -You need a Passphrase to protect your secret key.\n\ -\n", 321}, - {"passphrase not correctly repeated; try again.\n", 322}, - {"\ -You don't want a passphrase - this is probably a *bad* idea!\n\ -I will do it anyway. You can change your passphrase at any time,\n\ -using this program with the option \"--edit-key\".\n\ -\n", 323}, - {"\ -We need to generate a lot of random bytes. It is a good idea to perform\n\ -some other action (type on the keyboard, move the mouse, utilize the\n\ -disks) during the prime generation; this gives the random number\n\ -generator a better chance to gain enough entropy.\n", 324}, - {"DSA keypair will have 1024 bits.\n", 325}, - {"Key generation canceled.\n", 326}, - {"writing public key to `%s'\n", 327}, - {"writing secret key to `%s'\n", 328}, - {"public and secret key created and signed.\n", 329}, - {"\ -Note that this key cannot be used for encryption. You may want to use\n\ -the command \"--edit-key\" to generate a secondary key for this purpose.\n", 330}, - {"Key generation failed: %s\n", 331}, - {"\ -key has been created %lu second in future (time warp or clock problem)\n", 332}, - {"\ -key has been created %lu seconds in future (time warp or clock problem)\n", 333}, - {"Really create? ", 334}, - {"%s: can't open: %s\n", 335}, - {"error creating passphrase: %s\n", 336}, - {"%s: WARNING: empty file\n", 337}, - {"reading from `%s'\n", 338}, - {"%s/%s encrypted for: %s\n", 339}, - {"%s: user not found: %s\n", 340}, - {"certificate read problem: %s\n", 341}, - {"key %08lX: not a rfc2440 key - skipped\n", 342}, - {"key %08lX: not protected - skipped\n", 343}, - {"WARNING: nothing exported\n", 344}, - {"too many entries in pk cache - disabled\n", 345}, - {"[User id not found]", 346}, - {"too many entries in unk cache - disabled\n", 347}, - {"using secondary key %08lX instead of primary key %08lX\n", 348}, - {"key %08lX: secret key without public key - skipped\n", 349}, - {"skipping block of type %d\n", 350}, - {"%lu keys so far processed\n", 351}, - {"error reading `%s': %s\n", 352}, - {"Total number processed: %lu\n", 353}, - {" skipped new keys: %lu\n", 354}, - {" w/o user IDs: %lu\n", 355}, - {" imported: %lu", 356}, - {" unchanged: %lu\n", 357}, - {" new user IDs: %lu\n", 358}, - {" new subkeys: %lu\n", 359}, - {" new signatures: %lu\n", 360}, - {" new key revocations: %lu\n", 361}, - {" secret keys read: %lu\n", 362}, - {" secret keys imported: %lu\n", 363}, - {" secret keys unchanged: %lu\n", 364}, - {"key %08lX: no user ID\n", 365}, - {"key %08lX: no valid user IDs\n", 366}, - {"this may be caused by a missing self-signature\n", 367}, - {"key %08lX: public key not found: %s\n", 368}, - {"key %08lX: new key - skipped\n", 369}, - {"no default public keyring\n", 370}, - {"writing to `%s'\n", 371}, - {"can't lock keyring `%s': %s\n", 372}, - {"error writing keyring `%s': %s\n", 373}, - {"key %08lX: public key imported\n", 374}, - {"key %08lX: doesn't match our copy\n", 375}, - {"key %08lX: can't locate original keyblock: %s\n", 376}, - {"key %08lX: can't read original keyblock: %s\n", 377}, - {"key %08lX: 1 new user ID\n", 378}, - {"key %08lX: %d new user IDs\n", 379}, - {"key %08lX: 1 new signature\n", 380}, - {"key %08lX: %d new signatures\n", 381}, - {"key %08lX: 1 new subkey\n", 382}, - {"key %08lX: %d new subkeys\n", 383}, - {"key %08lX: not changed\n", 384}, - {"secret key %08lX not imported (use %s to allow for it)\n", 385}, - {"key %08lX: secret key imported\n", 386}, - {"key %08lX: already in secret keyring\n", 387}, - {"key %08lX: secret key not found: %s\n", 388}, - {"key %08lX: no public key - can't apply revocation certificate\n", 389}, - {"key %08lX: invalid revocation certificate: %s - rejected\n", 390}, - {"key %08lX: revocation certificate imported\n", 391}, - {"key %08lX: no user ID for signature\n", 392}, - {"key %08lX: unsupported public key algorithm\n", 393}, - {"key %08lX: invalid self-signature\n", 394}, - {"key %08lX: no subkey for key binding\n", 395}, - {"key %08lX: invalid subkey binding\n", 396}, - {"key %08lX: accepted non self-signed user ID '", 397}, - {"key %08lX: skipped user ID '", 398}, - {"key %08lX: skipped subkey\n", 399}, - {"key %08lX: non exportable signature (class %02x) - skipped\n", 400}, - {"key %08lX: revocation certificate at wrong place - skipped\n", 401}, - {"key %08lX: invalid revocation certificate: %s - skipped\n", 402}, - {"key %08lX: duplicated user ID detected - merged\n", 403}, - {"key %08lX: revocation certificate added\n", 404}, - {"key %08lX: our copy has no self-signature\n", 405}, - {"%s: user not found\n", 406}, - {"[revocation]", 407}, - {"[self-signature]", 408}, - {"1 bad signature\n", 409}, - {"%d bad signatures\n", 410}, - {"1 signature not checked due to a missing key\n", 411}, - {"%d signatures not checked due to missing keys\n", 412}, - {"1 signature not checked due to an error\n", 413}, - {"%d signatures not checked due to errors\n", 414}, - {"1 user ID without valid self-signature detected\n", 415}, - {"%d user IDs without valid self-signatures detected\n", 416}, - {"Already signed by key %08lX\n", 417}, - {"Nothing to sign with key %08lX\n", 418}, - {"\ -Are you really sure that you want to sign this key\n\ -with your key: \"", 419}, - {"\ -The signature will be marked as non-exportable.\n\ -\n", 420}, - {"Really sign? ", 421}, - {"signing failed: %s\n", 422}, - {"This key is not protected.\n", 423}, - {"Secret parts of primary key are not available.\n", 424}, - {"Key is protected.\n", 425}, - {"Can't edit this key: %s\n", 426}, - {"\ -Enter the new passphrase for this secret key.\n\ -\n", 427}, - {"\ -You don't want a passphrase - this is probably a *bad* idea!\n\ -\n", 428}, - {"Do you really want to do this? ", 429}, - {"moving a key signature to the correct place\n", 430}, - {"quit this menu", 431}, - {"q", 432}, - {"save", 433}, - {"save and quit", 434}, - {"help", 435}, - {"show this help", 436}, - {"fpr", 437}, - {"show fingerprint", 438}, - {"list", 439}, - {"list key and user IDs", 440}, - {"l", 441}, - {"uid", 442}, - {"select user ID N", 443}, - {"key", 444}, - {"select secondary key N", 445}, - {"check", 446}, - {"list signatures", 447}, - {"c", 448}, - {"sign", 449}, - {"sign the key", 450}, - {"s", 451}, - {"lsign", 452}, - {"sign the key locally", 453}, - {"debug", 454}, - {"adduid", 455}, - {"add a user ID", 456}, - {"deluid", 457}, - {"delete user ID", 458}, - {"addkey", 459}, - {"add a secondary key", 460}, - {"delkey", 461}, - {"delete a secondary key", 462}, - {"delsig", 463}, - {"delete signatures", 464}, - {"expire", 465}, - {"change the expire date", 466}, - {"toggle", 467}, - {"toggle between secret and public key listing", 468}, - {"t", 469}, - {"pref", 470}, - {"list preferences", 471}, - {"showpref", 472}, - {"passwd", 473}, - {"change the passphrase", 474}, - {"trust", 475}, - {"change the ownertrust", 476}, - {"revsig", 477}, - {"revoke signatures", 478}, - {"revkey", 479}, - {"revoke a secondary key", 480}, - {"disable", 481}, - {"disable a key", 482}, - {"enable", 483}, - {"enable a key", 484}, - {"can't do that in batchmode\n", 485}, - {"Secret key is available.\n", 486}, - {"Command> ", 487}, - {"Need the secret key to do this.\n", 488}, - {"Please use the command \"toggle\" first.\n", 489}, - {"Really sign all user IDs? ", 490}, - {"Hint: Select the user IDs to sign\n", 491}, - {"update of trustdb failed: %s\n", 492}, - {"You must select at least one user ID.\n", 493}, - {"You can't delete the last user ID!\n", 494}, - {"Really remove all selected user IDs? ", 495}, - {"Really remove this user ID? ", 496}, - {"You must select at least one key.\n", 497}, - {"Do you really want to delete the selected keys? ", 498}, - {"Do you really want to delete this key? ", 499}, - {"Do you really want to revoke the selected keys? ", 500}, - {"Do you really want to revoke this key? ", 501}, - {"Save changes? ", 502}, - {"Quit without saving? ", 503}, - {"update failed: %s\n", 504}, - {"update secret failed: %s\n", 505}, - {"Key not changed so no update needed.\n", 506}, - {"Invalid command (try \"help\")\n", 507}, - {"%s%c %4u%c/%08lX created: %s expires: %s", 508}, - {" trust: %c/%c", 509}, - {"This key has been disabled", 510}, - {"rev! subkey has been revoked: %s\n", 511}, - {"rev- faked revocation found\n", 512}, - {"rev? problem checking revocation: %s\n", 513}, - {"Delete this good signature? (y/N/q)", 514}, - {"Delete this invalid signature? (y/N/q)", 515}, - {"Delete this unknown signature? (y/N/q)", 516}, - {"Really delete this self-signature? (y/N)", 517}, - {"Deleted %d signature.\n", 518}, - {"Deleted %d signatures.\n", 519}, - {"Nothing deleted.\n", 520}, - {"Please remove selections from the secret keys.\n", 521}, - {"Please select at most one secondary key.\n", 522}, - {"Changing expiration time for a secondary key.\n", 523}, - {"Changing expiration time for the primary key.\n", 524}, - {"You can't change the expiration date of a v3 key\n", 525}, - {"No corresponding signature in secret ring\n", 526}, - {"No user ID with index %d\n", 527}, - {"No secondary key with index %d\n", 528}, - {"user ID: \"", 529}, - {"\ -\"\n\ -signed with your key %08lX at %s\n", 530}, - {"Create a revocation certificate for this signature? (y/N)", 531}, - {"You have signed these user IDs:\n", 532}, - {" signed by %08lX at %s\n", 533}, - {" revoked by %08lX at %s\n", 534}, - {"You are about to revoke these signatures:\n", 535}, - {"Really create the revocation certificates? (y/N)", 536}, - {"no secret key\n", 537}, - {" [expires: %s]", 538}, - {"public key is %08lX\n", 539}, - {"public key encrypted data: good DEK\n", 540}, - {"encrypted with %u-bit %s key, ID %08lX, created %s\n", 541}, - {"encrypted with %s key, ID %08lX\n", 542}, - {"public key decryption failed: %s\n", 543}, - {"decryption okay\n", 544}, - {"WARNING: encrypted message has been manipulated!\n", 545}, - {"decryption failed: %s\n", 546}, - {"NOTE: sender requested \"for-your-eyes-only\"\n", 547}, - {"original file name='%.*s'\n", 548}, - {"standalone revocation - use \"gpg --import\" to apply\n", 549}, - {"WARNING: invalid notation data found\n", 550}, - {"Notation: ", 551}, - {"Policy: ", 552}, - {"signature verification suppressed\n", 553}, - {"can't handle these multiple signatures\n", 554}, - {"Signature made %.*s using %s key ID %08lX\n", 555}, - {"BAD signature from \"", 556}, - {"Good signature from \"", 557}, - {" aka \"", 558}, - {"Can't check signature: %s\n", 559}, - {"not a detached signature\n", 560}, - {"standalone signature of class 0x%02x\n", 561}, - {"old style (PGP 2.x) signature\n", 562}, - {"invalid root packet detected in proc_tree()\n", 563}, - {"can't disable core dumps: %s\n", 564}, - {"Experimental algorithms should not be used!\n", 565}, - {"this cipher algorithm is deprecated; please use a more standard one!\n", 566}, - {"can't handle public key algorithm %d\n", 567}, - {"subpacket of type %d has critical bit set\n", 568}, - {"gpg-agent is not available in this session\n", 569}, - {"malformed GPG_AGENT_INFO environment variable\n", 570}, - {"can't connect to `%s': %s\n", 571}, - {" (main key ID %08lX)", 572}, - {"\ -You need a passphrase to unlock the secret key for user:\n\ -\"%.*s\"\n\ -%u-bit %s key, ID %08lX, created %s%s\n", 573}, - {"Enter passphrase\n", 574}, - {"Repeat passphrase\n", 575}, - {"passphrase too long\n", 576}, - {"invalid response from agent\n", 577}, - {"cancelled by user\n", 578}, - {"problem with the agent: agent returns 0x%lx\n", 579}, - {"\ -\n\ -You need a passphrase to unlock the secret key for\n\ -user: \"", 580}, - {"%u-bit %s key, ID %08lX, created %s", 581}, - {"can't query password in batchmode\n", 582}, - {"Enter passphrase: ", 583}, - {"Repeat passphrase: ", 584}, - {"data not saved; use option \"--output\" to save it\n", 585}, - {"Detached signature.\n", 586}, - {"Please enter name of data file: ", 587}, - {"reading stdin ...\n", 588}, - {"no signed data\n", 589}, - {"can't open signed data `%s'\n", 590}, - {"anonymous receiver; trying secret key %08lX ...\n", 591}, - {"okay, we are the anonymous recipient.\n", 592}, - {"old encoding of the DEK is not supported\n", 593}, - {"cipher algorithm %d is unknown or disabled\n", 594}, - {"NOTE: cipher algorithm %d not found in preferences\n", 595}, - {"NOTE: secret key %08lX expired at %s\n", 596}, - {"requesting key %08lX from %s ...\n", 597}, - {"can't get key from keyserver: %s\n", 598}, - {"no keyserver known (use option --keyserver)\n", 599}, - {"%s: not a valid key ID\n", 600}, - {"error sending to `%s': %s\n", 601}, - {"success sending to `%s' (status=%u)\n", 602}, - {"failed sending to `%s': status=%u\n", 603}, - {"secret key parts are not available\n", 604}, - {"protection algorithm %d is not supported\n", 605}, - {"Invalid passphrase; please try again ...\n", 606}, - {"WARNING: Weak key detected - please change passphrase again.\n", 607}, - {"assuming bad MDC due to an unknown critical bit\n", 608}, - {"\ -this is a PGP generated ElGamal key which is NOT secure for signatures!\n", 609}, - {"public key is %lu second newer than the signature\n", 610}, - {"public key is %lu seconds newer than the signature\n", 611}, - {"NOTE: signature key %08lX expired %s\n", 612}, - {"assuming bad signature due to an unknown critical bit\n", 613}, - {"checking created signature failed: %s\n", 614}, - {"%s signature from: %s\n", 615}, - {"can't create %s: %s\n", 616}, - {"signing:", 617}, - {"WARNING: `%s' is an empty file\n", 618}, - {"can't handle text lines longer than %d characters\n", 619}, - {"input line longer than %d characters\n", 620}, - {"trustdb rec %lu: lseek failed: %s\n", 621}, - {"trustdb rec %lu: write failed (n=%d): %s\n", 622}, - {"trustdb transaction too large\n", 623}, - {"%s: can't access: %s\n", 624}, - {"%s: directory does not exist!\n", 625}, - {"%s: can't create: %s\n", 626}, - {"%s: can't create lock\n", 627}, - {"%s: failed to create version record: %s", 628}, - {"%s: invalid trustdb created\n", 629}, - {"%s: trustdb created\n", 630}, - {"%s: invalid trustdb\n", 631}, - {"%s: failed to create hashtable: %s\n", 632}, - {"%s: error updating version record: %s\n", 633}, - {"%s: error reading version record: %s\n", 634}, - {"%s: error writing version record: %s\n", 635}, - {"trustdb: lseek failed: %s\n", 636}, - {"trustdb: read failed (n=%d): %s\n", 637}, - {"%s: not a trustdb file\n", 638}, - {"%s: version record with recnum %lu\n", 639}, - {"%s: invalid file version %d\n", 640}, - {"%s: error reading free record: %s\n", 641}, - {"%s: error writing dir record: %s\n", 642}, - {"%s: failed to zero a record: %s\n", 643}, - {"%s: failed to append a record: %s\n", 644}, - {"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n", 645}, - {"trust record %lu, req type %d: read failed: %s\n", 646}, - {"trust record %lu, type %d: write failed: %s\n", 647}, - {"trust record %lu: delete failed: %s\n", 648}, - {"trustdb: sync failed: %s\n", 649}, - {"error reading dir record for LID %lu: %s\n", 650}, - {"lid %lu: expected dir record, got type %d\n", 651}, - {"no primary key for LID %lu\n", 652}, - {"error reading primary key for LID %lu: %s\n", 653}, - {"get_dir_record: search_record failed: %s\n", 654}, - {"'%s' is not a valid long keyID\n", 655}, - {"key %08lX: can't put it into the trustdb\n", 656}, - {"key %08lX: query record failed\n", 657}, - {"key %08lX: already in trusted key table\n", 658}, - {"key %08lX: accepted as trusted key.\n", 659}, - {"key %08lX: no public key for trusted key - skipped\n", 660}, - {"NOTE: secret key %08lX is NOT protected.\n", 661}, - {"key %08lX: secret and public key don't match\n", 662}, - {"enumerate secret keys failed: %s\n", 663}, - {"key %08lX.%lu: Good subkey binding\n", 664}, - {"key %08lX.%lu: Invalid subkey binding: %s\n", 665}, - {"key %08lX.%lu: Valid key revocation\n", 666}, - {"key %08lX.%lu: Invalid key revocation: %s\n", 667}, - {"key %08lX.%lu: Valid subkey revocation\n", 668}, - {"Good self-signature", 669}, - {"Invalid self-signature", 670}, - {"Valid user ID revocation skipped due to a newer self signature", 671}, - {"Valid user ID revocation", 672}, - {"Invalid user ID revocation", 673}, - {"Valid certificate revocation", 674}, - {"Good certificate", 675}, - {"Invalid certificate revocation", 676}, - {"Invalid certificate", 677}, - {"sig record %lu[%d] points to wrong record.\n", 678}, - {"duplicated certificate - deleted", 679}, - {"tdbio_search_dir failed: %s\n", 680}, - {"lid ?: insert failed: %s\n", 681}, - {"lid %lu: insert failed: %s\n", 682}, - {"lid %lu: inserted\n", 683}, - {"error reading dir record: %s\n", 684}, - {"%lu keys processed\n", 685}, - {"\t%lu keys with errors\n", 686}, - {"\t%lu keys inserted\n", 687}, - {"enumerate keyblocks failed: %s\n", 688}, - {"lid %lu: dir record w/o key - skipped\n", 689}, - {"\t%lu due to new pubkeys\n", 690}, - {"\t%lu keys skipped\n", 691}, - {"\t%lu keys updated\n", 692}, - {"Ooops, no keys\n", 693}, - {"Ooops, no user IDs\n", 694}, - {"check_trust: search dir record failed: %s\n", 695}, - {"key %08lX: insert trust record failed: %s\n", 696}, - {"key %08lX.%lu: inserted into trustdb\n", 697}, - {"key %08lX.%lu: created in future (time warp or clock problem)\n", 698}, - {"key %08lX.%lu: expired at %s\n", 699}, - {"key %08lX.%lu: trust check failed: %s\n", 700}, - {"user '%s' not found: %s\n", 701}, - {"problem finding '%s' in trustdb: %s\n", 702}, - {"user '%s' not in trustdb - inserting\n", 703}, - {"failed to put '%s' into trustdb: %s\n", 704}, - {"WARNING: can't yet handle long pref records\n", 705}, - {"\ -the signature could not be verified.\n\ -Please remember that the signature file (.sig or .asc)\n\ -should be the first file given on the command line.\n", 706}, - {"input line %u too long or missing LF\n", 707}, - {"%s: can't create keyring: %s\n", 708}, - {"%s: keyring created\n", 709}, - {"WARNING: 2 files with confidential information exists.\n", 710}, - {"%s is the unchanged one\n", 711}, - {"%s is the new one\n", 712}, - {"Please fix this possible security flaw\n", 713}, - {"key is not flagged as insecure - can't use it with the faked RNG!\n", 714}, - {"skipped `%s': duplicated\n", 715}, - {"skipped `%s': %s\n", 716}, - {"skipped: secret key already present\n", 717}, - {"\ -skipped `%s': this is a PGP generated ElGamal key which is not secure for \ -signatures!\n", 718}, - {"File `%s' exists. ", 719}, - {"Overwrite (y/N)? ", 720}, - {"%s: unknown suffix\n", 721}, - {"Enter new filename", 722}, - {"writing to stdout\n", 723}, - {"assuming signed data in `%s'\n", 724}, - {"%s: new options file created\n", 725}, - {"%s: can't create directory: %s\n", 726}, - {"%s: directory created\n", 727}, - {"you have to start GnuPG again, so it can read the new options file\n", 728}, - {"%s encrypted data\n", 729}, - {"encrypted with unknown algorithm %d\n", 730}, - {"\ -WARNING: message was encrypted with a weak key in the symmetric cipher.\n", 731}, - {"problem handling encrypted packet\n", 732}, - {"weak key created - retrying\n", 733}, - {"cannot avoid weak key for symmetric cipher; tried %d times!\n", 734}, - {"can't do that in batchmode without \"--yes\"\n", 735}, - {"Delete this key from the keyring? ", 736}, - {"This is a secret key! - really delete? ", 737}, - {"there is a secret key for this public key!\n", 738}, - {"use option \"--delete-secret-key\" to delete it first.\n", 739}, - {"\ -It's up to you to assign a value here; this value will never be exported\n\ -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.", 740}, - {"If you want to use this revoked key anyway, answer \"yes\".", 741}, - {"If you want to use this untrusted key anyway, answer \"yes\".", 742}, - {"\ -Enter the user ID of the addressee to whom you want to send the message.", 743}, - {"\ -Select the algorithm to use.\n\ -\n\ -DSA (aka DSS) is the digital signature algorithm which can only be used\n\ -for signatures. This is the suggested algorithm because verification of\n\ -DSA signatures are much faster than those of ElGamal.\n\ -\n\ -ElGamal is an algorithm which can be used for signatures and encryption.\n\ -OpenPGP distinguishs between two flavors of this algorithms: an encrypt \ -only\n\ -and a sign+encrypt; actually it is the same, but some parameters must be\n\ -selected in a special way to create a safe key for signatures: this program\n\ -does this but other OpenPGP implementations are not required to understand\n\ -the signature+encryption flavor.\n\ -\n\ -The first (primary) key must always be a key which is capable of signing;\n\ -this is the reason why the encryption only ElGamal key is not available in\n\ -this menu.", 744}, - {"\ -Although these keys are defined in RFC2440 they are not suggested\n\ -because they are not supported by all programs and signatures created\n\ -with them are quite large and very slow to verify.", 745}, - {"Enter the size of the key", 746}, - {"Answer \"yes\" or \"no\"", 747}, - {"\ -Enter the required value as shown in the prompt.\n\ -It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n\ -get a good error response - instead the system tries to interpret\n\ -the given value as an interval.", 748}, - {"Enter the name of the key holder", 749}, - {"please enter an optional but highly suggested email address", 750}, - {"Please enter an optional comment", 751}, - {"\ -N to change the name.\n\ -C to change the comment.\n\ -E to change the email address.\n\ -O to continue with key generation.\n\ -Q to to quit the key generation.", 752}, - {"Answer \"yes\" (or just \"y\") if it is okay to generate the sub key.", 753}, - {"Answer \"yes\" is you want to sign ALL the user IDs", 754}, - {"\ -Answer \"yes\" if you really want to delete this user ID.\n\ -All certificates are then also lost!", 755}, - {"Answer \"yes\" if it is okay to delete the subkey", 756}, - {"\ -This is a valid signature on the key; you normally don't want\n\ -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.", 757}, - {"\ -This signature can't be checked because you don't have the\n\ -corresponding key. You should postpone its deletion until you\n\ -know which key was used because this signing key might establish\n\ -a trust connection through another already certified key.", 758}, - {"\ -The signature is not valid. It does make sense to remove it from\n\ -your keyring.", 759}, - {"\ -This is a signature which binds the user ID to the key. It is\n\ -usually not a good idea to remove such a signature. Actually\n\ -GnuPG might not be able to use this key anymore. So do this\n\ -only if this self-signature is for some reason not valid and\n\ -a second one is available.", 760}, - {"\ -Please enter the passhrase; this is a secret sentence \n\ - Blurb, blurb,.... ", 761}, - {"Please repeat the last passphrase, so you are sure what you typed in.", 762}, - {"Give the name of the file to which the signature applies", 763}, - {"Answer \"yes\" if it is okay to overwrite the file", 764}, - {"\ -Please enter a new filename. If you just hit RETURN the default\n\ -file (which is shown in brackets) will be used.", 765}, - {"\ -You should specify a reason for the certification. Depending on the\n\ -context you have the ability to choose from this list:\n\ - \"Key has been compromised\"\n\ - Use this if you have a reason to believe that unauthorized persons\n\ - got access to your secret key.\n\ - \"Key is superseded\"\n\ - Use this if you have replaced this key with a newer one.\n\ - \"Key is no longer used\"\n\ - Use this if you have retired this key.\n\ - \"User ID is no longer valid\"\n\ - 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", 766}, - {"\ -If you like, you can enter a text describing why you issue this\n\ -revocation certificate. Please keep this text concise.\n\ -An empty line ends the text.\n", 767}, - {"No help available", 768}, - {"No help available for `%s'", 769}, -}; - -int _msg_tbl_length = 769; diff -urN gnupg-1.0.5/po/da.po gnupg-1.0.6/po/da.po --- gnupg-1.0.5/po/da.po Sun Apr 29 16:39:22 2001 +++ gnupg-1.0.6/po/da.po Tue May 29 08:58:37 2001 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2000-03-07 22:51+01:00\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -15,15 +15,15 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Advarsel: benytter ubeskyttet hukommelse!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan have brugt et forkert program til denne opgave)\n" @@ -601,7 +601,7 @@ msgstr "|FD|skriv statusinfo til denne FD" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +msgid "|KEYID|ultimately trust this key" msgstr "" #: g10/g10.c:311 @@ -842,7 +842,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key bruger-id" +msgstr "--delete-secret-and-public-key bruger-id" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1546,7 +1546,7 @@ "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "" @@ -1563,7 +1563,11 @@ "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Vil du virkelig oprette?" @@ -1623,21 +1627,21 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 #, fuzzy msgid "[User id not found]" -msgstr "%s: bruger ikke fundet\n" +msgstr "[bruger ikke fundet]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -2212,7 +2216,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "præf" +msgstr "vispræf" #: g10/keyedit.c:608 msgid "passwd" @@ -2376,12 +2380,12 @@ #: g10/keyedit.c:1173 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" +msgstr "rev! undernøgle er blevet annulleret! %s\n" #: g10/keyedit.c:1176 #, fuzzy msgid "rev- faked revocation found\n" -msgstr " nye nøgletilbagekald: %lu\n" +msgstr "rev- forkert nøgletilbagekald\n" #: g10/keyedit.c:1178 #, c-format @@ -2649,7 +2653,7 @@ msgid "can't connect to `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (hovednøgle-ID %08lX)" @@ -2684,32 +2688,32 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -2754,7 +2758,7 @@ #: g10/pubkey-enc.c:153 #, fuzzy, c-format msgid "cipher algorithm %d is unknown or disabled\n" -msgstr "valgte cifferalgoritme er ugyldig\n" +msgstr "valgte cifferalgoritme %d er ugyldig\n" #: g10/pubkey-enc.c:192 #, c-format @@ -2774,7 +2778,7 @@ #: g10/hkp.c:83 #, fuzzy, c-format msgid "can't get key from keyserver: %s\n" -msgstr "importér nøgler fra en nøgleserver" +msgstr "importér nøgler fra en nøgleserver: %s\n" #: g10/hkp.c:102 g10/hkp.c:136 msgid "no keyserver known (use option --keyserver)\n" @@ -3348,7 +3352,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n" +msgstr "udelod: hemmelig nøgle er allerede tilstede\n" #: g10/skclist.c:160 #, c-format diff -urN gnupg-1.0.5/po/de.po gnupg-1.0.6/po/de.po --- gnupg-1.0.5/po/de.po Sun Apr 29 16:39:22 2001 +++ gnupg-1.0.6/po/de.po Tue May 29 08:58:38 2001 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-16 14:20+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -12,17 +12,17 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n" # " Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n" # " Bitte wenden Sie sich hierzu an den Systemadministrator.\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "" "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n" @@ -603,7 +603,8 @@ msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen" #: g10/g10.c:311 @@ -1629,7 +1630,7 @@ "werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n" "Zweitschlüssel für diesem Zweck erzeugen.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" @@ -1650,7 +1651,11 @@ "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht überein)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Wirklich erzeugen? " @@ -1710,7 +1715,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[User-ID nicht gefunden]" @@ -1718,13 +1723,13 @@ msgid "too many entries in unk cache - disabled\n" msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -1863,8 +1868,8 @@ #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -"Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: " -"%s\n" +"Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %" +"s\n" #: g10/import.c:495 g10/import.c:698 #, c-format @@ -2316,7 +2321,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2633,7 +2638,7 @@ #: g10/mainproc.c:430 msgid "decryption okay\n" -msgstr "Enschlüsselung fehlgeschlagen: %s\n" +msgstr "Enschlüsselung erfolgreich\n" #: g10/mainproc.c:435 msgid "WARNING: encrypted message has been manipulated!\n" @@ -2757,7 +2762,7 @@ msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (Hauptschlüssel-ID %08lX)" @@ -2793,12 +2798,12 @@ msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2808,20 +2813,20 @@ "Sie benötigen ein Mantra, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Geben Sie das Mantra ein: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Geben Sie das Mantra nochmal ein: " @@ -2935,8 +2940,8 @@ #: g10/sig-check.c:199 msgid "assuming bad MDC due to an unknown critical bit\n" msgstr "" -"Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical " -"bit\")\n" +"Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical bit" +"\")\n" #: g10/sig-check.c:297 msgid "" @@ -3124,8 +3129,8 @@ #: g10/tdbio.c:1748 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg " -"--fix-trustdb\".\n" +"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" +"\".\n" #: g10/trustdb.c:169 #, c-format diff -urN gnupg-1.0.5/po/eo.po gnupg-1.0.6/po/eo.po --- gnupg-1.0.5/po/eo.po Sun Apr 29 16:39:23 2001 +++ gnupg-1.0.6/po/eo.po Tue May 29 08:58:40 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-23 20:55+01:00\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -13,15 +13,15 @@ "Content-Type: text/plain; charset=iso-8859-3\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Averto: uzas malsekuran memoron!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n" @@ -599,7 +599,8 @@ msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|fidi æi tiun þlosilon absolute" #: g10/g10.c:311 @@ -840,7 +841,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key uzantidentigilo" +msgstr "--delete-secret-and-public-key uzantidentigilo" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1600,7 +1601,7 @@ "Notu, ke æi tiu þlosilo ne estas uzebla por æifrado. Vi eble volos\n" "uzi la komandon \"--edit-key\" por krei flankan þlosilon por tiu celo.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" @@ -1621,7 +1622,11 @@ "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Æu vere krei? " @@ -1681,7 +1686,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[Uzantidentigilo ne trovita]" @@ -1689,12 +1694,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "tro da registroj en unk-staplo - malþaltas\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" @@ -2277,7 +2282,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2716,7 +2721,7 @@ msgid "can't connect to `%s': %s\n" msgstr "ne povas konektiøi al '%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (æefþlosilo %08lX)" @@ -2728,9 +2733,9 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" -"\n" "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" -"por la uzanto: \"" +"por la uzanto: \"%.*s\"\n" +"%u-bit %s key, ID %08lX, created %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2754,12 +2759,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2769,20 +2774,20 @@ "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -2805,7 +2810,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "ne povas malfermi subskribitan dosieron '%s'\n" +msgstr "ne subskribitan dosieron\n" #: g10/plaintext.c:399 #, c-format @@ -2916,7 +2921,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTO: subskribo-þlosilo eksvalidiøis je %s\n" +msgstr "NOTO: subskribo-þlosilo %08lX eksvalidiøis je %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -3420,7 +3425,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "ignoris '%s': %s\n" +msgstr "ignoris '%s': ripetita\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3430,7 +3435,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: ignorita: publika þlosilo jam æeestas\n" +msgstr "ignorita: sekreta þlosilo jam æeestas\n" #: g10/skclist.c:160 #, c-format diff -urN gnupg-1.0.5/po/es_ES.po gnupg-1.0.6/po/es_ES.po --- gnupg-1.0.5/po/es_ES.po Sun Apr 29 16:39:24 2001 +++ gnupg-1.0.6/po/es_ES.po Tue May 29 08:58:42 2001 @@ -7,30 +7,30 @@ # GPG version: 1.0.0 msgid "" msgstr "" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 1999-10-27 06:35+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa \n" "Updated: 1998-01-12\n" "By: Luca Olivetti \n" -"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --" +"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c " "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c " -"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c " -"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c " -"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" +"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/" +"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/" +"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operación imposible sin memoria segura inicializada\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" @@ -253,7 +253,7 @@ #: util/errors.c:103 #, fuzzy msgid "not processed" -msgstr "se han procesado %lu claves\n" +msgstr "no procesado" #. the key cannot be used for a specific usage #: util/errors.c:105 @@ -612,7 +612,8 @@ msgstr "|DF|escribe información de estado en descriptor DF" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|ID-CLAVE|confía plenamente en esta clave" #: g10/g10.c:311 @@ -857,7 +858,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key id-usuario" +msgstr "--delete-secret-key-and-public id-usuario" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1627,7 +1628,7 @@ "el comando \"--edit-key\" para crear una clave secundaria con este " "propósito.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" @@ -1648,7 +1649,11 @@ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "¿Crear de verdad? " @@ -1708,21 +1713,21 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 #, fuzzy msgid "[User id not found]" -msgstr "%s: usuario no encontrado\n" +msgstr "[usuario no encontrado]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "demasiados registros en la cache unk - anulada\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n" @@ -2471,12 +2476,12 @@ #: g10/keyedit.c:1173 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n" +msgstr "rev! ¡esta subclave ha sido revocada! %s\n" #: g10/keyedit.c:1176 #, fuzzy msgid "rev- faked revocation found\n" -msgstr " nuevas revocaciones: %lu\n" +msgstr "rev- incorrectas revocaciones\n" #: g10/keyedit.c:1178 #, c-format @@ -2700,7 +2705,7 @@ #: g10/mainproc.c:1454 #, fuzzy, c-format msgid "standalone signature of class 0x%02x\n" -msgstr "Clase de firma desconocida" +msgstr "Clase 0x%02x de firma desconocida" #: g10/mainproc.c:1511 msgid "old style (PGP 2.x) signature\n" @@ -2749,7 +2754,7 @@ msgid "can't connect to `%s': %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr "(ID clave primaria %08lX)" @@ -2763,7 +2768,8 @@ msgstr "" "\n" "Necesita una contraseña para desbloquear la clave secreta\n" -"del usuario: \"" +"del usuario: \"%2$s\"\n" +"clave %4$s de %3$u bit, ID %5$08lX, creada el %6$s%7$s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2788,12 +2794,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2803,20 +2809,20 @@ "Necesita una contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Introduzca contraseña: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Repita contraseña: " @@ -2827,7 +2833,7 @@ #: g10/plaintext.c:332 #, fuzzy msgid "Detached signature.\n" -msgstr "%d firmas borradas.\n" +msgstr "Firma borrada.\n" #: g10/plaintext.c:336 msgid "Please enter name of data file: " @@ -2840,7 +2846,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "imposible abrir datos firmados `%s'\n" +msgstr "no datos firmados\n" #: g10/plaintext.c:399 #, c-format @@ -2873,7 +2879,7 @@ #: g10/pubkey-enc.c:198 #, fuzzy, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "NOTA: clave de la firma caducada el %s\n" +msgstr "NOTA: clave secreta %08lX caducada el %s\n" #: g10/hkp.c:59 #, c-format @@ -2912,7 +2918,7 @@ #: g10/seckey-cert.c:53 #, fuzzy msgid "secret key parts are not available\n" -msgstr "Clave secreta no disponible" +msgstr "Clave secreta no disponible\n" #: g10/seckey-cert.c:59 #, c-format @@ -2951,7 +2957,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTA: clave de la firma caducada el %s\n" +msgstr "NOTA: clave de la firma %08lX caducada el %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -2960,7 +2966,7 @@ #: g10/sign.c:152 #, fuzzy, c-format msgid "checking created signature failed: %s\n" -msgstr "lid %lu: lectura registro firma fallida: %s\n" +msgstr "lectura registro firma fallida: %s\n" #: g10/sign.c:161 #, c-format @@ -3330,10 +3336,11 @@ msgstr "lid %lu: registro de directiorio sin clave - ignorado\n" #: g10/trustdb.c:1873 -#, fuzzy, c-format +#, c-format msgid "\t%lu due to new pubkeys\n" -msgstr "clave %08lX: %d nuevas subclaves\n" +msgstr "" +# msgstr "clave %08lX: %d nuevas subclaves\n" #: g10/trustdb.c:1875 #, c-format msgid "\t%lu keys skipped\n" @@ -3455,7 +3462,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "`%s' ignorado: %s\n" +msgstr "`%s' ignorado: duplicado\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3465,7 +3472,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: ignorado: clave pública ya presente\n" +msgstr "ignorado: clave secreta ya presente\n" #: g10/skclist.c:160 #, c-format @@ -3836,8 +3843,8 @@ #~ msgstr "clave secreta para descifrado no disponible\n" #~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" +#~ "RSA keys are deprecated; please consider creating a new key and use this " +#~ "key in the future\n" #~ msgstr "" #~ "Las claves RSA están en desuso, considere la creación de una nueva clave " #~ "para futuros usos\n" diff -urN gnupg-1.0.5/po/et.po gnupg-1.0.6/po/et.po --- gnupg-1.0.5/po/et.po Sun Apr 29 16:39:25 2001 +++ gnupg-1.0.6/po/et.po Tue May 29 08:58:43 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-01-04 12:01+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -13,15 +13,15 @@ "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Hoiatus: kasutan ebaturvalist mälu!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "initsialiseerimata turvalise mäluta ei ole operatsioon võimalik\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n" @@ -599,7 +599,8 @@ msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|VÕTMEID|usalda seda võtit täielikult" #: g10/g10.c:311 @@ -840,7 +841,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key kasutaja-id" +msgstr "--delete-secret-and-public-key kasutaja-id" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1599,7 +1600,7 @@ "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n" "kasutades võtit \"--edit-key\".\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" @@ -1616,7 +1617,11 @@ "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Loon tõesti? " @@ -1676,7 +1681,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[Kasutaja id ei leitud]" @@ -1684,12 +1689,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "unk puhvris on liiga palju elemente - blokeerin\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n" @@ -2272,7 +2277,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2712,7 +2717,7 @@ msgid "can't connect to `%s': %s\n" msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (peamise võtme ID %08lX)" @@ -2726,7 +2731,8 @@ msgstr "" "\n" "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" -"parooli: \"" +"parooli: \"%*.s\"\n" +"%u-bit %s key, ID %08lX, created %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2750,12 +2756,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2765,20 +2771,20 @@ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -2799,9 +2805,8 @@ msgstr "loen standardsisendit ...\n" #: g10/plaintext.c:391 -#, fuzzy msgid "no signed data\n" -msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n" +msgstr "" #: g10/plaintext.c:399 #, c-format @@ -2910,7 +2915,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "MÄRKUS: allkirja võti aegus %s\n" +msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -3413,7 +3418,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "`%s' jäi vahele: %s\n" +msgstr "jäi vahele %s: dubleeritud\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3423,7 +3428,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: jätsin vahele: avalik võti on juba olemas\n" +msgstr "jätsin vahele: avalik võti on juba olemas\n" #: g10/skclist.c:160 #, c-format diff -urN gnupg-1.0.5/po/fr.po gnupg-1.0.6/po/fr.po --- gnupg-1.0.5/po/fr.po Sun Apr 29 16:39:25 2001 +++ gnupg-1.0.6/po/fr.po Tue May 29 08:58:45 2001 @@ -5,12 +5,12 @@ # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.47.2.41 2001/04/29 14:08:11 werner Exp $ +# $Id: fr.po,v 1.47.2.43 2001/05/28 12:46:18 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.4t\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-24 17:46+02:00\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -18,17 +18,17 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "" "l'opération n'est pas possible tant que la mémoire sûre n'est pas\n" "initialisée\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n" @@ -609,7 +609,8 @@ msgstr "|FD|écrire l'état sur ce descripteur" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|IDCLÉ|donner une confiance ultime à cette clé" #: g10/g10.c:311 @@ -1627,7 +1628,7 @@ "utiliser la commande «--edit-key» pour générer une clé secondaire à\n" "cette fin.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "La génération de clé a échoué: %s\n" @@ -1649,7 +1650,11 @@ "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Créer vraiment ? " @@ -1709,7 +1714,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[Nom utilisateur introuvable]" @@ -1717,14 +1722,14 @@ msgid "too many entries in unk cache - disabled\n" msgstr "trop d'entrées dans le cache unk - désactivé\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "utilisation de la clé secondaire %08lX à la place de la clé\n" "principale %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clé %08lX: clé secrète sans clé publique - non prise en compte\n" @@ -2306,9 +2311,8 @@ msgstr "lister les préférences" #: g10/keyedit.c:607 -#, fuzzy msgid "showpref" -msgstr "préf" +msgstr "" #: g10/keyedit.c:608 msgid "passwd" @@ -2747,7 +2751,7 @@ msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter à `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (ID clé principale %08lX)" @@ -2784,12 +2788,12 @@ msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2799,20 +2803,20 @@ "Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n" "l'utilisateur: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clé de %u bits %s, ID %08lX, créée le %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "impossible de demander un mot de passe en mode automatique\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -3121,8 +3125,8 @@ #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "" -"enregistrement de confiance %lu, type de requête %d: la lecture a échoué: " -"%s\n" +"enregistrement de confiance %lu, type de requête %d: la lecture a échoué: %" +"s\n" #: g10/trustdb.c:184 #, c-format diff -urN gnupg-1.0.5/po/gnupg.pot gnupg-1.0.6/po/gnupg.pot --- gnupg-1.0.5/po/gnupg.pot Sun Apr 29 16:39:21 2001 +++ gnupg-1.0.6/po/gnupg.pot Tue May 29 08:58:35 2001 @@ -6,23 +6,23 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "" @@ -585,7 +585,7 @@ msgstr "" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +msgid "|KEYID|ultimately trust this key" msgstr "" #: g10/g10.c:311 @@ -1500,7 +1500,7 @@ "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "" @@ -1517,7 +1517,11 @@ "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "" @@ -1577,7 +1581,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "" @@ -1585,12 +1589,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -2597,7 +2601,7 @@ msgid "can't connect to `%s': %s\n" msgstr "" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -2630,32 +2634,32 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "" -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "" diff -urN gnupg-1.0.5/po/id.po gnupg-1.0.6/po/id.po --- gnupg-1.0.5/po/id.po Sun Apr 29 16:39:26 2001 +++ gnupg-1.0.6/po/id.po Tue May 29 08:58:46 2001 @@ -1,27 +1,28 @@ -# GNU Privacy Guard 1.0.1 (Indonesian) -# Copyright (C) 1999 Free Software Foundation, Inc. -# Tedi Heriyanto , 1999-2000. +# GNU Privacy Guard 1.0.5 (Indonesian) +# Copyright (C) 1999, 2001 Free Software Foundation, Inc. +# Tedi Heriyanto , 1999-2001. # msgid "" msgstr "" -"Project-Id-Version: GNU Privacy Guard 1.0.1\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" -"PO-Revision-Date: 2000-02-06 18:04+07:00\n" +"Project-Id-Version: GNU Privacy Guard 1.0.4\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" +"PO-Revision-Date: 2001-04-30 15:19GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" -"Language-Team: Indonesia \n" +"Language-Team: Indonesian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.8\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Peringatan: menggunakan memori yang tidak aman!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" @@ -242,20 +243,17 @@ msgstr "tidak dienkripsi" #: util/errors.c:103 -#, fuzzy msgid "not processed" -msgstr "%lu kunci diproses\n" +msgstr "tidak diproses" #. the key cannot be used for a specific usage #: util/errors.c:105 -#, fuzzy msgid "unusable public key" -msgstr "kunci publik yang buruk" +msgstr "kunci publik tidak dapat dipakai" #: util/errors.c:106 -#, fuzzy msgid "unusable secret key" -msgstr "kunci rahasia yang buruk" +msgstr "kunci rahasia tidak dapat dipakai" #: util/logger.c:224 #, c-format @@ -273,51 +271,51 @@ msgstr "tidak dapat membuka `%s': %s\n" #: cipher/random.c:324 -#, fuzzy, c-format +#, c-format msgid "can't stat `%s': %s\n" -msgstr "tidak dapat membuka `%s': %s\n" +msgstr "tidak dapat menstat `%s': %s\n" #: cipher/random.c:329 #, c-format msgid "`%s' is not a regular file - ignored\n" -msgstr "" +msgstr "'%s' bukan file reguler - diabaikan\n" #: cipher/random.c:334 msgid "note: random_seed file is empty\n" -msgstr "" +msgstr "catatan: file random_seed kosong\n" #: cipher/random.c:340 msgid "warning: invalid size of random_seed file - not used\n" -msgstr "" +msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n" #: cipher/random.c:348 -#, fuzzy, c-format +#, c-format msgid "can't read `%s': %s\n" -msgstr "tidak dapat membuka `%s': %s\n" +msgstr "tidak dapat membaca `%s': %s\n" #: cipher/random.c:386 msgid "note: random_seed file not updated\n" -msgstr "" +msgstr "catatan: file random_seed tidak diupdate\n" #: cipher/random.c:406 -#, fuzzy, c-format +#, c-format msgid "can't create `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" #: cipher/random.c:413 -#, fuzzy, c-format +#, c-format msgid "can't write `%s': %s\n" -msgstr "tidak dapat membuka `%s': %s\n" +msgstr "tidak dapat menulis `%s': %s\n" #: cipher/random.c:416 -#, fuzzy, c-format +#, c-format msgid "can't close `%s': %s\n" -msgstr "tidak dapat membuka `%s': %s\n" +msgstr "tidak dapat menutup `%s': %s\n" #: cipher/random.c:427 #, c-format msgid "too many random bits requested; the limit is %d\n" -msgstr "" +msgstr "terlalu banyak permintaan random bit; batasnya adalah %d\n" #: cipher/random.c:661 msgid "WARNING: using insecure random number generator!!\n" @@ -417,9 +415,8 @@ msgstr "hapus kunci dari keyring publik" #: g10/g10.c:236 -#, fuzzy msgid "remove key from the secret keyring" -msgstr "hapus kunci dari keyring publik" +msgstr "hapus kunci dari keyring pribadi" #: g10/g10.c:237 msgid "sign a key" @@ -558,7 +555,7 @@ #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, #: g10/g10.c:292 msgid "use the gpg-agent" -msgstr "" +msgstr "gunakan gpg-agent" #: g10/g10.c:293 msgid "batch mode: never ask" @@ -601,8 +598,9 @@ msgstr "|FD|tulis info status ke FD ini" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" -msgstr "" +#, fuzzy +msgid "|KEYID|ultimately trust this key" +msgstr "|KEYID|sangat percaya kunci ini" #: g10/g10.c:311 msgid "|FILE|load extension module FILE" @@ -653,6 +651,8 @@ "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" +"@\n" +"(Lihat man page untuk daftar lengkap semua perintah dan option)\n" #: g10/g10.c:329 msgid "" @@ -838,9 +838,8 @@ msgstr "--delete-key id-user" #: g10/g10.c:1305 -#, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key id-user" +msgstr "--delete-secret-and-public-key id-user" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -961,7 +960,7 @@ #: g10/armor.c:922 msgid "For info see http://www.gnupg.org" -msgstr "" +msgstr "Untuk info lihat http://www.gnupg.org" #: g10/armor.c:1050 msgid "no valid OpenPGP data found.\n" @@ -991,33 +990,31 @@ #: g10/pkclist.c:116 msgid "No reason specified" -msgstr "" +msgstr "Tidak ada alasan diberikan" #: g10/pkclist.c:118 -#, fuzzy msgid "Key is superseded" -msgstr "Kunci diproteksi.\n" +msgstr "Kunci dilampau" #: g10/pkclist.c:120 -#, fuzzy msgid "Key has been compromised" -msgstr "Kunci ini telah ditiadakan" +msgstr "Kunci ini telah dikompromikan" #: g10/pkclist.c:122 msgid "Key is no longer used" -msgstr "" +msgstr "Kunci tidak lagi digunakan" #: g10/pkclist.c:124 msgid "User ID is no longer valid" -msgstr "" +msgstr "ID User tidak lagi valid" #: g10/pkclist.c:128 msgid "Reason for revocation: " -msgstr "" +msgstr "Alasan pembatalan:" #: g10/pkclist.c:145 msgid "Revocation comment: " -msgstr "" +msgstr "Komentar pembatalan:" #. a string with valid answers #: g10/pkclist.c:303 @@ -1273,14 +1270,14 @@ msgstr "menulis key binding signature\n" #: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445 -#, fuzzy, c-format +#, c-format msgid "keysize invalid; using %u bits\n" -msgstr "Keysize yang diminta adalah %u bit\n" +msgstr "keysize tidak valid; menggunakan %u bit\n" #: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450 -#, fuzzy, c-format +#, c-format msgid "keysize rounded up to %u bits\n" -msgstr "dibulatkan hingga %u bit\n" +msgstr "keysize dibulatkan hingga %u bit\n" #: g10/keygen.c:549 msgid "Please select what kind of key you want:\n" @@ -1307,9 +1304,9 @@ msgstr " (%d) ElGamal (tandai dan enkripsi)\n" #: g10/keygen.c:557 -#, fuzzy, c-format +#, c-format msgid " (%d) RSA (sign and encrypt)\n" -msgstr " (%d) ElGamal (tandai dan enkripsi)\n" +msgstr " (%d) RSA (tandai dan enkripsi)\n" #: g10/keygen.c:561 msgid "Your selection? " @@ -1321,7 +1318,7 @@ #: g10/keygen.c:580 msgid "The use of this algorithm is deprecated - create anyway? " -msgstr "" +msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?" #: g10/keygen.c:594 msgid "Invalid selection.\n" @@ -1353,9 +1350,9 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" #: g10/keygen.c:622 -#, fuzzy msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" +msgstr "" +"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n" #. It is ridiculous and an annoyance to use larger key sizes! #. * GnuPG can handle much larger sizes; but it takes an eternity @@ -1443,6 +1440,8 @@ "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" +"Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n" +"Namun, ia dapat menanganinya secara benar hingga 2106.\n" #: g10/keygen.c:750 msgid "Is this correct (y/n)? " @@ -1512,16 +1511,15 @@ #: g10/keygen.c:883 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "" +msgstr "Jangan menaruh alamat email dalam nama sebenarnya atau komentar\n" #: g10/keygen.c:888 msgid "NnCcEeOoQq" msgstr "NnKkEeOoQq" #: g10/keygen.c:898 -#, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? " +msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? " #: g10/keygen.c:899 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " @@ -1529,7 +1527,7 @@ #: g10/keygen.c:918 msgid "Please correct the error first\n" -msgstr "" +msgstr "Silakan perbaiki kesalahan ini dulu\n" #: g10/keygen.c:956 msgid "" @@ -1576,14 +1574,14 @@ msgstr "Pembuatan kunci dibatalkan.\n" #: g10/keygen.c:1581 -#, fuzzy, c-format +#, c-format msgid "writing public key to `%s'\n" -msgstr "menulis sertifikat publik ke `%s'\n" +msgstr "menulis kunci publik ke `%s'\n" #: g10/keygen.c:1582 -#, fuzzy, c-format +#, c-format msgid "writing secret key to `%s'\n" -msgstr "menulis sertifikat rahasia ke `%s'\n" +msgstr "menulis kunci rahasia ke `%s'\n" #: g10/keygen.c:1679 msgid "public and secret key created and signed.\n" @@ -1598,7 +1596,7 @@ "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua " "untuk tujuan ini.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Pembuatan kunci gagal: %s\n" @@ -1617,7 +1615,11 @@ msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Ingin diciptakan? " @@ -1663,9 +1665,9 @@ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n" #: g10/export.c:182 -#, fuzzy, c-format +#, c-format msgid "key %08lX: not protected - skipped\n" -msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n" +msgstr "kunci %08lX: tidak diproteksi - dilewati\n" #: g10/export.c:236 msgid "WARNING: nothing exported\n" @@ -1677,21 +1679,20 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 -#, fuzzy +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" -msgstr "%s: user tidak ditemukan\n" +msgstr "[User id tidak ditemukan]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "terlalu banyak masukan di unk cache - ditiadakan\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n" @@ -1717,9 +1718,9 @@ msgstr "Jumlah yang telah diproses: %lu\n" #: g10/import.c:208 -#, fuzzy, c-format +#, c-format msgid " skipped new keys: %lu\n" -msgstr " subkey baru: %lu\n" +msgstr " lewati subkey baru: %lu\n" #: g10/import.c:211 #, c-format @@ -1791,9 +1792,9 @@ msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n" #: g10/import.c:440 -#, fuzzy, c-format +#, c-format msgid "key %08lX: new key - skipped\n" -msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n" +msgstr "kunci %08lX: kunci baru - dilewati\n" #: g10/import.c:448 msgid "no default public keyring\n" @@ -1872,7 +1873,7 @@ #: g10/import.c:610 #, c-format msgid "secret key %08lX not imported (use %s to allow for it)\n" -msgstr "" +msgstr "kunci rahasia %08lX tidak diimpor (gunakan %s untuk memungkinkannya)\n" #: g10/import.c:640 #, c-format @@ -2072,9 +2073,8 @@ msgstr "Kunci ini tidak diproteksi.\n" #: g10/keyedit.c:432 -#, fuzzy msgid "Secret parts of primary key are not available.\n" -msgstr "kunci rahasia tidak ada" +msgstr "Bagian rahasia kunci primer tidak tersedia.\n" #: g10/keyedit.c:436 msgid "Key is protected.\n" @@ -2274,9 +2274,8 @@ msgstr "tampilkan preferensi" #: g10/keyedit.c:607 -#, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2346,7 +2345,7 @@ #: g10/keyedit.c:734 msgid "Please use the command \"toggle\" first.\n" -msgstr "" +msgstr "Silakan gunakan dulu perintah \"toogle\".\n" #: g10/keyedit.c:781 msgid "Really sign all user IDs? " @@ -2426,31 +2425,30 @@ #: g10/keyedit.c:1131 g10/keyedit.c:1157 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "" +msgstr "%s%c %4u%c/%08lX diciptakan: %s berakhir: %s" #: g10/keyedit.c:1140 #, c-format msgid " trust: %c/%c" -msgstr "" +msgstr " kepercayaan: %c/%c" #: g10/keyedit.c:1144 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" #: g10/keyedit.c:1173 -#, fuzzy, c-format +#, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "kunci %08lX: subkey telah dibatalkan!\n" +msgstr "rev! subkey telah dibatalkan: %s\n" #: g10/keyedit.c:1176 -#, fuzzy msgid "rev- faked revocation found\n" -msgstr " pembatalan kunci baru: %lu\n" +msgstr "rev - ditemukan pembatalan palsu\n" #: g10/keyedit.c:1178 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "" +msgstr "rev? masalah memeriksa pembatalan: %s\n" #: g10/keyedit.c:1420 msgid "Delete this good signature? (y/N/q)" @@ -2560,9 +2558,9 @@ #. of subkey #: g10/keylist.c:279 g10/mainproc.c:851 -#, fuzzy, c-format +#, c-format msgid " [expires: %s]" -msgstr "Kunci berakhir pada %s\n" +msgstr " [berakhir: %s]" #: g10/mainproc.c:269 #, c-format @@ -2612,7 +2610,7 @@ #: g10/mainproc.c:632 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "" +msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n" #: g10/mainproc.c:719 g10/mainproc.c:728 msgid "WARNING: invalid notation data found\n" @@ -2632,9 +2630,8 @@ #. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1235 g10/mainproc.c:1245 -#, fuzzy msgid "can't handle these multiple signatures\n" -msgstr "buat detached signature" +msgstr "tidak dapat menangani banyak signature ini\n" #: g10/mainproc.c:1256 #, c-format @@ -2660,14 +2657,13 @@ msgstr "Tidak dapat memeriksa signature: %s\n" #: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505 -#, fuzzy msgid "not a detached signature\n" -msgstr "buat detached signature" +msgstr "bukan detached signature\n" #: g10/mainproc.c:1454 -#, fuzzy, c-format +#, c-format msgid "standalone signature of class 0x%02x\n" -msgstr "kelas signature tidak dikenal" +msgstr "kelas signature mandiri 0x%02x\n" #: g10/mainproc.c:1511 msgid "old style (PGP 2.x) signature\n" @@ -2687,7 +2683,6 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n" #: g10/misc.c:238 -#, fuzzy msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n" @@ -2704,61 +2699,59 @@ #: g10/passphrase.c:223 msgid "gpg-agent is not available in this session\n" -msgstr "" +msgstr "gpg-agent tidak tersedia untuk sesi ini\n" #: g10/passphrase.c:229 msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "" +msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n" #: g10/hkp.c:167 g10/passphrase.c:248 -#, fuzzy, c-format +#, c-format msgid "can't connect to `%s': %s\n" -msgstr "tidak dapat membuka `%s': %s\n" +msgstr "tidak dapat terkoneksi ke `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (ID kunci utama %08lX)" #: g10/passphrase.c:323 -#, fuzzy, c-format +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" -"\n" -"Anda perlu passphrase untuk membuka kunci rahasia untuk\n" -"pemakai: \"" +"Anda perlu passphrase untuk membuka kunci rahasia untuk user:\n" +"\"%.*s\"\n" +"%u-bit %s key, ID %08lX, tercipta %s%s\n" #: g10/passphrase.c:344 -#, fuzzy msgid "Enter passphrase\n" -msgstr "Masukkan passphrase: " +msgstr "Masukkan passphrase\n" #: g10/passphrase.c:346 -#, fuzzy msgid "Repeat passphrase\n" -msgstr "Ulangi passphrase: " +msgstr "Ulangi passphrase\n" #: g10/passphrase.c:384 msgid "passphrase too long\n" -msgstr "" +msgstr "passphrase terlalu panjang\n" #: g10/passphrase.c:396 msgid "invalid response from agent\n" -msgstr "" +msgstr "respon tidak valid dari agen\n" #: g10/passphrase.c:405 msgid "cancelled by user\n" -msgstr "" +msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" -msgstr "" +msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2768,20 +2761,20 @@ "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -2790,9 +2783,8 @@ msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n" #: g10/plaintext.c:332 -#, fuzzy msgid "Detached signature.\n" -msgstr "Menghapus %d signature.\n" +msgstr "Menghapus signature.\n" #: g10/plaintext.c:336 msgid "Please enter name of data file: " @@ -2803,9 +2795,8 @@ msgstr "membaca stdin ...\n" #: g10/plaintext.c:391 -#, fuzzy msgid "no signed data\n" -msgstr "tidak dapat membuka data tertandai `%s'\n" +msgstr "tidak ada data tertandai\n" #: g10/plaintext.c:399 #, c-format @@ -2826,9 +2817,9 @@ msgstr "encoding lama DEK tidak didukung\n" #: g10/pubkey-enc.c:153 -#, fuzzy, c-format +#, c-format msgid "cipher algorithm %d is unknown or disabled\n" -msgstr "algoritma proteksi %d tidak didukung\n" +msgstr "algoritma cipher %d tidak dikenal atau ditiadakan\n" #: g10/pubkey-enc.c:192 #, c-format @@ -2836,48 +2827,47 @@ msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n" #: g10/pubkey-enc.c:198 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "CATATAN: kunci signature berakhir %s\n" +msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n" #: g10/hkp.c:59 #, c-format msgid "requesting key %08lX from %s ...\n" -msgstr "" +msgstr "meminta kunci %08lX dari %s ...\n" #: g10/hkp.c:83 -#, fuzzy, c-format +#, c-format msgid "can't get key from keyserver: %s\n" -msgstr "impor kunci dari key server" +msgstr "tidak dapat memperoleh kunci keyserver: %s\n" #: g10/hkp.c:102 g10/hkp.c:136 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "tidak ada keyserver yang dikenal (gunakan option --keyserver)\n" #: g10/hkp.c:110 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid key ID\n" -msgstr "%s bukanlah set karakter yang valid\n" +msgstr "%s: bukanlah ID kunci yang valid\n" #: g10/hkp.c:191 -#, fuzzy, c-format +#, c-format msgid "error sending to `%s': %s\n" -msgstr "kesalahan membaca `%s': %s\n" +msgstr "kesalahan mengirim ke `%s': %s\n" #: g10/hkp.c:203 #, c-format msgid "success sending to `%s' (status=%u)\n" -msgstr "" +msgstr "sukses mengirim ke '%s' (status=%u)\n" #: g10/hkp.c:206 #, c-format msgid "failed sending to `%s': status=%u\n" -msgstr "" +msgstr "gagal mengirim ke '%s': status=%u\n" #: g10/seckey-cert.c:53 -#, fuzzy msgid "secret key parts are not available\n" -msgstr "kunci rahasia tidak ada" +msgstr "bagian kunci rahasia tidak ada\n" #: g10/seckey-cert.c:59 #, c-format @@ -2913,18 +2903,18 @@ msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n" #: g10/sig-check.c:328 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "CATATAN: kunci signature berakhir %s\n" +msgstr "CATATAN: kunci signature %08lX berakhir %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n" #: g10/sign.c:152 -#, fuzzy, c-format +#, c-format msgid "checking created signature failed: %s\n" -msgstr "Tidak dapat memeriksa signature: %s\n" +msgstr "Gagal memeriksa signature yang dibuat: %s\n" #: g10/sign.c:161 #, c-format @@ -3125,9 +3115,9 @@ msgstr "get_dir_record: gagal search_record: %s\n" #: g10/trustdb.c:474 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid long keyID\n" -msgstr "%s bukanlah set karakter yang valid\n" +msgstr "'%s' bukanlah keyID panjang yang valid\n" #: g10/trustdb.c:501 #, c-format @@ -3150,9 +3140,9 @@ msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n" #: g10/trustdb.c:546 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n" +msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n" #: g10/trustdb.c:565 #, c-format @@ -3291,9 +3281,9 @@ msgstr "lid %lu: dir record tanpa kunci - dilewati\n" #: g10/trustdb.c:1873 -#, fuzzy, c-format +#, c-format msgid "\t%lu due to new pubkeys\n" -msgstr "kunci %08lX: %d subkey baru\n" +msgstr "\t%lu pubkey baru\n" #: g10/trustdb.c:1875 #, c-format @@ -3373,11 +3363,14 @@ "Please remember that the signature file (.sig or .asc)\n" "should be the first file given on the command line.\n" msgstr "" +"signature tidak dapat diverifikasi.\n" +"Tolong ingat bahwa file signature (.sig atau .asc)\n" +"haruslah file pertama yang diberikan pada perintah baris.\n" #: g10/verify.c:173 #, c-format msgid "input line %u too long or missing LF\n" -msgstr "" +msgstr "baris input %u terlalu panjang atau hilang LF\n" #: g10/ringedit.c:302 #, c-format @@ -3414,9 +3407,9 @@ "palsu!\n" #: g10/skclist.c:138 -#, fuzzy, c-format +#, c-format msgid "skipped `%s': duplicated\n" -msgstr "melewati `%s': %s\n" +msgstr "lewati `%s': terduplikasi\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3424,9 +3417,8 @@ msgstr "melewati `%s': %s\n" #: g10/skclist.c:149 -#, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: dilewati: kunci publik telah ada\n" +msgstr "dilewati: kunci pribadi telah ada\n" #: g10/skclist.c:160 #, c-format @@ -3483,6 +3475,7 @@ #: g10/openfile.c:355 msgid "you have to start GnuPG again, so it can read the new options file\n" msgstr "" +"anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n" #: g10/encr-data.c:66 #, c-format @@ -3501,9 +3494,8 @@ "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n" #: g10/encr-data.c:97 -#, fuzzy msgid "problem handling encrypted packet\n" -msgstr "buang field keyid paket terenkripsi" +msgstr "masalah menangani paket terenkripsi\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" @@ -3731,7 +3723,6 @@ "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan." #: g10/helptext.c:213 -#, fuzzy msgid "Give the name of the file to which the signature applies" msgstr "Beri nama file untuk mengaplikasikan signature" @@ -3762,6 +3753,20 @@ " 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 "" +"Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n" +"konteks, anda dapat memilih dari daftar berikut:\n" +" \"Key has been compromised\"\n" +" Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang " +"tidak berhak\n" +" memiliki akses ke kunci pribadi anda.\n" +" \"Key is superseded\"\n" +" Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n" +" \"Key is no longer used\"\n" +" Gunakan ini bila anda telah mempensiunkan kunci ini.\n" +" \"User ID is no longer valid\"\n" +" Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n" +" normalnya digunakan untuk menandai bahwa alamat email tidak valid " +"lagi.\n" #: g10/helptext.c:245 msgid "" @@ -3769,60 +3774,15 @@ "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" +"Jika anda suka, anda dapat memasukkan teks menjelaskan mengapa anda\n" +"mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n" +"Baris kosong mengakhiri teks.\n" #: g10/helptext.c:260 msgid "No help available" msgstr "Tidak tersedia bantuan" #: g10/helptext.c:268 -#, fuzzy, c-format +#, c-format msgid "No help available for `%s'" msgstr "Tidak tersedia bantuan untuk `%s'" - -#, fuzzy -#~ msgid "invalid" -#~ msgstr "armor tidak valid" - -#, fuzzy -#~ msgid "revoked" -#~ msgstr "revkey" - -#~ msgid "RSA key cannot be used in this version\n" -#~ msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n" - -#~ msgid "No key for user ID\n" -#~ msgstr "Tidak ada kunci untuk ID user\n" - -#~ msgid "No user ID for key\n" -#~ msgstr "Tidak ada ID user untuk kunci\n" - -#~ msgid "no secret key for decryption available\n" -#~ msgstr "tidak tersedia kunci rahasia untuk dekripsi\n" - -#~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" -#~ msgstr "" -#~ "Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di " -#~ "masa depan\n" - -#~ msgid "set debugging flags" -#~ msgstr "set flag debugging" - -#~ msgid "enable full debugging" -#~ msgstr "aktifkan full debugging" - -#~ msgid "do not write comment packets" -#~ msgstr "jangan menulis komentar paket" - -#~ msgid "(default is 1)" -#~ msgstr "(baku adalah 1)" - -#~ msgid "(default is 3)" -#~ msgstr "(baku adalah 3)" - -#~ msgid " (%d) ElGamal in a v3 packet\n" -#~ msgstr " (%d) ElGamal dalam paket v3\n" - -#~ msgid "Key generation can only be used in interactive mode\n" -#~ msgstr "Pembuatan kunci hanya dapat digunakan dalam mode interaktif\n" diff -urN gnupg-1.0.5/po/it.po gnupg-1.0.6/po/it.po --- gnupg-1.0.5/po/it.po Sun Apr 29 16:39:26 2001 +++ gnupg-1.0.6/po/it.po Tue May 29 08:58:48 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.5\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-23 21:15+02:00\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -13,15 +13,15 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Attenzione: si sta usando memoria insicura!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" @@ -601,7 +601,8 @@ msgstr "|FD|scrivi le informazioni di stato su questo FD" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|assegna fiducia definitiva a questa chiave" #: g10/g10.c:311 @@ -1606,7 +1607,7 @@ "il comando \"--edit-key\" per generare una chiave secondaria per questo " "scopo.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" @@ -1627,7 +1628,11 @@ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Crea davvero? " @@ -1687,7 +1692,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[User ID non trovato]" @@ -1695,12 +1700,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "troppe voci nella unk cache - disabilitata\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" @@ -2285,7 +2290,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2723,7 +2728,7 @@ msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (key ID principale %08lX)" @@ -2759,12 +2764,12 @@ msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2774,20 +2779,20 @@ "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " diff -urN gnupg-1.0.5/po/ja.po gnupg-1.0.6/po/ja.po --- gnupg-1.0.5/po/ja.po Sun Apr 29 16:39:27 2001 +++ gnupg-1.0.6/po/ja.po Tue May 29 08:58:49 2001 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2000-10-19 23:08+09:00\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -15,15 +15,15 @@ "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "·Ù¹ð: ¤ä¤Ð¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n" @@ -621,7 +621,8 @@ "½ñ¤­½Ð¤¹" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|¸°ID|¤³¤Î¡Ö¸°¡×¤òµæ¶ËŪ¤Ë¿®ÍѤ¹¤ë" #: g10/g10.c:311 @@ -881,7 +882,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key ¥æ¡¼¥¶¡¼id" +msgstr "--delete-secret-and-public-key ¥æ¡¼¥¶¡¼id" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1638,7 +1639,7 @@ "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n" "¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" @@ -1655,7 +1656,11 @@ "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? " @@ -1715,7 +1720,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" @@ -1723,12 +1728,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "unk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹¡£¥¹¥­¥Ã¥×\n" @@ -2309,7 +2314,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2750,7 +2755,7 @@ msgid "can't connect to `%s': %s\n" msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (¼ç¸°ID %08lX)" @@ -2764,7 +2769,8 @@ msgstr "" "\n" "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"%.*s\"\n" +"%u-bit %s key, ID %08lX, created %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2788,12 +2794,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2803,20 +2809,20 @@ "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -2841,7 +2847,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n" +msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿ ¤¬³«¤±¤Þ¤»¤ó\n" #: g10/plaintext.c:399 #, c-format @@ -2951,7 +2957,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n" +msgstr "Ãí°Õ: %08lX ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -3455,7 +3461,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "`%s'¤ò¥¹¥­¥Ã¥×: %s\n" +msgstr "`%s'¤ò¥¹¥­¥Ã¥×: duplicated\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3465,7 +3471,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n" #: g10/skclist.c:160 #, c-format diff -urN gnupg-1.0.5/po/nl.po gnupg-1.0.6/po/nl.po --- gnupg-1.0.5/po/nl.po Sun Apr 29 16:39:28 2001 +++ gnupg-1.0.6/po/nl.po Tue May 29 08:58:51 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2000-02-20 21:30+01:00\n" "Last-Translator: Ivo Timmermans \n" "Language-Team: Dutch \n" @@ -13,15 +13,15 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Let op: er wordt onveilig geheugen gebruikt!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n" @@ -601,7 +601,7 @@ msgstr "|BB|schrijf status naar deze bestandsbeschrijver" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +msgid "|KEYID|ultimately trust this key" msgstr "" #: g10/g10.c:311 @@ -842,7 +842,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key gebruikersidentificatie" +msgstr "--delete-secret-and-public-key gebruikersidentificatie" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1622,7 +1622,7 @@ "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n" "sleutel te maken hiervoor.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Sleutelgeneratie is mislukt: %s\n" @@ -1643,7 +1643,11 @@ "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n" "klokprobleem)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Echt maken? " @@ -1703,21 +1707,21 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 #, fuzzy msgid "[User id not found]" -msgstr "%s: gebruiker niet gevonden\n" +msgstr "[gebruiker niet gevonden]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "te veel ingangen in de unk cache - uitgezet\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -2311,7 +2315,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2475,12 +2479,12 @@ #: g10/keyedit.c:1173 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n" +msgstr "rev! subsleutel is teruggeroepen: %s\n" #: g10/keyedit.c:1176 #, fuzzy msgid "rev- faked revocation found\n" -msgstr "nieuwe sleutelterugtrekkingen: %lu\n" +msgstr "rev- vervalste sleutelterugtrekking gevonden\n" #: g10/keyedit.c:1178 #, c-format @@ -2752,7 +2756,7 @@ msgid "can't connect to `%s': %s\n" msgstr "kan geen verbinding maken met `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (hoofdsleutelnummer %08lX)" @@ -2766,7 +2770,8 @@ msgstr "" "\n" "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n" -"sleutel voor gebruiker op te heffen: \"" +"sleutel op te heffen voor gebruiker \"%.*s\"\n" +"%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2790,12 +2795,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2805,20 +2810,20 @@ "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n" "sleutel voor gebruiker op te heffen: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "kan niet om wachtwoord vragen in lopende band-modus\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Geef de sleuteltekst: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Herhaal de sleuteltekst: " @@ -2842,7 +2847,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "kan ondertekende gegevens `%s' niet openen\n" +msgstr "geen ondertekende gegevens\n" #: g10/plaintext.c:399 #, c-format @@ -2875,7 +2880,7 @@ #: g10/pubkey-enc.c:198 #, fuzzy, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n" +msgstr "LET OP: geheime sleutel %08lX is vervallen op %s\n" #: g10/hkp.c:59 #, c-format @@ -2955,7 +2960,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n" +msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -3460,13 +3465,13 @@ #: g10/skclist.c:110 g10/skclist.c:166 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -"sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met " -"nep-RNG!\n" +"sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met nep-" +"RNG!\n" #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "`%s' overgeslagen: %s\n" +msgstr "`%s' overgeslagen: dubbel\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3476,7 +3481,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n" +msgstr "overgeslagen: geheime sleutel is al aanwezig\n" #: g10/skclist.c:160 #, c-format @@ -3860,8 +3865,8 @@ #~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n" #~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" +#~ "RSA keys are deprecated; please consider creating a new key and use this " +#~ "key in the future\n" #~ msgstr "" #~ "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n" #~ "nieuwe sleutel om in de toekomst te gebruiken\n" diff -urN gnupg-1.0.5/po/pl.po gnupg-1.0.6/po/pl.po --- gnupg-1.0.5/po/pl.po Sun Apr 29 16:39:29 2001 +++ gnupg-1.0.6/po/pl.po Tue May 29 08:58:53 2001 @@ -7,31 +7,31 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-21 01:03+02:00\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --" +"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c " "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c " -"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c " -"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c " -"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c " -"g10/pubkey-enc.c\n" +"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/" +"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/" +"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-" +"enc.c\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n" @@ -611,7 +611,8 @@ msgstr "|FD|zapisaæ opis stanu do FD" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|KLUCZ|ca³kowite zaufanie dla tego klucza" #: g10/g10.c:311 @@ -1627,7 +1628,7 @@ "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\" \n" "mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" @@ -1648,7 +1649,11 @@ "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Na pewno utworzyæ? " @@ -1708,7 +1713,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[brak identyfikatora u¿ytkownika]" @@ -1716,12 +1721,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "zbyt wiele wpisów w buforze nieznanych kluczy - wy³±czony\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n" @@ -2307,9 +2312,8 @@ msgstr "lista opcji" #: g10/keyedit.c:607 -#, fuzzy msgid "showpref" -msgstr "opcje" +msgstr "" #: g10/keyedit.c:608 msgid "passwd" @@ -2751,7 +2755,7 @@ msgid "can't connect to `%s': %s\n" msgstr "nie mo¿na po³±czyæ siê z %s: %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (g³ówny ID klucza %08lX)" @@ -2787,12 +2791,12 @@ msgid "cancelled by user\n" msgstr "anulowane przez u¿ytkownika\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2802,20 +2806,20 @@ "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby uaktywniæ klucz tajny\n" "dla u¿ytkownika: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Wyra¿enie przej¶ciowe: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Powtórzone wyra¿enie przej¶ciowe: " @@ -3594,8 +3598,8 @@ #: g10/helptext.c:53 msgid "If you want to use this revoked key anyway, answer \"yes\"." msgstr "" -"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz " -"\"tak\"." +"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz \"tak" +"\"." #: g10/helptext.c:57 msgid "If you want to use this untrusted key anyway, answer \"yes\"." @@ -3711,8 +3715,8 @@ #: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" msgstr "" -"Aby podpisaæ WSZYSTKIE identyfikatory u¿ytkownika nale¿y odpowiedzieæ " -"\"tak\"." +"Aby podpisaæ WSZYSTKIE identyfikatory u¿ytkownika nale¿y odpowiedzieæ \"tak" +"\"." #: g10/helptext.c:168 msgid "" @@ -3878,14 +3882,15 @@ #~ msgid " (%d) ElGamal in a v3 packet\n" #~ msgstr "" -#~ " (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji formatu\n" +#~ " (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji " +#~ "formatu\n" #~ msgid "Key generation can only be used in interactive mode\n" #~ msgstr "Generacjê klucza mo¿na wykonywaæ tylko w trybie interaktywnym\n" #~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" +#~ "RSA keys are deprecated; please consider creating a new key and use this " +#~ "key in the future\n" #~ msgstr "" #~ "Odradza siê stosowanie kluczy RSA; proszê rozwa¿yæ przej¶cie na inne " #~ "algorytmy\n" @@ -4009,14 +4014,17 @@ #~ "stosowaæ\n" #~ "zarówno do szyfrowania jak i do tworzenia podpisów cyfrowych\n" #~ "W standardzie OpenPGP algorytm ElGamala wystêpuje w dwóch wersjach:\n" -#~ "obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; z\n" +#~ "obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; " +#~ "z\n" #~ "technicznego punktu widzenia algorytm dzia³a tak samo, ale pewne " #~ "wspó³czynniki\n" #~ "musz± byæ dobrane tak aby klucz nadawa³ siê do sk³adania bezpiecznych\n" -#~ "podpisów. Ten program obs³uguje obie wersje, ale inne implementacje OpenPGP\n" +#~ "podpisów. Ten program obs³uguje obie wersje, ale inne implementacje " +#~ "OpenPGP\n" #~ "nie musz± rozumieæ obs³ugiwaæ klucza przeznaczonego jednocze¶nie do\n" #~ "podpisywania i szyfrowania.\n" -#~ "G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym podpisywanie,\n" +#~ "G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym " +#~ "podpisywanie,\n" #~ "dlatego te¿ ten program nie obs³uguje osobnych kluczy ElGamala s³u¿±cych " #~ "tylko\n" #~ "do szyfrowania." @@ -4088,7 +4096,8 @@ #~ msgid "keyedit.remove.uid.okay" #~ msgstr "" -#~ "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator klucza.\n" +#~ "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator " +#~ "klucza.\n" #~ "Utracisz wszystkie podpisy innych u¿ytkowników z³o¿one na tym " #~ "identyfikatorze!" diff -urN gnupg-1.0.5/po/pt_BR.po gnupg-1.0.6/po/pt_BR.po --- gnupg-1.0.5/po/pt_BR.po Sun Apr 29 16:39:29 2001 +++ gnupg-1.0.6/po/pt_BR.po Tue May 29 08:58:55 2001 @@ -5,27 +5,27 @@ # msgid "" msgstr "" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-20 23:46:36-0200\n" "From: Thiago Jung Bauermann \n" -"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --" +"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c " "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c " -"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c " -"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c " -"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" +"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/" +"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/" +"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Aviso: usando memória insegura!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "a operação não é possível sem memória segura inicializada\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" @@ -619,7 +619,7 @@ "descritor de arquivo DA" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +msgid "|KEYID|ultimately trust this key" msgstr "" #: g10/g10.c:311 @@ -867,7 +867,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key id-usuário" +msgstr "--delete-secret-and-public-key id-usuário" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -1636,7 +1636,7 @@ "Note que esta chave não pode ser usada para criptografia. Você pode usar\n" "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" @@ -1657,7 +1657,11 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Realmente criar? " @@ -1717,21 +1721,21 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 #, fuzzy msgid "[User id not found]" -msgstr "%s: usuário não encontrado\n" +msgstr "[usuário não encontrado]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "entradas demais no cache unk - desativado\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -2316,7 +2320,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2481,12 +2485,12 @@ #: g10/keyedit.c:1173 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "chave %08lX: a subchave foi revogada!\n" +msgstr "rev! a subchave foi revogada: %s\n" #: g10/keyedit.c:1176 #, fuzzy msgid "rev- faked revocation found\n" -msgstr " novas revogações de chaves: %lu\n" +msgstr "rev- revogações de chaves incorreta\n" #: g10/keyedit.c:1178 #, c-format @@ -2759,7 +2763,7 @@ msgid "can't connect to `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -2773,7 +2777,8 @@ msgstr "" "\n" "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" -"usuário: \"" +"usuário: \"%.*s\"\n" +"%u-bit %s chave, ID %08lX, criada %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2798,12 +2803,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2813,20 +2818,20 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -2849,7 +2854,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "impossível abrir dados assinados `%s'\n" +msgstr "no dados assinados\n" #: g10/plaintext.c:399 #, c-format @@ -2882,7 +2887,7 @@ #: g10/pubkey-enc.c:198 #, fuzzy, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "NOTA: chave de assinatura expirou %s\n" +msgstr "NOTA: chave secreta %08lX expirou %s\n" #: g10/hkp.c:59 #, c-format @@ -2960,7 +2965,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTA: chave de assinatura expirou %s\n" +msgstr "NOTA: chave de assinatura %08lX expirou %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -2969,7 +2974,7 @@ #: g10/sign.c:152 #, fuzzy, c-format msgid "checking created signature failed: %s\n" -msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n" +msgstr "leitura de registro de assinatura falhou: %s\n" #: g10/sign.c:161 #, c-format @@ -3469,7 +3474,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "ignorado `%s': %s\n" +msgstr "ignorado `%s': duplicado\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3479,7 +3484,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: ignorado: a chave pública já está presente\n" +msgstr "ignorado: a chave secreta já está presente\n" #: g10/skclist.c:160 #, c-format @@ -3559,9 +3564,7 @@ #: g10/encr-data.c:97 #, fuzzy msgid "problem handling encrypted packet\n" -msgstr "" -"eliminar o campo keyid dos pacotes\n" -"criptografados" +msgstr "eliminar o campo keyid dos pacotes criptografados\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" @@ -3858,11 +3861,11 @@ #~ msgstr "nenhuma chave secreta para descriptografia disponível\n" #~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" +#~ "RSA keys are deprecated; please consider creating a new key and use this " +#~ "key in the future\n" #~ msgstr "" -#~ "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e " -#~ "usá-la no futuro\n" +#~ "Chaves RSA não são recomendáveis; por favor considere criar uma nova " +#~ "chave e usá-la no futuro\n" #~ msgid "set debugging flags" #~ msgstr "definir parâmetros de depuração" @@ -3899,7 +3902,8 @@ #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" #~ msgstr "" -#~ "NOTA: assinatura rec %lu[%d] está na lista de sugestões de %lu mas não está\n" +#~ "NOTA: assinatura rec %lu[%d] está na lista de sugestões de %lu mas não " +#~ "está\n" #~ " marcada\n" #~ msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n" diff -urN gnupg-1.0.5/po/pt_PT.po gnupg-1.0.6/po/pt_PT.po --- gnupg-1.0.5/po/pt_PT.po Sun Apr 29 16:39:30 2001 +++ gnupg-1.0.6/po/pt_PT.po Tue May 29 08:58:56 2001 @@ -8,23 +8,23 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2001-04-08 16:28+00:00\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-latin-1\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: none\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Aviso: a utilizar memória insegura!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "a operação não é possível sem memória segura inicializada\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" @@ -611,7 +611,8 @@ "descritor de ficheiro DF" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|KEYID|confiar totalmente nesta chave" #: g10/g10.c:311 @@ -1625,7 +1626,7 @@ "Note que esta chave não pode ser usada para encriptação. Você pode usar\n" "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" @@ -1646,7 +1647,11 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Realmente criar? " @@ -1706,7 +1711,7 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" msgstr "[Utilizador não encontrado]" @@ -1714,12 +1719,12 @@ msgid "too many entries in unk cache - disabled\n" msgstr "entradas demais no cache unk - desactivado\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -2303,7 +2308,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2741,7 +2746,7 @@ msgid "can't connect to `%s': %s\n" msgstr "impossível ligar a `%s': %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -2779,12 +2784,12 @@ msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2794,20 +2799,20 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " diff -urN gnupg-1.0.5/po/ru.po gnupg-1.0.6/po/ru.po --- gnupg-1.0.5/po/ru.po Sun Apr 29 16:39:31 2001 +++ gnupg-1.0.6/po/ru.po Thu Jan 1 01:00:00 1970 @@ -1,4166 +0,0 @@ -# I finished the translation without looking at the contrib directory of -# GPG site. Werner enlightened me about two previous translations and I -# dared to look in them to correct my translation of questionable phrases. -# So I'd like to thank: -# Artem Belevich -# Alexey Morozov -# Michael Sobolev , 1998 -# Alexey Vyskubov , 1998 -# QingLong (couldn't send an email to let you know) -msgid "" -msgstr "" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" -"Content-Type: text/plain; charset=\n" -"Date: 1998-01-26 22:08:36+0100\n" -"From: Gregory Steuck \n" -"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " -"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" -"Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c " -"cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c " -"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c " -"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c " -"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" - -#: util/secmem.c:79 -msgid "Warning: using insecure memory!\n" -msgstr "" -"÷ÎÉÍÁÎÉÅ, ×ÏÚÍÏÖÎÁ ÕÔÅÞËÁ ÓÅËÒÅÔÎÙÈ ÄÁÎÎÙÈ!\n" -"üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n" -"ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n" - -#: util/secmem.c:299 -msgid "operation is not possible without initialized secure memory\n" -msgstr "" - -#: util/secmem.c:300 -msgid "(you may have used the wrong program for this task)\n" -msgstr "" - -#: util/miscutil.c:287 util/miscutil.c:316 -msgid "yes" -msgstr "ÄÁ(y)" - -#: util/miscutil.c:288 util/miscutil.c:319 -msgid "yY" -msgstr "yY" - -#: util/miscutil.c:289 util/miscutil.c:317 -msgid "no" -msgstr "" - -#: util/miscutil.c:290 util/miscutil.c:320 -msgid "nN" -msgstr "" - -#: g10/keyedit.c:581 util/miscutil.c:318 -msgid "quit" -msgstr "×ÙÈÏÄ" - -#: util/miscutil.c:321 -msgid "qQ" -msgstr "" - -#: util/errors.c:54 -#, fuzzy -msgid "general error" -msgstr "ïÂÝÁÑ ÏÛÉÂËÁ" - -#: util/errors.c:55 -#, fuzzy -msgid "unknown packet type" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÐÁËÅÔÁ" - -#: util/errors.c:56 -#, fuzzy -msgid "unknown version" -msgstr "îÅÉÚ×ÅÓÔÎÁÑ ×ÅÒÓÉÑ" - -#: util/errors.c:57 -#, fuzzy -msgid "unknown pubkey algorithm" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ" - -#: util/errors.c:58 -#, fuzzy -msgid "unknown digest algorithm" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÇÅÎÅÒÁÃÉÉ ÄÁÊÄÖÅÓÔÁ" - -#: util/errors.c:59 -#, fuzzy -msgid "bad public key" -msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ" - -#: util/errors.c:60 -#, fuzzy -msgid "bad secret key" -msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#: util/errors.c:61 -#, fuzzy -msgid "bad signature" -msgstr "ðÌÏÈÁÑ ÐÏÄÐÉÓØ" - -#: util/errors.c:62 -#, fuzzy -msgid "checksum error" -msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÙ" - -#: util/errors.c:63 -#, fuzzy -msgid "bad passphrase" -msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\"" - -#: util/errors.c:64 -#, fuzzy -msgid "public key not found" -msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ" - -#: util/errors.c:65 -#, fuzzy -msgid "unknown cipher algorithm" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ" - -#: util/errors.c:66 -#, fuzzy -msgid "can't open the keyring" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ \"Ó×ÑÚËÕ ËÌÀÞÅÊ\"" - -#: util/errors.c:67 -#, fuzzy -msgid "invalid packet" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÐÁËÅÔ" - -#: util/errors.c:68 -#, fuzzy -msgid "invalid armor" -msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ" - -#: util/errors.c:69 -#, fuzzy -msgid "no such user id" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: util/errors.c:70 -#, fuzzy -msgid "secret key not available" -msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" - -#: util/errors.c:71 -#, fuzzy -msgid "wrong secret key used" -msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#: util/errors.c:72 -#, fuzzy -msgid "not supported" -msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" - -#: util/errors.c:73 -#, fuzzy -msgid "bad key" -msgstr "ðÌÏÈÏÊ ËÌÀÞ" - -#: util/errors.c:74 -#, fuzzy -msgid "file read error" -msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ" - -#: util/errors.c:75 -#, fuzzy -msgid "file write error" -msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ" - -#: util/errors.c:76 -#, fuzzy -msgid "unknown compress algorithm" -msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ" - -#: util/errors.c:77 -#, fuzzy -msgid "file open error" -msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ" - -#: util/errors.c:78 -#, fuzzy -msgid "file create error" -msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÆÁÊÌÁ" - -#: util/errors.c:79 -#, fuzzy -msgid "invalid passphrase" -msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\"" - -#: util/errors.c:80 -#, fuzzy -msgid "unimplemented pubkey algorithm" -msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ" - -#: util/errors.c:81 -#, fuzzy -msgid "unimplemented cipher algorithm" -msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ" - -#: util/errors.c:82 -#, fuzzy -msgid "unknown signature class" -msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ" - -#: util/errors.c:83 -#, fuzzy -msgid "trust database error" -msgstr "ïÛÉÂËÁ × Trust-DB (ÂÁÚÁ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ)" - -#: util/errors.c:84 -msgid "bad MPI" -msgstr "" - -#: util/errors.c:85 -#, fuzzy -msgid "resource limit" -msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÒÅÓÕÒÓÏ×" - -#: util/errors.c:86 -#, fuzzy -msgid "invalid keyring" -msgstr "îÅÄÏÐÕÓÔÉÍÁÑ \"Ó×ÑÚËÁ ËÌÀÞÅÊ\"" - -#: util/errors.c:87 -#, fuzzy -msgid "bad certificate" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: util/errors.c:88 -#, fuzzy -msgid "malformed user id" -msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÆÏÒÍÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: util/errors.c:89 -#, fuzzy -msgid "file close error" -msgstr "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ ÆÁÊÌÁ" - -#: util/errors.c:90 -#, fuzzy -msgid "file rename error" -msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ÆÁÊÌÁ" - -#: util/errors.c:91 -#, fuzzy -msgid "file delete error" -msgstr "ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÆÁÊÌÁ" - -#: util/errors.c:92 -#, fuzzy -msgid "unexpected data" -msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ" - -#: util/errors.c:93 -#, fuzzy -msgid "timestamp conflict" -msgstr "ëÏÎÆÌÉËÔ ×ÒÅÍÅÎÎÙÈ ÏÔÐÅÞÁÔËÏ× (timestamp)" - -#: util/errors.c:94 -#, fuzzy -msgid "unusable pubkey algorithm" -msgstr "îÅÐÒÉÇÏÄÎÙÊ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ" - -#: util/errors.c:95 -#, fuzzy -msgid "file exists" -msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ" - -#: util/errors.c:96 -#, fuzzy -msgid "weak key" -msgstr "óÌÁÂÙÊ ËÌÀÞ" - -#: util/errors.c:97 -#, fuzzy -msgid "invalid argument" -msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ" - -#: util/errors.c:98 -msgid "bad URI" -msgstr "" - -#: util/errors.c:99 -#, fuzzy -msgid "unsupported URI" -msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" - -#: util/errors.c:100 -#, fuzzy -msgid "network error" -msgstr "ïÂÝÁÑ ÏÛÉÂËÁ" - -#: util/errors.c:102 -#, fuzzy -msgid "not encrypted" -msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" - -#: util/errors.c:103 -#, fuzzy -msgid "not processed" -msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" - -#. the key cannot be used for a specific usage -#: util/errors.c:105 -#, fuzzy -msgid "unusable public key" -msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ" - -#: util/errors.c:106 -#, fuzzy -msgid "unusable secret key" -msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#: util/logger.c:224 -#, fuzzy, c-format -msgid "... this is a bug (%s:%d:%s)\n" -msgstr "ïÊ-ÊÏ ... ÏÛÉÂËÁ × ÐÒÏÇÒÁÍÍÅ (%s:%d:%s)\n" - -#: util/logger.c:230 -#, c-format -msgid "you found a bug ... (%s:%d)\n" -msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n" - -#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265 -#, fuzzy, c-format -msgid "can't open `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: cipher/random.c:324 -#, fuzzy, c-format -msgid "can't stat `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: cipher/random.c:329 -#, c-format -msgid "`%s' is not a regular file - ignored\n" -msgstr "" - -#: cipher/random.c:334 -msgid "note: random_seed file is empty\n" -msgstr "" - -#: cipher/random.c:340 -msgid "warning: invalid size of random_seed file - not used\n" -msgstr "" - -#: cipher/random.c:348 -#, fuzzy, c-format -msgid "can't read `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: cipher/random.c:386 -msgid "note: random_seed file not updated\n" -msgstr "" - -#: cipher/random.c:406 -#, fuzzy, c-format -msgid "can't create `%s': %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: cipher/random.c:413 -#, fuzzy, c-format -msgid "can't write `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: cipher/random.c:416 -#, fuzzy, c-format -msgid "can't close `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: cipher/random.c:427 -#, c-format -msgid "too many random bits requested; the limit is %d\n" -msgstr "" - -#: cipher/random.c:661 -#, fuzzy -msgid "WARNING: using insecure random number generator!!\n" -msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n" - -#: cipher/random.c:662 -msgid "" -"The random number generator is only a kludge to let\n" -"it run - it is in no way a strong RNG!\n" -"\n" -"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" -"\n" -msgstr "" -"éÓÐÏÌØÚÕÅÍÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ -- ÔÏÌØËÏ ÚÁÇÌÕÛËÁ,\n" -"ÞÔÏÂÙ ÓËÏÍÐÉÌÉÒÏ×ÁÔØ ÐÒÏÇÒÁÍÍÕ, ÎÉËÁË ÎÅ ÎÁÄÅÖÎÙÊ çóþ!\n" -"\n" -"îå ðïìøúõêôåóø äáîîùíé óïúäáîîùíé üôïê ðòïçòáííïê!\n" -"\n" - -#: cipher/rndlinux.c:142 -#, c-format -msgid "" -"\n" -"Not enough random bytes available. Please do some other work to give\n" -"the OS a chance to collect more entropy! (Need %d more bytes)\n" -msgstr "" -"\n" -"îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n" -"ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n" - -#: g10/g10.c:216 -msgid "" -"@Commands:\n" -" " -msgstr "" -"@ëÏÍÁÎÄÙ:\n" -" " - -#: g10/g10.c:218 -#, fuzzy -msgid "|[file]|make a signature" -msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ" - -#: g10/g10.c:219 -#, fuzzy -msgid "|[file]|make a clear text signature" -msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" - -#: g10/g10.c:220 -msgid "make a detached signature" -msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" - -#: g10/g10.c:221 -msgid "encrypt data" -msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" - -#: g10/g10.c:222 -msgid "encryption only with symmetric cipher" -msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ" - -#: g10/g10.c:223 -msgid "store only" -msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ" - -#: g10/g10.c:224 -msgid "decrypt data (default)" -msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" - -#: g10/g10.c:225 -msgid "verify a signature" -msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ" - -#: g10/g10.c:227 -msgid "list keys" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ" - -#: g10/g10.c:229 -msgid "list keys and signatures" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ" - -#: g10/g10.c:230 -msgid "check key signatures" -msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" - -#: g10/g10.c:231 -msgid "list keys and fingerprints" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\"" - -#: g10/g10.c:232 -msgid "list secret keys" -msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ" - -#: g10/g10.c:233 -msgid "generate a new key pair" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)" - -#: g10/g10.c:234 -msgid "remove key from the public keyring" -msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ" - -#: g10/g10.c:236 -#, fuzzy -msgid "remove key from the secret keyring" -msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ" - -#: g10/g10.c:237 -#, fuzzy -msgid "sign a key" -msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" - -#: g10/g10.c:238 -#, fuzzy -msgid "sign a key locally" -msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" - -#: g10/g10.c:239 -msgid "sign or edit a key" -msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ" - -#: g10/g10.c:240 -msgid "generate a revocation certificate" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/g10.c:241 -msgid "export keys" -msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ" - -#: g10/g10.c:242 -msgid "export keys to a key server" -msgstr "" - -#: g10/g10.c:243 -msgid "import keys from a key server" -msgstr "" - -#: g10/g10.c:247 -msgid "import/merge keys" -msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ" - -#: g10/g10.c:249 -msgid "list only the sequence of packets" -msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×" - -#: g10/g10.c:251 -#, fuzzy -msgid "export the ownertrust values" -msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" - -#: g10/g10.c:253 -#, fuzzy -msgid "import ownertrust values" -msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" - -#: g10/g10.c:255 -#, fuzzy -msgid "update the trust database" -msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" - -#: g10/g10.c:257 -msgid "|[NAMES]|check the trust database" -msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" - -#: g10/g10.c:258 -msgid "fix a corrupted trust database" -msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" - -#: g10/g10.c:259 -msgid "De-Armor a file or stdin" -msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ" - -#: g10/g10.c:261 -msgid "En-Armor a file or stdin" -msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ" - -#: g10/g10.c:263 -msgid "|algo [files]|print message digests" -msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ" - -#: g10/g10.c:267 -msgid "" -"@\n" -"Options:\n" -" " -msgstr "" -"@\n" -"ðÁÒÁÍÅÔÒÙ:\n" -" " - -#: g10/g10.c:269 -msgid "create ascii armored output" -msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ" - -#: g10/g10.c:271 -#, fuzzy -msgid "|NAME|encrypt for NAME" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" - -#: g10/g10.c:274 -#, fuzzy -msgid "|NAME|use NAME as default recipient" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" - -#: g10/g10.c:276 -msgid "use the default key as default recipient" -msgstr "" - -#: g10/g10.c:280 -msgid "use this user-id to sign or decrypt" -msgstr "" -"ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ" - -#: g10/g10.c:281 -msgid "|N|set compress level N (0 disables)" -msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)" - -#: g10/g10.c:283 -msgid "use canonical text mode" -msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ" - -#: g10/g10.c:284 -msgid "use as output file" -msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ" - -#: g10/g10.c:285 -msgid "verbose" -msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ" - -#: g10/g10.c:286 -msgid "be somewhat more quiet" -msgstr "" - -#: g10/g10.c:287 -msgid "don't use the terminal at all" -msgstr "" - -#: g10/g10.c:288 -#, fuzzy -msgid "force v3 signatures" -msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" - -#: g10/g10.c:289 -#, fuzzy -msgid "always use a MDC for encryption" -msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ" - -#: g10/g10.c:290 -msgid "do not make any changes" -msgstr "Keine wirklichen Änderungen durchführen" - -#. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, -#: g10/g10.c:292 -msgid "use the gpg-agent" -msgstr "" - -#: g10/g10.c:293 -msgid "batch mode: never ask" -msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ" - -#: g10/g10.c:294 -msgid "assume yes on most questions" -msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" - -#: g10/g10.c:295 -msgid "assume no on most questions" -msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" - -#: g10/g10.c:296 -msgid "add this keyring to the list of keyrings" -msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" - -#: g10/g10.c:297 -msgid "add this secret keyring to the list" -msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" - -#: g10/g10.c:298 -msgid "|NAME|use NAME as default secret key" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" - -#: g10/g10.c:299 -msgid "|HOST|use this keyserver to lookup keys" -msgstr "" - -#: g10/g10.c:300 -#, fuzzy -msgid "|NAME|set terminal charset to NAME" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" - -#: g10/g10.c:301 -msgid "read options from file" -msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ" - -#: g10/g10.c:305 -msgid "|FD|write status info to this FD" -msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)" - -#: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" -msgstr "" - -#: g10/g10.c:311 -#, fuzzy -msgid "|FILE|load extension module FILE" -msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ" - -#: g10/g10.c:312 -msgid "emulate the mode described in RFC1991" -msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991" - -#: g10/g10.c:313 -msgid "set all packet, cipher and digest options to OpenPGP behavior" -msgstr "" - -#: g10/g10.c:314 -#, fuzzy -msgid "|N|use passphrase mode N" -msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n" - -#: g10/g10.c:316 -#, fuzzy -msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" - -#: g10/g10.c:318 -#, fuzzy -msgid "|NAME|use cipher algorithm NAME for passphrases" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" - -#: g10/g10.c:319 -msgid "|NAME|use cipher algorithm NAME" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" - -#: g10/g10.c:320 -msgid "|NAME|use message digest algorithm NAME" -msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ" - -#: g10/g10.c:321 -msgid "|N|use compress algorithm N" -msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N" - -#: g10/g10.c:322 -msgid "throw keyid field of encrypted packets" -msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×" - -#: g10/g10.c:323 -msgid "|NAME=VALUE|use this notation data" -msgstr "" - -#: g10/g10.c:326 -msgid "" -"@\n" -"(See the man page for a complete listing of all commands and options)\n" -msgstr "" - -#: g10/g10.c:329 -#, fuzzy -msgid "" -"@\n" -"Examples:\n" -"\n" -" -se -r Bob [file] sign and encrypt for user Bob\n" -" --clearsign [file] make a clear text signature\n" -" --detach-sign [file] make a detached signature\n" -" --list-keys [names] show keys\n" -" --fingerprint [names] show fingerprints\n" -msgstr "" -"@\n" -"ðÒÉÍÅÒÙ:\n" -"\n" -" -se -r Bob [file] ÐÏÄÐÉÓÁÔØ É ÚÁÛÉÆÒÏ×ÁÔØ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ Bob\n" -" --clearsign [file] ÓÄÅÌÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ\n" -" --detach-sign [file] ÓÄÅÌÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ\n" -" --list-keys [names] ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n" -" --fingerprint [names] ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n" - -#: g10/g10.c:438 -msgid "Please report bugs to .\n" -msgstr "" -"ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ " -".\n" - -#: g10/g10.c:442 -msgid "Usage: gpg [options] [files] (-h for help)" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" - -#: g10/g10.c:445 -msgid "" -"Syntax: gpg [options] [files]\n" -"sign, check, encrypt or decrypt\n" -"default operation depends on the input data\n" -msgstr "" -"óÉÎÔÁËÓÉÓ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ]\n" -"ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n" -"ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n" - -#: g10/g10.c:452 -msgid "" -"\n" -"Supported algorithms:\n" -msgstr "" -"\n" -"ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n" - -#: g10/g10.c:531 -msgid "usage: gpg [options] " -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] " - -#: g10/g10.c:584 -msgid "conflicting commands\n" -msgstr "Widersprüchliche Kommandos\n" - -#: g10/g10.c:734 -#, fuzzy, c-format -msgid "NOTE: no default option file `%s'\n" -msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" - -#: g10/g10.c:738 -#, c-format -msgid "option file `%s': %s\n" -msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n" - -#: g10/g10.c:745 -#, c-format -msgid "reading options from `%s'\n" -msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n" - -#: g10/g10.c:950 -#, fuzzy, c-format -msgid "%s is not a valid character set\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" - -#: g10/g10.c:1024 -msgid "WARNING: program may create a core file!\n" -msgstr "" - -#: g10/g10.c:1028 g10/g10.c:1037 -#, c-format -msgid "NOTE: %s is not for normal use!\n" -msgstr "" - -#: g10/g10.c:1030 -#, c-format -msgid "%s not allowed with %s!\n" -msgstr "" - -#: g10/g10.c:1033 -#, c-format -msgid "%s makes no sense with %s!\n" -msgstr "" - -#: g10/g10.c:1053 g10/g10.c:1065 -msgid "selected cipher algorithm is invalid\n" -msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n" - -#: g10/g10.c:1059 g10/g10.c:1071 -msgid "selected digest algorithm is invalid\n" -msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" - -#: g10/g10.c:1075 -msgid "the given policy URL is invalid\n" -msgstr "" - -#: g10/g10.c:1078 -#, c-format -msgid "compress algorithm must be in range %d..%d\n" -msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n" - -#: g10/g10.c:1080 -msgid "completes-needed must be greater than 0\n" -msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n" - -#: g10/g10.c:1082 -msgid "marginals-needed must be greater than 1\n" -msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n" - -#: g10/g10.c:1084 -msgid "max-cert-depth must be in range 1 to 255\n" -msgstr "" - -#: g10/g10.c:1087 -#, fuzzy -msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n" - -#: g10/g10.c:1091 -msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n" - -#: g10/g10.c:1176 -#, c-format -msgid "failed to initialize the TrustDB: %s\n" -msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" - -#: g10/g10.c:1182 -msgid "--store [filename]" -msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1189 -msgid "--symmetric [filename]" -msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1197 -msgid "--encrypt [filename]" -msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1210 -msgid "--sign [filename]" -msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1223 -msgid "--sign --encrypt [filename]" -msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1237 -msgid "--clearsign [filename]" -msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1254 -msgid "--decrypt [filename]" -msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1262 -msgid "--sign-key user-id" -msgstr "" - -#: g10/g10.c:1270 -#, fuzzy -msgid "--lsign-key user-id" -msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/g10.c:1278 -#, fuzzy -msgid "--edit-key user-id [commands]" -msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/g10.c:1294 -#, fuzzy -msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/g10.c:1297 -#, fuzzy -msgid "--delete-key user-id" -msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/g10.c:1305 -#, fuzzy -msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 -#, c-format -msgid "can't open %s: %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: g10/g10.c:1357 -#, fuzzy -msgid "-k[v][v][v][c] [user-id] [keyring]" -msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]" - -#: g10/g10.c:1423 -#, c-format -msgid "dearmoring failed: %s\n" -msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" - -#: g10/g10.c:1431 -#, c-format -msgid "enarmoring failed: %s\n" -msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n" - -#: g10/g10.c:1502 -#, c-format -msgid "invalid hash algorithm `%s'\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n" - -#: g10/g10.c:1589 -msgid "[filename]" -msgstr "[ÉÍÑ ÆÁÊÌÁ]" - -#: g10/g10.c:1593 -msgid "Go ahead and type your message ...\n" -msgstr "" - -#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139 -#, c-format -msgid "can't open `%s'\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n" - -#: g10/g10.c:1805 -msgid "" -"the first character of a notation name must be a letter or an underscore\n" -msgstr "" - -#: g10/g10.c:1811 -msgid "" -"a notation name must have only letters, digits, dots or underscores and end " -"with an '='\n" -msgstr "" - -#: g10/g10.c:1817 -msgid "dots in a notation name must be surrounded by other characters\n" -msgstr "" - -#: g10/g10.c:1825 -msgid "a notation value must not use any control characters\n" -msgstr "" - -#: g10/armor.c:306 -#, fuzzy, c-format -msgid "armor: %s\n" -msgstr "ëÏÄÉÒÏ×ËÁ: %s\n" - -#: g10/armor.c:335 -msgid "invalid armor header: " -msgstr "" - -#: g10/armor.c:342 -msgid "armor header: " -msgstr "" - -#: g10/armor.c:353 -#, fuzzy -msgid "invalid clearsig header\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÎÁÞÁÌÏ ÔÅËÓÔÏ×ÏÊ ÐÏÄÐÉÓÉ\n" - -#: g10/armor.c:405 -#, fuzzy -msgid "nested clear text signatures\n" -msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" - -#: g10/armor.c:529 -msgid "invalid dash escaped line: " -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: " - -#: g10/armor.c:541 -#, fuzzy -msgid "unexpected armor:" -msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ" - -#: g10/armor.c:667 g10/armor.c:1235 -#, fuzzy, c-format -msgid "invalid radix64 character %02x skipped\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n" - -#: g10/armor.c:710 -msgid "premature eof (no CRC)\n" -msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (ÎÅÔ CRC)\n" - -#: g10/armor.c:744 -msgid "premature eof (in CRC)\n" -msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× CRC)\n" - -#: g10/armor.c:748 -msgid "malformed CRC\n" -msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n" - -#: g10/armor.c:752 g10/armor.c:1272 -#, c-format -msgid "CRC error; %06lx - %06lx\n" -msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n" - -#: g10/armor.c:772 -msgid "premature eof (in Trailer)\n" -msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n" - -#: g10/armor.c:776 -msgid "error in trailer line\n" -msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" - -#: g10/armor.c:922 -msgid "For info see http://www.gnupg.org" -msgstr "" - -#: g10/armor.c:1050 -#, fuzzy -msgid "no valid OpenPGP data found.\n" -msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" - -#: g10/armor.c:1055 -#, c-format -msgid "invalid armor: line longer than %d characters\n" -msgstr "" - -#: g10/armor.c:1059 -msgid "" -"quoted printable character in armor - probably a buggy MTA has been used\n" -msgstr "" - -#. Translators: this shoud fit into 24 bytes to that the fingerprint -#. * data is properly aligned with the user ID -#: g10/keyedit.c:1243 g10/pkclist.c:53 -msgid " Fingerprint:" -msgstr "" - -#: g10/pkclist.c:80 -#, fuzzy -msgid "Fingerprint:" -msgstr "ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔÏË ÐÁÌØÃÁ\"" - -#: g10/pkclist.c:116 -msgid "No reason specified" -msgstr "" - -#: g10/pkclist.c:118 -#, fuzzy -msgid "Key is superseded" -msgstr "üÔÏÔ ËÌÀÞ ÚÁÝÉÝÅÎ.\n" - -#: g10/pkclist.c:120 -#, fuzzy -msgid "Key has been compromised" -msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" - -#: g10/pkclist.c:122 -msgid "Key is no longer used" -msgstr "" - -#: g10/pkclist.c:124 -msgid "User ID is no longer valid" -msgstr "" - -#: g10/pkclist.c:128 -msgid "Reason for revocation: " -msgstr "" - -#: g10/pkclist.c:145 -msgid "Revocation comment: " -msgstr "" - -# valid user replies (not including 1..4) -#. a string with valid answers -#: g10/pkclist.c:303 -#, fuzzy -msgid "sSmMqQ" -msgstr "sSmMqQ" - -#: g10/pkclist.c:307 -#, fuzzy, c-format -msgid "" -"No trust value assigned to %lu:\n" -"%4u%c/%08lX %s \"" -msgstr "" -"îÅ ÏÐÒÅÄÅÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ ÄÌÑ %lu:\n" -"%4u%c/%08lX %s \"" - -#: g10/pkclist.c:319 -#, fuzzy -msgid "" -"Please decide how far you trust this user to correctly\n" -"verify other users' keys (by looking at passports,\n" -"checking fingerprints from different sources...)?\n" -"\n" -" 1 = Don't know\n" -" 2 = I do NOT trust\n" -" 3 = I trust marginally\n" -" 4 = I trust fully\n" -" s = please show me more information\n" -msgstr "" -"\"\n" -"\n" -"ðÏÖÁÌÕÊÓÔÁ ÒÅÛÉÔÅ, ÎÁÓËÏÌØËÏ ×Ù ÄÏ×ÅÒÑÅÔÅ ÜÔÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ ÐÒÏ×ÅÒÑÔØ\n" -"ÞÕÖÉÅ ËÌÀÞÉ (ÇÌÑÄÑ × ÐÁÓÐÏÒÔÁ, ÐÒÏ×ÅÒÑÑ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ÐÏ ÄÒÕÇÉÍ\n" -"ÉÓÔÏÞÎÉËÁÍ)?\n" -"\n" -" 1 = îÅ ÚÎÁÀ\n" -" 2 = îÅÔ, ÎÅ ÄÏ×ÅÒÑÀ\n" -" 3 = ÷ÅÒÀ ÏÔÞÁÓÔÉ\n" -" 4 = ÷ÅÒÀ ÐÏÌÎÏÓÔØÀ\n" -" s = ðÏÖÁÌÕÊÓÔÁ, ÐÏËÁÖÉÔÅ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ\n" - -#: g10/pkclist.c:328 -msgid " m = back to the main menu\n" -msgstr " m = ÏÂÒÁÔÎÏ × ÇÌÁ×ÎÏÅ ÍÅÎÀ\n" - -#: g10/pkclist.c:330 -msgid " q = quit\n" -msgstr "" - -#: g10/pkclist.c:336 -msgid "Your decision? " -msgstr "÷ÁÛÅ ÒÅÛÅÎÉÅ? " - -#: g10/pkclist.c:358 -msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "" - -#: g10/pkclist.c:429 -msgid "" -"Could not find a valid trust path to the key. Let's see whether we\n" -"can assign some missing owner trust values.\n" -"\n" -msgstr "" -"îÅ ÐÏÌÕÞÉÌÏÓØ ÎÁÊÔÉ ÃÅÐÏÞËÕ ÄÏ×ÅÒÉÑ ÄÌÑ ËÌÀÞÁ. ðÏÓÍÏÔÒÉÍ, ÍÏÖÎÏ ÌÉ " -"ÐÒÉÓ×ÏÉÔØ\n" -"ÎÅËÏÔÏÒÙÅ ÎÅÄÏÓÔÁÀÝÉÅ ÚÎÁÞÅÎÉÑ \"ÄÏ×ÅÒÉÑ ×ÌÁÄÅÌØÃÕ\"\n" -"\n" - -#: g10/pkclist.c:435 -msgid "" -"No path leading to one of our keys found.\n" -"\n" -msgstr "" - -#: g10/pkclist.c:437 -msgid "" -"No certificates with undefined trust found.\n" -"\n" -msgstr "" - -#: g10/pkclist.c:439 -#, fuzzy -msgid "" -"No trust values changed.\n" -"\n" -msgstr "úÎÁÞÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× ÄÏ×ÅÒÉÑ ÎÅ ÉÚÍÅÎÅÎÙ.\n" - -#: g10/pkclist.c:457 -#, fuzzy, c-format -msgid "key %08lX: key has been revoked!\n" -msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n" - -#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598 -msgid "Use this key anyway? " -msgstr "÷ÓÅ ÒÁ×ÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?" - -#: g10/pkclist.c:469 -#, fuzzy, c-format -msgid "key %08lX: subkey has been revoked!\n" -msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n" - -#: g10/pkclist.c:512 -#, fuzzy, c-format -msgid "%08lX: key has expired\n" -msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" - -#: g10/pkclist.c:518 -#, c-format -msgid "%08lX: no info to calculate a trust probability\n" -msgstr "" - -#: g10/pkclist.c:533 -#, fuzzy, c-format -msgid "%08lX: We do NOT trust this key\n" -msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\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 "" - -#: g10/pkclist.c:545 -msgid "This key probably belongs to the owner\n" -msgstr "" - -#: g10/pkclist.c:550 -msgid "This key belongs to us\n" -msgstr "" - -#: g10/pkclist.c:593 -msgid "" -"It is NOT certain that the key belongs to its owner.\n" -"If you *really* know what you are doing, you may answer\n" -"the next question with yes\n" -"\n" -msgstr "" -"îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÄÏÓÔÏ×ÅÒÎÏ, ÞÔÏ ËÌÀÞ ÐÒÉÎÁÄÌÅÖÉÔ ÔÏÍÕ,\n" -"ËÔÏ ÕËÁÚÁÎ ÅÇÏ ×ÌÁÄÅÌØÃÅÍ. ïÔ×ÅÞÁÊÔÅ \"ÄÁ\" ÎÁ ÓÌÅÄÕÀÝÉÊ ×ÏÐÒÏÓ,\n" -"ÔÏÌØËÏ ÅÓÌÉ ×Ù *ÄÅÊÓÔ×ÉÔÅÌØÎÏ* ÐÏÎÉÍÁÅÔÅ ÞÔÏ ÄÅÌÁÅÔÅ.\n" - -#: g10/pkclist.c:607 g10/pkclist.c:630 -msgid "WARNING: Using untrusted key!\n" -msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" - -#: g10/pkclist.c:651 -msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n" - -#: g10/pkclist.c:652 -msgid " This could mean that the signature is forgery.\n" -msgstr " üÔÏ ÍÏÖÅÔ ÏÚÎÁÞÁÔØ, ÞÔÏ ÐÏÄÐÉÓØ ÐÏÄÄÅÌØÎÁÑ.\n" - -#: g10/pkclist.c:657 -#, fuzzy -msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n" - -#: g10/pkclist.c:679 -msgid "Note: This key has expired!\n" -msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" - -#: g10/pkclist.c:687 -msgid "WARNING: This key is not certified with a trusted signature!\n" -msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏ×ÅÒÅÎÎÏÊ ÐÏÄÐÉÓØÀ!\n" - -#: g10/pkclist.c:689 -msgid "" -" There is no indication that the signature belongs to the owner.\n" -msgstr "" -" îÅÔ ÎÉËÁËÉÈ ÕËÁÚÁÎÉÑ ÎÁ ÔÏ, ÞÔÏ ËÌÀÞ ÐÒÉÎÁÄÌÅÖÉÔ ÅÇÏ ×ÌÁÄÅÌØÃÕ.\n" - -#: g10/pkclist.c:706 -msgid "WARNING: We do NOT trust this key!\n" -msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\n" - -#: g10/pkclist.c:707 -msgid " The signature is probably a FORGERY.\n" -msgstr " ðÏÄÐÉÓØ ×ÅÒÏÑÔÎÏ -- ðïääåìëá.\n" - -#: g10/pkclist.c:714 -msgid "" -"WARNING: This key is not certified with sufficiently trusted signatures!\n" -msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏÓÔÁÔÏÞÎÏ ÄÏ×ÅÒÅÎÎÙÍÉ ÐÏÄÐÉÓÑÍÉ!\n" - -#: g10/pkclist.c:717 -msgid " It is not certain that the signature belongs to the owner.\n" -msgstr " îÅÔ Õ×ÅÒÅÎÎÏÓÔÉ, ÞÔÏ ÐÏÄÐÉÓØ ÐÒÉÎÁÄÌÅÖÉÔ ×ÌÁÄÅÌØÃÕ.\n" - -#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011 -#, c-format -msgid "%s: skipped: %s\n" -msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" - -#: g10/pkclist.c:826 g10/pkclist.c:993 -#, c-format -msgid "%s: skipped: public key already present\n" -msgstr "" - -#: g10/pkclist.c:853 -msgid "" -"You did not specify a user ID. (you may use \"-r\")\n" -"\n" -msgstr "" -"÷Ù ÎÅ ÕËÁÚÁÌÉ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ (×ÏÓÐÏÌØÚÕÊÔÅÓØ ÐÁÒÁÍÅÔÒÏÍ " -"\"-r\").\n" -"\n" - -#: g10/pkclist.c:863 -msgid "Enter the user ID: " -msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: " - -#: g10/pkclist.c:875 -msgid "No such user ID.\n" -msgstr "îÅÔ ÔÁËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n" - -#: g10/pkclist.c:880 -msgid "skipped: public key already set as default recipient\n" -msgstr "" - -#: g10/pkclist.c:903 -#, fuzzy -msgid "Public key is disabled.\n" -msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ" - -#: g10/pkclist.c:910 -msgid "skipped: public key already set with --encrypt-to\n" -msgstr "" - -#: g10/pkclist.c:941 -#, fuzzy, c-format -msgid "unknown default recipient `%s'\n" -msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" - -#: g10/pkclist.c:974 -#, c-format -msgid "%s: error checking key: %s\n" -msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÏ×ÅÒËÅ ËÌÀÞÁ: %s\n" - -#: g10/pkclist.c:979 -#, c-format -msgid "%s: skipped: public key is disabled\n" -msgstr "" - -#: g10/pkclist.c:1017 -msgid "no valid addressees\n" -msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n" - -#: g10/keygen.c:176 -msgid "writing self signature\n" -msgstr "ÐÉÛÅÔÓÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n" - -#: g10/keygen.c:217 -msgid "writing key binding signature\n" -msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n" - -#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445 -#, fuzzy, c-format -msgid "keysize invalid; using %u bits\n" -msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n" - -#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450 -#, fuzzy, c-format -msgid "keysize rounded up to %u bits\n" -msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n" - -#: g10/keygen.c:549 -msgid "Please select what kind of key you want:\n" -msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n" - -#: g10/keygen.c:551 -#, c-format -msgid " (%d) DSA and ElGamal (default)\n" -msgstr " (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" - -#: g10/keygen.c:552 -#, c-format -msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n" - -#: g10/keygen.c:554 -#, c-format -msgid " (%d) ElGamal (encrypt only)\n" -msgstr " (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n" - -#: g10/keygen.c:555 -#, c-format -msgid " (%d) ElGamal (sign and encrypt)\n" -msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n" - -#: g10/keygen.c:557 -#, fuzzy, c-format -msgid " (%d) RSA (sign and encrypt)\n" -msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n" - -#: g10/keygen.c:561 -msgid "Your selection? " -msgstr "÷ÁÛ ×ÙÂÏÒ? " - -#: g10/keygen.c:572 -#, fuzzy -msgid "Do you really want to create a sign and encrypt key? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? " - -#: g10/keygen.c:580 -msgid "The use of this algorithm is deprecated - create anyway? " -msgstr "" - -#: g10/keygen.c:594 -msgid "Invalid selection.\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n" - -#: g10/keygen.c:606 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"óÏÂÉÒÁÅÍÓÑ ÓÇÅÎÅÒÉÒÏ×ÁÔØ %s ËÌÀÞÅ×ÕÀ ÐÁÒÕ.\n" -" ÍÉÎÉÍÁÌØÎÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 768 ÂÉÔ\n" -" ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n" -" ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n" - -#: g10/keygen.c:613 -msgid "What keysize do you want? (1024) " -msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)" - -#: g10/keygen.c:618 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n" - -#: g10/keygen.c:620 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n" - -#: g10/keygen.c:622 -#, fuzzy -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n" - -#. It is ridiculous and an annoyance to use larger key sizes! -#. * GnuPG can handle much larger sizes; but it takes an eternity -#. * to create such a key (but less than the time the Sirius -#. * Computer Corporation needs to process one of the usual -#. * complaints) and {de,en}cryption although needs some time. -#. * So, before you complain about this limitation, I suggest that -#. * you start a discussion with Marvin about this theme and then -#. * do whatever you want. -#: g10/keygen.c:633 -#, fuzzy, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n" - -#: g10/keygen.c:638 -#, fuzzy -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" -msgstr "" -"ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ " -"ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n" - -#: g10/keygen.c:641 -msgid "Are you sure that you want this keysize? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? " - -#: g10/keygen.c:642 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" -msgstr "" -"ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n" -"ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n" - -#: g10/keygen.c:650 -msgid "Do you really need such a large keysize? " -msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? " - -#: g10/keygen.c:656 -#, c-format -msgid "Requested keysize is %u bits\n" -msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n" - -#: g10/keygen.c:659 g10/keygen.c:663 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n" - -#: g10/keygen.c:711 -msgid "" -"Please specify how long the key should be valid.\n" -" 0 = key does not expire\n" -" = key expires in n days\n" -" w = key expires in n weeks\n" -" m = key expires in n months\n" -" y = key expires in n years\n" -msgstr "" -"ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ ÄÅÊÓÔ×ÉÑ ×ÁÛÅÇÏ ËÌÀÞÁ.\n" -" 0 = ÂÅÓÓÒÏÞÎÙÊ ËÌÀÞ\n" -" = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÄÎÅÊ\n" -" w = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÎÅÄÅÌØ\n" -" m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n" -" y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n" - -#: g10/keygen.c:726 -msgid "Key is valid for? (0) " -msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) " - -#: g10/keygen.c:731 -msgid "invalid value\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n" - -#: g10/keygen.c:736 -msgid "Key does not expire at all\n" -msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n" - -#. print the date when the key expires -#: g10/keygen.c:742 -#, c-format -msgid "Key expires at %s\n" -msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n" - -#: g10/keygen.c:745 -msgid "" -"Your system can't display dates beyond 2038.\n" -"However, it will be correctly handled up to 2106.\n" -msgstr "" - -#: g10/keygen.c:750 -msgid "Is this correct (y/n)? " -msgstr "üÔÏ ×ÅÒÎÏ? (y/n) " - -#: g10/keygen.c:793 -msgid "" -"\n" -"You need a User-ID to identify your key; the software constructs the user " -"id\n" -"from Real Name, Comment and Email Address in this form:\n" -" \"Heinrich Heine (Der Dichter) \"\n" -"\n" -msgstr "" -"\n" -"äÌÑ ÉÄÅÎÔÉÆÉËÁÃÉÉ ËÌÀÞÁ ÎÅÏÂÈÏÄÉÍ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ; ÐÒÏÇÒÁÍÍÁ\n" -"ËÏÎÓÔÒÕÉÒÕÅÔ ÅÇÏ ÉÚ ÐÏÌÎÏÇÏ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ, ËÏÍÍÅÎÔÁÒÉÑ É ÁÄÒÅÓÁ email× " -"×ÉÄÅ:\n" -" \"Vasya Pupkin (KRUTOI) \"\n" -"\n" - -#: g10/keygen.c:805 -msgid "Real name: " -msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): " - -#: g10/keygen.c:813 -msgid "Invalid character in name\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n" - -#: g10/keygen.c:815 -msgid "Name may not start with a digit\n" -msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n" - -#: g10/keygen.c:817 -msgid "Name must be at least 5 characters long\n" -msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n" - -#: g10/keygen.c:825 -msgid "Email address: " -msgstr "E-Mail: " - -#: g10/keygen.c:836 -msgid "Not a valid email address\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n" - -#: g10/keygen.c:844 -msgid "Comment: " -msgstr "ëÏÍÍÅÎÔÁÒÉÊ: " - -#: g10/keygen.c:850 -msgid "Invalid character in comment\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" - -#: g10/keygen.c:873 -#, c-format -msgid "You are using the `%s' character set.\n" -msgstr "" - -#: g10/keygen.c:879 -#, c-format -msgid "" -"You selected this USER-ID:\n" -" \"%s\"\n" -"\n" -msgstr "" -"÷Ù ×ÙÂÒÁÌÉ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ:\n" -" \"%s\"\n" -"\n" - -#: g10/keygen.c:883 -msgid "Please don't put the email address into the real name or the comment\n" -msgstr "" - -#: g10/keygen.c:888 -msgid "NnCcEeOoQq" -msgstr "" - -#: g10/keygen.c:898 -#, fuzzy -msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? " - -#: g10/keygen.c:899 -#, fuzzy -msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " -msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? " - -#: g10/keygen.c:918 -msgid "Please correct the error first\n" -msgstr "" - -#: g10/keygen.c:956 -msgid "" -"You need a Passphrase to protect your secret key.\n" -"\n" -msgstr "" -"äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n" -"\n" - -#: g10/keyedit.c:469 g10/keygen.c:964 -msgid "passphrase not correctly repeated; try again.\n" -msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n" - -#: g10/keygen.c:970 -msgid "" -"You don't want a passphrase - this is probably a *bad* idea!\n" -"I will do it anyway. You can change your passphrase at any time,\n" -"using this program with the option \"--edit-key\".\n" -"\n" -msgstr "" -"÷Ù ÎÅ ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ - ÜÔÏ, ÓËÏÒÅÅ ×ÓÅÇÏ, *ÐÌÏÈÁÑ*\n" -"ÉÄÅÑ. îÏ Ñ ÓÄÅÌÁÀ, ÞÔÏ ÷Ù ÈÏÔÉÔÅ. ëÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÍÏÖÎÏ ÓÍÅÎÉÔØ × ÌÀÂÏÅ\n" -"×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n" -"\n" - -#: g10/keygen.c:991 -#, fuzzy -msgid "" -"We need to generate a lot of random bytes. It is a good idea to perform\n" -"some other action (type on the keyboard, move the mouse, utilize the\n" -"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" - -#: g10/keygen.c:1440 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n" - -#: g10/keygen.c:1483 -#, fuzzy -msgid "Key generation canceled.\n" -msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n" - -#: g10/keygen.c:1581 -#, fuzzy, c-format -msgid "writing public key to `%s'\n" -msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" - -#: g10/keygen.c:1582 -#, fuzzy, c-format -msgid "writing secret key to `%s'\n" -msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" - -#: g10/keygen.c:1679 -msgid "public and secret key created and signed.\n" -msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n" - -#: g10/keygen.c:1684 -#, fuzzy -msgid "" -"Note that this key cannot be used for encryption. You may want to use\n" -"the command \"--edit-key\" to generate a secondary key for this purpose.\n" -msgstr "" -"ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÜÔÏÔ ËÌÀÞ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n" -"÷Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒÏÍ --add-key ÄÌÑ ÇÅÎÅÒÁÃÉÉ " -"ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n" -"ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n" - -#: g10/keygen.c:1701 g10/keygen.c:1807 -#, c-format -msgid "Key generation failed: %s\n" -msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112 -#, fuzzy, c-format -msgid "" -"key has been created %lu second in future (time warp or clock problem)\n" -msgstr "" -"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ " -"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n" - -#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114 -#, fuzzy, c-format -msgid "" -"key has been created %lu seconds in future (time warp or clock problem)\n" -msgstr "" -"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ " -"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n" - -#: g10/keygen.c:1783 -#, fuzzy -msgid "Really create? " -msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? " - -#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454 -#: g10/tdbio.c:515 -#, c-format -msgid "%s: can't open: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/encode.c:113 -#, c-format -msgid "error creating passphrase: %s\n" -msgstr "ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ: %s\n" - -#: g10/encode.c:171 g10/encode.c:327 -#, fuzzy, c-format -msgid "%s: WARNING: empty file\n" -msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" - -#: g10/encode.c:274 -#, c-format -msgid "reading from `%s'\n" -msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n" - -#: g10/encode.c:497 -#, fuzzy, c-format -msgid "%s/%s encrypted for: %s\n" -msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n" - -#: g10/export.c:153 -#, fuzzy, c-format -msgid "%s: user not found: %s\n" -msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#: g10/export.c:162 -#, c-format -msgid "certificate read problem: %s\n" -msgstr "" - -#: g10/export.c:171 -#, fuzzy, c-format -msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" - -#: g10/export.c:182 -#, fuzzy, c-format -msgid "key %08lX: not protected - skipped\n" -msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" - -#: g10/export.c:236 -#, fuzzy -msgid "WARNING: nothing exported\n" -msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" - -#: g10/getkey.c:214 -msgid "too many entries in pk cache - disabled\n" -msgstr "" - -#. fixme: returning translatable constants instead of a user ID is -#. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 -#, fuzzy -msgid "[User id not found]" -msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#: g10/getkey.c:453 -msgid "too many entries in unk cache - disabled\n" -msgstr "" - -#: g10/getkey.c:2207 -#, c-format -msgid "using secondary key %08lX instead of primary key %08lX\n" -msgstr "ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ %09lX ×ÍÅÓÔÏ ÏÓÎÏ×ÎÏÇÏ %08lX%\n" - -#: g10/getkey.c:2249 g10/trustdb.c:577 -#, fuzzy, c-format -msgid "key %08lX: secret key without public key - skipped\n" -msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" - -#: g10/import.c:184 -#, c-format -msgid "skipping block of type %d\n" -msgstr "ÐÒÏÐÕÓËÁÅÍ ÂÌÏË ÔÉÐÁ %d\n" - -#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847 -#, c-format -msgid "%lu keys so far processed\n" -msgstr "" - -#: g10/import.c:196 -#, fuzzy, c-format -msgid "error reading `%s': %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/import.c:206 -#, c-format -msgid "Total number processed: %lu\n" -msgstr "" - -#: g10/import.c:208 -#, fuzzy, c-format -msgid " skipped new keys: %lu\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/import.c:211 -#, c-format -msgid " w/o user IDs: %lu\n" -msgstr "" - -#: g10/import.c:213 -#, c-format -msgid " imported: %lu" -msgstr "" - -#: g10/import.c:219 -#, c-format -msgid " unchanged: %lu\n" -msgstr "" - -#: g10/import.c:221 -#, c-format -msgid " new user IDs: %lu\n" -msgstr "" - -#: g10/import.c:223 -#, c-format -msgid " new subkeys: %lu\n" -msgstr "" - -#: g10/import.c:225 -#, fuzzy, c-format -msgid " new signatures: %lu\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/import.c:227 -#, c-format -msgid " new key revocations: %lu\n" -msgstr "" - -#: g10/import.c:229 -#, c-format -msgid " secret keys read: %lu\n" -msgstr "" - -#: g10/import.c:231 -#, fuzzy, c-format -msgid " secret keys imported: %lu\n" -msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" - -#: g10/import.c:233 -#, fuzzy, c-format -msgid " secret keys unchanged: %lu\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#: g10/import.c:408 g10/import.c:617 -#, fuzzy, c-format -msgid "key %08lX: no user ID\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" - -#: g10/import.c:422 -#, fuzzy, c-format -msgid "key %08lX: no valid user IDs\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" - -#: g10/import.c:424 -msgid "this may be caused by a missing self-signature\n" -msgstr "ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÏ ÏÔÓÕÔÓÔ×ÉÅÍ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n" - -#: g10/import.c:435 g10/import.c:684 -#, c-format -msgid "key %08lX: public key not found: %s\n" -msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" - -#: g10/import.c:440 -#, fuzzy, c-format -msgid "key %08lX: new key - skipped\n" -msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" - -#: g10/import.c:448 -msgid "no default public keyring\n" -msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" - -#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635 -#, c-format -msgid "writing to `%s'\n" -msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" - -#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733 -#, fuzzy, c-format -msgid "can't lock keyring `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n" - -#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736 -#, fuzzy, c-format -msgid "error writing keyring `%s': %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/import.c:463 -#, c-format -msgid "key %08lX: public key imported\n" -msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" - -#: g10/import.c:480 -#, c-format -msgid "key %08lX: doesn't match our copy\n" -msgstr "ËÌÀÞ %08lX: ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó ÎÁÛÅÊ ËÏÐÉÅÊ\n" - -#: g10/import.c:489 g10/import.c:692 -#, c-format -msgid "key %08lX: can't locate original keyblock: %s\n" -msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÏÂÎÁÒÕÖÉÔØ original keyblock: %s\n" - -#: g10/import.c:495 g10/import.c:698 -#, c-format -msgid "key %08lX: can't read original keyblock: %s\n" -msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ original keyblock: %s\n" - -#: g10/import.c:522 -#, fuzzy, c-format -msgid "key %08lX: 1 new user ID\n" -msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" - -#: g10/import.c:525 -#, fuzzy, c-format -msgid "key %08lX: %d new user IDs\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" - -#: g10/import.c:528 -#, c-format -msgid "key %08lX: 1 new signature\n" -msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÁÑ ÐÏÄÐÉÓØ\n" - -#: g10/import.c:531 -#, c-format -msgid "key %08lX: %d new signatures\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/import.c:534 -#, c-format -msgid "key %08lX: 1 new subkey\n" -msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n" - -#: g10/import.c:537 -#, c-format -msgid "key %08lX: %d new subkeys\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄ-ËÌÀÞÅÊ\n" - -#: g10/import.c:547 -#, c-format -msgid "key %08lX: not changed\n" -msgstr "ËÌÀÞ %08lX: ÎÅ ÉÚÍÅÎÅÎ\n" - -#: g10/import.c:610 -#, c-format -msgid "secret key %08lX not imported (use %s to allow for it)\n" -msgstr "" - -#: g10/import.c:640 -#, c-format -msgid "key %08lX: secret key imported\n" -msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" - -#. we can't merge secret keys -#: g10/import.c:644 -#, c-format -msgid "key %08lX: already in secret keyring\n" -msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n" - -#: g10/import.c:649 -#, c-format -msgid "key %08lX: secret key not found: %s\n" -msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" - -#: g10/import.c:678 -#, c-format -msgid "key %08lX: no public key - can't apply revocation certificate\n" -msgstr "" -"ËÌÀÞ %08lX: ÎÅÔ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ - ÎÅ×ÏÚÍÏÖÎÏ ÐÒÉÍÅÎÉÔØ ÏÔÚÙ×ÁÀÝÉÊ " -"ÓÅÒÔÉÆÉËÁÔ\n" - -#: g10/import.c:709 -#, c-format -msgid "key %08lX: invalid revocation certificate: %s - rejected\n" -msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÏÔ×ÅÒÇÎÕÔ\n" - -#: g10/import.c:741 -#, c-format -msgid "key %08lX: revocation certificate imported\n" -msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" - -#: g10/import.c:783 -#, fuzzy, c-format -msgid "key %08lX: no user ID for signature\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" - -#: g10/import.c:790 g10/import.c:814 -#, c-format -msgid "key %08lX: unsupported public key algorithm\n" -msgstr "ËÌÀÞ %08lX: ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ\n" - -#: g10/import.c:791 -#, c-format -msgid "key %08lX: invalid self-signature\n" -msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n" - -#: g10/import.c:806 -#, fuzzy, c-format -msgid "key %08lX: no subkey for key binding\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" - -#: g10/import.c:815 -#, fuzzy, c-format -msgid "key %08lX: invalid subkey binding\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" - -#: g10/import.c:842 -#, fuzzy, c-format -msgid "key %08lX: accepted non self-signed user ID '" -msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '" - -#: g10/import.c:871 -#, fuzzy, c-format -msgid "key %08lX: skipped user ID '" -msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '" - -#: g10/import.c:894 -#, fuzzy, c-format -msgid "key %08lX: skipped subkey\n" -msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n" - -#. here we violate the rfc a bit by still allowing -#. * to import non-exportable signature when we have the -#. * the secret key used to create this signature - it -#. * seems that this makes sense -#: g10/import.c:919 -#, fuzzy, c-format -msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ × ÎÅÐÒÁ×ÉÌØÎÏÍ ÍÅÓÔÅ - ÐÒÏÐÕÝÅÎ\n" - -#: g10/import.c:928 -#, c-format -msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ × ÎÅÐÒÁ×ÉÌØÎÏÍ ÍÅÓÔÅ - ÐÒÏÐÕÝÅÎ\n" - -#: g10/import.c:936 -#, c-format -msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÐÒÏÐÕÝÅÎ\n" - -#: g10/import.c:1036 -#, c-format -msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "" - -#: g10/import.c:1088 -#, c-format -msgid "key %08lX: revocation certificate added\n" -msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÄÏÂÁ×ÌÅÎ\n" - -#: g10/import.c:1202 g10/import.c:1255 -#, c-format -msgid "key %08lX: our copy has no self-signature\n" -msgstr "ËÌÀÞ %08lX: ÎÁÛÁ ËÏÐÉÑ ÎÅ ÉÍÅÅÔ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n" - -#: g10/delkey.c:67 g10/keyedit.c:94 -#, c-format -msgid "%s: user not found\n" -msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#: g10/keyedit.c:156 -msgid "[revocation]" -msgstr "" - -#: g10/keyedit.c:157 -#, fuzzy -msgid "[self-signature]" -msgstr "[ÓÁÍÏ-ÐÏÄÐÉÓØ]\n" - -#: g10/keyedit.c:221 -#, fuzzy -msgid "1 bad signature\n" -msgstr "1 ÐÌÏÈÁÑ ÐÏÄÐÉÓØ\n" - -#: g10/keyedit.c:223 -#, c-format -msgid "%d bad signatures\n" -msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/keyedit.c:225 -#, fuzzy -msgid "1 signature not checked due to a missing key\n" -msgstr "1 ÐÏÄÐÉÓØ ÎÅ ÐÒÏ×ÅÒÅÎÁ ÉÚ-ÚÁ ÏÔÓÕÔÓÔ×ÉÑ ËÌÀÞÁ\n" - -#: g10/keyedit.c:227 -#, fuzzy, c-format -msgid "%d signatures not checked due to missing keys\n" -msgstr "%s ÐÏÄÐÉÓÅÊ ÎÅ ÐÒÏ×ÅÒÅÎÏ ÉÚ-ÚÁ ÏÔÓÕÔÓÔ×ÉÑ ËÌÀÞÅÊ\n" - -#: g10/keyedit.c:229 -#, fuzzy -msgid "1 signature not checked due to an error\n" -msgstr "1 ÐÏÄÐÉÓØ ÎÅ ÐÒÏ×ÅÒÅÎÁ ÉÚ-ÚÁ ÏÛÉÂËÉ\n" - -#: g10/keyedit.c:231 -#, c-format -msgid "%d signatures not checked due to errors\n" -msgstr "%s ÐÏÄÐÉÓÅÊ ÎÅ ÐÒÏ×ÅÒÅÎÏ ÉÚ-ÚÁ ÏÛÉÂÏË\n" - -#: g10/keyedit.c:233 -#, fuzzy -msgid "1 user ID without valid self-signature detected\n" -msgstr "ÏÂÎÁÒÕÖÅÎ 1 ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÂÅÚ ÄÏÐÕÓÔÉÍÏÊ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n" - -#: g10/keyedit.c:235 -#, fuzzy, c-format -msgid "%d user IDs without valid self-signatures detected\n" -msgstr "" -"ÏÂÎÁÒÕÖÅÎÏ %d ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÂÅÚ ÄÏÐÕÓÔÉÍÙÈ ÓÁÍÏ-ÐÏÄÐÉÓÅÊ\n" - -#. Fixme: see whether there is a revocation in which -#. * case we should allow to sign it again. -#: g10/keyedit.c:317 -#, fuzzy, c-format -msgid "Already signed by key %08lX\n" -msgstr "õÖÅ ÐÏÄÐÉÓÁÎÏ ËÌÀÞÏÍ %08lX.\n" - -#: g10/keyedit.c:325 -#, fuzzy, c-format -msgid "Nothing to sign with key %08lX\n" -msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n" - -#: g10/keyedit.c:334 -#, fuzzy -msgid "" -"Are you really sure that you want to sign this key\n" -"with your key: \"" -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ ÜÔÏÔ ËÌÀÞ Ó×ÏÉÍ:\n" - -#: g10/keyedit.c:343 -msgid "" -"The signature will be marked as non-exportable.\n" -"\n" -msgstr "" - -#: g10/keyedit.c:348 -msgid "Really sign? " -msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? " - -#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157 -#, fuzzy, c-format -msgid "signing failed: %s\n" -msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n" - -#: g10/keyedit.c:428 -msgid "This key is not protected.\n" -msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÚÁÝÉÝÅÎ.\n" - -#: g10/keyedit.c:432 -#, fuzzy -msgid "Secret parts of primary key are not available.\n" -msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" - -#: g10/keyedit.c:436 -msgid "Key is protected.\n" -msgstr "üÔÏÔ ËÌÀÞ ÚÁÝÉÝÅÎ.\n" - -#: g10/keyedit.c:456 -#, c-format -msgid "Can't edit this key: %s\n" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ: %s\n" - -#: g10/keyedit.c:461 -msgid "" -"Enter the new passphrase for this secret key.\n" -"\n" -msgstr "" -"÷×ÅÄÉÔÅ ÎÏ×ÕÀ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÄÌÑ ÜÔÏÇÏ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ.\n" -"\n" - -#: g10/keyedit.c:473 -msgid "" -"You don't want a passphrase - this is probably a *bad* idea!\n" -"\n" -msgstr "" -"÷Ù ÎÅ ÈÏÔÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ - ÜÔÏ ÓËÏÒÅÅ ×ÓÅÇÏ *ÐÌÏÈÁÑ* ÉÄÅÑ!\n" -"\n" - -#: g10/keyedit.c:476 -msgid "Do you really want to do this? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÜÔÏÇÏ ÈÏÔÉÔÅ? " - -#: g10/keyedit.c:540 -msgid "moving a key signature to the correct place\n" -msgstr "" - -#: g10/keyedit.c:581 -msgid "quit this menu" -msgstr "×ÙÊÔÉ ÉÚ ÍÅÎÀ" - -#: g10/keyedit.c:582 -msgid "q" -msgstr "" - -#: g10/keyedit.c:583 -msgid "save" -msgstr "ÚÁÐÉÓÁÔØ" - -#: g10/keyedit.c:583 -msgid "save and quit" -msgstr "ÚÁÐÉÓÁÔØ É ×ÙÊÔÉ" - -#: g10/keyedit.c:584 -msgid "help" -msgstr "ÐÏÍÏÝØ" - -#: g10/keyedit.c:584 -msgid "show this help" -msgstr "ÐÏËÁÚÁÔØ ÐÏÍÏÝØ" - -#: g10/keyedit.c:586 -msgid "fpr" -msgstr "" - -#: g10/keyedit.c:586 -#, fuzzy -msgid "show fingerprint" -msgstr "ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔÏË ÐÁÌØÃÁ\"" - -#: g10/keyedit.c:587 -#, fuzzy -msgid "list" -msgstr "ÓÐÉÓÏË" - -#: g10/keyedit.c:587 -#, fuzzy -msgid "list key and user IDs" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ" - -#: g10/keyedit.c:588 -msgid "l" -msgstr "" - -#: g10/keyedit.c:589 -msgid "uid" -msgstr "" - -#: g10/keyedit.c:589 -#, fuzzy -msgid "select user ID N" -msgstr "×ÙÂÒÁÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ N" - -#: g10/keyedit.c:590 -msgid "key" -msgstr "ËÌÀÞ" - -#: g10/keyedit.c:590 -msgid "select secondary key N" -msgstr "×ÙÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ N" - -#: g10/keyedit.c:591 -msgid "check" -msgstr "ÐÒÏ×ÅÒËÁ" - -#: g10/keyedit.c:591 -#, fuzzy -msgid "list signatures" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÈ ÐÏÄÐÉÓÅÊ" - -#: g10/keyedit.c:592 -msgid "c" -msgstr "" - -#: g10/keyedit.c:593 -msgid "sign" -msgstr "ÐÏÄÐÉÓÁÔØ" - -#: g10/keyedit.c:593 -#, fuzzy -msgid "sign the key" -msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" - -#: g10/keyedit.c:594 -msgid "s" -msgstr "" - -#: g10/keyedit.c:595 -#, fuzzy -msgid "lsign" -msgstr "ÐÏÄÐÉÓÁÔØ" - -#: g10/keyedit.c:595 -#, fuzzy -msgid "sign the key locally" -msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ" - -#: g10/keyedit.c:596 -msgid "debug" -msgstr "ÏÔÌÁÄËÁ" - -#: g10/keyedit.c:597 -msgid "adduid" -msgstr "" - -#: g10/keyedit.c:597 -#, fuzzy -msgid "add a user ID" -msgstr "ÄÏÂÁ×ÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/keyedit.c:598 -msgid "deluid" -msgstr "" - -#: g10/keyedit.c:598 -#, fuzzy -msgid "delete user ID" -msgstr "ÕÄÁÌÉÔØ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ" - -#: g10/keyedit.c:599 -msgid "addkey" -msgstr "" - -#: g10/keyedit.c:599 -#, fuzzy -msgid "add a secondary key" -msgstr "ÄÏÂÁ×ÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ" - -#: g10/keyedit.c:600 -msgid "delkey" -msgstr "" - -#: g10/keyedit.c:600 -msgid "delete a secondary key" -msgstr "ÕÄÁÌÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ" - -#: g10/keyedit.c:601 -#, fuzzy -msgid "delsig" -msgstr "ÐÏÄÐÉÓÁÔØ" - -#: g10/keyedit.c:601 -#, fuzzy -msgid "delete signatures" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÈ ÐÏÄÐÉÓÅÊ" - -#: g10/keyedit.c:602 -msgid "expire" -msgstr "" - -#: g10/keyedit.c:602 -#, fuzzy -msgid "change the expire date" -msgstr "ÉÚÍÅÎÉÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ" - -#: g10/keyedit.c:603 -msgid "toggle" -msgstr "" - -#: g10/keyedit.c:603 -msgid "toggle between secret and public key listing" -msgstr "ÐÅÒÅËÌÀÞÉÔØ ÍÅÖÄÕ ÓÐÉÓËÏÍ ÓÅËÒÅÔÎÙÈ É ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ" - -#: g10/keyedit.c:605 -msgid "t" -msgstr "" - -#: g10/keyedit.c:606 -msgid "pref" -msgstr "" - -#: g10/keyedit.c:606 g10/keyedit.c:607 -msgid "list preferences" -msgstr "" - -#: g10/keyedit.c:607 -msgid "showpref" -msgstr "" - -#: g10/keyedit.c:608 -msgid "passwd" -msgstr "" - -#: g10/keyedit.c:608 -#, fuzzy -msgid "change the passphrase" -msgstr "ÉÚÍÅÎÉÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ" - -#: g10/keyedit.c:609 -msgid "trust" -msgstr "" - -#: g10/keyedit.c:609 -msgid "change the ownertrust" -msgstr "ÉÚÍÅÎÉÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ" - -#: g10/keyedit.c:610 -#, fuzzy -msgid "revsig" -msgstr "ÐÏÄÐÉÓÁÔØ" - -#: g10/keyedit.c:610 -#, fuzzy -msgid "revoke signatures" -msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" - -#: g10/keyedit.c:611 -#, fuzzy -msgid "revkey" -msgstr "ËÌÀÞ" - -#: g10/keyedit.c:611 -#, fuzzy -msgid "revoke a secondary key" -msgstr "ÕÄÁÌÉÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ" - -#: g10/keyedit.c:612 -msgid "disable" -msgstr "" - -#: g10/keyedit.c:612 -#, fuzzy -msgid "disable a key" -msgstr "ðÌÏÈÏÊ ËÌÀÞ" - -#: g10/keyedit.c:613 -msgid "enable" -msgstr "" - -#: g10/keyedit.c:613 -#, fuzzy -msgid "enable a key" -msgstr "ðÌÏÈÏÊ ËÌÀÞ" - -#: g10/delkey.c:110 g10/keyedit.c:633 -msgid "can't do that in batchmode\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ.\n" - -#. check that they match -#. fixme: check that they both match -#: g10/keyedit.c:671 -#, fuzzy -msgid "Secret key is available.\n" -msgstr "éÍÅÅÔÓÑ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n" - -#: g10/keyedit.c:700 -#, fuzzy -msgid "Command> " -msgstr "ëÏÍÁÎÄÁ> " - -#: g10/keyedit.c:730 -#, fuzzy -msgid "Need the secret key to do this.\n" -msgstr "þÔÏÂÙ ÜÔÏ ÓÄÅÌÁÔØ, ÎÕÖÅÎ ÓÅËÒÅÔÎÙÊ ËÌÀÞ.\n" - -#: g10/keyedit.c:734 -msgid "Please use the command \"toggle\" first.\n" -msgstr "" - -#: g10/keyedit.c:781 -#, fuzzy -msgid "Really sign all user IDs? " -msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ ×ÓÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? " - -#: g10/keyedit.c:782 -#, fuzzy -msgid "Hint: Select the user IDs to sign\n" -msgstr "" -"ðÏÄÓËÁÚËÁ: ×ÙÂÅÒÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ ËÏÔÏÒÙÅ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ\n" - -#: g10/keyedit.c:814 g10/keyedit.c:1000 -#, fuzzy, c-format -msgid "update of trustdb failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/keyedit.c:825 g10/keyedit.c:846 -#, fuzzy -msgid "You must select at least one user ID.\n" -msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n" - -#: g10/keyedit.c:827 -#, fuzzy -msgid "You can't delete the last user ID!\n" -msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n" - -#: g10/keyedit.c:830 -#, fuzzy -msgid "Really remove all selected user IDs? " -msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ×ÓÅ ×ÙÂÒÁÎÎÙÅ ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ÐÏÌØÚÏ×ÁÔÅÌÑ? " - -#: g10/keyedit.c:831 -#, fuzzy -msgid "Really remove this user ID? " -msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÕÄÁÌÉÔØ ÜÔÏÔ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ? " - -#: g10/keyedit.c:867 g10/keyedit.c:889 -msgid "You must select at least one key.\n" -msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n" - -#: g10/keyedit.c:871 -#, fuzzy -msgid "Do you really want to delete the selected keys? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? " - -#: g10/keyedit.c:872 -#, fuzzy -msgid "Do you really want to delete this key? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? " - -#: g10/keyedit.c:893 -#, fuzzy -msgid "Do you really want to revoke the selected keys? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? " - -#: g10/keyedit.c:894 -#, fuzzy -msgid "Do you really want to revoke this key? " -msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ËÌÀÞ? " - -#: g10/keyedit.c:964 -msgid "Save changes? " -msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ? " - -#: g10/keyedit.c:967 -msgid "Quit without saving? " -msgstr "÷ÙÊÔÉ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ? " - -#: g10/keyedit.c:978 -#, fuzzy, c-format -msgid "update failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/keyedit.c:985 -#, fuzzy, c-format -msgid "update secret failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/keyedit.c:992 -msgid "Key not changed so no update needed.\n" -msgstr "ëÌÀÞ ÎÅ ÉÚÍÅÎÉÌÓÑ, ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÎÕÖÎÏ.\n" - -#: g10/keyedit.c:1007 -msgid "Invalid command (try \"help\")\n" -msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ (ÐÏÐÒÏÂÕÊÔÅ \"help\")\n" - -#: g10/keyedit.c:1131 g10/keyedit.c:1157 -#, c-format -msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "" - -#: g10/keyedit.c:1140 -#, c-format -msgid " trust: %c/%c" -msgstr "" - -#: g10/keyedit.c:1144 -#, fuzzy -msgid "This key has been disabled" -msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n" - -#: g10/keyedit.c:1173 -#, fuzzy, c-format -msgid "rev! subkey has been revoked: %s\n" -msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n" - -#: g10/keyedit.c:1176 -msgid "rev- faked revocation found\n" -msgstr "" - -#: g10/keyedit.c:1178 -#, c-format -msgid "rev? problem checking revocation: %s\n" -msgstr "" - -#: g10/keyedit.c:1420 -msgid "Delete this good signature? (y/N/q)" -msgstr "" - -#: g10/keyedit.c:1424 -msgid "Delete this invalid signature? (y/N/q)" -msgstr "" - -#: g10/keyedit.c:1428 -#, fuzzy -msgid "Delete this unknown signature? (y/N/q)" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/keyedit.c:1434 -#, fuzzy -msgid "Really delete this self-signature? (y/N)" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/keyedit.c:1448 -#, fuzzy, c-format -msgid "Deleted %d signature.\n" -msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/keyedit.c:1449 -#, fuzzy, c-format -msgid "Deleted %d signatures.\n" -msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/keyedit.c:1452 -#, fuzzy -msgid "Nothing deleted.\n" -msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" - -#: g10/keyedit.c:1521 -msgid "Please remove selections from the secret keys.\n" -msgstr "" - -#: g10/keyedit.c:1527 -#, fuzzy -msgid "Please select at most one secondary key.\n" -msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n" - -#: g10/keyedit.c:1531 -msgid "Changing expiration time for a secondary key.\n" -msgstr "" - -#: g10/keyedit.c:1533 -msgid "Changing expiration time for the primary key.\n" -msgstr "" - -#: g10/keyedit.c:1575 -msgid "You can't change the expiration date of a v3 key\n" -msgstr "" - -#: g10/keyedit.c:1591 -msgid "No corresponding signature in secret ring\n" -msgstr "" - -#: g10/keyedit.c:1652 -#, fuzzy, c-format -msgid "No user ID with index %d\n" -msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n" - -#: g10/keyedit.c:1698 -#, c-format -msgid "No secondary key with index %d\n" -msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n" - -#: g10/keyedit.c:1796 -#, fuzzy -msgid "user ID: \"" -msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: " - -#: g10/keyedit.c:1799 -#, fuzzy, c-format -msgid "" -"\"\n" -"signed with your key %08lX at %s\n" -msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n" - -#: g10/keyedit.c:1803 -#, fuzzy -msgid "Create a revocation certificate for this signature? (y/N)" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" - -#. FIXME: detect duplicates here -#: g10/keyedit.c:1827 -#, fuzzy -msgid "You have signed these user IDs:\n" -msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n" - -#: g10/keyedit.c:1841 g10/keyedit.c:1876 -#, fuzzy, c-format -msgid " signed by %08lX at %s\n" -msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n" - -#: g10/keyedit.c:1846 -#, fuzzy, c-format -msgid " revoked by %08lX at %s\n" -msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n" - -#: g10/keyedit.c:1866 -#, fuzzy -msgid "You are about to revoke these signatures:\n" -msgstr "Möchten Sie einige der ungültigen Signaturen entfernen? " - -#: g10/keyedit.c:1884 -#, fuzzy -msgid "Really create the revocation certificates? (y/N)" -msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/keyedit.c:1913 -#, fuzzy -msgid "no secret key\n" -msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#. of subkey -#: g10/keylist.c:279 g10/mainproc.c:851 -#, fuzzy, c-format -msgid " [expires: %s]" -msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n" - -#: g10/mainproc.c:269 -#, fuzzy, c-format -msgid "public key is %08lX\n" -msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ" - -#: g10/mainproc.c:314 -#, fuzzy -msgid "public key encrypted data: good DEK\n" -msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n" - -#: g10/mainproc.c:366 -#, fuzzy, c-format -msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" -msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n" - -#: g10/mainproc.c:376 -#, fuzzy, c-format -msgid "encrypted with %s key, ID %08lX\n" -msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n" - -#: g10/mainproc.c:390 -#, c-format -msgid "public key decryption failed: %s\n" -msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n" - -#: g10/mainproc.c:430 -#, fuzzy -msgid "decryption okay\n" -msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/mainproc.c:435 -msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "" - -#: g10/mainproc.c:440 -#, c-format -msgid "decryption failed: %s\n" -msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/mainproc.c:459 -#, fuzzy -msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n" - -#: g10/mainproc.c:461 -#, c-format -msgid "original file name='%.*s'\n" -msgstr "" - -#: g10/mainproc.c:632 -msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "" - -#: g10/mainproc.c:719 g10/mainproc.c:728 -#, fuzzy -msgid "WARNING: invalid notation data found\n" -msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" - -#: g10/mainproc.c:731 -msgid "Notation: " -msgstr "" - -#: g10/mainproc.c:740 -msgid "Policy: " -msgstr "" - -#: g10/mainproc.c:1193 -msgid "signature verification suppressed\n" -msgstr "" - -#. plaintext before signatures but no one-pass packets -#: g10/mainproc.c:1235 g10/mainproc.c:1245 -#, fuzzy -msgid "can't handle these multiple signatures\n" -msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" - -#: g10/mainproc.c:1256 -#, c-format -msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n" - -#. just in case that we have no userid -#: g10/mainproc.c:1284 g10/mainproc.c:1292 -msgid "BAD signature from \"" -msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" - -#: g10/mainproc.c:1285 g10/mainproc.c:1293 -msgid "Good signature from \"" -msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \"" - -#: g10/mainproc.c:1308 -msgid " aka \"" -msgstr "" - -#: g10/mainproc.c:1358 -#, c-format -msgid "Can't check signature: %s\n" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n" - -#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505 -#, fuzzy -msgid "not a detached signature\n" -msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" - -#: g10/mainproc.c:1454 -#, fuzzy, c-format -msgid "standalone signature of class 0x%02x\n" -msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ" - -#: g10/mainproc.c:1511 -msgid "old style (PGP 2.x) signature\n" -msgstr "" - -#: g10/mainproc.c:1518 -msgid "invalid root packet detected in proc_tree()\n" -msgstr "" - -#: g10/misc.c:98 -#, fuzzy, c-format -msgid "can't disable core dumps: %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: g10/misc.c:208 -msgid "Experimental algorithms should not be used!\n" -msgstr "" - -#: g10/misc.c:238 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" - -#: g10/parse-packet.c:119 -#, fuzzy, c-format -msgid "can't handle public key algorithm %d\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n" - -#: g10/parse-packet.c:1010 -#, c-format -msgid "subpacket of type %d has critical bit set\n" -msgstr "" - -#: g10/passphrase.c:223 -msgid "gpg-agent is not available in this session\n" -msgstr "" - -#: g10/passphrase.c:229 -msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "" - -#: g10/hkp.c:167 g10/passphrase.c:248 -#, fuzzy, c-format -msgid "can't connect to `%s': %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" - -#: g10/passphrase.c:313 g10/passphrase.c:576 -#, c-format -msgid " (main key ID %08lX)" -msgstr "" - -#: g10/passphrase.c:323 -#, fuzzy, c-format -msgid "" -"You need a passphrase to unlock the secret key for user:\n" -"\"%.*s\"\n" -"%u-bit %s key, ID %08lX, created %s%s\n" -msgstr "" -"\n" -"÷ÁÍ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÞÔÏÂÙ ÏÔÏÍËÎÕÔØ ËÌÀÞ\n" -"ÐÏÌØÚÏ×ÁÔÅÌÑ: \"" - -#: g10/passphrase.c:344 -#, fuzzy -msgid "Enter passphrase\n" -msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n" - -#: g10/passphrase.c:346 -#, fuzzy -msgid "Repeat passphrase\n" -msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n" - -# ################################ -# ####### Help msgids ############ -# ################################ -#: g10/passphrase.c:384 -#, fuzzy -msgid "passphrase too long\n" -msgstr "" -"Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" -"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n" -"Zur ihrer eigenen Sicherbeit benutzen Sie biite einen Satz, den sie sich\n" -"gut merken könne, der aber nicht leicht zu raten ist; Zitate und andere\n" -"bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n" -"verfügbar sind und durch entsprechende Programme zum Raten der " -"\"Passphrase\"\n" -"benutzt werden. Sätze mit persönlicher Bedeutung, die auch noch durch\n" -"falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert " -"werden,\n" -"sind i.d.R. eine gute Wahl" - -#: g10/passphrase.c:396 -msgid "invalid response from agent\n" -msgstr "" - -#: g10/passphrase.c:405 -msgid "cancelled by user\n" -msgstr "" - -#: g10/passphrase.c:408 g10/passphrase.c:477 -#, c-format -msgid "problem with the agent: agent returns 0x%lx\n" -msgstr "" - -#: g10/passphrase.c:562 -msgid "" -"\n" -"You need a passphrase to unlock the secret key for\n" -"user: \"" -msgstr "" -"\n" -"÷ÁÍ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÞÔÏÂÙ ÏÔÏÍËÎÕÔØ ËÌÀÞ\n" -"ÐÏÌØÚÏ×ÁÔÅÌÑ: \"" - -#: g10/passphrase.c:571 -#, fuzzy, c-format -msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n" - -#: g10/passphrase.c:609 -#, fuzzy -msgid "can't query password in batchmode\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÄÅÌÁÔØ ÜÔÏ × ÐÁËÅÔÎÏÍ ÒÅÖÉÍÅ.\n" - -#: g10/passphrase.c:613 -#, fuzzy -msgid "Enter passphrase: " -msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n" - -#: g10/passphrase.c:617 -#, fuzzy -msgid "Repeat passphrase: " -msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n" - -#: g10/plaintext.c:67 -msgid "data not saved; use option \"--output\" to save it\n" -msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n" - -#: g10/plaintext.c:332 -#, fuzzy -msgid "Detached signature.\n" -msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n" - -#: g10/plaintext.c:336 -msgid "Please enter name of data file: " -msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: " - -#: g10/plaintext.c:357 -msgid "reading stdin ...\n" -msgstr "" - -#: g10/plaintext.c:391 -#, fuzzy -msgid "no signed data\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n" - -#: g10/plaintext.c:399 -#, c-format -msgid "can't open signed data `%s'\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n" - -#: g10/pubkey-enc.c:76 -#, c-format -msgid "anonymous receiver; trying secret key %08lX ...\n" -msgstr "ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ, ÐÒÏÂÕÅÍ ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX ...\n" - -#: g10/pubkey-enc.c:82 -#, fuzzy -msgid "okay, we are the anonymous recipient.\n" -msgstr "ïË, ÍÙ -- ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ.\n" - -#: g10/pubkey-enc.c:134 -#, fuzzy -msgid "old encoding of the DEK is not supported\n" -msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" - -#: g10/pubkey-enc.c:153 -#, fuzzy, c-format -msgid "cipher algorithm %d is unknown or disabled\n" -msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" - -#: g10/pubkey-enc.c:192 -#, fuzzy, c-format -msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "ÚÁÍÅÞÁÎÉÅ: ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍ %d ÎÅ ÎÁÊÄÅÎ × ÐÒÅÄÐÏÞÔÅÎÉÑÈ\n" - -#: g10/pubkey-enc.c:198 -#, fuzzy, c-format -msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n" - -#: g10/hkp.c:59 -#, c-format -msgid "requesting key %08lX from %s ...\n" -msgstr "" - -#: g10/hkp.c:83 -#, fuzzy, c-format -msgid "can't get key from keyserver: %s\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ × Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n" - -#: g10/hkp.c:102 g10/hkp.c:136 -msgid "no keyserver known (use option --keyserver)\n" -msgstr "" - -#: g10/hkp.c:110 -#, fuzzy, c-format -msgid "%s: not a valid key ID\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" - -#: g10/hkp.c:191 -#, fuzzy, c-format -msgid "error sending to `%s': %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/hkp.c:203 -#, c-format -msgid "success sending to `%s' (status=%u)\n" -msgstr "" - -#: g10/hkp.c:206 -#, c-format -msgid "failed sending to `%s': status=%u\n" -msgstr "" - -#: g10/seckey-cert.c:53 -#, fuzzy -msgid "secret key parts are not available\n" -msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" - -#: g10/seckey-cert.c:59 -#, fuzzy, c-format -msgid "protection algorithm %d is not supported\n" -msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" - -#: g10/seckey-cert.c:184 -msgid "Invalid passphrase; please try again ...\n" -msgstr "îÅÐÒÁ×ÉÌØÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á ...\n" - -#: g10/seckey-cert.c:240 -#, fuzzy -msgid "WARNING: Weak key detected - please change passphrase again.\n" -msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÎÁÒÕÖÅÎ ÓÌÁÂÙÊ ËÌÀÞ - ÓÍÅÎÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ.\n" - -#: g10/sig-check.c:199 -msgid "assuming bad MDC due to an unknown critical bit\n" -msgstr "" - -#: g10/sig-check.c:297 -msgid "" -"this is a PGP generated ElGamal key which is NOT secure for signatures!\n" -msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n" - -#: g10/sig-check.c:305 -#, fuzzy, c-format -msgid "public key is %lu second newer than the signature\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" - -#: g10/sig-check.c:306 -#, fuzzy, c-format -msgid "public key is %lu seconds newer than the signature\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" - -#: g10/sig-check.c:328 -#, fuzzy, c-format -msgid "NOTE: signature key %08lX expired %s\n" -msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n" - -#: g10/sig-check.c:398 -msgid "assuming bad signature due to an unknown critical bit\n" -msgstr "" - -#: g10/sign.c:152 -#, fuzzy, c-format -msgid "checking created signature failed: %s\n" -msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/sign.c:161 -#, fuzzy, c-format -msgid "%s signature from: %s\n" -msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" - -#: g10/sign.c:307 g10/sign.c:630 -#, fuzzy, c-format -msgid "can't create %s: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/sign.c:405 -#, fuzzy -msgid "signing:" -msgstr "ÐÏÄÐÉÓÁÔØ" - -#: g10/sign.c:448 -#, fuzzy, c-format -msgid "WARNING: `%s' is an empty file\n" -msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" - -#: g10/textfilter.c:134 -#, c-format -msgid "can't handle text lines longer than %d characters\n" -msgstr "" - -#: g10/textfilter.c:231 -#, c-format -msgid "input line longer than %d characters\n" -msgstr "" - -#: g10/tdbio.c:116 g10/tdbio.c:1623 -#, fuzzy, c-format -msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/tdbio.c:122 g10/tdbio.c:1630 -#, c-format -msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "" - -#: g10/tdbio.c:232 -msgid "trustdb transaction too large\n" -msgstr "" - -#: g10/tdbio.c:424 -#, fuzzy, c-format -msgid "%s: can't access: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:438 -#, c-format -msgid "%s: directory does not exist!\n" -msgstr "" - -#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444 -#, fuzzy, c-format -msgid "%s: can't create: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:459 g10/tdbio.c:508 -#, fuzzy, c-format -msgid "%s: can't create lock\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:473 -#, c-format -msgid "%s: failed to create version record: %s" -msgstr "" - -#: g10/tdbio.c:477 -#, fuzzy, c-format -msgid "%s: invalid trustdb created\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:480 -#, fuzzy, c-format -msgid "%s: trustdb created\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:517 -#, fuzzy, c-format -msgid "%s: invalid trustdb\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/tdbio.c:550 -#, fuzzy, c-format -msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/tdbio.c:558 -#, fuzzy, c-format -msgid "%s: error updating version record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %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 -#, fuzzy, c-format -msgid "%s: error reading version record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/tdbio.c:587 g10/tdbio.c:646 -#, fuzzy, c-format -msgid "%s: error writing version record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/tdbio.c:1235 -#, fuzzy, c-format -msgid "trustdb: lseek failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/tdbio.c:1243 -#, fuzzy, c-format -msgid "trustdb: read failed (n=%d): %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/tdbio.c:1264 -#, fuzzy, c-format -msgid "%s: not a trustdb file\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/tdbio.c:1280 -#, c-format -msgid "%s: version record with recnum %lu\n" -msgstr "" - -#: g10/tdbio.c:1285 -#, fuzzy, c-format -msgid "%s: invalid file version %d\n" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÎÁÞÁÌÏ ÔÅËÓÔÏ×ÏÊ ÐÏÄÐÉÓÉ\n" - -#: g10/tdbio.c:1589 -#, fuzzy, c-format -msgid "%s: error reading free record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/tdbio.c:1597 -#, fuzzy, c-format -msgid "%s: error writing dir record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/tdbio.c:1607 -#, c-format -msgid "%s: failed to zero a record: %s\n" -msgstr "" - -#: g10/tdbio.c:1637 -#, c-format -msgid "%s: failed to append a record: %s\n" -msgstr "" - -#: g10/tdbio.c:1748 -#, fuzzy -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "âÁÚÁ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÒÁÚÒÕÛÅÎÁ: ÚÁÐÕÓÔÉÔÅ \"gpgm --fix-trust-db\".\n" - -#: g10/trustdb.c:169 -#, c-format -msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "" - -#: g10/trustdb.c:184 -#, c-format -msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "" - -#: g10/trustdb.c:198 -#, fuzzy, c-format -msgid "trust record %lu: delete failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:212 -#, fuzzy, c-format -msgid "trustdb: sync failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:377 -#, fuzzy, c-format -msgid "error reading dir record for LID %lu: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/trustdb.c:384 -#, c-format -msgid "lid %lu: expected dir record, got type %d\n" -msgstr "" - -#: g10/trustdb.c:389 -#, c-format -msgid "no primary key for LID %lu\n" -msgstr "" - -#: g10/trustdb.c:394 -#, fuzzy, c-format -msgid "error reading primary key for LID %lu: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/trustdb.c:433 -#, fuzzy, c-format -msgid "get_dir_record: search_record failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:474 -#, fuzzy, c-format -msgid "'%s' is not a valid long keyID\n" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" - -#: g10/trustdb.c:501 -#, fuzzy, c-format -msgid "key %08lX: can't put it into the trustdb\n" -msgstr "ËÌÀÞ %08lX.%lu: ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÏÖÉÔØ × ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ\n" - -#: g10/trustdb.c:507 -#, fuzzy, c-format -msgid "key %08lX: query record failed\n" -msgstr "ËÌÀÞ %08lX: ÚÁÐÒÏÓ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÓÑ\n" - -#: g10/trustdb.c:516 -#, fuzzy, c-format -msgid "key %08lX: already in trusted key table\n" -msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n" - -#: g10/trustdb.c:519 -#, fuzzy, c-format -msgid "key %08lX: accepted as trusted key.\n" -msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n" - -#: g10/trustdb.c:546 -#, fuzzy, c-format -msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" - -#: g10/trustdb.c:565 -#, fuzzy, c-format -msgid "NOTE: secret key %08lX is NOT protected.\n" -msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÚÁÝÉÝÅÎ.\n" - -#: g10/trustdb.c:584 -#, c-format -msgid "key %08lX: secret and public key don't match\n" -msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ É ÏÔËÒÙÔÏÇÏ ËÌÀÞÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ.\n" - -#: g10/trustdb.c:597 -#, fuzzy, c-format -msgid "enumerate secret keys failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:987 -#, fuzzy, c-format -msgid "key %08lX.%lu: Good subkey binding\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" - -#: g10/trustdb.c:993 g10/trustdb.c:1028 -#, fuzzy, c-format -msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" - -#: g10/trustdb.c:1005 -#, fuzzy, c-format -msgid "key %08lX.%lu: Valid key revocation\n" -msgstr "ËÌÀÞ %08lX.%lu: ÓÒÏË ÄÅÊÓÔ×ÉÑ ÉÓÔÅË %s\n" - -#: g10/trustdb.c:1011 -#, fuzzy, c-format -msgid "key %08lX.%lu: Invalid key revocation: %s\n" -msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" - -#: g10/trustdb.c:1022 -#, fuzzy, c-format -msgid "key %08lX.%lu: Valid subkey revocation\n" -msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" - -#: g10/trustdb.c:1133 -#, fuzzy -msgid "Good self-signature" -msgstr "[ÓÁÍÏ-ÐÏÄÐÉÓØ]\n" - -#: g10/trustdb.c:1143 -#, fuzzy -msgid "Invalid self-signature" -msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n" - -#: g10/trustdb.c:1170 -msgid "Valid user ID revocation skipped due to a newer self signature" -msgstr "" - -#: g10/trustdb.c:1176 -#, fuzzy -msgid "Valid user ID revocation" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n" - -#: g10/trustdb.c:1181 -#, fuzzy -msgid "Invalid user ID revocation" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n" - -#: g10/trustdb.c:1223 -#, fuzzy -msgid "Valid certificate revocation" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/trustdb.c:1224 -#, fuzzy -msgid "Good certificate" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/trustdb.c:1252 -#, fuzzy -msgid "Invalid certificate revocation" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/trustdb.c:1253 -#, fuzzy -msgid "Invalid certificate" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/trustdb.c:1270 g10/trustdb.c:1274 -#, c-format -msgid "sig record %lu[%d] points to wrong record.\n" -msgstr "" - -#: g10/trustdb.c:1333 -#, fuzzy -msgid "duplicated certificate - deleted" -msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ" - -#: g10/trustdb.c:1650 -#, fuzzy, c-format -msgid "tdbio_search_dir failed: %s\n" -msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" - -#: g10/trustdb.c:1784 -#, fuzzy, c-format -msgid "lid ?: insert failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:1789 -#, fuzzy, c-format -msgid "lid %lu: insert failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:1795 -#, c-format -msgid "lid %lu: inserted\n" -msgstr "" - -#: g10/trustdb.c:1800 -#, fuzzy, c-format -msgid "error reading dir record: %s\n" -msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#: g10/trustdb.c:1808 g10/trustdb.c:1871 -#, c-format -msgid "%lu keys processed\n" -msgstr "" - -#: g10/trustdb.c:1810 g10/trustdb.c:1877 -#, fuzzy, c-format -msgid "\t%lu keys with errors\n" -msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ" - -#: g10/trustdb.c:1812 -#, c-format -msgid "\t%lu keys inserted\n" -msgstr "" - -#: g10/trustdb.c:1815 -#, fuzzy, c-format -msgid "enumerate keyblocks failed: %s\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:1863 -#, c-format -msgid "lid %lu: dir record w/o key - skipped\n" -msgstr "" - -#: g10/trustdb.c:1873 -#, fuzzy, c-format -msgid "\t%lu due to new pubkeys\n" -msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄ-ËÌÀÞÅÊ\n" - -#: g10/trustdb.c:1875 -#, fuzzy, c-format -msgid "\t%lu keys skipped\n" -msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" - -#: g10/trustdb.c:1879 -#, c-format -msgid "\t%lu keys updated\n" -msgstr "" - -#: g10/trustdb.c:2224 -msgid "Ooops, no keys\n" -msgstr "" - -#: g10/trustdb.c:2228 -#, fuzzy -msgid "Ooops, no user IDs\n" -msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ" - -#: g10/trustdb.c:2386 -#, fuzzy, c-format -msgid "check_trust: search dir record failed: %s\n" -msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/trustdb.c:2395 -#, fuzzy, c-format -msgid "key %08lX: insert trust record failed: %s\n" -msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#: g10/trustdb.c:2399 -#, c-format -msgid "key %08lX.%lu: inserted into trustdb\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" - -#: g10/trustdb.c:2422 -#, c-format -msgid "key %08lX.%lu: expired at %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" - -#: g10/trustdb.c:2581 -#, fuzzy, c-format -msgid "user '%s' not found: %s\n" -msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#: g10/trustdb.c:2583 -#, fuzzy, c-format -msgid "problem finding '%s' in trustdb: %s\n" -msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" - -#: g10/trustdb.c:2586 -#, fuzzy, c-format -msgid "user '%s' not in trustdb - inserting\n" -msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#: g10/trustdb.c:2589 -#, fuzzy, c-format -msgid "failed to put '%s' into trustdb: %s\n" -msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" - -#: g10/trustdb.c:2775 g10/trustdb.c:2805 -msgid "WARNING: can't yet handle long pref records\n" -msgstr "" - -#: g10/verify.c:108 -msgid "" -"the signature could not be verified.\n" -"Please remember that the signature file (.sig or .asc)\n" -"should be the first file given on the command line.\n" -msgstr "" - -#: g10/verify.c:173 -#, c-format -msgid "input line %u too long or missing LF\n" -msgstr "" - -#: g10/ringedit.c:302 -#, fuzzy, c-format -msgid "%s: can't create keyring: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/ringedit.c:319 g10/ringedit.c:1376 -#, fuzzy, c-format -msgid "%s: keyring created\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/ringedit.c:1557 -msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "" - -#: g10/ringedit.c:1558 -#, fuzzy, c-format -msgid "%s is the unchanged one\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#: g10/ringedit.c:1559 -#, c-format -msgid "%s is the new one\n" -msgstr "" - -#: g10/ringedit.c:1560 -msgid "Please fix this possible security flaw\n" -msgstr "" - -#: g10/skclist.c:110 g10/skclist.c:166 -msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" -msgstr "" - -#: g10/skclist.c:138 -#, fuzzy, c-format -msgid "skipped `%s': duplicated\n" -msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" - -#: g10/skclist.c:145 g10/skclist.c:153 -#, fuzzy, c-format -msgid "skipped `%s': %s\n" -msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" - -#: g10/skclist.c:149 -msgid "skipped: secret key already present\n" -msgstr "" - -#: g10/skclist.c:160 -#, fuzzy, c-format -msgid "" -"skipped `%s': this is a PGP generated ElGamal key which is not secure for " -"signatures!\n" -msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n" - -#. do not overwrite -#: g10/openfile.c:84 -#, c-format -msgid "File `%s' exists. " -msgstr "æÁÊÌ `%s' ÓÕÝÅÓÔ×ÕÅÔ. " - -#: g10/openfile.c:86 -msgid "Overwrite (y/N)? " -msgstr "ðÅÒÅÐÉÓÁÔØ (y/N)? " - -#: g10/openfile.c:119 -#, c-format -msgid "%s: unknown suffix\n" -msgstr "" - -#: g10/openfile.c:141 -#, fuzzy -msgid "Enter new filename" -msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" - -#: g10/openfile.c:184 -#, fuzzy -msgid "writing to stdout\n" -msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" - -#: g10/openfile.c:273 -#, fuzzy, c-format -msgid "assuming signed data in `%s'\n" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n" - -#: g10/openfile.c:323 -#, c-format -msgid "%s: new options file created\n" -msgstr "" - -#: g10/openfile.c:350 -#, fuzzy, c-format -msgid "%s: can't create directory: %s\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/openfile.c:353 -#, fuzzy, c-format -msgid "%s: directory created\n" -msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" - -#: g10/openfile.c:355 -msgid "you have to start GnuPG again, so it can read the new options file\n" -msgstr "" - -#: g10/encr-data.c:66 -#, fuzzy, c-format -msgid "%s encrypted data\n" -msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" - -#: g10/encr-data.c:68 -#, c-format -msgid "encrypted with unknown algorithm %d\n" -msgstr "" - -#: g10/encr-data.c:90 -#, fuzzy -msgid "" -"WARNING: message was encrypted with a weak key in the symmetric cipher.\n" -msgstr "" -"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ ÚÁÛÉÆÒÏ×ÁÎÏ, ÉÓÐÏÌØÚÕÑ ÓÌÁÂÙÊ ËÌÀÞ, × " -"ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ ÛÉÆÒÏ×ÁÎÉÑ.\n" - -#: g10/encr-data.c:97 -#, fuzzy -msgid "problem handling encrypted packet\n" -msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×" - -#: g10/seskey.c:52 -msgid "weak key created - retrying\n" -msgstr "ÐÏÌÕÞÉÌÓÑ ÓÌÁÂÙÊ ËÌÀÞ, ÐÒÏÂÕÅÍ ÅÝÅ ÒÁÚ\n" - -#: g10/seskey.c:57 -#, c-format -msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" -msgstr "" -"ÎÅ ÐÏÌÕÞÁÅÔÓÑ ÉÚÂÅÖÁÔØ ÓÌÁÂÏÇÏ ËÌÀÞÁ × ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ; ÐÒÏÂÏ×ÁÌÉ %d " -"ÒÁÚ!\n" - -#: g10/delkey.c:114 -msgid "can't do that in batchmode without \"--yes\"\n" -msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgeführt werden.\n" - -#: g10/delkey.c:136 -msgid "Delete this key from the keyring? " -msgstr "Diesen ËÌÀÞ aus dem ËÌÀÞring löschen? " - -#: g10/delkey.c:144 -msgid "This is a secret key! - really delete? " -msgstr "Dies ist ein privater ËÌÀÞ! - Wirklich löschen? " - -#: g10/delkey.c:181 -msgid "there is a secret key for this public key!\n" -msgstr "Es gibt einen privaten ËÌÀÞ zu diesem öffentlichen ËÌÀÞ!\n" - -#: g10/delkey.c:183 -msgid "use option \"--delete-secret-key\" to delete it first.\n" -msgstr "" -"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu " -"entfernen.\n" - -#: g10/helptext.c:47 -#, fuzzy -msgid "" -"It's up to you to assign a value here; this value will never be exported\n" -"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 "" -"Sie müssen selbt entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n" -"wird niemals an eine dritte Seite weitergegeben. Wir brauchen diesen Wert,\n" -"um das \"Netz des Vertrauens\" aufzubauen. Dieses hat nichts mit dem " -"(implizit\n" -"erzeugten) \"Netz der Zertifikate\" zu tun.\n" - -#: g10/helptext.c:53 -msgid "If you want to use this revoked key anyway, answer \"yes\"." -msgstr "" - -#: g10/helptext.c:57 -msgid "If you want to use this untrusted key anyway, answer \"yes\"." -msgstr "" - -#: g10/helptext.c:61 -msgid "" -"Enter the user ID of the addressee to whom you want to send the message." -msgstr "" - -#: g10/helptext.c:65 -msgid "" -"Select the algorithm to use.\n" -"\n" -"DSA (aka DSS) is the digital signature algorithm which can only be used\n" -"for signatures. This is the suggested algorithm because verification of\n" -"DSA signatures are much faster than those of ElGamal.\n" -"\n" -"ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " -"only\n" -"and a sign+encrypt; actually it is the same, but some parameters must be\n" -"selected in a special way to create a safe key for signatures: this program\n" -"does this but other OpenPGP implementations are not required to understand\n" -"the signature+encryption flavor.\n" -"\n" -"The first (primary) key must always be a key which is capable of signing;\n" -"this is the reason why the encryption only ElGamal key is not available in\n" -"this menu." -msgstr "" - -#: g10/helptext.c:85 -msgid "" -"Although these keys are defined in RFC2440 they are not suggested\n" -"because they are not supported by all programs and signatures created\n" -"with them are quite large and very slow to verify." -msgstr "" - -#: g10/helptext.c:92 -#, fuzzy -msgid "Enter the size of the key" -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 "" - -#: g10/helptext.c:106 -msgid "" -"Enter the required value as shown in the prompt.\n" -"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" -"get a good error response - instead the system tries to interpret\n" -"the given value as an interval." -msgstr "" - -#: g10/helptext.c:118 -msgid "Enter the name of the key holder" -msgstr "" - -#: g10/helptext.c:123 -msgid "please enter an optional but highly suggested email address" -msgstr "" - -#: g10/helptext.c:127 -#, fuzzy -msgid "Please enter an optional comment" -msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: " - -#: g10/helptext.c:132 -msgid "" -"N to change the name.\n" -"C to change the comment.\n" -"E to change the email address.\n" -"O to continue with key generation.\n" -"Q to to quit the key generation." -msgstr "" - -#: g10/helptext.c:141 -msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr "" - -#: g10/helptext.c:164 -msgid "Answer \"yes\" is you want to sign ALL the user IDs" -msgstr "" - -#: g10/helptext.c:168 -msgid "" -"Answer \"yes\" if you really want to delete this user ID.\n" -"All certificates are then also lost!" -msgstr "" - -#: g10/helptext.c:173 -msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "" - -#: g10/helptext.c:178 -msgid "" -"This is a valid signature on the key; you normally don't want\n" -"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 "" - -#: g10/helptext.c:183 -msgid "" -"This signature can't be checked because you don't have the\n" -"corresponding key. You should postpone its deletion until you\n" -"know which key was used because this signing key might establish\n" -"a trust connection through another already certified key." -msgstr "" - -#: g10/helptext.c:189 -msgid "" -"The signature is not valid. It does make sense to remove it from\n" -"your keyring." -msgstr "" - -#: g10/helptext.c:193 -msgid "" -"This is a signature which binds the user ID to the key. It is\n" -"usually not a good idea to remove such a signature. Actually\n" -"GnuPG might not be able to use this key anymore. So do this\n" -"only if this self-signature is for some reason not valid and\n" -"a second one is available." -msgstr "" - -#: g10/helptext.c:202 -msgid "" -"Please enter the passhrase; this is a secret sentence \n" -" Blurb, blurb,.... " -msgstr "" - -#: g10/helptext.c:209 -msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr "" - -#: g10/helptext.c:213 -msgid "Give the name of the file to which the signature applies" -msgstr "" - -#: g10/helptext.c:218 -msgid "Answer \"yes\" if it is okay to overwrite the file" -msgstr "" - -#: 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 "" - -#: g10/helptext.c:229 -msgid "" -"You should specify a reason for the certification. Depending on the\n" -"context you have the ability to choose from this list:\n" -" \"Key has been compromised\"\n" -" Use this if you have a reason to believe that unauthorized persons\n" -" got access to your secret key.\n" -" \"Key is superseded\"\n" -" Use this if you have replaced this key with a newer one.\n" -" \"Key is no longer used\"\n" -" Use this if you have retired this key.\n" -" \"User ID is no longer valid\"\n" -" 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 "" - -#: g10/helptext.c:245 -msgid "" -"If you like, you can enter a text describing why you issue this\n" -"revocation certificate. Please keep this text concise.\n" -"An empty line ends the text.\n" -msgstr "" - -#: g10/helptext.c:260 -msgid "No help available" -msgstr "ðÏÍÏÝØ ÏÔÓÕÔÓÔ×ÕÅÔ." - -#: g10/helptext.c:268 -#, c-format -msgid "No help available for `%s'" -msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ." - -#, fuzzy -#~ msgid "invalid" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ" - -#, fuzzy -#~ msgid "revoked" -#~ msgstr "ËÌÀÞ" - -#, fuzzy -#~ msgid "No key for user ID\n" -#~ msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" - -#, fuzzy -#~ msgid "No user ID for key\n" -#~ msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" - -#, fuzzy -#~ msgid "no secret key for decryption available\n" -#~ msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" - -#~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" -#~ msgstr "" -#~ "ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n" -#~ "ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\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 × v3-ÐÁËÅÔÅ\n" - -#~ msgid "Key generation can only be used in interactive mode\n" -#~ msgstr "" -#~ "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ.\n" - -#~ msgid "passphrase.repeat" -#~ msgstr "" -#~ "Um sicher zu gehen, daß Sie sich bei der Eingabe der \"Passphrase\" nicht\n" -#~ "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" -#~ "übereinstimmen, wird die \"Passphrase\" akzeptiert." - -#, fuzzy -#~ msgid "detached_signature.filename" -#~ msgstr "ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÄÅÌØÎÏÊ ÐÏÄÐÉÓÉ" - -#~ msgid "openfile.overwrite.okay" -#~ msgstr "÷Ù ÖÅÌÁÅÔÅ ÐÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ (×ÏÚÍÏÖÎÁ ÐÏÔÅÒÑ ÄÁÎÎÙÈ)" - -#, fuzzy -#~ msgid "tdbio_search_sdir failed: %s\n" -#~ msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" - -#~ msgid "print all message digests" -#~ msgstr "ÎÁÐÅÞÁÔÁÔØ ×ÓÅ ÄÁÊÄÖÅÓÔÙ ÓÏÏÂÝÅÎÉÑ" - -#, fuzzy -#~ msgid "lid %lu: user id not found in keyblock\n" -#~ msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#, fuzzy -#~ msgid "lid %lu: user id without signature\n" -#~ msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" - -#, fuzzy -#~ msgid "lid %lu: self-signature in hintlist\n" -#~ msgstr "build_sigrecs: Selbst-Signatur fehlt\n" - -#, fuzzy -#~ msgid "lid %lu: can't get keyblock: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÂÌÏË ËÌÀÞÁ: %s\n" - -#, fuzzy -#~ msgid "public key not anymore available" -#~ msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" - -#, fuzzy -#~ msgid "insert_trust_record: keyblock not found: %s\n" -#~ msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" - -#, fuzzy -#~ msgid "lid %lu: update failed: %s\n" -#~ msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#, fuzzy -#~ msgid "%s: update failed: %s\n" -#~ msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÎÅ ÕÄÁÌÏÓØ: %s\n" - -#, fuzzy -#~ msgid "lid %lu: keyblock not found: %s\n" -#~ msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" - -#, fuzzy -#~ msgid "can't lock keyring `%': %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n" - -#, fuzzy -#~ msgid "error writing keyring `%': %s\n" -#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" - -#~ msgid "can't open file: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ: %s\n" - -#~ msgid "read error: %s\n" -#~ msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s\n" - -#~ msgid "writing keyblock\n" -#~ msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ ÂÌÏË ËÌÀÞÁ\n" - -#~ msgid "can't write keyblock: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÂÌÏË ËÌÀÞÁ: %s\n" - -#~ msgid "can't lock secret keyring: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ: %s\n" - -#, fuzzy -#~ msgid "can't write keyring: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n" - -#, fuzzy -#~ msgid "encrypted message is valid\n" -#~ msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" - -#, fuzzy -#~ msgid "Can't check MDC: %s\n" -#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n" - -#~ msgid "Usage: gpgm [options] [files] (-h for help)" -#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" - -#, fuzzy -#~ msgid "" -#~ "Syntax: gpgm [options] [files]\n" -#~ "GnuPG maintenance utility\n" -#~ msgstr "" -#~ "óÉÎÔÁËÓÉÓ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ]\n" -#~ "ðÒÏÇÒÁÍÍÁ ÓÏÐÒÏ×ÏÖÄÅÎÉÑ GNUPG\n" - -#~ msgid "usage: gpgm [options] " -#~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] " - -#, fuzzy -#~ msgid "lid %lu: read dir record failed: %s\n" -#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read key record failed: %s\n" -#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read uid record failed: %s\n" -#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#, fuzzy -#~ msgid "lid %lu: read pref record failed: %s\n" -#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#, fuzzy -#~ msgid "user '%s' read problem: %s\n" -#~ msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#, fuzzy -#~ msgid "user '%s' list problem: %s\n" -#~ msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#, fuzzy -#~ msgid "user '%s' not in trustdb\n" -#~ msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" - -#, fuzzy -#~ msgid "error: invalid fingerprint\n" -#~ msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" - -#, fuzzy -#~ msgid "error: no ownertrust value\n" -#~ msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" - -#, fuzzy -#~ msgid "key not in ring: %s\n" -#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n" - -#, fuzzy -#~ msgid "insert trust record failed: %s\n" -#~ msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n" - -#, fuzzy -#~ msgid "Hmmm, public key lost?" -#~ msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ" - -#~ msgid "invalid clear text header: " -#~ msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÔÅËÓÔÏ×ÙÊ ÚÁÇÏÌÏ×ÏË: " - -#~ msgid "You will see a list of signators etc. here\n" -#~ msgstr "úÄÅÓØ ×Ù Õ×ÉÄÉÔÅ ÓÐÉÓÏË ÐÏÄÐÉÓÁ×ÛÉÈ É Ô.Ä.\n" - -#~ msgid "key %08lX: already in ultikey_table\n" -#~ msgstr "ËÌÀÞ %08lX: ÕÖÅ × ultikey_table\n" - -#, fuzzy -#~ msgid "key %08lX.%lu, uid %02X%02X: no public key for signature %08lX\n" -#~ msgstr "" -#~ "ËÌÀÞ %08lX.%lu, uid %02X%02X: ÎÅÔ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ ÄÌÑ ÐÏÄÐÉÓÉ %08lX\n" - -#, fuzzy -#~ msgid "key %08lX.%lu, uid %02X%02X: invalid %ssignature: %s\n" -#~ msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n" - -#~ msgid "can't write keyring\n" -#~ msgstr "kann ËÌÀÞring nicht schreiben\n" - -#~ msgid "make a signature on a key in the keyring" -#~ msgstr "ËÌÀÞ signieren" - -#~ msgid "edit a key signature" -#~ msgstr "Bearbeiten der Signaturen eines ËÌÀÞs" - -#~ msgid "public and secret subkey created.\n" -#~ msgstr "Öffentlicher und privater ËÌÀÞ erzeugt.\n" - -#~ msgid "No public key for %d signatures\n" -#~ msgstr "Kein öffentlicher ËÌÀÞ für %d Signaturen\n" - -#~ msgid "[User name not available] " -#~ msgstr "[Benuzername nicht verfügbar] " - -#~ msgid "This is a BAD signature!\n" -#~ msgstr "Dies ist eine FALSCHE Signatur!\n" - -#~ msgid "The signature could not be checked!\n" -#~ msgstr "Die Signatur konnte nicht geprüft werden!\n" - -#~ msgid "Checking signatures of this public key certificate:\n" -#~ msgstr "Die Signaturen dieses Zertifikats werden überprüft:\n" diff -urN gnupg-1.0.5/po/stamp-cat-id gnupg-1.0.6/po/stamp-cat-id --- gnupg-1.0.5/po/stamp-cat-id Sun Apr 29 16:39:35 2001 +++ gnupg-1.0.6/po/stamp-cat-id Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -timestamp diff -urN gnupg-1.0.5/po/sv.po gnupg-1.0.6/po/sv.po --- gnupg-1.0.5/po/sv.po Sun Apr 29 16:39:31 2001 +++ gnupg-1.0.6/po/sv.po Tue May 29 08:58:58 2001 @@ -8,12 +8,12 @@ # Also many thanks to my wife Olivia for # patience, help and suggestions # -# $Id: sv.po,v 1.1.2.31 2001/04/29 14:08:26 werner Exp $ +# $Id: sv.po,v 1.1.2.33 2001/05/28 12:46:26 werner Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.1e\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" "PO-Revision-Date: 2000-04-23 16:43+02:00\n" "Last-Translator: Daniel Resare \n" "Language-Team: Swedish \n" @@ -21,15 +21,15 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Varning: använder osäkert minne!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "operationen är ej möjlig utan tillgång till säkert minne\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha använt fel program för denna uppgift)\n" @@ -614,7 +614,7 @@ msgstr "|FD|skriv statusinformation till denna FD" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +msgid "|KEYID|ultimately trust this key" msgstr "" #: g10/g10.c:311 @@ -863,7 +863,7 @@ #: g10/g10.c:1305 #, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key användaridentitet" +msgstr "--delete-secret-and-public-key användaridentitet" # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon # fixa en patch? @@ -1639,7 +1639,7 @@ "att vilja använda kommandot \"--edit-key\" för att generera en sekundär\n" "nyckel för detta syfte.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" @@ -1661,7 +1661,11 @@ "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:1783 +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" + +#: g10/keygen.c:1786 msgid "Really create? " msgstr "Vill du verkligen skapa? " @@ -1721,21 +1725,21 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 #, fuzzy msgid "[User id not found]" -msgstr "%s: hittade inte användaren\n" +msgstr "[hittade inte användaren]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "för många poster i unk-cachen - inaktiverad\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade över\n" @@ -2321,7 +2325,7 @@ #: g10/keyedit.c:607 #, fuzzy msgid "showpref" -msgstr "pref" +msgstr "showpref" #: g10/keyedit.c:608 msgid "passwd" @@ -2486,12 +2490,12 @@ #: g10/keyedit.c:1173 #, fuzzy, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "nyckeln %08lX: en undernyckel har återkallats!\n" +msgstr "rev! en undernyckel har återkallats: %s\n" #: g10/keyedit.c:1176 #, fuzzy msgid "rev- faked revocation found\n" -msgstr " nya återkallelser av nycklar: %lu\n" +msgstr "rev- fel återkallelser av nycklar\n" #: g10/keyedit.c:1178 #, c-format @@ -2775,7 +2779,7 @@ msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (huvudnyckelns identitet %08lX)" @@ -2789,7 +2793,8 @@ msgstr "" "\n" "Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n" -"användaren: \"" +"användaren: \"%.*s\"\n" +"%u-bit %s key, ID %08lX, created %s%s\n" #: g10/passphrase.c:344 #, fuzzy @@ -2813,12 +2818,12 @@ msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2828,20 +2833,20 @@ "Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n" "användaren: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "kan inte fråga efter lösenord i batch-läge\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Ange lösenordsfras: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Repetera lösenordsfrasen: " @@ -2864,7 +2869,7 @@ #: g10/plaintext.c:391 #, fuzzy msgid "no signed data\n" -msgstr "kan inte öppna signerad data \"%s\"\n" +msgstr "ingen signerad data\n" #: g10/plaintext.c:399 #, c-format @@ -2975,7 +2980,7 @@ #: g10/sig-check.c:328 #, fuzzy, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTERA: signaturnyckeln är för gammal, gick ut vid %s\n" +msgstr "NOTERA: signaturnyckeln är %08lX för gammal, gick ut vid %s\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" @@ -3490,7 +3495,7 @@ #: g10/skclist.c:138 #, fuzzy, c-format msgid "skipped `%s': duplicated\n" -msgstr "hoppade över \"%s\": %s\n" +msgstr "hoppade över \"%s\": dubblett\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3500,7 +3505,7 @@ #: g10/skclist.c:149 #, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: hoppade över: publik nyckel finns redan\n" +msgstr "hoppade över: publik nyckel finns redan\n" #: g10/skclist.c:160 #, c-format @@ -3902,8 +3907,8 @@ # maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis #~ msgid "" -#~ "RSA keys are deprecated; please consider creating a new key and use this key " -#~ "in the future\n" +#~ "RSA keys are deprecated; please consider creating a new key and use this " +#~ "key in the future\n" #~ msgstr "" -#~ "RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa i " -#~ "framtiden\n" +#~ "RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa " +#~ "i framtiden\n" diff -urN gnupg-1.0.5/po/tr.po gnupg-1.0.6/po/tr.po --- gnupg-1.0.5/po/tr.po Sun Apr 29 16:39:32 2001 +++ gnupg-1.0.6/po/tr.po Tue May 29 08:58:59 2001 @@ -1,27 +1,28 @@ -# GnuPG Turkish messages. -# Copyright (C) 2000, 2001 Free Software Foundation, Inc. -# Nilgun Belma Buguner , 2000. +# Turkish translations for GnuPG messages. +# Copyright (C) 2001 Free Software Foundation, Inc. +# Nilgün Belma Bugüner , 2001. # msgid "" msgstr "" -"Project-Id-Version: gnupg-1.0.4\n" -"POT-Creation-Date: 2001-04-29 16:39+0200\n" -"PO-Revision-Date: 2000-11-01 05:20+300\n" -"Last-Translator: Nilgün Belma Bugüner \n" +"Project-Id-Version: gnupg 1.0.4h.po\n" +"POT-Creation-Date: 2001-05-29 08:58+0200\n" +"PO-Revision-Date: 2001-05-24 06:42+300\n" +"Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-9\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Type: text/plain; charset=ISO-8859-9\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.8\n" -#: util/secmem.c:79 +#: util/secmem.c:84 msgid "Warning: using insecure memory!\n" msgstr "Uyarý: kullanýlan bellek güvenli deðil!\n" -#: util/secmem.c:299 +#: util/secmem.c:304 msgid "operation is not possible without initialized secure memory\n" msgstr "güvenli bellek hazýrlanmadan iþlem yapmak mümkün deðil\n" -#: util/secmem.c:300 +#: util/secmem.c:305 msgid "(you may have used the wrong program for this task)\n" msgstr "(bu görev için yanlýþ program kullanmýþ olabilirsiniz)\n" @@ -39,7 +40,7 @@ #: util/miscutil.c:290 util/miscutil.c:320 msgid "nN" -msgstr "yY" +msgstr "hH" #: g10/keyedit.c:581 util/miscutil.c:318 msgid "quit" @@ -63,7 +64,7 @@ #: util/errors.c:57 msgid "unknown pubkey algorithm" -msgstr "bilinmeyen pubkey algoritmasý" +msgstr "bilinmeyen genel anahtar algoritmasý" #: util/errors.c:58 msgid "unknown digest algorithm" @@ -111,7 +112,7 @@ #: util/errors.c:69 msgid "no such user id" -msgstr "böyle bir özgün dizi yok" +msgstr "böyle bir kullanýcý kimliði yok" #: util/errors.c:70 msgid "secret key not available" @@ -155,11 +156,11 @@ #: util/errors.c:80 msgid "unimplemented pubkey algorithm" -msgstr "tamamlanmamýþ pubkey algoritmasý" +msgstr "tamamlanmamýþ genel anahtar algoritmasý" #: util/errors.c:81 msgid "unimplemented cipher algorithm" -msgstr "tamamlanmamýþ cipher algoritmasý" +msgstr "tamamlanmamýþ þifre algoritmasý" #: util/errors.c:82 msgid "unknown signature class" @@ -187,7 +188,7 @@ #: util/errors.c:88 msgid "malformed user id" -msgstr "özgün dizi bozuk" +msgstr "kullanýcý kimliði bozuk" #: util/errors.c:89 msgid "file close error" @@ -195,7 +196,7 @@ #: util/errors.c:90 msgid "file rename error" -msgstr "dosya isimlendirme hatasý" +msgstr "dosya isim deðiþtirme hatasý" #: util/errors.c:91 msgid "file delete error" @@ -207,11 +208,11 @@ #: util/errors.c:93 msgid "timestamp conflict" -msgstr "damga çeliþkili" +msgstr "zaman damgasý çeliþkili" #: util/errors.c:94 msgid "unusable pubkey algorithm" -msgstr "pubkey algoritmasý kullanýþsýz" +msgstr "genel anahtar algoritmasý kullanýþsýz" #: util/errors.c:95 msgid "file exists" @@ -247,14 +248,12 @@ #. the key cannot be used for a specific usage #: util/errors.c:105 -#, fuzzy msgid "unusable public key" -msgstr "genel anahtar hatalý" +msgstr "genel anahtar kullanýmdýþý" #: util/errors.c:106 -#, fuzzy msgid "unusable secret key" -msgstr "gizli anahtar hatalý" +msgstr "gizli anahtar kullanýmdýþý" #: util/logger.c:224 #, c-format @@ -292,11 +291,11 @@ #: cipher/random.c:348 #, c-format msgid "can't read `%s': %s\n" -msgstr "\"%s\" okunamyor: %s\n" +msgstr "\"%s\" okunamýyor: %s\n" #: cipher/random.c:386 msgid "note: random_seed file not updated\n" -msgstr "not: \"random_seed\" dosyasý güncel deðil\n" +msgstr "bilgi: \"random_seed\" dosyasý güncel deðil\n" #: cipher/random.c:406 #, c-format @@ -330,8 +329,8 @@ "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" msgstr "" -"Rasgele sayý üretecinin (RSÜ) kendi halinde çalýþan yalnýz ve yalnýz bir\n" -"\"kludge\"ý var - dolayýsýyla iþimizi görecek saðlýklý bir RSÜ yok!\n" +"Rasgele sayý üreteci kendi halinde çalýþan\n" +"bir kukla - güvenilir bir RSÜ deðil!\n" "\n" "BU PROGRAMLA ÜRETÝLMÝÞ HÝÇBÝR VERÝYÝ KULLANMAYIN!!\n" "\n" @@ -345,8 +344,8 @@ msgstr "" "\n" "Rasgele üretilen baytlar yetersiz. Lütfen bazý iþlemler yaparak\n" -"daha fazla ganimet toplayabilmesi için iþletim sistemine\n" -"bir þans! verin. (%d bayt daha gerekiyor)\n" +"daha fazla rasgele bayt toplayabilmesi için iþletim sistemine\n" +"yardýmcý olun! (%d bayt daha gerekiyor)\n" #: g10/g10.c:216 msgid "" @@ -478,11 +477,11 @@ #: g10/g10.c:259 msgid "De-Armor a file or stdin" -msgstr "Bir dosya veya standard girdinin zýrhýný kaldýrýr" +msgstr "Bir dosya veya standart girdinin zýrhýný kaldýrýr" #: g10/g10.c:261 msgid "En-Armor a file or stdin" -msgstr "Bir dosya veya standard girdiyi zýrhlar" +msgstr "Bir dosya veya standart girdiyi zýrhlar" #: g10/g10.c:263 msgid "|algo [files]|print message digests" @@ -516,7 +515,7 @@ #: g10/g10.c:280 msgid "use this user-id to sign or decrypt" -msgstr "imzalamak ya da þifre çözmek için bu özgün dizi kullanýlýr" +msgstr "imzalamak ya da þifre çözmek için bu kullanýcý kimliði kullanýlýr" #: g10/g10.c:281 msgid "|N|set compress level N (0 disables)" @@ -524,7 +523,7 @@ #: g10/g10.c:283 msgid "use canonical text mode" -msgstr "meþru metin kipini kullanýr" +msgstr "kurallý metin kipini kullanýr" #: g10/g10.c:284 msgid "use as output file" @@ -540,7 +539,7 @@ #: g10/g10.c:287 msgid "don't use the terminal at all" -msgstr "herþeye terminal kullanma" +msgstr "terminali hiç kullanma" #: g10/g10.c:288 msgid "force v3 signatures" @@ -557,7 +556,7 @@ #. { oInteractive, "interactive", 0, N_("prompt before overwriting") }, #: g10/g10.c:292 msgid "use the gpg-agent" -msgstr "" +msgstr "gpg-agent kullan" #: g10/g10.c:293 msgid "batch mode: never ask" @@ -585,7 +584,7 @@ #: g10/g10.c:299 msgid "|HOST|use this keyserver to lookup keys" -msgstr "|SUNUCU|anahtarlarý aramak için bu anahtar sunucusu kullanýlýr" +msgstr "|MAKÝNA|anahtarlarý aramak için bu anahtar sunucusu kullanýlýr" #: g10/g10.c:300 msgid "|NAME|set terminal charset to NAME" @@ -600,7 +599,8 @@ msgstr "|FD|durum bilgisini bu FD'ye yazar" #: g10/g10.c:310 -msgid "|KEYID|ulimately trust this key" +#, fuzzy +msgid "|KEYID|ultimately trust this key" msgstr "|ANAHTAR-KÝMLÝK|bu anahtar son derece güvence altýnda" #: g10/g10.c:311 @@ -643,7 +643,7 @@ #: g10/g10.c:322 msgid "throw keyid field of encrypted packets" -msgstr "þifreli paketlerin anahtar-kimlik alanlarýný kurar" +msgstr "þifreli paketlerin anahtar-kimlik alanlarýný atar" #: g10/g10.c:323 msgid "|NAME=VALUE|use this notation data" @@ -673,7 +673,7 @@ "\n" " -se -r Ali [dosya] kullanýcý Ali için imzalar ve þifreler\n" " --clearsign [dosya] açýkça okunabilir bir imza yapar\n" -" --detach-sign [file] baðýmsýz bir imza yapar\n" +" --detach-sign [dosya] baðýmsýz bir imza yapar\n" " --list-keys [isimler] anahtarlarý listeler\n" " --fingerprint [isimler] parmak izlerini gösterir\n" @@ -714,7 +714,7 @@ #: g10/g10.c:734 #, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "NOT: \"%s\" öntanýmlý seçenek dosyasý yok\n" +msgstr "BÝLGÝ: \"%s\" öntanýmlý seçenek dosyasý yok\n" #: g10/g10.c:738 #, c-format @@ -733,12 +733,12 @@ #: g10/g10.c:1024 msgid "WARNING: program may create a core file!\n" -msgstr "UYARI: program bir \"core\" dosyasý yaratabilir!\n" +msgstr "UYARI: program bir \"core\" dosyasý oluþturabilir!\n" #: g10/g10.c:1028 g10/g10.c:1037 #, c-format msgid "NOTE: %s is not for normal use!\n" -msgstr "NOT: %s normal kullaným için deðil!\n" +msgstr "BÝLGÝ: %s normal kullaným için deðil!\n" #: g10/g10.c:1030 #, c-format @@ -752,7 +752,7 @@ #: g10/g10.c:1053 g10/g10.c:1065 msgid "selected cipher algorithm is invalid\n" -msgstr "seçilen cipher algoritmasý geçersiz\n" +msgstr "seçilen þifre algoritmasý geçersiz\n" #: g10/g10.c:1059 g10/g10.c:1071 msgid "selected digest algorithm is invalid\n" @@ -781,7 +781,7 @@ #: g10/g10.c:1087 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "NOT: basit S2K kipi (0) kesinlikle cesaret kýrýcý\n" +msgstr "BÝLGÝ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" #: g10/g10.c:1091 msgid "invalid S2K mode; must be 0, 1 or 3\n" @@ -822,28 +822,27 @@ #: g10/g10.c:1262 msgid "--sign-key user-id" -msgstr "--sign-key öz-dizi" +msgstr "--sign-key kullanýcý-kimliði" #: g10/g10.c:1270 msgid "--lsign-key user-id" -msgstr "--lsign-key öz-dizi" +msgstr "--lsign-key kullanýcý-kimliði" #: g10/g10.c:1278 msgid "--edit-key user-id [commands]" -msgstr "--edit-key öz-dizi [komutlar]" +msgstr "--edit-key kullanýcý-kimliði [komutlar]" #: g10/g10.c:1294 msgid "--delete-secret-key user-id" -msgstr "--delete-secret-key öz-dizi" +msgstr "--delete-secret-key kullanýcý-kimliði" #: g10/g10.c:1297 msgid "--delete-key user-id" -msgstr "--delete-key öz-dizi" +msgstr "--delete-key kullanýcý-kimliði" #: g10/g10.c:1305 -#, fuzzy msgid "--delete-secret-and-public-key user-id" -msgstr "--delete-secret-key öz-dizi" +msgstr "--delete-secret-and-public-key kullanýcý-kimliði" #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410 #, c-format @@ -852,7 +851,7 @@ #: g10/g10.c:1357 msgid "-k[v][v][v][c] [user-id] [keyring]" -msgstr "-k[v][v][v][c] [öz-dizi] [anahtardemeti]" +msgstr "-k[v][v][v][c] [kullanýcý-kimliði] [anahtar-demeti]" #: g10/g10.c:1423 #, c-format @@ -867,7 +866,7 @@ #: g10/g10.c:1502 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "\"s\" hash algoritmasý geçersiz\n" +msgstr "`%s' hash algoritmasý geçersiz\n" #: g10/g10.c:1589 msgid "[filename]" @@ -875,12 +874,12 @@ #: g10/g10.c:1593 msgid "Go ahead and type your message ...\n" -msgstr "Baþa dönüp iletinizi yazýn ...\n" +msgstr "Ýletinizi yazýn ...\n" #: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139 #, c-format msgid "can't open `%s'\n" -msgstr "\"s\" açýlamadý\n" +msgstr "`%s' açýlamadý\n" #: g10/g10.c:1805 msgid "" @@ -892,8 +891,8 @@ "a notation name must have only letters, digits, dots or underscores and end " "with an '='\n" msgstr "" -"bir niteleme ismi sadece harf, rakam, nokta, ve altçizgi karakterleri " -"içerebilir ve bir \"=\" iþareti ile biter\n" +"bir niteleme ismi sadece harfler, rakamlar, nokta ve altçizgiler içerebilir " +"ve bir '=' iþareti ile biter\n" #: g10/g10.c:1817 msgid "dots in a notation name must be surrounded by other characters\n" @@ -928,7 +927,7 @@ #: g10/armor.c:529 msgid "invalid dash escaped line: " -msgstr "\"dash escaped\" (araçizgisi escape'lý) satýr geçersiz: " +msgstr "araçizgisi escape'lý satýr geçersiz: " #: g10/armor.c:541 msgid "unexpected armor:" @@ -966,7 +965,7 @@ #: g10/armor.c:922 msgid "For info see http://www.gnupg.org" -msgstr "Bilgi için http://www.gnupg.org adresine bir bakýn" +msgstr "Bilgi için http://www.gnupg.org adresine bakýn" #: g10/armor.c:1050 msgid "no valid OpenPGP data found.\n" @@ -981,14 +980,14 @@ msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -"zýrh içinde uluslararasý karakterler - hatalý yazýlmýþ bir MTA kullanýlmýþ " -"olabilir\n" +"zýrh içinde uluslararasý karakterler - büyük olasýlýkla hatalý bir e-posta " +"sunucusu kullanýlmýþ\n" #. Translators: this shoud fit into 24 bytes to that the fingerprint #. * data is properly aligned with the user ID #: g10/keyedit.c:1243 g10/pkclist.c:53 msgid " Fingerprint:" -msgstr " Parmak izi:" +msgstr " Parmak izi:" #: g10/pkclist.c:80 msgid "Fingerprint:" @@ -1000,7 +999,7 @@ #: g10/pkclist.c:118 msgid "Key is superseded" -msgstr "Anahtar geçici" +msgstr "Anahtarýn yerine baþkasý konulmuþ ve iptal edilmiþtir" #: g10/pkclist.c:120 msgid "Key has been compromised" @@ -1012,7 +1011,7 @@ #: g10/pkclist.c:124 msgid "User ID is no longer valid" -msgstr "Özgün dizi artýk geçersiz" +msgstr "Kullanýcý kimliði artýk geçersiz" #: g10/pkclist.c:128 msgid "Reason for revocation: " @@ -1020,7 +1019,7 @@ #: g10/pkclist.c:145 msgid "Revocation comment: " -msgstr "Yürürlükten kaldýrma yorumu: " +msgstr "Yürürlükten kaldýrma açýklamasý: " #. a string with valid answers #: g10/pkclist.c:303 @@ -1048,25 +1047,24 @@ " 4 = I trust fully\n" " s = please show me more information\n" msgstr "" -"Bu kullanýcýnýn \"diðer kullanýcýlarý doðrulama\"\n" -"anahtarlarýnýn uygun biçimde olduðuna nasýl\n" -"güvence verebiliyorsunuz? Lütfen karar verin.\n" -"(Pasaportlarýna bakarak mý, farklý kaynaklardan\n" -"parmak izlerini kontrol ederek mi, ...?)\n" -"\n" -" 1 = Bilmirem )-:\n" -" 2 = Güvence veremem\n" -" 3 = Sýnýrlý güvence verebilirim\n" -" 4 = Tam güvence veririm\n" +"Bu kullanýcýnýn diðer kullanýcýlarýn anahtarlarýný doðrulama\n" +"yeterliliðine ne kadar güveniyorsunuz? Lütfen karar\n" +"verin. (Pasaportlarýna bakarak mý, farklý kaynaklardan parmak izlerini\n" +"kontrol ederek mi, ...?) \n" +"\n" +" 1 = Bilmiyorum\n" +" 2 = Güvenmiyorum\n" +" 3 = Sýnýrlý olarak güveniyorum\n" +" 4 = Tam güveniyorum\n" " b = lütfen bana biraz daha bilgi ver\n" #: g10/pkclist.c:328 msgid " m = back to the main menu\n" -msgstr "m = ana menuye dön\n" +msgstr " m = ana menüye dön\n" #: g10/pkclist.c:330 msgid " q = quit\n" -msgstr "ç = çýk\n" +msgstr " ç = çýk\n" #: g10/pkclist.c:336 msgid "Your decision? " @@ -1090,7 +1088,7 @@ "No path leading to one of our keys found.\n" "\n" msgstr "" -"Anahtarlarýmýzdan biriyle sonuçlanan bir yol bulunamadý.\n" +"Anahtarlarýmýzýn bulunabileceði bir dosya yolu yok.\n" "\n" #: g10/pkclist.c:437 @@ -1098,7 +1096,7 @@ "No certificates with undefined trust found.\n" "\n" msgstr "" -"Güvence tanýmlanmamýþ sertifika bulunamadý.\n" +"Güvence tanýmý yapýlmamýþ bir sertifika yok.\n" "\n" #: g10/pkclist.c:439 @@ -1106,22 +1104,22 @@ "No trust values changed.\n" "\n" msgstr "" -"Güvence deðerleri deðiþmedi.\n" +"Deðiþen güvence deðeri yok.\n" "\n" #: g10/pkclist.c:457 #, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "anahtar %08lX: anahtar yürürlükten kaldýrýlmýþ!\n" +msgstr "anahtar %08lX: anahtar yürürlükten kaldýrýlmýþtý!\n" #: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598 msgid "Use this key anyway? " -msgstr "Bu anahtar n'olursa olsun kullanýlsýn mý? " +msgstr "Bu anahtar yine de kullanýlsýn mý? " #: g10/pkclist.c:469 #, c-format msgid "key %08lX: subkey has been revoked!\n" -msgstr "anahtar %08lX: yardýmcý anahtar yürürlükten kaldýrýlmýþ!\n" +msgstr "anahtar %08lX: yardýmcý anahtar yürürlükten kaldýrýlmýþtý!\n" #: g10/pkclist.c:512 #, c-format @@ -1144,8 +1142,8 @@ "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" -"%08lX: Ne olursa olsun diyerek kabul edildiðinden bu anahtarýn gerçekten\n" -"sahibine ait olup olmadýðýndan emin olunamaz.\n" +"%08lX: Bu anahtarýn gerçekten sahibine ait olup olmadýðýndan emin\n" +"olunamadý fakat yine de kabul edildi.\n" #: g10/pkclist.c:545 msgid "This key probably belongs to the owner\n" @@ -1172,20 +1170,20 @@ #: g10/pkclist.c:651 msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "UYARI: Bu anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþ!\n" +msgstr "UYARI: Bu anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþtý!\n" #: g10/pkclist.c:652 msgid " This could mean that the signature is forgery.\n" -msgstr " Bu imza sahtekarlýktýr anlamýnda olabilirdi.\n" +msgstr " Bu imza sahte anlamýna gelebilir.\n" #: g10/pkclist.c:657 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "" -"UYARI: Bu yardýmcý anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþ!\n" +"UYARI: Bu yardýmcý anahtar sahibi tarafýndan yürürlükten kaldýrýlmýþtý!\n" #: g10/pkclist.c:679 msgid "Note: This key has expired!\n" -msgstr "Not: Bu anahtarýn kullaným süresi dolmuþ!\n" +msgstr "Not: Bu anahtarýn kullaným süresi dolmuþtu!\n" #: g10/pkclist.c:687 msgid "WARNING: This key is not certified with a trusted signature!\n" @@ -1202,7 +1200,7 @@ #: g10/pkclist.c:707 msgid " The signature is probably a FORGERY.\n" -msgstr " Bu imzanýn bir SAHTEKARLIK olduðu umuluyor.\n" +msgstr " Bu imza SAHTE olabilir.\n" #: g10/pkclist.c:714 msgid "" @@ -1227,15 +1225,17 @@ msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" -msgstr "Bir özgün dizi belirtmediniz. (\"-r\" kullanabilirsiniz)\n" +msgstr "" +"Bir kullanýcý kimliði belirtmediniz. (\"-r\" kullanabilirsiniz)\n" +"\n" #: g10/pkclist.c:863 msgid "Enter the user ID: " -msgstr "Özgün diziyi girin:" +msgstr "Kullanýcý kimliðini girin:" #: g10/pkclist.c:875 msgid "No such user ID.\n" -msgstr "Böyle bir özgün dizi yok.\n" +msgstr "Böyle bir kullanýcý kimliði yok.\n" #: g10/pkclist.c:880 msgid "skipped: public key already set as default recipient\n" @@ -1252,7 +1252,7 @@ #: g10/pkclist.c:941 #, c-format msgid "unknown default recipient `%s'\n" -msgstr "öntanýmlý alýcý \"%s\" bilinmiyor\n" +msgstr "öntanýmlý alýcý `%s' bilinmiyor\n" #: g10/pkclist.c:974 #, c-format @@ -1303,7 +1303,7 @@ #: g10/keygen.c:554 #, c-format msgid " (%d) ElGamal (encrypt only)\n" -msgstr " (%d) ElGamal (Yanýz þifrelemek için)\n" +msgstr " (%d) ElGamal (yalnýz þifrelemek için)\n" #: g10/keygen.c:555 #, c-format @@ -1321,11 +1321,11 @@ #: g10/keygen.c:572 msgid "Do you really want to create a sign and encrypt key? " -msgstr "Bir imza ve þifreleme anahtarý yaratmayý gerçekten istiyor musunuz? " +msgstr "Bir imza ve þifreleme anahtarý oluþturmayý gerçekten istiyor musunuz? " #: g10/keygen.c:580 msgid "The use of this algorithm is deprecated - create anyway? " -msgstr "" +msgstr "Bu algoritmanýn kullanýmý uygun deðil - Yine de oluþturulsun mu?" #: g10/keygen.c:594 msgid "Invalid selection.\n" @@ -1418,7 +1418,7 @@ " y = key expires in n years\n" msgstr "" "Lütfen anahtarýn ne kadar süreyle geçerli olacaðýný belirtin.\n" -" 0 = anahtar hayatýnýz boyunca geçerli\n" +" 0 = anahtar süresiz geçerli\n" " = anahtar n gün geçerli\n" " w = anahtar n hafta geçerli\n" " m = anahtar n ay geçerli\n" @@ -1434,7 +1434,7 @@ #: g10/keygen.c:736 msgid "Key does not expire at all\n" -msgstr "Anahtar hayatýnýz boyunca geçerli\n" +msgstr "Anahtar süresiz geçerli\n" #. print the date when the key expires #: g10/keygen.c:742 @@ -1464,9 +1464,9 @@ "\n" msgstr "" "\n" -"Anahtarýnýzý tanýmlamak için bir özgün dizi gerekiyor; Yazýlým bu özgün " -"diziyi\n" -"Adý Soyadý, Yorum ve Eposta adresi alanlarýndan\n" +"Anahtarýnýzý tanýmlamak için bir kullanýcý kimliði gerekiyor; Yazýlým\n" +"bu kullanýcý kimliðini \n" +"Adý Soyadý, Açýklama ve Eposta adresi alanlarýndan\n" " \"Fatih Sultan Mehmet (padisah) \"\n" "þeklinde oluþturur.\n" @@ -1496,16 +1496,16 @@ #: g10/keygen.c:844 msgid "Comment: " -msgstr "Yorum: " +msgstr "Açýklama: " #: g10/keygen.c:850 msgid "Invalid character in comment\n" -msgstr "Yorum alanýnda geçersiz karakter\n" +msgstr "Açýklama alanýnda geçersiz karakter\n" #: g10/keygen.c:873 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "\"%s\" karakter setini kullanýyorsunuz.\n" +msgstr "`%s' karakter setini kullanýyorsunuz.\n" #: g10/keygen.c:879 #, c-format @@ -1514,14 +1514,14 @@ " \"%s\"\n" "\n" msgstr "" -"Seçtiðiniz ÖZGÜN DÝZÝ:\n" +"Seçtiðiniz KULLANICI KÝMLÝÐÝ:\n" " \"%s\"\n" "\n" #: g10/keygen.c:883 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -"Lütfen Eposta adresinizi Adý ve Soyadý veya Yorum alaný içine koymayýn\n" +"Lütfen Eposta adresinizi Adý ve Soyadý veya Açýklama alaný içine koymayýn\n" #: g10/keygen.c:888 msgid "NnCcEeOoQq" @@ -1571,11 +1571,11 @@ "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"Bir miktar rasgele byte üretilmesi gerekiyor. Ýlk üretim sýrasýnda biraz\n" +"Bir miktar rasgele bayt üretilmesi gerekiyor. Ýlk üretim sýrasýnda biraz\n" "hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden " -"yaralanmak)\n" -"iyi olacaktýr; bu yeterli ganimet kazanmak için rasgele sayý üretimine daha\n" -"fazla þans verir.\n" +"yararlanmak)\n" +"iyi olacaktýr; bu yeterli rasgele bayt kazanmak için rasgele sayý\n" +"üreticisine yardýmcý olur. \n" #: g10/keygen.c:1440 msgid "DSA keypair will have 1024 bits.\n" @@ -1588,12 +1588,12 @@ #: g10/keygen.c:1581 #, c-format msgid "writing public key to `%s'\n" -msgstr "genel anahtarý \"%s\"e yazýyor\n" +msgstr "genel anahtarý `%s'e yazýyor\n" #: g10/keygen.c:1582 #, c-format msgid "writing secret key to `%s'\n" -msgstr "gizli anahtarý \"%s\"e yazýyor\n" +msgstr "gizli anahtarý `%s'e yazýyor\n" #: g10/keygen.c:1679 msgid "public and secret key created and signed.\n" @@ -1604,11 +1604,11 @@ "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -"Bu anahtarýn þifreleme için kullanýlamayacaðýný bir kenara not edin.\n" +"Bu anahtarýn þifreleme için kullanýlamayacaðýna dikkatinizi çekeriz.\n" "Þifrelemede kullanmak amacýyla ikinci bir anahtar üretmek isterseniz\n" "\"--edit-key\" seçeneðini kullanabilirsiniz.\n" -#: g10/keygen.c:1701 g10/keygen.c:1807 +#: g10/keygen.c:1701 g10/keygen.c:1810 #, c-format msgid "Key generation failed: %s\n" msgstr "Anahtar üretimi baþarýsýzlýða uðradý: %s\n" @@ -1617,18 +1617,25 @@ #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" -msgstr "anahtar üretimi %lu saniye sürecek (zaman sapmasý veya hýz problemi)\n" +msgstr "" +"anahtar bundan %lu saniye sonra üretilmiþti.\n" +"(zaman sapmasý veya saat problemi)\n" #: g10/keygen.c:1750 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 "" -"anahtar üretimi %lu saniye sürecek (zaman sapmasý ya da hýz problemi)\n" +"anahtar bundan %lu saniye sonra üretilmiþti.\n" +"(zaman sapmasý veya saat problemi)\n" + +#: g10/keygen.c:1759 +msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" +msgstr "" -#: g10/keygen.c:1783 +#: g10/keygen.c:1786 msgid "Really create? " -msgstr "Gerçekten yaratýlacak mý? " +msgstr "Gerçekten oluþturulacak mý? " #: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454 #: g10/tdbio.c:515 @@ -1649,7 +1656,7 @@ #: g10/encode.c:274 #, c-format msgid "reading from `%s'\n" -msgstr "\"%s\"den okuyor\n" +msgstr "`%s'den okunuyor\n" #: g10/encode.c:497 #, c-format @@ -1678,7 +1685,7 @@ #: g10/export.c:236 msgid "WARNING: nothing exported\n" -msgstr "UYARI: hiçbir þey gönderilmedi\n" +msgstr "UYARI: hiçbir þey dýþarý aktarýlmadý\n" #: g10/getkey.c:214 msgid "too many entries in pk cache - disabled\n" @@ -1686,20 +1693,20 @@ #. fixme: returning translatable constants instead of a user ID is #. * not good because they are probably not utf-8 encoded. -#: g10/getkey.c:249 g10/getkey.c:2536 +#: g10/getkey.c:249 g10/getkey.c:2525 msgid "[User id not found]" -msgstr "[Özgün dizi bulunamadý]" +msgstr "[Kullanýcý kimliði bulunamadý]" #: g10/getkey.c:453 msgid "too many entries in unk cache - disabled\n" msgstr "unk belleðinde çok fazla girdi - iptal edildi\n" -#: g10/getkey.c:2207 +#: g10/getkey.c:2196 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "yardýmcý anahtar %08lX, asýl anahtar %08lX yerine kullanýlýyor\n" -#: g10/getkey.c:2249 g10/trustdb.c:577 +#: g10/getkey.c:2238 g10/trustdb.c:577 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "%08lX anahtarý: genel anahtarsýz gizli anahtar - atlandý\n" @@ -1732,7 +1739,7 @@ #: g10/import.c:211 #, c-format msgid " w/o user IDs: %lu\n" -msgstr " özgün dizi olmaksýzýn: %lu\n" +msgstr " kullanýcý kimliði olmaksýzýn: %lu\n" #: g10/import.c:213 #, c-format @@ -1747,7 +1754,7 @@ #: g10/import.c:221 #, c-format msgid " new user IDs: %lu\n" -msgstr " yeni özgün dizi: %lu\n" +msgstr " yeni kullanýcý kimliði: %lu\n" #: g10/import.c:223 #, c-format @@ -1767,7 +1774,7 @@ #: g10/import.c:229 #, c-format msgid " secret keys read: %lu\n" -msgstr " gizli anahtarlar okunuyor: %lu\n" +msgstr " gizli anahtarlar okundu: %lu\n" #: g10/import.c:231 #, c-format @@ -1782,16 +1789,16 @@ #: g10/import.c:408 g10/import.c:617 #, c-format msgid "key %08lX: no user ID\n" -msgstr "anahtar %08lX: özgün dizi yok\n" +msgstr "anahtar %08lX: kullanýcý kimliði yok\n" #: g10/import.c:422 #, c-format msgid "key %08lX: no valid user IDs\n" -msgstr "key %08lX: özgün dizi geçerli deðil\n" +msgstr "anahtar %08lX: kullanýcý kimliði geçerli deðil\n" #: g10/import.c:424 msgid "this may be caused by a missing self-signature\n" -msgstr "bu kayýp bir öz-imza tarafýndan meydana gelebilir\n" +msgstr "bu kayýp bir öz-imza yüzünden meydana gelebilir\n" #: g10/import.c:435 g10/import.c:684 #, c-format @@ -1835,22 +1842,22 @@ #: g10/import.c:489 g10/import.c:692 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" -msgstr "anahtar %08lX: özgün anahtar bloku yerleþtirilemedi: %s\n" +msgstr "anahtar %08lX: özgün anahtar bloku bulunamadý: %s\n" #: g10/import.c:495 g10/import.c:698 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" -msgstr "anahtar %08lX: özgün anahtar bloku okunamadý\n" +msgstr "anahtar %08lX: özgün anahtar bloku okunamadý: %s\n" #: g10/import.c:522 #, c-format msgid "key %08lX: 1 new user ID\n" -msgstr "anahtar %08lX: 1 yeni özgün dizi\n" +msgstr "anahtar %08lX: 1 yeni kullanýcý kimliði\n" #: g10/import.c:525 #, c-format msgid "key %08lX: %d new user IDs\n" -msgstr "anahtar %08lX: %d yeni özgün dizi\n" +msgstr "anahtar %08lX: %d yeni kullanýcý kimliði\n" #: g10/import.c:528 #, c-format @@ -1880,7 +1887,7 @@ #: g10/import.c:610 #, c-format msgid "secret key %08lX not imported (use %s to allow for it)\n" -msgstr "" +msgstr "%08lX gizli anahtarý alýnamadý (izin vermek için %s kullanýn)\n" #: g10/import.c:640 #, c-format @@ -1919,7 +1926,7 @@ #: g10/import.c:783 #, c-format msgid "key %08lX: no user ID for signature\n" -msgstr "anahtar %08lX: imza için özgün dizi yok\n" +msgstr "anahtar %08lX: imza için kullanýcý kimliði yok\n" #: g10/import.c:790 g10/import.c:814 #, c-format @@ -1944,12 +1951,12 @@ #: g10/import.c:842 #, c-format msgid "key %08lX: accepted non self-signed user ID '" -msgstr "anahtar %08lX: öz-imzalý olmayan özgün dizi kabul edildi: '" +msgstr "anahtar %08lX: öz-imzalý olmayan kullanýcý kimliði kabul edildi: '" #: g10/import.c:871 #, c-format msgid "key %08lX: skipped user ID '" -msgstr "anahtar %08lX: özgün dizi atlandý: '" +msgstr "anahtar %08lX: kullanýcý kimliði atlandý: '" #: g10/import.c:894 #, c-format @@ -1980,7 +1987,7 @@ #: g10/import.c:1036 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "anahtar %08lX: çift özgün kimlik saptandý - katýþtýrýldý\n" +msgstr "anahtar %08lX: çift kullanýcý kimliði saptandý - katýþtýrýldý\n" #: g10/import.c:1088 #, c-format @@ -1990,7 +1997,7 @@ #: g10/import.c:1202 g10/import.c:1255 #, c-format msgid "key %08lX: our copy has no self-signature\n" -msgstr "anahtar %08lX: bizim koya öz-imzaya sahip deðil\n" +msgstr "anahtar %08lX: bizim kopya öz-imzaya sahip deðil\n" #: g10/delkey.c:67 g10/keyedit.c:94 #, c-format @@ -2034,12 +2041,12 @@ #: g10/keyedit.c:233 msgid "1 user ID without valid self-signature detected\n" -msgstr "1 öz-imzasý geçersiz özgün dizi saptandý\n" +msgstr "1 öz-imzasý geçersiz kullanýcý kimliði saptandý\n" #: g10/keyedit.c:235 #, c-format msgid "%d user IDs without valid self-signatures detected\n" -msgstr "%d öz-imzasý geçersiz özgün dizi saptandý\n" +msgstr "%d öz-imzasý geçersiz kullanýcý kimliði saptandý\n" #. Fixme: see whether there is a revocation in which #. * case we should allow to sign it again. @@ -2051,15 +2058,15 @@ #: g10/keyedit.c:325 #, c-format msgid "Nothing to sign with key %08lX\n" -msgstr "%08lX anahtarý ile imzalanan hiçbir þey yok\n" +msgstr "%08lX anahtarý ile imzalanacak hiçbir þey yok\n" #: g10/keyedit.c:334 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "" -"Bu anahtarý þu anahtarýnýzla imzalamak istediðinize gerçekten emin misiniz?: " -"\"" +"Bu anahtarý kendi anahtarýnýzla imzalamak istediðinize gerçekten\n" +"emin misiniz?: \"" #: g10/keyedit.c:343 msgid "" @@ -2071,7 +2078,7 @@ #: g10/keyedit.c:348 msgid "Really sign? " -msgstr "" +msgstr "Gerçekten imzalayacak mýsýnýz? " #: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157 #, c-format @@ -2108,6 +2115,8 @@ "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" +"Bu gizli anahtar için yeni anahtar parolasý giriniz.\n" +"\n" #: g10/keyedit.c:476 msgid "Do you really want to do this? " @@ -2119,7 +2128,7 @@ #: g10/keyedit.c:581 msgid "quit this menu" -msgstr "bu menuden çýk" +msgstr "bu menüden çýk" #: g10/keyedit.c:582 msgid "q" @@ -2155,7 +2164,7 @@ #: g10/keyedit.c:587 msgid "list key and user IDs" -msgstr "anahtarý ve özgün diziyi göster" +msgstr "anahtarý ve kullanýcý kimliðini göster" #: g10/keyedit.c:588 msgid "l" @@ -2163,11 +2172,11 @@ #: g10/keyedit.c:589 msgid "uid" -msgstr "ödz" +msgstr "kullkim" #: g10/keyedit.c:589 msgid "select user ID N" -msgstr "N özgün dizi seçer" +msgstr "N kullanýcý kimliðini seçer" #: g10/keyedit.c:590 msgid "key" @@ -2175,7 +2184,7 @@ #: g10/keyedit.c:590 msgid "select secondary key N" -msgstr "N yardýmcý anahtar seçer" +msgstr "N yardýmcý anahtarýný seçer" #: g10/keyedit.c:591 msgid "check" @@ -2215,23 +2224,23 @@ #: g10/keyedit.c:597 msgid "adduid" -msgstr "ödzekle" +msgstr "kullkimEkle" #: g10/keyedit.c:597 msgid "add a user ID" -msgstr "bir özgün dizi ekler" +msgstr "bir kullanýcý kimliði ekler" #: g10/keyedit.c:598 msgid "deluid" -msgstr "ödzsil" +msgstr "kullkimSil" #: g10/keyedit.c:598 msgid "delete user ID" -msgstr "özgün diziyi siler" +msgstr "kullanýcý kimliðini siler" #: g10/keyedit.c:599 msgid "addkey" -msgstr "anhekle" +msgstr "anhEkle" #: g10/keyedit.c:599 msgid "add a secondary key" @@ -2239,7 +2248,7 @@ #: g10/keyedit.c:600 msgid "delkey" -msgstr "anhsil" +msgstr "anhSil" #: g10/keyedit.c:600 msgid "delete a secondary key" @@ -2247,7 +2256,7 @@ #: g10/keyedit.c:601 msgid "delsig" -msgstr "imzasil" +msgstr "imzaSil" #: g10/keyedit.c:601 msgid "delete signatures" @@ -2255,7 +2264,7 @@ #: g10/keyedit.c:602 msgid "expire" -msgstr "sontrh" +msgstr "sonkulltarih" #: g10/keyedit.c:602 msgid "change the expire date" @@ -2282,9 +2291,8 @@ msgstr "önayarlarý listeler" #: g10/keyedit.c:607 -#, fuzzy msgid "showpref" -msgstr "önayar" +msgstr "" #: g10/keyedit.c:608 msgid "passwd" @@ -2296,27 +2304,27 @@ #: g10/keyedit.c:609 msgid "trust" -msgstr "büvence" +msgstr "güvence" #: g10/keyedit.c:609 msgid "change the ownertrust" -msgstr "sahibinigüvencesini deðiþtirir" +msgstr "sahibiningüvencesini deðiþtirir" #: g10/keyedit.c:610 msgid "revsig" -msgstr "imzafes" +msgstr "imzayürkal" #: g10/keyedit.c:610 msgid "revoke signatures" -msgstr "imzalarý fesheder" +msgstr "imzalarý yürürlükten kaldýrýr" #: g10/keyedit.c:611 msgid "revkey" -msgstr "anfes" +msgstr "yürkalanh" #: g10/keyedit.c:611 msgid "revoke a secondary key" -msgstr "bir yardýmcý anahtarý yürürlükten kaldýrýr (fesheder)" +msgstr "bir yardýmcý anahtarý yürürlükten kaldýrýr" #: g10/keyedit.c:612 msgid "disable" @@ -2342,7 +2350,7 @@ #. fixme: check that they both match #: g10/keyedit.c:671 msgid "Secret key is available.\n" -msgstr "Gizli key kullanýþsýz.\n" +msgstr "Gizli anahtar mevcut.\n" #: g10/keyedit.c:700 msgid "Command> " @@ -2358,11 +2366,11 @@ #: g10/keyedit.c:781 msgid "Really sign all user IDs? " -msgstr "Tüm özgün diziler gerçekten imzalanacak mý? " +msgstr "Tüm kullanýcý kimlikleri gerçekten imzalanacak mý? " #: g10/keyedit.c:782 msgid "Hint: Select the user IDs to sign\n" -msgstr "Ýpucu: Ýmzalamak için bir özgün dizi seçiniz\n" +msgstr "Ýpucu: Ýmzalamak için bir kullanýcý kimliði seçiniz\n" #: g10/keyedit.c:814 g10/keyedit.c:1000 #, c-format @@ -2371,19 +2379,19 @@ #: g10/keyedit.c:825 g10/keyedit.c:846 msgid "You must select at least one user ID.\n" -msgstr "En az bir özgün dizi seçmelisiniz.\n" +msgstr "En az bir kullanýcý kimliði seçmelisiniz.\n" #: g10/keyedit.c:827 msgid "You can't delete the last user ID!\n" -msgstr "Son özgün diziyi silemezsiniz!\n" +msgstr "Son kullanýcý kimliðini silemezsiniz!\n" #: g10/keyedit.c:830 msgid "Really remove all selected user IDs? " -msgstr "Seçilen tüm özgün diziler gerçekten silinecek mi? " +msgstr "Seçilen tüm kullanýcý kimlikleri gerçekten silinecek mi? " #: g10/keyedit.c:831 msgid "Really remove this user ID? " -msgstr "Bu özgün dizi gerçekten silinecek mi? " +msgstr "Bu kullanýcý kimliði gerçekten silinecek mi? " #: g10/keyedit.c:867 g10/keyedit.c:889 msgid "You must select at least one key.\n" @@ -2425,7 +2433,7 @@ #: g10/keyedit.c:992 msgid "Key not changed so no update needed.\n" -msgstr "güncelleme gereði olmadýðýndan anahtar deðiþmedi.\n" +msgstr "Güncelleme gereði olmadýðýndan anahtar deðiþmedi.\n" #: g10/keyedit.c:1007 msgid "Invalid command (try \"help\")\n" @@ -2439,25 +2447,25 @@ #: g10/keyedit.c:1140 #, c-format msgid " trust: %c/%c" -msgstr "güvence: %c/%c" +msgstr " güvence: %c/%c" #: g10/keyedit.c:1144 msgid "This key has been disabled" -msgstr "Bu anahtar kullanýmdan kaldýrýlmýþ" +msgstr "Bu anahtar kullanýmdan kaldýrýlmýþtý" #: g10/keyedit.c:1173 #, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "fesh! yardýmcý anahtar yürürlükten kaldýrýlmýþ: %s\n" +msgstr "yürkal! yardýmcý anahtar yürürlülükten kaldýrýlmýþtý: %s\n" #: g10/keyedit.c:1176 msgid "rev- faked revocation found\n" -msgstr "fesh- sahte yürürlükten kaldýrma sertifikasý bulundu\n" +msgstr "yürkal- sahte yürürlükten kaldýrma sertifikasý bulundu\n" #: g10/keyedit.c:1178 #, c-format msgid "rev? problem checking revocation: %s\n" -msgstr "fesh? yürürlükten kaldýrma kontrol edilirken problem: %s\n" +msgstr "yürkal? Yürürlükten kaldýrma denetlenirken problem: %s\n" #: g10/keyedit.c:1420 msgid "Delete this good signature? (y/N/q)" @@ -2465,7 +2473,7 @@ #: g10/keyedit.c:1424 msgid "Delete this invalid signature? (y/N/q)" -msgstr "Bu geçersiz imza silinsin mi? (e/H/ç" +msgstr "Bu geçersiz imza silinsin mi? (e/H/ç)" #: g10/keyedit.c:1428 msgid "Delete this unknown signature? (y/N/q)" @@ -2478,7 +2486,7 @@ #: g10/keyedit.c:1448 #, c-format msgid "Deleted %d signature.\n" -msgstr "%d imza silindi.\n" +msgstr "%d imzasý silindi.\n" #: g10/keyedit.c:1449 #, c-format @@ -2516,16 +2524,16 @@ #: g10/keyedit.c:1652 #, c-format msgid "No user ID with index %d\n" -msgstr "%d endeksiyle özgün dizi yok\n" +msgstr "%d endeksine sahip kullanýcý kimliði yok\n" #: g10/keyedit.c:1698 #, c-format msgid "No secondary key with index %d\n" -msgstr "%d endeksiyle yardýmcý anahtar yok\n" +msgstr "%d endeksine sahip yardýmcý anahtar yok\n" #: g10/keyedit.c:1796 msgid "user ID: \"" -msgstr "özgün dizi: \"" +msgstr "Kullanýcý kimliði: \"" #: g10/keyedit.c:1799 #, c-format @@ -2544,7 +2552,7 @@ #. FIXME: detect duplicates here #: g10/keyedit.c:1827 msgid "You have signed these user IDs:\n" -msgstr "Bu özgün dizileri imzalamýþsýnýz:\n" +msgstr "Bu kullanýcý kimliklerini imzalamýþsýnýz:\n" #: g10/keyedit.c:1841 g10/keyedit.c:1876 #, c-format @@ -2563,7 +2571,7 @@ #: g10/keyedit.c:1884 msgid "Really create the revocation certificates? (y/N)" msgstr "" -"Bu yürürlükten kaldýrma sertifikalarýný gerçekten yaratacak mýsýnýz? (e/H)" +"Bu yürürlükten kaldýrma sertifikalarýný gerçekten oluþturacak mýsýnýz? (e/H)" #: g10/keyedit.c:1913 msgid "no secret key\n" @@ -2587,12 +2595,14 @@ #: g10/mainproc.c:366 #, c-format msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" -msgstr "%s anahtarý ve özgün dizi %08lX %u-bit ile þifrelendi, %s yaratýldý\n" +msgstr "" +"%u-bit %s anahtarý ve kullanýcý kimliði %08lX ile þifrelendi, %s " +"oluþturuldu\n" #: g10/mainproc.c:376 #, c-format msgid "encrypted with %s key, ID %08lX\n" -msgstr "özgün dizi %08lX %s anahtarý ile þifrelendi\n" +msgstr "%s anahtarý ve kullanýcý kimliði %08lX ile þifrelendi\n" #: g10/mainproc.c:390 #, c-format @@ -2605,7 +2615,7 @@ #: g10/mainproc.c:435 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "UYARI: þifreli ileti tahrif edilmiþ!\n" +msgstr "UYARI: þifreli ileti tahrip edilmiþ!\n" #: g10/mainproc.c:440 #, c-format @@ -2614,17 +2624,17 @@ #: g10/mainproc.c:459 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "NOT: gönderen \"yalnýz-gözleriniz-için\" ricada bulundu\n" +msgstr "BÝLGÝ: gönderen \"yalnýz-gözleriniz-için\" ricasýnda bulundu\n" #: g10/mainproc.c:461 #, c-format msgid "original file name='%.*s'\n" -msgstr "özgün dosya adý=\"%.*s\"\n" +msgstr "özgün dosya adý = '%.*s'\n" #: g10/mainproc.c:632 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -"tekbaþýna yürürlükten kaldýrma - uygulamak için \"gpg --import\" kullanýn\n" +"tek baþýna yürürlükten kaldýrma - uygulamak için \"gpg --import\" kullanýn\n" #: g10/mainproc.c:719 g10/mainproc.c:728 msgid "WARNING: invalid notation data found\n" @@ -2644,14 +2654,13 @@ #. plaintext before signatures but no one-pass packets #: g10/mainproc.c:1235 g10/mainproc.c:1245 -#, fuzzy msgid "can't handle these multiple signatures\n" -msgstr "açýkça okunabilen imzalar dahil edildi\n" +msgstr "bu çoklu imzalar elde edilemiyor\n" #: g10/mainproc.c:1256 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "%s anahtarý ve %08lX özgün dizisi ile %.*s imzasý yapýldý\n" +msgstr "%.*s imzasý, %s anahtarý ve %08lX kullanýcý kimliði ile yapýldý\n" #. just in case that we have no userid #: g10/mainproc.c:1284 g10/mainproc.c:1292 @@ -2672,14 +2681,13 @@ msgstr "Ýmza kontrol edilemedi: %s\n" #: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505 -#, fuzzy msgid "not a detached signature\n" -msgstr "baðýmsýz bir imza yapar" +msgstr "bir baðýmsýz imza deðil\n" #: g10/mainproc.c:1454 #, c-format msgid "standalone signature of class 0x%02x\n" -msgstr "0x%02x sýnýfý tekbaþýna imza\n" +msgstr "0x%02x sýnýfý tek baþýna imza\n" #: g10/mainproc.c:1511 msgid "old style (PGP 2.x) signature\n" @@ -2692,85 +2700,83 @@ #: g10/misc.c:98 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "\"core dumps\" iptal edilemedi: %s\n" +msgstr "\"core\" oluþumu iptal edilemedi: %s\n" #: g10/misc.c:208 msgid "Experimental algorithms should not be used!\n" -msgstr "Deneyimsel algoritmalar kullanýlmayacaktý!\n" +msgstr "Deneysel algoritmalar kullanýlmamalý!\n" #: g10/misc.c:238 #, fuzzy msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" -"bu cipher algoritmasýnýn deðeri düþük; lütfem daha standard birini kullan!\n" +"Bu þifre algoritmasý uygun deðil; lütfen daha standart birini kullanýn!\n" #: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" -msgstr "%d genel anahtar algoritmasý elde edilemedi\n" +msgstr "%d genel anahtar algoritmasý kullanýlamadý\n" #: g10/parse-packet.c:1010 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "%d tipi altpaket kritik bit setine sahip\n" +msgstr "%d tipi alt paket kritik bit kümesine sahip\n" #: g10/passphrase.c:223 msgid "gpg-agent is not available in this session\n" -msgstr "" +msgstr "gpg-agent bu oturumda kullanýlamaz\n" #: g10/passphrase.c:229 msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "" +msgstr "GPG_AGENT_INFO çevre deðiþkeni bozuk\n" #: g10/hkp.c:167 g10/passphrase.c:248 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna baðlanýlamadý: %s\n" -#: g10/passphrase.c:313 g10/passphrase.c:576 +#: g10/passphrase.c:313 g10/passphrase.c:580 #, c-format msgid " (main key ID %08lX)" msgstr " (asýl anahtar kimliði %08lX)" #: g10/passphrase.c:323 -#, fuzzy, c-format +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" msgstr "" -"\n" -"Gizli anahtarýn kilidini açmak için bir anahtar parolasýna ihtiyacýnýz var.\n" -"Anahtarýn sahibi: \"" +"\"%.*s\"\n" +"kullanýcýsýnýn gizli anahtarýný açacak bir anahtar parolasýna ihtiyaç var.\n" +"%u-bit %s anahtar, kimlik %08lX, oluþturulan %s%s\n" #: g10/passphrase.c:344 -#, fuzzy msgid "Enter passphrase\n" -msgstr "Anahtar parolasýný girin: " +msgstr "Anahtar parolasýný girin\n" #: g10/passphrase.c:346 -#, fuzzy msgid "Repeat passphrase\n" -msgstr "Tekrar:" +msgstr "Parolayý tekrar yazýn\n" #: g10/passphrase.c:384 msgid "passphrase too long\n" -msgstr "" +msgstr "Parola çok uzun\n" #: g10/passphrase.c:396 msgid "invalid response from agent\n" -msgstr "" +msgstr "vekilin yanýtý geçersiz\n" #: g10/passphrase.c:405 msgid "cancelled by user\n" -msgstr "" +msgstr "kullanýcý tarafýndan iptal edildi\n" -#: g10/passphrase.c:408 g10/passphrase.c:477 +#: g10/passphrase.c:408 g10/passphrase.c:481 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" -msgstr "" +msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandý\n" -#: g10/passphrase.c:562 +#: g10/passphrase.c:566 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -2780,26 +2786,26 @@ "Gizli anahtarýn kilidini açmak için bir anahtar parolasýna ihtiyacýnýz var.\n" "Anahtarýn sahibi: \"" -#: g10/passphrase.c:571 +#: g10/passphrase.c:575 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "%u-bit %s anahtarý, kimlik: %08lX, yaratýldý %s" +msgstr "%u-bit %s anahtarý, kimlik: %08lX, oluþturuldu %s" -#: g10/passphrase.c:609 +#: g10/passphrase.c:613 msgid "can't query password in batchmode\n" msgstr "önceden tanýmlanmýþ iþlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:613 +#: g10/passphrase.c:617 msgid "Enter passphrase: " msgstr "Anahtar parolasýný girin: " -#: g10/passphrase.c:617 +#: g10/passphrase.c:621 msgid "Repeat passphrase: " msgstr "Tekrar:" #: g10/plaintext.c:67 msgid "data not saved; use option \"--output\" to save it\n" -msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneðni kullanýn\n" +msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneðini kullanýn\n" #: g10/plaintext.c:332 msgid "Detached signature.\n" @@ -2811,12 +2817,11 @@ #: g10/plaintext.c:357 msgid "reading stdin ...\n" -msgstr "standard girdiden okuyor ...\n" +msgstr "standart girdiden okuyor ...\n" #: g10/plaintext.c:391 -#, fuzzy msgid "no signed data\n" -msgstr "imzalý veri: %s açýlamadý\n" +msgstr "imzalý veri yok\n" #: g10/plaintext.c:399 #, c-format @@ -2826,7 +2831,7 @@ #: g10/pubkey-enc.c:76 #, c-format msgid "anonymous receiver; trying secret key %08lX ...\n" -msgstr "anonim alýcý; %08lX gizli anahtarýný deneniyor ...\n" +msgstr "anonim alýcý; %08lX gizli anahtarý deneniyor ...\n" #: g10/pubkey-enc.c:82 msgid "okay, we are the anonymous recipient.\n" @@ -2839,22 +2844,22 @@ #: g10/pubkey-enc.c:153 #, c-format msgid "cipher algorithm %d is unknown or disabled\n" -msgstr "%d cipher algoritmasý bilinmiyor ya da kullaným dýþý\n" +msgstr "%d þifre algoritmasý bilinmiyor ya da kullaným dýþý\n" #: g10/pubkey-enc.c:192 #, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" -msgstr "NOT: %d cipher algoritmasý önayarlarda bulunamadý\n" +msgstr "BÝLGÝ: %d þifre algoritmasý önayarlarda bulunamadý\n" #: g10/pubkey-enc.c:198 #, c-format msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "NOT: %08lX gizli anahtarýnýn %s tarihinde kullaným süresi doldu\n" +msgstr "BÝLGÝ: %08lX gizli anahtarýnýn %s tarihinde kullaným süresi doldu\n" #: g10/hkp.c:59 #, c-format msgid "requesting key %08lX from %s ...\n" -msgstr "%s den %08lX anahtarý isteniyor ...\n" +msgstr "%08lX anahtarý %s den isteniyor ...\n" #: g10/hkp.c:83 #, c-format @@ -2924,18 +2929,18 @@ msgstr "genel anahtar imzadan %lu saniye daha yeni.\n" #: g10/sig-check.c:328 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTE: imza anahtarýnýn kullaným süresi %s tarihinde dolmuþ\n" +msgstr "BÝLGÝ: %08lX imza anahtarýnýn kullaným süresi %s tarihinde dolmuþ\n" #: g10/sig-check.c:398 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "Hatalý imzanýn bilinmeyen bir kritik bitten kaynaklandýðý sanýlýyor\n" #: g10/sign.c:152 -#, fuzzy, c-format +#, c-format msgid "checking created signature failed: %s\n" -msgstr "Ýmza kontrol edilemedi: %s\n" +msgstr "oluþturulan imzanýn denetimi baþarýsýz: %s\n" #: g10/sign.c:161 #, c-format @@ -2945,7 +2950,7 @@ #: g10/sign.c:307 g10/sign.c:630 #, c-format msgid "can't create %s: %s\n" -msgstr "%s yaratýlamadý: %s\n" +msgstr "%s oluþturulamadý: %s\n" #: g10/sign.c:405 msgid "signing:" @@ -2969,12 +2974,12 @@ #: g10/tdbio.c:116 g10/tdbio.c:1623 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "güvence veritabaný %lu kaydý: sýralama baþarýsýz: %s\n" +msgstr "güvence veritabaný %lu kaydý: arama baþarýsýz: %s\n" #: g10/tdbio.c:122 g10/tdbio.c:1630 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "güvence veritabaný %lu kaydý: yazma baþarýsýz: %s\n" +msgstr "güvence veritabaný %lu kaydý: yazma baþarýsýz (n=%d): %s\n" #: g10/tdbio.c:232 msgid "trustdb transaction too large\n" @@ -2993,27 +2998,27 @@ #: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444 #, c-format msgid "%s: can't create: %s\n" -msgstr "%s: yaratýlamadý: %s\n" +msgstr "%s: oluþturulamadý: %s\n" #: g10/tdbio.c:459 g10/tdbio.c:508 #, c-format msgid "%s: can't create lock\n" -msgstr "%s: kilit yaratýlamadý\n" +msgstr "%s: kilit oluþturulamadý\n" #: g10/tdbio.c:473 #, c-format msgid "%s: failed to create version record: %s" -msgstr "%s: sürüm kaydý yaratmada baþarýsýz: %s" +msgstr "%s: sürüm kaydý oluþturmada baþarýsýz: %s" #: g10/tdbio.c:477 #, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: geçersiz güvence veritabaný yaratýldý\n" +msgstr "%s: geçersiz güvence veritabaný oluþturuldu\n" #: g10/tdbio.c:480 #, c-format msgid "%s: trustdb created\n" -msgstr "&s: güvence veritabaný yaratýldý\n" +msgstr "%s: güvence veritabaný oluþturuldu\n" #: g10/tdbio.c:517 #, c-format @@ -3023,7 +3028,7 @@ #: g10/tdbio.c:550 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s: hash tablosu yaratma baþarýsýz: %s\n" +msgstr "%s: hash tablosu oluþturma baþarýsýz: %s\n" #: g10/tdbio.c:558 #, c-format @@ -3044,7 +3049,7 @@ #: g10/tdbio.c:1235 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "güvence veritabaný: sýralama baþarýsýz: %s\n" +msgstr "güvence veritabaný: arama baþarýsýz: %s\n" #: g10/tdbio.c:1243 #, c-format @@ -3089,7 +3094,7 @@ #: g10/tdbio.c:1748 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"güvence veritabaný bozulmuþ; lutfen \"gpg --fix-trustdb\" çalýþtýrýn.\n" +"güvence veritabaný bozulmuþ; lütfen \"gpg --fix-trustdb\" çalýþtýrýn.\n" #: g10/trustdb.c:169 #, c-format @@ -3109,7 +3114,7 @@ #: g10/trustdb.c:212 #, c-format msgid "trustdb: sync failed: %s\n" -msgstr "güvence veritabaný: senronizasyon baþarýsýz: %s\n" +msgstr "güvence veritabaný: eþzamanlama baþarýsýz: %s\n" #: g10/trustdb.c:377 #, c-format @@ -3119,7 +3124,7 @@ #: g10/trustdb.c:384 #, c-format msgid "lid %lu: expected dir record, got type %d\n" -msgstr "lid %lu: dizin kaydýnýn %d tipinde alýndýðý sanýlýyor\n" +msgstr "lid %lu: dizin kaydý bekleniyordu, %d kaydý alýndý\n" #: g10/trustdb.c:389 #, c-format @@ -3139,7 +3144,7 @@ #: g10/trustdb.c:474 #, c-format msgid "'%s' is not a valid long keyID\n" -msgstr "\"%s\" geçerli uzunlukta bir özgün dizi deðil\n" +msgstr "\"%s\" geçerli bir uzun anahtar kimliði deðil\n" #: g10/trustdb.c:501 #, c-format @@ -3169,7 +3174,7 @@ #: g10/trustdb.c:565 #, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" -msgstr "NOT: %08lX gizli anahtarý korunmuþ DEÐÝL.\n" +msgstr "Bilgi: %08lX gizli anahtarý korunmuþ DEÐÝL.\n" #: g10/trustdb.c:584 #, c-format @@ -3179,7 +3184,7 @@ #: g10/trustdb.c:597 #, c-format msgid "enumerate secret keys failed: %s\n" -msgstr "gizli anahtarlarýn numaralanmasý baþarýsýz: %s\n" +msgstr "gizli anahtarlarýn listelenmesi baþarýsýz: %s\n" #: g10/trustdb.c:987 #, c-format @@ -3194,18 +3199,18 @@ #: g10/trustdb.c:1005 #, c-format msgid "key %08lX.%lu: Valid key revocation\n" -msgstr "anahtar %08lX.%lu: anahtarýn yürürlükten kaldýrýlmasý geçerli\n" +msgstr "anahtar %08lX.%lu: Anahtarýn yürürlükten kaldýrýlmasý geçerli\n" #: g10/trustdb.c:1011 #, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" -msgstr "anahtar %08lX.%lu: anahtarýn yürürlükten kaldýrýlmasý geçersiz\n" +msgstr "anahtar %08lX.%lu: Anahtarýn yürürlükten kaldýrýlmasý geçersiz: %s\n" #: g10/trustdb.c:1022 #, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" msgstr "" -"anahtar %08lX.%lu: yardýmcý anahtarýn yürürlükten kaldýrýlmasý geçerli\n" +"anahtar %08lX.%lu: Yardýmcý anahtarýn yürürlükten kaldýrýlmasý geçerli\n" #: g10/trustdb.c:1133 msgid "Good self-signature" @@ -3218,20 +3223,20 @@ #: g10/trustdb.c:1170 msgid "Valid user ID revocation skipped due to a newer self signature" msgstr "" -"Daha yeni bir öz-imzadan dolayý özgün dizi için geçerli yürürlükten kaldýrma " -"atlandý" +"Daha yeni bir öz-imzadan dolayý geçerli kullanýcý kimliðin yürürlükten " +"kaldýrýlmasý atlandý" #: g10/trustdb.c:1176 msgid "Valid user ID revocation" -msgstr "Özgün dizi için geçerli yürürlükten kaldýrma" +msgstr "Kullanýcý kimliðin yürürlükten kaldýrýlmasý geçerli" #: g10/trustdb.c:1181 msgid "Invalid user ID revocation" -msgstr "Özgün dizi için geçersiz yürürlükten kaldýrma" +msgstr "Kullanýcý kimliðin yürürlükten kaldýrýlmasý geçersiz" #: g10/trustdb.c:1223 msgid "Valid certificate revocation" -msgstr "Sertifika için geçerli yürürlükten kaldýrma" +msgstr "Sertifikanýn yürürlükten kaldýrýlmasý geçerli" #: g10/trustdb.c:1224 msgid "Good certificate" @@ -3239,7 +3244,7 @@ #: g10/trustdb.c:1252 msgid "Invalid certificate revocation" -msgstr "Sertifika için geçersiz yürürlükten kaldýrma" +msgstr "Sertifikanýn yürürlükten kaldýrýlmasý geçersiz" #: g10/trustdb.c:1253 msgid "Invalid certificate" @@ -3248,7 +3253,7 @@ #: g10/trustdb.c:1270 g10/trustdb.c:1274 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" -msgstr "imza kaydý %lu[%d] yanlýþ kayda gönderiyor.\n" +msgstr "imza kaydý %lu[%d] yanlýþ kaydý gösteriyor.\n" #: g10/trustdb.c:1333 msgid "duplicated certificate - deleted" @@ -3297,7 +3302,7 @@ #: g10/trustdb.c:1815 #, c-format msgid "enumerate keyblocks failed: %s\n" -msgstr "anahtar bloklarýnýn numaralanmasý baþarýsýz: %s\n" +msgstr "anahtar bloklarýnýn listelenmesi baþarýsýz: %s\n" #: g10/trustdb.c:1863 #, c-format @@ -3307,7 +3312,7 @@ #: g10/trustdb.c:1873 #, c-format msgid "\t%lu due to new pubkeys\n" -msgstr "\t%lu genel anahtardan dolayý\n" +msgstr "\t%lu yeni genel anahtardan dolayý\n" #: g10/trustdb.c:1875 #, c-format @@ -3325,7 +3330,7 @@ #: g10/trustdb.c:2228 msgid "Ooops, no user IDs\n" -msgstr "Hooop, özgün dizi yok\n" +msgstr "Hooop, kullanýcý kimliði yok\n" #: g10/trustdb.c:2386 #, c-format @@ -3346,7 +3351,8 @@ #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" -"anahtar %08lX.%lu: ilerde yaratýlacak (zaman sapmasý ya da hýz problemi)\n" +"anahtar %08lX.%lu: gelecekte oluþturulmuþ\n" +"(zaman sapmasý ya da saat problemi)\n" #: g10/trustdb.c:2422 #, c-format @@ -3380,7 +3386,7 @@ #: g10/trustdb.c:2775 g10/trustdb.c:2805 msgid "WARNING: can't yet handle long pref records\n" -msgstr "UYARI: uzun önayarlar kayýtlarý henüz elde edilemedi\n" +msgstr "UYARI: uzun önayar kayýtlarý henüz elde edilemedi\n" #: g10/verify.c:108 msgid "" @@ -3390,7 +3396,7 @@ msgstr "" "imza doðrulanamadý.\n" "Ýmza dosyasýnýn (.sig veya .asc) komut satýrýnda verilecek\n" -"ilk dosya olmasý gerektiðini lutfen hatýrýnýzdan çýkarmayýn.\n" +"ilk dosya olmasý gerektiðini lütfen hatýrlayýn.\n" #: g10/verify.c:173 #, c-format @@ -3400,16 +3406,16 @@ #: g10/ringedit.c:302 #, c-format msgid "%s: can't create keyring: %s\n" -msgstr "%s: anahtar demeti yaratýlamadý: %s\n" +msgstr "%s: anahtar demeti oluþturulamadý: %s\n" #: g10/ringedit.c:319 g10/ringedit.c:1376 #, c-format msgid "%s: keyring created\n" -msgstr "%s: anahtar demeti yaratýldý\n" +msgstr "%s: anahtar demeti oluþturuldu\n" #: g10/ringedit.c:1557 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "UYARI: gizli bilgilerle 2 dosya mevcut.\n" +msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n" #: g10/ringedit.c:1558 #, c-format @@ -3419,11 +3425,11 @@ #: g10/ringedit.c:1559 #, c-format msgid "%s is the new one\n" -msgstr "%s yeni\n" +msgstr "%s yeni olan\n" #: g10/ringedit.c:1560 msgid "Please fix this possible security flaw\n" -msgstr "Lutfen bu güvenlik çatlaðýný giderin\n" +msgstr "Lütfen bu güvenlik çatlaðýný giderin\n" #: g10/skclist.c:110 g10/skclist.c:166 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" @@ -3431,9 +3437,9 @@ "anahtar güvenli olarak iþaretlenmemiþ - onu sahte RNG ile kullanmayýn!\n" #: g10/skclist.c:138 -#, fuzzy, c-format +#, c-format msgid "skipped `%s': duplicated\n" -msgstr "\"%s\" atlandý: %s\n" +msgstr "`%s' atlandý: tekrarlanmýþ\n" #: g10/skclist.c:145 g10/skclist.c:153 #, c-format @@ -3441,9 +3447,8 @@ msgstr "\"%s\" atlandý: %s\n" #: g10/skclist.c:149 -#, fuzzy msgid "skipped: secret key already present\n" -msgstr "%s: atlandý: genel anahtar zaten mevcut\n" +msgstr "atlandý: gizli anahtar zaten var\n" #: g10/skclist.c:160 #, c-format @@ -3451,7 +3456,7 @@ "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"\"%s\" atlandý: bu imzalar için güvenli olmayan PGP üretimi bir ElGamal " +"`%s' atlandý: bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal " "anahtarý!\n" #. do not overwrite @@ -3475,27 +3480,27 @@ #: g10/openfile.c:184 msgid "writing to stdout\n" -msgstr "standard çýktýya yazýyor\n" +msgstr "standart çýktýya yazýyor\n" #: g10/openfile.c:273 #, c-format msgid "assuming signed data in `%s'\n" -msgstr "\"%s\" içindeki veri imzalý sanýlýyor\n" +msgstr "\"%s\" içindeki veri imzalý kabul edildi\n" #: g10/openfile.c:323 #, c-format msgid "%s: new options file created\n" -msgstr "%s: yeni seçenekler dosyasý yaratýldý\n" +msgstr "%s: yeni seçenekler dosyasý oluþturuldu\n" #: g10/openfile.c:350 #, c-format msgid "%s: can't create directory: %s\n" -msgstr "%s: dizin yaratýlamadý: %s\n" +msgstr "%s: dizin oluþturulamadý: %s\n" #: g10/openfile.c:353 #, c-format msgid "%s: directory created\n" -msgstr "%s: dizin yaratýldý\n" +msgstr "%s: dizin oluþturulamadý\n" #: g10/openfile.c:355 msgid "you have to start GnuPG again, so it can read the new options file\n" @@ -3518,13 +3523,12 @@ msgstr "UYARI: ileti simetrik þifre içindeki zayýf bir anahtarla þifrelendi.\n" #: g10/encr-data.c:97 -#, fuzzy msgid "problem handling encrypted packet\n" -msgstr "þifreli paketlerin anahtar-kimlik alanlarýný kurar" +msgstr "þifreli paketin elde edilmesinde sorun var\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" -msgstr "zayýf anahtar yaratýldý - yeniden deneniyor\n" +msgstr "zayýf anahtar oluþturuldu - yeniden deneniyor\n" #: g10/seskey.c:57 #, c-format @@ -3551,7 +3555,7 @@ #: g10/delkey.c:183 msgid "use option \"--delete-secret-key\" to delete it first.\n" -msgstr "silmek için \"--delete-secret-key\" seçeneðini önce kullanýn.\n" +msgstr "silmek için önce \"--delete-secret-key\" seçeneðini kullanýn.\n" #: g10/helptext.c:47 msgid "" @@ -3559,10 +3563,10 @@ "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 "" -"Bir deðeri buraya iþaretlemek size kalmýþ; bu deðer herhangi bir 3. partiye\n" -"gönderilmiþ olmayacak. Bizim bir güvence webi saðlamaya ihtiyacýmýz var;\n" -"(açýkça belirtilmeden yaratýlmýþ) bir sertifikalar web'iyle hiçbir þey\n" -"yapýlmaz." +"Bir deðeri buraya iþaretlemek size kalmýþ; bu deðer herhangi bir 3. þahsa\n" +"gönderilmeyecek. Bir güvence aðý saðlamak için bizim buna ihtiyacýmýz var;\n" +"bunun (açýkça belirtilmeden oluþturulmuþ) sertifikalar aðýyla\n" +"hiç bir alakasý yok." #: g10/helptext.c:53 msgid "If you want to use this revoked key anyway, answer \"yes\"." @@ -3579,10 +3583,9 @@ #: g10/helptext.c:61 msgid "" "Enter the user ID of the addressee to whom you want to send the message." -msgstr "Bu iletiyi göndereceðiniz adresin özgün dizisini girin" +msgstr "Bu iletiyi göndereceðiniz adresin kullanýcý kimliðini girin" #: g10/helptext.c:65 -#, fuzzy msgid "" "Select the algorithm to use.\n" "\n" @@ -3602,22 +3605,23 @@ "this is the reason why the encryption only ElGamal key is not available in\n" "this menu." msgstr "" -"DSA (aka DSS) yalnýz imzalar için kullanýlabilen bir sayýsal imza\n" -"algoritmasýdýr. Bu algoritma DSA imzalarýnýn doðrulanmasý " -"ElGamal'ýnkilerden\n" -"daha hýzlý olduðundan tavsiye edilen bir algoritmadýr.\n" +"DSA (diðer adý ile DSS) yalnýz imzalar için kullanýlabilen bir sayýsal imza\n" +"algoritmasýdýr. Bu algoritma ile DSA imzalarýnýn doðrulanmasý\n" +"ElGamal'ýnkilere göre daha hýzlý olduðundan tavsiye edilen bir " +"algoritmadýr.\n" "\n" "ElGamal imzalar ve þifreleme için kullanýlabilen bir algoritmadýr. OpenPGP\n" "bu algoritmanýn iki kullanýmýný birbirinden ayýrdeder:\n" -"bir yalnýz þifreleme için\n" -"ve bir imza+þifreleme için\n" -"aslýnda ikisi de aynýdýr ama imzalar için bir güvenli bir anahtar yaratmak\n" -"için bazý parametreleri özel bir yöntemle seçilmiþ olmalýdýr: bu program\n" -"bunu yapar fakat diðer OpenPGP taklitlerinin imza+þifreleme ayrýmýný\n" -"anlamasý gerekli deðildir.\n" -"Ýlk (öncelikli) anahtar daima imzalama yapabilen bir anahtar olmalýdýr; Bu\n" -"sadece þifreleme yapabilen ElGamal anahtarýnýn neden menude bulunmadýðýný\n" -"açýklar." +"yalnýz þifreleme için\n" +"ve imza+þifreleme için\n" +"aslýnda ikisi de aynýdýr ama imzalarda kullanýlabilecek bir güvenli\n" +"anahtar oluþturmak için bazý parametreler özel bir yöntemle seçilmiþ\n" +"olmalýdýr: bu program bunu yapar fakat diðer OpenPGP taklitlerinin\n" +"imza+þifreleme ayrýmýný anlamasý gerekli deðildir.\n" +"\n" +"Ýlk (asýl) anahtar daima imzalama yapabilen bir anahtar olmalýdýr;\n" +"yalnýzca þifreleme yapabilen ElGamal anahtarýnýn bu menüde yer\n" +"almamasýnýn sebebi budur." #: g10/helptext.c:85 msgid "" @@ -3626,7 +3630,7 @@ "with them are quite large and very slow to verify." msgstr "" "Bu anahtarlar tüm programlar tarafýndan desteklenmediði için ve\n" -"onlarla yaratýlan imzalar gereðinden büyük ve doðrulanmasý çok yavaþ\n" +"onlarla oluþturulan imzalar gereðinden büyük ve doðrulanmasý çok yavaþ\n" "olduðundan RFC2440 standardýnda tanýmlý olmalarýna raðmen tavsiye\n" "edilmezler." @@ -3646,9 +3650,9 @@ "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -"Ýstenen deðeri girin. Ýyi bir hata cevabý almak istemezseniz onu\n" -"ISO tarih biçiminde (YYYY-AA-GG) girmeniz mümkündür - ya da verilen\n" -"deðeri sistem bir zaman aralýðý olarak çözmeyi dener." +"Ýstenen deðeri girin. ISO tarihi (YYYY-AA-GG) girmeniz mümkündür fakat\n" +"iyi bir hata cevabý alamazsýnýz -- onun yerine sistem verilen deðeri\n" +"bir zaman aralýðý olarak çözümlemeyi dener." #: g10/helptext.c:118 msgid "Enter the name of the key holder" @@ -3657,7 +3661,7 @@ #: g10/helptext.c:123 msgid "please enter an optional but highly suggested email address" msgstr "" -"lütfen bir Eposta adresi girin (isteðe baðlý ancak þiddetle tavsiye edilir)" +"lütfen bir Eposta adresi girin (isteðe baðlý ancak kuvvetle tavsiye edilir)" #: g10/helptext.c:127 msgid "Please enter an optional comment" @@ -3683,19 +3687,19 @@ #: g10/helptext.c:164 msgid "Answer \"yes\" is you want to sign ALL the user IDs" -msgstr "Özgün dizilerin TÜMünü imzalamak istiyorsanýz \"evet\" girin" +msgstr "Kullanýcý kimliklerinin TÜMünü imzalamak istiyorsanýz \"evet\" girin" #: g10/helptext.c:168 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -"Bu özgün diziyi gerçekten silmek istiyorsanýz \"evet\" girin.\n" +"Bu kullanýcý kimliðini gerçekten silmek istiyorsanýz \"evet\" girin.\n" "Böylece bütün sertifikalarýnýzý kaybedeceksiniz!" #: g10/helptext.c:173 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "Bu yardýmcý anahtarý silmek istiyorsanýz \"evet\" girin" +msgstr "Bu yardýmcý anahtarý silme izni vermek istiyorsanýz \"evet\" girin" #: g10/helptext.c:178 msgid "" @@ -3714,18 +3718,16 @@ "know which key was used because this signing key might establish\n" "a trust connection through another already certified key." msgstr "" -"Karþýlýðý olmasý gereken anahtara sahip olmadýðýnýzdan bu imza kontrol\n" -"edilemez. Bu imzalama anahtarý bir diðer zaten sertifikalý anahtara bir\n" -"güvence baðlantýsý saðlamasý gerektiðinden kullanýlmýþ olduðunu bilene\n" -"kadar silinmesini erteleyeceksiniz." +"Bu imza, anahtarýna sahip olmadýðýnýzdan, kontrol edilemez. Bu imzanýn\n" +"silinmesini hangi anahtarýn kullanýldýðýný bilene kadar\n" +"ertelemelisiniz çünkü bu imzalama anahtarý baþka bir sertifikalý\n" +"anahtar vasýtasý ile bir güvence baðlantýsý saðlayabilir." #: g10/helptext.c:189 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." -msgstr "" -"Ýmza geçersiz. Onu anahtar demetinden kaldýrmak için baþka nedene ihtiyaç " -"yok." +msgstr "Ýmza geçersiz. Onu anahtar demetinden kaldýrmak mantýklý." #: g10/helptext.c:193 msgid "" @@ -3735,22 +3737,22 @@ "only if this self-signature is for some reason not valid and\n" "a second one is available." msgstr "" -"Bu imza özgün diziyi anahtara baðlar. Öz-imzayý silmek hiç iyi\n" +"Bu imza kullanýcý kimliðini anahtara baðlar. Öz-imzayý silmek hiç iyi\n" "bir fikir deðil. GnuPG bu anahtarý bir daha hiç kullanamayabilir.\n" "Bunu sadece, eðer bu öz-imza bazý durumlarda geçerli deðilse ya da\n" -"bir ikincisi yerine kullanýlabilecekse yapýn." +"kullanýlabilir bir ikincisi var ise yapýn." #: g10/helptext.c:202 msgid "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " msgstr "" -"Lutfen anahtar parolanýzý girin; bu gizli bir cümle \n" +"Lütfen anahtar parolanýzý girin; bu gizli bir cümle \n" " Blurb, blurb,.... " #: g10/helptext.c:209 msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr "Lütfen son parolayý tekrarla ki ne yazdýðýný bildiðinden emin ol." +msgstr "Lütfen son parolayý tekrarlayarak parolanýn ne olduðundan emin olun." #: g10/helptext.c:213 msgid "Give the name of the file to which the signature applies" @@ -3784,17 +3786,17 @@ " this is normally used to mark an email address invalid.\n" msgstr "" "Sertifikalama için bir sebep belirtmelisiniz. Ýçeriðine baðlý olarak\n" -"bu listeden seçme yeterliðine sahipsiniz:\n" +"bu listeden seçebilirsiniz:\n" " \"Anahtar tehlikede\"\n" "\tYetkisiz kiþilerin gizli anahtarýnýza eriþebildiðine inanýyorsanýz\n" "\tbunu seçin.\n" " \"Anahtar geçici\"\n" -"\tDaha yeni biriyle bu anahtarý deðiþtirecekseniz bunu seçin.\n" +"\tMevcut anahtarý daha yeni bir anahtar ile deðiþtirmiþseniz bunu seçin.\n" " \"Anahtar artýk kullanýlmayacak\"\n" "\tAnahtarý emekliye ayýracaksanýz bunu seçin.\n" -" \"Özgün dizi artýk geçersiz\"\n" -"\tÖzgün dizi artýk kullanýlmayacak durumdaysa bunu seçin; normalde\n" -"\tEposta adresi geçersiz olduðunda kullanýlýr.\n" +" \"Kullanýcý kimliði artýk geçersiz\"\n" +"\tKullanýcý kimliði artýk kullanýlamayacak durumdaysa bunu\n" +" seçin; genelde Eposta adresi geçersiz olduðunda kullanýlýr.\n" #: g10/helptext.c:245 msgid "" @@ -3803,32 +3805,14 @@ "An empty line ends the text.\n" msgstr "" "Ýsterseniz, neden bu yürürlükten kaldýrma sertifikasýný\n" -"yayýnlayacaðýnýzý açýklayan bir metin girebilirsiniz.\n" +"verdiðinizi açýklayan bir metin girebilirsiniz.\n" "Lütfen bu metin kýsa olsun. Bir boþ satýr metni bitirir.\n" #: g10/helptext.c:260 msgid "No help available" -msgstr "yardým taze bitti" +msgstr "yardým mevcut deðil" #: g10/helptext.c:268 #, c-format msgid "No help available for `%s'" -msgstr "\"%s\" için yardým taze bitti" - -#~ msgid "RSA key cannot be used in this version\n" -#~ msgstr "Bu sürümde RSA anahtarý kullanýlamaz\n" - -#~ msgid "No key for user ID\n" -#~ msgstr "Özgün dizi için anahtar yok\n" - -#~ msgid "No user ID for key\n" -#~ msgstr "Anahtar için özgün dizi yok\n" - -#~ msgid "invalid" -#~ msgstr "geçersiz" - -#~ msgid "revoked" -#~ msgstr "yürürlükten kaldýrýldý" - -#~ msgid "no secret key for decryption available\n" -#~ msgstr "þifre çözme için kullanýþlý bir gizli anahtar yok\n" +msgstr "\"%s\" için yardým mevcut deðil" diff -urN gnupg-1.0.5/scripts/ChangeLog gnupg-1.0.6/scripts/ChangeLog --- gnupg-1.0.5/scripts/ChangeLog Thu Apr 19 13:15:16 2001 +++ gnupg-1.0.6/scripts/ChangeLog Sun May 6 12:48:41 2001 @@ -1,3 +1,7 @@ +2001-05-06 Werner Koch + + * config.guess, config.sub: Add updates from subversions.gnu.org. + 2001-04-19 Werner Koch * autogen.sh: Add VPATH build support for option --build-w32. diff -urN gnupg-1.0.5/scripts/config.guess gnupg-1.0.6/scripts/config.guess --- gnupg-1.0.5/scripts/config.guess Mon Mar 12 19:53:27 2001 +++ gnupg-1.0.6/scripts/config.guess Sun May 6 12:47:21 2001 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-03-06' +timestamp='2001-04-20' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - - ) # Use stdin as input. + - ) # Use stdin as input. break ;; -* ) echo "$me: invalid option $1$help" >&2 @@ -97,17 +97,17 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int dummy(){}" > $dummy.c - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 - if test $? = 0 ; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o $dummy.rel - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 + if test $? = 0 ; then + CC_FOR_BUILD="$c"; break + fi + done + rm -f $dummy.c $dummy.o $dummy.rel + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; esac @@ -115,7 +115,7 @@ # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH + PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown @@ -127,210 +127,211 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; + # Netbsd (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + cat <$dummy.s + .data \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" + .byte 37,100,45,37,120,10,0 # "%d-%x\n" - .text - .globl main - .align 4 - .ent main + .text + .globl main + .align 4 + .ent main main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `./$dummy` in + 0-0) + UNAME_MACHINE="alpha" + ;; + 1-0) + UNAME_MACHINE="alphaev5" + ;; + 1-1) + UNAME_MACHINE="alphaev56" + ;; + 1-101) + UNAME_MACHINE="alphapca56" + ;; + 2-303) + UNAME_MACHINE="alphaev6" + ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; + esac + fi + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrs +tuvwxyz'` + exit 0 ;; Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit 0 ;; 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; + echo alpha-dec-winnt3.5 + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; + echo m68k-unknown-sysv4 + exit 0;; amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; + echo hppa1.1-hitachi-hiuxmpp + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; + echo pyramid-pyramid-svr4 + exit 0 ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -341,13 +342,13 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} exit 0 ;; @@ -358,181 +359,184 @@ echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; + echo mips-dec-mach_bsd4.3 + exit 0 ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ - int main (int argc, char *argv[]) { + int main (int argc, char *argv[]) { #else - int main (argc, argv) int argc; char *argv[]; { + int main (argc, argv) int argc; char *argv[]; { #endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; + echo powerpc-harris-powerunix + exit 0 ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; + echo m88k-harris-cxux7 + exit 0 ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; + echo m88k-motorola-sysv4 + exit 0 ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; + echo m88k-motorola-sysv3 + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; + echo m88k-tektronix-sysv3 + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; + echo m68k-tektronix-bsd + exit 0 ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo rs6000-ibm-aix3.2.5 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit 0 ;; + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; + echo rs6000-ibm-aix + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; + echo romp-ibm-bsd4.4 + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; + echo rs6000-bull-bosx + exit 0 ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; + echo m68k-bull-sysv3 + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; + echo m68k-hp-bsd + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; + echo m68k-hp-bsd4.4 + exit 0 ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) case "${HPUX_REV}" in 11.[0-9][0-9]) if [ -x /usr/bin/getconf ]; then @@ -564,203 +568,203 @@ long cpu = sysconf (_SC_CPU_VERSION); switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; + puts ("hppa2.0"); break; #endif - default: puts ("hppa1.0"); break; - } + default: puts ("hppa1.0"); break; + } exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; - esac - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; + esac + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo unknown-hitachi-hiuxwe2 - exit 0 ;; + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo unknown-hitachi-hiuxwe2 + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; + echo hppa1.1-hp-bsd + exit 0 ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; + echo hppa1.0-hp-bsd + exit 0 ;; *9??*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; + echo hppa1.0-hp-mpeix + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; + echo hppa1.1-hp-osf + exit 0 ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; + echo hppa1.0-hp-osf + exit 0 ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; + echo hppa1.1-hp-lites + exit 0 ;; hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd + echo c1-convex-bsd exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd + echo c34-convex-bsd exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd + echo c38-convex-bsd exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd + echo c4-convex-bsd exit 0 ;; CRAY*X-MP:*:*:*) - echo xmp-cray-unicos + echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} - exit 0 ;; + echo ymp-cray-unicos${UNAME_RELEASE} + exit 0 ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - exit 0 ;; + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY-2:*:*:*) - echo cray2-cray-unicos + echo cray2-cray-unicos exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix - exit 0 ;; + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; + echo powerpcle-unknown-cygwin + exit 0 ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux + exit 0 ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnuaout - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; mips:Linux:*:*) - cat >$dummy.c <$dummy.c < /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -776,12 +780,12 @@ return 0; } EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - ;; + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + ;; ppc:Linux:*:*) - # Determine Lib Version - cat >$dummy.c <$dummy.c < #if defined(__GLIBC__) extern char __libc_version[]; @@ -799,128 +803,128 @@ return 0; } EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then LIBC="libc1" ; fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} - exit 0 ;; + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then LIBC="libc1" ; fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 ;; alpha:Linux:*:*) - cat <$dummy.s - .data - \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - .text - .globl main - .align 4 - .ent main - main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main + cat <$dummy.s + .data + \$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + .text + .globl main + .align 4 + .ent main + main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) UNAME_MACHINE="alpha" ;; - 1-0) UNAME_MACHINE="alphaev5" ;; - 1-1) UNAME_MACHINE="alphaev56" ;; - 1-101) UNAME_MACHINE="alphapca56" ;; - 2-303) UNAME_MACHINE="alphaev6" ;; - 2-307) UNAME_MACHINE="alphaev67" ;; - esac - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + LIBC="" + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; + 1-0) UNAME_MACHINE="alphaev5" ;; + 1-1) UNAME_MACHINE="alphaev56" ;; + 1-101) UNAME_MACHINE="alphapca56" ;; + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) UNAME_MACHINE="alphaev67" ;; + esac + objdump --private-headers $dummy | \ + grep ld.so.1 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + echo hppa64-unknown-linux-gnu + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i?86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - ld_supported_emulations=`cd /; ld --help 2>&1 \ - | sed -ne '/supported emulations:/!d - s/[ ][ ]*/ /g - s/.*supported emulations: *// - s/ .*// - p'` + echo x86_64-unknown-linux-gnu + exit 0 ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + ld_supported_emulations=`cd /; ld --help 2>&1 \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` case "$ld_supported_emulations" in - i?86linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 - ;; - elf_i?86) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - i?86coff) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 - ;; - esac - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >$dummy.c <$dummy.c < #ifdef __cplusplus #include /* for printf() prototype */ - int main (int argc, char *argv[]) { + int main (int argc, char *argv[]) { #else - int main (argc, argv) int argc; char *argv[]; { + int main (argc, argv) int argc; char *argv[]; { #endif #ifdef __ELF__ # ifdef __GLIBC__ @@ -938,237 +942,237 @@ return 0; } EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions # are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) - echo i386-sequent-sysv4 - exit 0 ;; - i?86:UNIX_SV:4.2MP:2.*) + i*86:DYNIX/ptx:4*:*) + echo i386-sequent-sysv4 + exit 0 ;; + i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. + # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i?86:*:5:7*) + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i*86:*:5:7*) # Fixed at (any) Pentium or better UNAME_MACHINE=i586 if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi - exit 0 ;; - i?86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - i?86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi + exit 0 ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) - # Left here for compatibility: + # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + echo i386-pc-msdosdjgpp exit 0 ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; + echo i386-pc-mach3 + exit 0 ;; paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; + echo i860-intel-osf1 + exit 0 ;; i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit 0 ;; mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-sysv4 + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; + echo mips-sni-sysv4 + exit 0 ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; + echo mips-sni-sysv4 + exit 0 ;; *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; + echo mips-sony-newsos6 + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then - UNAME_MACHINE=pc - fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx - exit 0 ;; + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; + echo i386-pc-qnx + exit 0 ;; NSR-[KW]:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; + echo mips-compaq-nonstopux + exit 0 ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; + echo bs2000-siemens-sysv + exit 0 ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - i?86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; + echo pdp10-unknown-tops10 + exit 0 ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; + echo pdp10-unknown-tenex + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; + echo pdp10-dec-tops20 + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; + echo pdp10-xkl-tops20 + exit 0 ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; + echo pdp10-unknown-tops20 + exit 0 ;; *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; + echo pdp10-unknown-its + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1192,7 +1196,7 @@ #ifdef NEWSOS4 "4" #else - "" + "" #endif ); exit (0); #endif @@ -1250,10 +1254,10 @@ uname(&un); if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); + printf ("i386-sequent-ptx2\n"); exit (0); } if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); + printf ("i386-sequent-ptx1\n"); exit (0); } printf ("i386-sequent-ptx\n"); exit (0); @@ -1301,23 +1305,23 @@ then case `getsysinfo -f cpu_type` in c1*) - echo c1-convex-bsd - exit 0 ;; + echo c1-convex-bsd + exit 0 ;; c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; c34*) - echo c34-convex-bsd - exit 0 ;; + echo c34-convex-bsd + exit 0 ;; c38*) - echo c38-convex-bsd - exit 0 ;; + echo c38-convex-bsd + exit 0 ;; c4*) - echo c4-convex-bsd - exit 0 ;; + echo c4-convex-bsd + exit 0 ;; esac fi @@ -1366,3 +1370,4 @@ # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: + diff -urN gnupg-1.0.5/scripts/config.sub gnupg-1.0.6/scripts/config.sub --- gnupg-1.0.5/scripts/config.sub Mon Mar 12 19:53:30 2001 +++ gnupg-1.0.6/scripts/config.sub Sun May 6 12:47:21 2001 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-02-16' +timestamp='2001-04-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -46,9 +46,9 @@ # The goal of this file is to map all the various variations of a given # machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. me=`echo "$0" | sed -e 's,.*/,,'` @@ -89,7 +89,7 @@ echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - - ) # Use stdin as input. + - ) # Use stdin as input. break ;; -* ) echo "$me: invalid option $1$help" @@ -134,844 +134,850 @@ ### recognize some manufacturers as not being operating systems, so we ### can provide default operating systems below. case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i[234567]86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ + | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ + | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | hppa64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp10 | pdp11 \ + | mips16 | mips64 | mipsel | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ + | v850 | c4x \ + | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ + | pj | pjl | h8500) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ + | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ + | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ + | xmp-* | ymp-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ + | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ + | clipper-* | orion-* \ + | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ + | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ + | [cjt]90-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ + | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | ymp) + basic_machine=ymp-cray + os=-unicos + ;; + cray2) + basic_machine=cray2-cray + os=-unicos + ;; + [cjt]90) + basic_machine=${basic_machine}-cray + os=-unicos + ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34567]86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i[34567]86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i[34567]86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i[34567]86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon) - basic_machine=i686-pc - ;; - pentiumii | pentium2) - basic_machine=i686-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sparclite-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=t3e-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5 | k5 | k6 | nexgen) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon) + basic_machine=i686-pc + ;; + pentiumii | pentium2) + basic_machine=i686-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) basic_machine=f301-fujitsu ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xmp) - basic_machine=xmp-cray - os=-unicos - ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xmp) + basic_machine=xmp-cray + os=-unicos + ;; xps | xps100) - basic_machine=xps100-honeywell - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; + basic_machine=xps100-honeywell + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4) - basic_machine=sh-unknown - ;; - sparc | sparcv9) - basic_machine=sparc-sun - ;; + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh3 | sh4) + basic_machine=sh-unknown + ;; + sparc | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; esac # Decode manufacturer-specific aliases for certain operating systems. @@ -981,150 +987,150 @@ case $os in # First match some system type aliases # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i[34567]86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto*) - os=-nto-qnx - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; + os=-mint + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; esac else @@ -1139,144 +1145,144 @@ # system, and we'll never get to this point. case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - pdp10-*) - os=-tops20 - ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + pdp10-*) + os=-tops20 + ;; pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; *-gould) - os=-sysv - ;; + os=-sysv + ;; *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; + os=-bsd + ;; + *-encore) + os=-bsd + ;; *-sgi) - os=-irix - ;; + os=-irix + ;; *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; esac fi @@ -1284,65 +1290,65 @@ # manufacturer. We pick the logical manufacturer. vendor=unknown case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -vxsim* | -vxworks*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; esac echo $basic_machine$os @@ -1354,3 +1360,4 @@ # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: + diff -urN gnupg-1.0.5/scripts/gnupg.spec gnupg-1.0.6/scripts/gnupg.spec --- gnupg-1.0.5/scripts/gnupg.spec Sun Apr 29 16:39:53 2001 +++ gnupg-1.0.6/scripts/gnupg.spec Tue May 29 08:59:20 2001 @@ -2,7 +2,7 @@ # gnupg -- gnu privacy guard # This is a template. The dist target uses it to create the real file. # -%define version 1.0.5 +%define version 1.0.6 %define name gnupg Summary: GNU Utility for data encryption and digital signatures Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati. diff -urN gnupg-1.0.5/tools/Makefile.in gnupg-1.0.6/tools/Makefile.in --- gnupg-1.0.5/tools/Makefile.in Sun Apr 29 16:39:11 2001 +++ gnupg-1.0.6/tools/Makefile.in Tue May 29 08:58:26 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ EXTRA_DIST = lspgpot ring-a-party mail-signed-keys INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl diff -urN gnupg-1.0.5/util/ChangeLog gnupg-1.0.6/util/ChangeLog --- gnupg-1.0.5/util/ChangeLog Fri Apr 27 15:01:56 2001 +++ gnupg-1.0.6/util/ChangeLog Fri May 25 08:46:25 2001 @@ -1,3 +1,17 @@ +2001-05-25 Werner Koch + + * ttyio.c (do_get): Fixed a serious format string bug. Thanks to + fish stiqz. + +2001-05-23 Werner Koch + + * secmem.c (EPERM): Try to work around a Slackware problem. + +2001-05-05 Werner Koch + + * http.c (http_start_data): Flush before writing. + (http_wait_response): No need to flush here. + 2001-04-27 Werner Koch * memory.c (out_of_core): Print an explanation on reasons why diff -urN gnupg-1.0.5/util/Makefile.in gnupg-1.0.6/util/Makefile.in --- gnupg-1.0.5/util/Makefile.in Sun Apr 29 16:38:59 2001 +++ gnupg-1.0.6/util/Makefile.in Tue May 29 08:58:13 2001 @@ -83,6 +83,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -96,15 +97,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +124,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl diff -urN gnupg-1.0.5/util/http.c gnupg-1.0.6/util/http.c --- gnupg-1.0.5/util/http.c Sun Apr 29 15:28:03 2001 +++ gnupg-1.0.6/util/http.c Sat May 5 16:40:41 2001 @@ -149,6 +149,7 @@ void http_start_data( HTTP_HD hd ) { + iobuf_flush ( hd->fp_write ); if( !hd->in_data ) { write_server (hd->sock, "\r\n", 2); hd->in_data = 1; @@ -162,7 +163,6 @@ int rc; http_start_data( hd ); /* make sure that we are in the data */ - iobuf_flush( hd->fp_write ); #if 0 hd->sock = dup( hd->sock ); diff -urN gnupg-1.0.5/util/secmem.c gnupg-1.0.6/util/secmem.c --- gnupg-1.0.5/util/secmem.c Sun Apr 29 15:30:42 2001 +++ gnupg-1.0.6/util/secmem.c Wed May 23 15:27:20 2001 @@ -42,6 +42,11 @@ #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif +/* It seems that Slackware 7.1 does not know about EPERM */ +#if !defined(EPERM) && defined(ENOMEM) + #define EPERM ENOMEM +#endif + #define DEFAULT_POOLSIZE 16384 diff -urN gnupg-1.0.5/util/ttyio.c gnupg-1.0.6/util/ttyio.c --- gnupg-1.0.5/util/ttyio.c Sat Apr 28 18:22:27 2001 +++ gnupg-1.0.6/util/ttyio.c Fri May 25 08:45:34 2001 @@ -308,7 +308,7 @@ init_ttyfp(); last_prompt_len = 0; - tty_printf( prompt ); + tty_printf( "%s", prompt ); buf = m_alloc(n=50); i = 0; diff -urN gnupg-1.0.5/zlib/Makefile.in gnupg-1.0.6/zlib/Makefile.in --- gnupg-1.0.5/zlib/Makefile.in Sun Apr 29 16:38:55 2001 +++ gnupg-1.0.6/zlib/Makefile.in Tue May 29 08:58:09 2001 @@ -70,6 +70,7 @@ target_triplet = @target@ AS = @AS@ AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -83,15 +84,15 @@ DYNLINK_MOD_CFLAGS = @DYNLINK_MOD_CFLAGS@ FAQPROG = @FAQPROG@ GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIBICONV = @LIBICONV@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -110,7 +111,6 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ZLIBS = @ZLIBS@ -l = @l@ EXTRA_DIST = README algorithm.doc ChangeLog -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.5 (GNU/Linux) Comment: For info see http://www.gnupg.org iD8DBQE7E1p9aLeriVdUjc0RAr0NAJ4tJd0753xTwoFMACC9DV+1omUo3ACdHD7O YP4CsRoFWw5rt2JDHuHx1dE= =ZQqf -----END PGP SIGNATURE-----