summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2013-09-21 18:45:27 -0600
committerEduardo Chappa <chappa@washington.edu>2013-09-21 18:45:27 -0600
commitc5bb25b1320af6cda4cc62ea9e15fbb03ee92026 (patch)
tree7edbf4ad7c92cac182112201293da92dff56d7bf
parent48e1f5018f9d324c1ebce3ea627db50fe03a2134 (diff)
downloadalpine-c5bb25b1320af6cda4cc62ea9e15fbb03ee92026.tar.xz
* Version 2.11.6
* Add /tls1, /tls1_1, /tls1_2 and /dtls1 to the definition of a server to use different ways to connect using ssl, for example {server.com/tls1} will attempt to connect to server.com at the ssl imap port (port 993) and establish a connection using TLSv1. These flags can be used in conjunction with the /ssl flag, the ssl flag is redundant. Conversely, however, the /ssl flag does not imply any of these flags; the /ssl flag means SSLv3 or, if not available, SSLv2 in the SSL port. * WebAlpine: add _GNU_SOURCE to make pubcookie build. * On my way to make 'make dist' and 'make distcheck' actually work.
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rw-r--r--VERSION2
-rw-r--r--autom4te.cache/output.027
-rw-r--r--autom4te.cache/output.227
-rw-r--r--autom4te.cache/requests294
-rw-r--r--autom4te.cache/traces.0658
-rw-r--r--autom4te.cache/traces.2196
-rwxr-xr-xconfigure27
-rw-r--r--configure.ac5
-rw-r--r--imap/src/c-client/imap4r1.c3
-rw-r--r--imap/src/c-client/mail.c15
-rw-r--r--imap/src/c-client/mail.h20
-rw-r--r--imap/src/c-client/nntp.c3
-rw-r--r--imap/src/c-client/pop3.c3
-rw-r--r--imap/src/c-client/smtp.c3
-rw-r--r--m4/Makefile.am2
-rw-r--r--m4/Makefile.in2
-rw-r--r--pith/pine.hlp9
-rw-r--r--po/Makevars2
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/alpine.pot5531
-rw-r--r--regex/Makefile.in1
-rw-r--r--web/src/cgi.tcl-1.10/cgi.tcl2659
-rw-r--r--web/src/cgi.tcl-1.10/version2
-rwxr-xr-xweb/src/pubcookie/wp_gssapi_proxybin0 -> 28756 bytes
-rwxr-xr-xweb/src/pubcookie/wp_tclshbin0 -> 22279 bytes
-rwxr-xr-xweb/src/pubcookie/wp_uidmapperbin0 -> 34929 bytes
-rw-r--r--web/src/pubcookie/wp_uidmapper.c5
-rwxr-xr-xweb/src/pubcookie/wp_umcbin0 -> 21337 bytes
30 files changed, 6293 insertions, 3208 deletions
diff --git a/Makefile.am b/Makefile.am
index 6ae813a9..74e12be5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@
#
# ========================================================================
-EXTRA_DIST = config.rpath VERSION README LICENSE
+EXTRA_DIST = config.rpath VERSION README LICENSE
SUBDIRS = m4 po $(REGEX_BUILD) pith pico alpine $(WEB_PUBCOOKIE_BUILD) $(WEB_BUILD)
diff --git a/Makefile.in b/Makefile.in
index b49df208..602b42b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -308,7 +308,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = config.rpath VERSION README LICENSE
+EXTRA_DIST = config.rpath VERSION README LICENSE
SUBDIRS = m4 po $(REGEX_BUILD) pith pico alpine $(WEB_PUBCOOKIE_BUILD) $(WEB_BUILD)
BUILT_SOURCES = c-client.d c-client $(WEB_PUBCOOKIE_LINK)
CLEANFILES = c-client
diff --git a/VERSION b/VERSION
index 497a78c5..03b7bd69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.5
+2.11.6
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 9edfe27e..13522c88 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,7 +1,7 @@
@%:@! /bin/sh
-@%:@ From configure.ac Rev:3 by chappa@washington.edu.
+@%:@ From configure.ac Rev:4 by chappa@washington.edu.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.5.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.6.
@%:@
@%:@ Report bugs to <chappa@washington.edu>.
@%:@
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.5'
-PACKAGE_STRING='alpine 2.11.5'
+PACKAGE_VERSION='2.11.6'
+PACKAGE_STRING='alpine 2.11.6'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alpine 2.11.5 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1664,7 +1664,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.11.5:";;
+ short | recursive ) echo "Configuration of alpine 2.11.6:";;
esac
cat <<\_ACEOF
@@ -1948,7 +1948,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.11.5
+alpine configure 2.11.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alpine $as_me 2.11.5, which was
+It was created by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3375,7 +3375,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.11.5'
+ VERSION='2.11.6'
cat >>confdefs.h <<_ACEOF
@@ -17374,6 +17374,7 @@ if test "x$alpine_REGEX" = "xyes" ; then
CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
REGEX_BUILD=regex
+ REGEX_MAKEFILE="$REGEX_BUILD/Makefile"
fi
if test "x$with_pthread" != "xno" ; then
@@ -19632,7 +19633,7 @@ fi
-ac_config_files="$ac_config_files m4/Makefile po/Makefile.in regex/Makefile pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
+ac_config_files="$ac_config_files m4/Makefile po/Makefile.in $REGEX_MAKEFILE pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20160,7 +20161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alpine $as_me 2.11.5, which was
+This file was extended by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20226,7 +20227,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alpine config.status 2.11.5
+alpine config.status 2.11.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20623,7 +20624,7 @@ do
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "regex/Makefile") CONFIG_FILES="$CONFIG_FILES regex/Makefile" ;;
+ "$REGEX_MAKEFILE") CONFIG_FILES="$CONFIG_FILES $REGEX_MAKEFILE" ;;
"pith/osdep/Makefile") CONFIG_FILES="$CONFIG_FILES pith/osdep/Makefile" ;;
"pith/charconv/Makefile") CONFIG_FILES="$CONFIG_FILES pith/charconv/Makefile" ;;
"pith/Makefile") CONFIG_FILES="$CONFIG_FILES pith/Makefile" ;;
diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2
index 9edfe27e..13522c88 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -1,7 +1,7 @@
@%:@! /bin/sh
-@%:@ From configure.ac Rev:3 by chappa@washington.edu.
+@%:@ From configure.ac Rev:4 by chappa@washington.edu.
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.5.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.6.
@%:@
@%:@ Report bugs to <chappa@washington.edu>.
@%:@
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.5'
-PACKAGE_STRING='alpine 2.11.5'
+PACKAGE_VERSION='2.11.6'
+PACKAGE_STRING='alpine 2.11.6'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alpine 2.11.5 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1664,7 +1664,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.11.5:";;
+ short | recursive ) echo "Configuration of alpine 2.11.6:";;
esac
cat <<\_ACEOF
@@ -1948,7 +1948,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.11.5
+alpine configure 2.11.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alpine $as_me 2.11.5, which was
+It was created by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3375,7 +3375,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.11.5'
+ VERSION='2.11.6'
cat >>confdefs.h <<_ACEOF
@@ -17374,6 +17374,7 @@ if test "x$alpine_REGEX" = "xyes" ; then
CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
REGEX_BUILD=regex
+ REGEX_MAKEFILE="$REGEX_BUILD/Makefile"
fi
if test "x$with_pthread" != "xno" ; then
@@ -19632,7 +19633,7 @@ fi
-ac_config_files="$ac_config_files m4/Makefile po/Makefile.in regex/Makefile pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
+ac_config_files="$ac_config_files m4/Makefile po/Makefile.in $REGEX_MAKEFILE pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20160,7 +20161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alpine $as_me 2.11.5, which was
+This file was extended by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20226,7 +20227,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alpine config.status 2.11.5
+alpine config.status 2.11.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20623,7 +20624,7 @@ do
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "regex/Makefile") CONFIG_FILES="$CONFIG_FILES regex/Makefile" ;;
+ "$REGEX_MAKEFILE") CONFIG_FILES="$CONFIG_FILES $REGEX_MAKEFILE" ;;
"pith/osdep/Makefile") CONFIG_FILES="$CONFIG_FILES pith/osdep/Makefile" ;;
"pith/charconv/Makefile") CONFIG_FILES="$CONFIG_FILES pith/charconv/Makefile" ;;
"pith/Makefile") CONFIG_FILES="$CONFIG_FILES pith/Makefile" ;;
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 0e62d8f3..8240fc7f 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -814,6 +814,300 @@
'_AM_COND_ELSE' => 1,
'AC_SUBST_TRACE' => 1
}
+ ], 'Autom4te::Request' ),
+ bless( [
+ '5',
+ 1,
+ [
+ '/usr/local/share/autoconf'
+ ],
+ [
+ '/usr/local/share/autoconf/autoconf/autoconf.m4f',
+ '/usr/share/aclocal/argz.m4',
+ '/usr/share/aclocal/libtool.m4',
+ '/usr/share/aclocal/ltdl.m4',
+ '/usr/share/aclocal/ltoptions.m4',
+ '/usr/share/aclocal/ltsugar.m4',
+ '/usr/share/aclocal/ltversion.m4',
+ '/usr/share/aclocal/lt~obsolete.m4',
+ '/usr/share/aclocal-1.11/amversion.m4',
+ '/usr/share/aclocal-1.11/auxdir.m4',
+ '/usr/share/aclocal-1.11/cond.m4',
+ '/usr/share/aclocal-1.11/depend.m4',
+ '/usr/share/aclocal-1.11/depout.m4',
+ '/usr/share/aclocal-1.11/init.m4',
+ '/usr/share/aclocal-1.11/install-sh.m4',
+ '/usr/share/aclocal-1.11/lead-dot.m4',
+ '/usr/share/aclocal-1.11/maintainer.m4',
+ '/usr/share/aclocal-1.11/make.m4',
+ '/usr/share/aclocal-1.11/missing.m4',
+ '/usr/share/aclocal-1.11/mkdirp.m4',
+ '/usr/share/aclocal-1.11/options.m4',
+ '/usr/share/aclocal-1.11/runlog.m4',
+ '/usr/share/aclocal-1.11/sanity.m4',
+ '/usr/share/aclocal-1.11/silent.m4',
+ '/usr/share/aclocal-1.11/strip.m4',
+ '/usr/share/aclocal-1.11/substnot.m4',
+ '/usr/share/aclocal-1.11/tar.m4',
+ 'm4/acx_pthread.m4',
+ 'm4/codeset.m4',
+ 'm4/gettext.m4',
+ 'm4/glibc2.m4',
+ 'm4/glibc21.m4',
+ 'm4/iconv.m4',
+ 'm4/intdiv0.m4',
+ 'm4/intl.m4',
+ 'm4/intmax.m4',
+ 'm4/inttypes-pri.m4',
+ 'm4/inttypes_h.m4',
+ 'm4/lcmessage.m4',
+ 'm4/lib-ld.m4',
+ 'm4/lib-link.m4',
+ 'm4/lib-prefix.m4',
+ 'm4/lock.m4',
+ 'm4/longdouble.m4',
+ 'm4/longlong.m4',
+ 'm4/nls.m4',
+ 'm4/po.m4',
+ 'm4/printf-posix.m4',
+ 'm4/progtest.m4',
+ 'm4/size_max.m4',
+ 'm4/stdint_h.m4',
+ 'm4/uintmax_t.m4',
+ 'm4/ulonglong.m4',
+ 'm4/visibility.m4',
+ 'm4/wchar_t.m4',
+ 'm4/wint_t.m4',
+ 'm4/xsize.m4',
+ 'configure.ac'
+ ],
+ {
+ 'AM_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ 'AC_DEFUN' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'gl_AC_HEADER_STDINT_H' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'gl_SIZE_MAX' => 1,
+ 'AC_LIB_RPATH' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'gt_PRINTF_POSIX' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ 'gl_LOCK_EARLY' => 1,
+ '_m4_warn' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'gl_FUNC_ARGZ' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ 'LT_LIB_M' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ 'gl_AC_TYPE_LONG_LONG' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'AC_LIB_ARG_WITH' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ '_LTDL_SETUP' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ 'AC_LIB_LTDL' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ 'AM_PROG_LD' => 1,
+ 'gt_INTL_MACOSX' => 1,
+ 'AM_ICONV_LINK' => 1,
+ 'AC_LIB_PREPARE_MULTILIB' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'AC_PROG_LD' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'gt_TYPE_INTMAX_T' => 1,
+ 'AC_LIB_HAVE_LINKFLAGS' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AM_ICONV_LINKFLAGS_BODY' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ 'gl_LOCK_EARLY_BODY' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
+ 'AC_LIB_PREFIX' => 1,
+ 'gt_TYPE_LONGDOUBLE' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ 'LT_PROG_RC' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AC_' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ 'gt_INTDIV0' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AM_ICONV' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'include' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
+ 'AC_LIB_APPENDTOVAR' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'AC_ENABLE_SHARED' => 1,
+ 'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+ 'AC_LIB_WITH_FINAL_PREFIX' => 1,
+ 'gt_TYPE_WINT_T' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'AM_LANGINFO_CODESET' => 1,
+ 'gl_AC_HEADER_INTTYPES_H' => 1,
+ 'LTDL_INIT' => 1,
+ 'LTVERSION_VERSION' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'm4_include' => 1,
+ 'AC_PROG_EGREP' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ 'PINEVAR' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
+ 'gl_PREREQ_LOCK' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'gt_INTTYPES_PRI' => 1,
+ 'AM_PO_SUBDIRS' => 1,
+ 'AC_LIB_PREPARE_PREFIX' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ 'LT_LANG' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ 'AC_TYPE_LONG_LONG_INT' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'LT_OUTPUT' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'AM_GNU_GETTEXT_VERSION' => 1,
+ 'AC_LIB_PROG_LD_GNU' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'AM_NLS' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'AC_WITH_LTDL' => 1,
+ 'gt_INTL_SUBDIR_CORE' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ 'LT_INIT' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ 'AM_DEP_TRACK' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_PATH_PROG_WITH_TEST' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ 'gt_CHECK_DECL' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ 'AC_LIB_LINKFLAGS' => 1,
+ 'AM_PROG_NM' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'AM_GNU_GETTEXT_NEED' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'jm_MAINTAINER_MODE' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'gl_XSIZE' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ 'LT_PROG_GCJ' => 1,
+ 'gt_GLIBC2' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'gl_AC_TYPE_UINTMAX_T' => 1,
+ 'gl_LOCK' => 1,
+ 'AM_INTL_SUBDIR' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'gl_VISIBILITY' => 1,
+ 'gt_TYPE_WCHAR_T' => 1,
+ 'PINEVAR_UNQUOTED' => 1,
+ 'LT_PATH_NM' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ '_LT_AC_LOCK' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'gl_GLIBC21' => 1,
+ 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_RUN_LOG' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ 'AC_LIB_LINKFLAGS_BODY' => 1,
+ 'LT_PATH_LD' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ 'ACX_PTHREAD' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'gt_LC_MESSAGES' => 1,
+ 'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'gl_LOCK_BODY' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AC_LIB_PROG_LD' => 1
+ }
], 'Autom4te::Request' )
);
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index 4529ece4..42e3dda0 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -1011,477 +1011,477 @@ m4trace:configure.ac:1488: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
m4trace:configure.ac:1488: -1- m4_pattern_allow([^HAVE_REGEX_H$])
m4trace:configure.ac:1488: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
@%:@undef HAVE_REGEX_H])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- AC_SUBST([acx_pthread_config])
-m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([acx_pthread_config])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- AC_SUBST([acx_pthread_config])
+m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([acx_pthread_config])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1497: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1498: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@%:@undef PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_LIBS])
-m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CFLAGS])
-m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1497: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1497: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1497: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1497: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1497: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
+m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CFLAGS])
+m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1498: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1498: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1498: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1498: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1498: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
@%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1497: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1497: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
+m4trace:configure.ac:1498: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1498: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
@%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1515: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
-m4trace:configure.ac:1515: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1515: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
+configure.ac:1498: the top level])
+m4trace:configure.ac:1516: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
+m4trace:configure.ac:1516: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1516: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
@%:@undef HAVE_NANOSLEEP])
-m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1525: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:1526: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:1526: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1526: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
@%:@undef STDC_HEADERS])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
*/
@%:@undef HAVE_DIRENT_H])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
*/
@%:@undef HAVE_SYS_NDIR_H])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
*/
@%:@undef HAVE_SYS_DIR_H])
-m4trace:configure.ac:1526: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
+m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
@%:@undef HAVE_NDIR_H])
-m4trace:configure.ac:1527: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
-m4trace:configure.ac:1527: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
+m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1528: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
@%:@undef STAT_MACROS_BROKEN])
-m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1528: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+m4trace:configure.ac:1529: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
+m4trace:configure.ac:1529: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
@%:@undef HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1529: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1529: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1530: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
@%:@undef TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1530: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1530: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
+m4trace:configure.ac:1531: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
+m4trace:configure.ac:1531: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1531: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
@%:@undef GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1532: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:1533: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
@%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:1532: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
-m4trace:configure.ac:1532: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+m4trace:configure.ac:1533: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
+m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
@%:@undef HAVE_ERRNO_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
@%:@undef HAVE_CTYPE_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
@%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
@%:@undef HAVE_SIGNAL_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
@%:@undef HAVE_SETJMP_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
@%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
@%:@undef HAVE_SYS_PARAM_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
@%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
@%:@undef HAVE_SYS_UIO_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
@%:@undef HAVE_SYS_UN_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
@%:@undef HAVE_LIMITS_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
@%:@undef HAVE_WCHAR_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
@%:@undef HAVE_SYS_POLL_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
@%:@undef HAVE_STROPTS_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
@%:@undef HAVE_NETDB_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
@%:@undef HAVE_SYSLOG_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
@%:@undef HAVE_SYS_SYSLOG_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
@%:@undef HAVE_LOCALE_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
@%:@undef HAVE_LANGINFO_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
@%:@undef HAVE_UTIME_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
@%:@undef HAVE_SYS_UTIME_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
@%:@undef HAVE_PTHREAD_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
@%:@undef HAVE_PWD_H])
-m4trace:configure.ac:1534: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
+m4trace:configure.ac:1535: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
@%:@undef HAVE_ASSERT_H])
-m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
+m4trace:configure.ac:1562: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
+m4trace:configure.ac:1562: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1562: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
@%:@undef HAS_TERMIOS])
-m4trace:configure.ac:1560: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
-m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1560: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
+m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
@%:@undef HAS_TERMIO])
-m4trace:configure.ac:1560: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
-m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1560: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
+m4trace:configure.ac:1561: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1561: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
@%:@undef HAS_SGTTY])
-m4trace:configure.ac:1577: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+m4trace:configure.ac:1578: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1586: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
+m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
+m4trace:configure.ac:1587: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1587: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
@%:@undef RETSIGTYPE])
-m4trace:configure.ac:1589: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:1589: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1589: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1590: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:1590: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1590: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
@%:@undef size_t])
-m4trace:configure.ac:1590: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1590: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1591: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
@%:@undef mode_t])
-m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1591: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1592: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
@%:@undef pid_t])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
@%:@undef uid_t])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
@%:@undef gid_t])
-m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1593: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
+m4trace:configure.ac:1594: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
+m4trace:configure.ac:1594: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1594: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
@%:@undef TM_IN_SYS_TIME])
-m4trace:configure.ac:1595: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
-m4trace:configure.ac:1595: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1595: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
+m4trace:configure.ac:1596: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
+m4trace:configure.ac:1596: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1596: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
@%:@undef HAVE_UNION_WAIT])
-m4trace:configure.ac:1597: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
@%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1597: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
@%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1597: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1598: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
@%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1597: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1598: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
@%:@undef SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1597: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1598: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1598: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
@%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1614: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
-m4trace:configure.ac:1614: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1614: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
+m4trace:configure.ac:1615: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
+m4trace:configure.ac:1615: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1615: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
@%:@undef UINT16])
-m4trace:configure.ac:1616: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
@%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1616: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
@%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1616: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1617: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
@%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1616: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1617: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
@%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1616: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1616: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
+m4trace:configure.ac:1617: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1617: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
@%:@undef SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1633: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
-m4trace:configure.ac:1633: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1633: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
+m4trace:configure.ac:1634: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
+m4trace:configure.ac:1634: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1634: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
@%:@undef UINT32])
-m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1651: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
+m4trace:configure.ac:1652: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
+m4trace:configure.ac:1652: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1652: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
@%:@undef qsort_t])
-m4trace:configure.ac:1655: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
+m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
@%:@undef HAVE_SYS_SELECT_H])
-m4trace:configure.ac:1655: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
@%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1655: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
+m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
@%:@undef SELECT_TYPE_ARG1])
-m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1655: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
+m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
@%:@undef SELECT_TYPE_ARG234])
-m4trace:configure.ac:1655: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1655: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
+m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1656: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
@%:@undef SELECT_TYPE_ARG5])
-m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
+m4trace:configure.ac:1658: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
+m4trace:configure.ac:1658: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
*/
@%:@undef HAVE_STRCOLL])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
@%:@undef HAVE_VFORK_H])
-m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
+m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
@%:@undef HAVE_FORK])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
@%:@undef HAVE_VFORK])
-m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
+m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
@%:@undef HAVE_WORKING_VFORK])
-m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([vfork])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
+m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([vfork])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1662: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
@%:@undef vfork])
-m4trace:configure.ac:1661: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1661: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
+m4trace:configure.ac:1662: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
@%:@undef HAVE_WORKING_FORK])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
@%:@undef HAVE_STRCHR])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
@%:@undef HAVE_MEMCPY])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
@%:@undef HAVE_STRTOL])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
@%:@undef HAVE_STRTOUL])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
@%:@undef HAVE_SELECT])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
@%:@undef HAVE_POLL])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
@%:@undef HAVE_QSORT])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
@%:@undef HAVE_GETUID])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
@%:@undef HAVE_GETPWUID])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
@%:@undef HAVE_GETPWNAM])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
@%:@undef HAVE_GETTIMEOFDAY])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
@%:@undef HAVE_TMPFILE])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
@%:@undef HAVE_UNAME])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
@%:@undef HAVE_RENAME])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
@%:@undef HAVE_READ])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
@%:@undef HAVE_SIGNAL])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
@%:@undef HAVE_SETJMP])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
@%:@undef HAVE_CHOWN])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
@%:@undef HAVE_WAIT4])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
@%:@undef HAVE_WAITPID])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
@%:@undef HAVE_WAIT])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
@%:@undef HAVE_SRANDOM])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
@%:@undef HAVE_POPEN])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
@%:@undef HAVE_PCLOSE])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
@%:@undef HAVE_FSYNC])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
@%:@undef HAVE_TRUNCATE])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
@%:@undef HAVE_LISTEN])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
@%:@undef HAVE_WCWIDTH])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
@%:@undef HAVE_MBSTOWCS])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
@%:@undef HAVE_WCRTOMB])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
@%:@undef HAVE_PUTENV])
-m4trace:configure.ac:1662: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+m4trace:configure.ac:1663: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
@%:@undef HAVE_SETENV])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
@%:@undef HAVE_SIGACTION])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
@%:@undef HAVE_SIGEMPTYSET])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
@%:@undef HAVE_SIGADDSET])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
@%:@undef HAVE_SIGPROCMASK])
-m4trace:configure.ac:1708: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
-m4trace:configure.ac:1708: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
+m4trace:configure.ac:1709: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
+m4trace:configure.ac:1709: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1709: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
@%:@undef POSIX_SIGNALS])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
@%:@undef HAVE_SIGSET])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
+m4trace:configure.ac:1709: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
@%:@undef HAVE_SIGRELSE])
-m4trace:configure.ac:1708: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
-m4trace:configure.ac:1708: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1708: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
+m4trace:configure.ac:1709: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
+m4trace:configure.ac:1709: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1709: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
@%:@undef SYSV_SIGNALS])
-m4trace:configure.ac:1719: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
-m4trace:configure.ac:1719: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1719: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
+m4trace:configure.ac:1720: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
+m4trace:configure.ac:1720: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1720: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
@%:@undef HAVE_SYSLOG])
-m4trace:configure.ac:1741: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
-m4trace:configure.ac:1741: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1741: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
+m4trace:configure.ac:1742: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
+m4trace:configure.ac:1742: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1742: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
@%:@undef SYSTYPE])
-m4trace:configure.ac:1742: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
-m4trace:configure.ac:1742: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1742: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
+m4trace:configure.ac:1743: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
+m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1743: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
@%:@undef C_FILESEP])
-m4trace:configure.ac:1743: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1743: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
+m4trace:configure.ac:1744: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1744: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
@%:@undef S_FILESEP])
-m4trace:configure.ac:1744: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1744: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
+m4trace:configure.ac:1745: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1745: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
@%:@undef MAILDIR])
-m4trace:configure.ac:1745: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1745: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
+m4trace:configure.ac:1746: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
+m4trace:configure.ac:1746: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1746: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
@%:@undef MODE_READONLY])
-m4trace:configure.ac:1748: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
-m4trace:configure.ac:1748: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
-m4trace:configure.ac:1748: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1749: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
-m4trace:configure.ac:1749: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
-m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1768: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
-m4trace:configure.ac:1768: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1768: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
+m4trace:configure.ac:1749: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
+m4trace:configure.ac:1749: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1750: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
+m4trace:configure.ac:1750: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
+m4trace:configure.ac:1750: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1769: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
+m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1769: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
@%:@undef SMIME])
-m4trace:configure.ac:1769: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
-m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1769: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
+m4trace:configure.ac:1770: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
+m4trace:configure.ac:1770: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1770: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
@%:@undef SMIME_SSLCERTS])
-m4trace:configure.ac:1821: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
-m4trace:configure.ac:1821: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
-m4trace:configure.ac:1821: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1832: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
-m4trace:configure.ac:1832: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
-m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1836: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
-m4trace:configure.ac:1836: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
-m4trace:configure.ac:1836: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1839: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
-m4trace:configure.ac:1839: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
-m4trace:configure.ac:1839: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1859: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
-m4trace:configure.ac:1859: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1859: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
+m4trace:configure.ac:1822: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
+m4trace:configure.ac:1822: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
+m4trace:configure.ac:1822: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1833: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
+m4trace:configure.ac:1833: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
+m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1837: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
+m4trace:configure.ac:1837: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
+m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1840: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
+m4trace:configure.ac:1840: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
+m4trace:configure.ac:1840: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1860: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
+m4trace:configure.ac:1860: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1860: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
@%:@undef PUBCOOKIE])
-m4trace:configure.ac:1866: -1- AC_SUBST([REGEX_BUILD])
-m4trace:configure.ac:1866: -1- AC_SUBST_TRACE([REGEX_BUILD])
-m4trace:configure.ac:1866: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1868: -1- AC_SUBST([WEB_BUILD])
-m4trace:configure.ac:1868: -1- AC_SUBST_TRACE([WEB_BUILD])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1869: -1- AC_SUBST([WEB_BINDIR])
-m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([WEB_BINDIR])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1870: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1870: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1871: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1871: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1872: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1872: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1874: -1- AC_SUBST([AM_CFLAGS])
-m4trace:configure.ac:1874: -1- AC_SUBST_TRACE([AM_CFLAGS])
-m4trace:configure.ac:1874: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1875: -1- AC_SUBST([AM_LDFLAGS])
-m4trace:configure.ac:1875: -1- AC_SUBST_TRACE([AM_LDFLAGS])
-m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1877: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in regex/Makefile \
+m4trace:configure.ac:1867: -1- AC_SUBST([REGEX_BUILD])
+m4trace:configure.ac:1867: -1- AC_SUBST_TRACE([REGEX_BUILD])
+m4trace:configure.ac:1867: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1869: -1- AC_SUBST([WEB_BUILD])
+m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([WEB_BUILD])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1870: -1- AC_SUBST([WEB_BINDIR])
+m4trace:configure.ac:1870: -1- AC_SUBST_TRACE([WEB_BINDIR])
+m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1871: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1871: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1872: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1872: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1873: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1873: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1875: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:1875: -1- AC_SUBST_TRACE([AM_CFLAGS])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1876: -1- AC_SUBST([AM_LDFLAGS])
+m4trace:configure.ac:1876: -1- AC_SUBST_TRACE([AM_LDFLAGS])
+m4trace:configure.ac:1876: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1878: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in $REGEX_MAKEFILE \
pith/osdep/Makefile pith/charconv/Makefile pith/Makefile \
pico/osdep/Makefile pico/Makefile \
alpine/osdep/Makefile alpine/Makefile \
web/src/Makefile web/src/pubcookie/Makefile \
web/src/alpined.d/Makefile \
Makefile])
-m4trace:configure.ac:1884: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1884: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1884: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1884: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1884: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1884: -2- m4_include([VERSION])
-m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1884: -2- m4_include([VERSION])
-m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:1884: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:1884: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:1885: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1885: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1885: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1885: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1885: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1885: -2- m4_include([VERSION])
+m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1885: -2- m4_include([VERSION])
+m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:1885: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:1885: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2
index d0839532..f94b38d0 100644
--- a/autom4te.cache/traces.2
+++ b/autom4te.cache/traces.2
@@ -5479,7 +5479,7 @@ m4trace:configure.ac:1442: -1- _m4_warn([cross], [cannot check for file existenc
../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
configure.ac:1442: the top level])
m4trace:configure.ac:1488: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1497: -1- ACX_PTHREAD([
+m4trace:configure.ac:1498: -1- ACX_PTHREAD([
AC_MSG_RESULT([yes])
case "$target" in
*openbsd*)
@@ -5494,111 +5494,111 @@ m4trace:configure.ac:1497: -1- ACX_PTHREAD([
], [
AC_MSG_RESULT([no])
])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1497: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1497: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1497: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1498: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1498: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1498: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1497: the top level])
-m4trace:configure.ac:1515: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1527: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1529: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1530: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1532: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1560: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1577: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+configure.ac:1498: the top level])
+m4trace:configure.ac:1516: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1526: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1529: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1530: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1531: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1533: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1562: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1561: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1578: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1589: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1591: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1593: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1595: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1597: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1614: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1616: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1633: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1651: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1655: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1661: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1708: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1708: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1719: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1741: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1742: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1745: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1748: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1768: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1821: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1836: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1839: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1859: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1866: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1874: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1884: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1884: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1884: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1884: -2- m4_include([VERSION])
-m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1884: -2- m4_include([VERSION])
-m4trace:configure.ac:1884: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1884: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:1884: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:1884: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:1587: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1590: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1592: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1594: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1596: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1598: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1615: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1617: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1634: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1652: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1656: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1658: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1662: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1709: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1709: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1720: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1742: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1746: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1749: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1750: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1769: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1770: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1822: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1837: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1840: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1860: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1867: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1870: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1871: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1872: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1873: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1875: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1876: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1885: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1885: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1885: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1885: -2- m4_include([VERSION])
+m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1885: -2- m4_include([VERSION])
+m4trace:configure.ac:1885: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1885: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:1885: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:1885: -1- _LT_PROG_LTMAIN
diff --git a/configure b/configure
index 68588a18..3f9d5929 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Rev:3 by chappa@washington.edu.
+# From configure.ac Rev:4 by chappa@washington.edu.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.11.5.
+# Generated by GNU Autoconf 2.69 for alpine 2.11.6.
#
# Report bugs to <chappa@washington.edu>.
#
@@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='alpine'
PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.5'
-PACKAGE_STRING='alpine 2.11.5'
+PACKAGE_VERSION='2.11.6'
+PACKAGE_STRING='alpine 2.11.6'
PACKAGE_BUGREPORT='chappa@washington.edu'
PACKAGE_URL=''
@@ -1594,7 +1594,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures alpine 2.11.5 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1664,7 +1664,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of alpine 2.11.5:";;
+ short | recursive ) echo "Configuration of alpine 2.11.6:";;
esac
cat <<\_ACEOF
@@ -1948,7 +1948,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-alpine configure 2.11.5
+alpine configure 2.11.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by alpine $as_me 2.11.5, which was
+It was created by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3375,7 +3375,7 @@ fi
# Define the identity of the package.
PACKAGE='alpine'
- VERSION='2.11.5'
+ VERSION='2.11.6'
cat >>confdefs.h <<_ACEOF
@@ -17374,6 +17374,7 @@ if test "x$alpine_REGEX" = "xyes" ; then
CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
REGEX_BUILD=regex
+ REGEX_MAKEFILE="$REGEX_BUILD/Makefile"
fi
if test "x$with_pthread" != "xno" ; then
@@ -19632,7 +19633,7 @@ fi
-ac_config_files="$ac_config_files m4/Makefile po/Makefile.in regex/Makefile pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
+ac_config_files="$ac_config_files m4/Makefile po/Makefile.in $REGEX_MAKEFILE pith/osdep/Makefile pith/charconv/Makefile pith/Makefile pico/osdep/Makefile pico/Makefile alpine/osdep/Makefile alpine/Makefile web/src/Makefile web/src/pubcookie/Makefile web/src/alpined.d/Makefile Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20160,7 +20161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by alpine $as_me 2.11.5, which was
+This file was extended by alpine $as_me 2.11.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20226,7 +20227,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-alpine config.status 2.11.5
+alpine config.status 2.11.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20623,7 +20624,7 @@ do
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "regex/Makefile") CONFIG_FILES="$CONFIG_FILES regex/Makefile" ;;
+ "$REGEX_MAKEFILE") CONFIG_FILES="$CONFIG_FILES $REGEX_MAKEFILE" ;;
"pith/osdep/Makefile") CONFIG_FILES="$CONFIG_FILES pith/osdep/Makefile" ;;
"pith/charconv/Makefile") CONFIG_FILES="$CONFIG_FILES pith/charconv/Makefile" ;;
"pith/Makefile") CONFIG_FILES="$CONFIG_FILES pith/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index f00f8472..b47cb081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl */
AC_PREREQ([2.69])
-AC_REVISION([Rev:3 by chappa@washington.edu])
+AC_REVISION([Rev:4 by chappa@washington.edu])
dnl Alpine Version Number is in $srcdir/VERSION
AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu])
@@ -1490,6 +1490,7 @@ if test "x$alpine_REGEX" = "xyes" ; then
CPPFLAGS="$CPPFLAGS -I${top_builddir}/regex"
LDFLAGS="$LDFLAGS -L${top_builddir}/regex -lregex"
REGEX_BUILD=regex
+ REGEX_MAKEFILE="$REGEX_BUILD/Makefile"
fi
if test "x$with_pthread" != "xno" ; then
@@ -1874,7 +1875,7 @@ AC_SUBST([WEB_PUBCOOKIE_LINK])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_LDFLAGS])
-AC_CONFIG_FILES([m4/Makefile po/Makefile.in regex/Makefile \
+AC_CONFIG_FILES([m4/Makefile po/Makefile.in $REGEX_MAKEFILE \
pith/osdep/Makefile pith/charconv/Makefile pith/Makefile \
pico/osdep/Makefile pico/Makefile \
alpine/osdep/Makefile alpine/Makefile \
diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c
index 1409b37d..8c1d326a 100644
--- a/imap/src/c-client/imap4r1.c
+++ b/imap/src/c-client/imap4r1.c
@@ -885,8 +885,7 @@ MAILSTREAM *imap_open (MAILSTREAM *stream)
LOCAL->netstream->dtb = ssld;
if (!(LOCAL->netstream->stream =
(*stls) (LOCAL->netstream->stream,mb.host,
- (mb.tlssslv23 ? NIL : NET_TLSCLIENT) |
- (mb.novalidate ? NET_NOVALIDATECERT : NIL)))) {
+ SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT : NIL)))) {
/* drat, drop this connection */
if (LOCAL->netstream) net_close (LOCAL->netstream);
LOCAL->netstream = NIL;
diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c
index d80a01f6..9b5526b4 100644
--- a/imap/src/c-client/mail.c
+++ b/imap/src/c-client/mail.c
@@ -814,6 +814,18 @@ long mail_valid_net_parse_work (char *name,NETMBX *mb,char *service)
mb->trysslflag = mailssldriver? T : NIL;
else if (mailssldriver && !compare_cstring (s,"ssl") && !mb->tlsflag)
mb->sslflag = mb->notlsflag = T;
+ else if (!compare_cstring(s, "tls1")
+ && !mb->tls1_1flag && !mb->tls1_2flag && !mb->dtls1flag)
+ mb->sslflag = mb->notlsflag = mb->tls1_1flag = T;
+ else if (!compare_cstring(s, "tls1_1")
+ && !mb->tls1flag && !mb->tls1_2flag && !mb->dtls1flag)
+ mb->sslflag = mb->notlsflag = mb->tls1_1flag = T;
+ else if (!compare_cstring(s, "tls1_2")
+ && !mb->tls1flag && !mb->tls1_1flag && !mb->dtls1flag)
+ mb->sslflag = mb->notlsflag = mb->tls1_2flag = T;
+ else if (!compare_cstring(s, "dtls1")
+ && !mb->tls1flag && !mb->tls1_1flag && !mb->tls1_2flag)
+ mb->sslflag = mb->notlsflag = mb->dtls1flag = T;
else if (mailssldriver && !compare_cstring (s,"novalidate-cert"))
mb->novalidate = T;
/* hack for compatibility with the past */
@@ -1222,6 +1234,9 @@ MAILSTREAM *mail_open (MAILSTREAM *stream,char *name,long options)
if (mb.tlsflag) strcat (tmp,"/tls");
if (mb.notlsflag) strcat (tmp,"/notls");
if (mb.sslflag) strcat (tmp,"/ssl");
+ if (mb.tls1_1flag) strcat (tmp,"/tls1_1");
+ if (mb.tls1_2flag) strcat (tmp,"/tls1_2");
+ if (mb.dtls1flag) strcat (tmp,"/dtls1");
if (mb.trysslflag) strcat (tmp,"/tryssl");
if (mb.novalidate) strcat (tmp,"/novalidate-cert");
strcat (tmp,"/pop3/loser}");
diff --git a/imap/src/c-client/mail.h b/imap/src/c-client/mail.h
index 174993e1..2c3f92d2 100644
--- a/imap/src/c-client/mail.h
+++ b/imap/src/c-client/mail.h
@@ -428,6 +428,14 @@
#define NET_TLSCLIENT ((unsigned long) 0x10000000)
/* try SSL mode */
#define NET_TRYSSL ((unsigned long) 0x8000000)
+ /* try TLS1 mode */
+#define NET_TRYTLS1 ((unsigned long) 0x1000000)
+ /* try TLS1_1 mode */
+#define NET_TRYTLS1_1 ((unsigned long) 0x2000000)
+ /* try TLS1_2 mode */
+#define NET_TRYTLS1_2 ((unsigned long) 0x4000000)
+ /* try DTLS1 mode */
+#define NET_TRYDTLS1 ((unsigned long) 0x8000000)
/* Close options */
@@ -654,6 +662,10 @@ typedef struct net_mailbox {
unsigned int dbgflag : 1; /* debug flag */
unsigned int secflag : 1; /* secure flag */
unsigned int sslflag : 1; /* SSL driver flag */
+ unsigned int tls1flag : 1; /* Use TLSv1 */
+ unsigned int tls1_1flag : 1; /* Use TLSv1.1 */
+ unsigned int tls1_2flag : 1; /* Use TLSV1.2 */
+ unsigned int dtls1flag : 1; /* Use DTLSv1 */
unsigned int trysslflag : 1; /* try SSL driver first flag */
unsigned int novalidate : 1; /* don't validate certificates */
unsigned int tlsflag : 1; /* TLS flag */
@@ -663,6 +675,14 @@ typedef struct net_mailbox {
unsigned int loser : 1; /* server is a loser */
unsigned int tlssslv23 : 1; /* force SSLv23 client method over TLS */
} NETMBX;
+
+#define SSL_METHOD(M) ((M).tlssslv23 ? NIL \
+ : (M).tls1flag ? NET_TRYTLS1 \
+ : (M).tls1_1flag ? NET_TRYTLS1_1 \
+ : (M).tls1_2flag ? NET_TRYTLS1_2 \
+ : (M).dtls1flag ? NET_TRYDTLS1 \
+ : NET_TLSCLIENT)
+
/* Item in an address list */
diff --git a/imap/src/c-client/nntp.c b/imap/src/c-client/nntp.c
index fe90edba..8a9d00a8 100644
--- a/imap/src/c-client/nntp.c
+++ b/imap/src/c-client/nntp.c
@@ -1719,8 +1719,7 @@ SENDSTREAM *nntp_open_full (NETDRIVER *dv,char **hostlist,char *service,
/* negotiate TLS */
if (stream->netstream->stream =
(*stls) (stream->netstream->stream,mb.host,
- (mb.tlssslv23 ? NIL : NET_TLSCLIENT) |
- (mb.novalidate ? NET_NOVALIDATECERT:NIL)))
+ SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))
extok = nntp_extensions (stream,(mb.secflag ? AU_SECURE : NIL) |
(mb.authuser[0] ? AU_AUTHUSER : NIL));
else {
diff --git a/imap/src/c-client/pop3.c b/imap/src/c-client/pop3.c
index 58a9ceb6..5065fed2 100644
--- a/imap/src/c-client/pop3.c
+++ b/imap/src/c-client/pop3.c
@@ -567,8 +567,7 @@ long pop3_auth (MAILSTREAM *stream,NETMBX *mb,char *pwd,char *usr)
LOCAL->netstream->dtb = ssld;
if (!(LOCAL->netstream->stream =
(*stls) (LOCAL->netstream->stream,mb->host,
- (mb->tlssslv23 ? NIL : NET_TLSCLIENT) |
- (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) {
+ SSL_METHOD(*mb) | (mb->novalidate ? NET_NOVALIDATECERT : NIL)))) {
/* drat, drop this connection */
if (LOCAL->netstream) net_close (LOCAL->netstream);
LOCAL->netstream= NIL;
diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c
index 1b748b71..1cba3357 100644
--- a/imap/src/c-client/smtp.c
+++ b/imap/src/c-client/smtp.c
@@ -210,8 +210,7 @@ SENDSTREAM *smtp_open_full (NETDRIVER *dv,char **hostlist,char *service,
/* TLS started, negotiate it */
if (!(stream->netstream->stream = (*stls)
(stream->netstream->stream,mb.host,
- (mb.tlssslv23 ? NIL : NET_TLSCLIENT) |
- (mb.novalidate ? NET_NOVALIDATECERT:NIL)))){
+ SSL_METHOD(mb) | (mb.novalidate ? NET_NOVALIDATECERT:NIL)))){
/* TLS negotiation failed after STARTTLS */
sprintf (tmp,"Unable to negotiate TLS with this server: %.80s",
mb.host);
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 6914e980..24e44998 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = glibc2.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = glibc2.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 374f9e7c..1ad45857 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -216,7 +216,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = glibc2.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = glibc2.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
all: all-am
.SUFFIXES:
diff --git a/pith/pine.hlp b/pith/pine.hlp
index da5e7dea..964389f2 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -179,6 +179,14 @@ Additions include:
<P>
<UL>
+ <LI> Add /tls1, /tls1_1, /tls1_2 and /dtls1 to the definition of a
+ server to use different ways to connect using ssl, for example
+ {server.com/tls1} will attempt to connect to server.com at the ssl
+ imap port (port 993) and establish a connection using TLSv1. These
+ flags can be used in conjunction with the /ssl flag, the ssl flag
+ is redundant. Conversely, however, the /ssl flag does not imply any
+ of these flags; the /ssl flag means SSLv3 or, if not available,
+ SSLv2 in the SSL port.
<LI> Experimental: Write the content-type of a message in lowercase, as some
non-compliant servers do not understand uppercase content-type, such as
those of GMX.de.
@@ -194,6 +202,7 @@ Additions include:
<P>
Bugs that have been addressed include:
<UL>
+ <LI> WebAlpine: add _GNU_SOURCE to make pubcookie build.
<LI> Save command did not warn of existence of a message with a deleted
attachment in an aggregate save, unless cursor was positioned on a message
with a deleted attachment. Reported by Florian Herzig.
diff --git a/po/Makevars b/po/Makevars
index 5715806f..eb844b11 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER = University of Washington
+COPYRIGHT_HOLDER = Eduardo Chappa
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c549d00e..63294490 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -90,7 +90,6 @@ pico/buffer.c
pico/mswinver.c
pico/word.c
pico/bind.c
-pico/msmem.c
pico/file.c
pico/random.c
pico/main.c
diff --git a/po/alpine.pot b/po/alpine.pot
index d3b38e66..f85d114d 100644
--- a/po/alpine.pot
+++ b/po/alpine.pot
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR University of Washington
+# Copyright (C) YEAR Eduardo Chappa
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: chappa@gmx.com\n"
-"POT-Creation-Date: 2008-06-03 12:14-0700\n"
+"POT-Creation-Date: 2013-09-18 23:49-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,40 +21,40 @@ msgstr ""
#. TRANSLATORS: command names, editURL means user gets to edit a URL if they
#. want, editApp is edit application where they edit the application used to
#. view a URL
-#: alpine/osdep/print.c:108 alpine/mailview.c:724 alpine/send.c:1288
-#: alpine/send.c:4511 alpine/radio.c:49 alpine/mailcmd.c:804
-#: alpine/mailcmd.c:977 alpine/mailcmd.c:1090 alpine/reply.c:845
-#: alpine/reply.c:977 pico/display.c:1357 pico/display.c:1386
-#: pico/display.c:1403
+#: alpine/osdep/print.c:109 alpine/mailview.c:728 alpine/send.c:1290
+#: alpine/send.c:4530 alpine/radio.c:50 alpine/mailcmd.c:806
+#: alpine/mailcmd.c:979 alpine/mailcmd.c:1092 alpine/reply.c:846
+#: alpine/reply.c:941 alpine/reply.c:1011 pico/display.c:1358
+#: pico/display.c:1387 pico/display.c:1404
msgid "Yes"
msgstr ""
-#: alpine/osdep/print.c:109 alpine/mailview.c:725 alpine/keymenu.c:555
-#: alpine/keymenu.c:570 alpine/takeaddr.c:580 alpine/takeaddr.c:602
-#: alpine/send.c:1293 alpine/send.c:4516 alpine/send.c:5156 alpine/radio.c:50
-#: alpine/mailcmd.c:805 alpine/mailcmd.c:978 alpine/mailcmd.c:1091
-#: alpine/titlebar.c:535 alpine/reply.c:978 pico/display.c:1361
-#: pico/display.c:1386 pico/display.c:1410
+#: alpine/osdep/print.c:110 alpine/mailview.c:729 alpine/keymenu.c:555
+#: alpine/keymenu.c:570 alpine/takeaddr.c:581 alpine/takeaddr.c:603
+#: alpine/send.c:1295 alpine/send.c:4535 alpine/send.c:5175 alpine/radio.c:51
+#: alpine/mailcmd.c:807 alpine/mailcmd.c:980 alpine/mailcmd.c:1093
+#: alpine/titlebar.c:539 alpine/reply.c:945 alpine/reply.c:1012
+#: pico/display.c:1362 pico/display.c:1387 pico/display.c:1411
msgid "No"
msgstr ""
#. TRANSLATORS: go to Previous Printer in list
-#: alpine/osdep/print.c:111
+#: alpine/osdep/print.c:112
msgid "Prev Printer"
msgstr ""
-#: alpine/osdep/print.c:112
+#: alpine/osdep/print.c:113
msgid "Next Printer"
msgstr ""
#. TRANSLATORS: use Custom Print command
-#: alpine/osdep/print.c:115
+#: alpine/osdep/print.c:116
msgid "CustomPrint"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. For example, Print configuration using printer three.
-#: alpine/osdep/print.c:199
+#: alpine/osdep/print.c:200
#, c-format
msgid "Print %s using \"%s\" ? "
msgstr ""
@@ -61,589 +62,589 @@ msgstr ""
#. TRANSLATORS: This is a list of errors printed when something goes wrong
#. early on with the argument list. Be careful not to change literal
#. option names mentioned in the strings.
-#: alpine/arg.c:53
+#: alpine/arg.c:54
msgid "missing argument for option \"-pinerc\" (use - for standard out)"
msgstr ""
-#: alpine/arg.c:55
+#: alpine/arg.c:56
msgid "missing argument for option \"-aux\""
msgstr ""
-#: alpine/arg.c:58
+#: alpine/arg.c:59
msgid "missing argument for option \"-passfile\""
msgstr ""
-#: alpine/arg.c:59
+#: alpine/arg.c:60
msgid "argument to \"-passfile\" should be fully-qualified"
msgstr ""
-#: alpine/arg.c:61
+#: alpine/arg.c:62
msgid "missing argument for option \"-sort\""
msgstr ""
-#: alpine/arg.c:62
+#: alpine/arg.c:63
#, c-format
msgid "missing argument for flag \"%c\""
msgstr ""
-#: alpine/arg.c:63
+#: alpine/arg.c:64
#, c-format
msgid "Non numeric argument for flag \"%c\""
msgstr ""
-#: alpine/arg.c:64
+#: alpine/arg.c:65
#, c-format
msgid "Non numeric argument for \"%s\""
msgstr ""
-#: alpine/arg.c:65
+#: alpine/arg.c:66
msgid "missing URL for \"-url\""
msgstr ""
-#: alpine/arg.c:66
+#: alpine/arg.c:67
#, c-format
msgid "missing attachment for \"%s\""
msgstr ""
-#: alpine/arg.c:67
+#: alpine/arg.c:68
#, c-format
msgid "conflicting action: \"%s\""
msgstr ""
#. TRANSLATORS: An error message about an unknown flag (option)
#. on the command line
-#: alpine/arg.c:68 pico/main.c:84 pico/pilot.c:51
+#: alpine/arg.c:69 pico/main.c:85 pico/pilot.c:52
#, c-format
msgid "unknown flag \"%c\""
msgstr ""
-#: alpine/arg.c:69
+#: alpine/arg.c:70
#, c-format
msgid "-I argument \"%s\": %s"
msgstr ""
-#: alpine/arg.c:70
+#: alpine/arg.c:71
#, c-format
msgid "-d argument \"%s\": %s"
msgstr ""
-#: alpine/arg.c:72
+#: alpine/arg.c:73
msgid ""
"missing argument for option \"-copy_pinerc\"\n"
"Usage: pine -copy_pinerc <local_pinerc> <remote_pinerc>"
msgstr ""
-#: alpine/arg.c:73
+#: alpine/arg.c:74
msgid ""
"missing argument for option \"-copy_abook\"\n"
"Usage: pine -copy_abook <local_abook> <remote_abook>"
msgstr ""
-#: alpine/arg.c:77
+#: alpine/arg.c:78
msgid "Possible Starting Arguments for Alpine program:"
msgstr ""
-#: alpine/arg.c:79
+#: alpine/arg.c:80
msgid " Argument\tMeaning"
msgstr ""
-#: alpine/arg.c:80
+#: alpine/arg.c:81
msgid " <addrs>...\tGo directly into composer sending to given address"
msgstr ""
-#: alpine/arg.c:81
+#: alpine/arg.c:82
msgid "\t\tList multiple addresses with a single space between them."
msgstr ""
-#: alpine/arg.c:82
+#: alpine/arg.c:83
msgid "\t\tStandard input redirection is allowed with addresses."
msgstr ""
-#: alpine/arg.c:83
+#: alpine/arg.c:84
msgid "\t\tNote: Places addresses in the \"To\" field only."
msgstr ""
-#: alpine/arg.c:84
+#: alpine/arg.c:85
msgid " -attach <file>\tGo directly into composer with given file"
msgstr ""
-#: alpine/arg.c:85
+#: alpine/arg.c:86
msgid " -attachlist <file-list>"
msgstr ""
-#: alpine/arg.c:86
+#: alpine/arg.c:87
msgid " -attach_and_delete <file>"
msgstr ""
-#: alpine/arg.c:87
+#: alpine/arg.c:88
msgid "\t\tGo to composer, attach file, delete when finished"
msgstr ""
-#: alpine/arg.c:88
+#: alpine/arg.c:89
msgid "\t\tNote: Attach options can't be used if -f, -F"
msgstr ""
-#: alpine/arg.c:89
+#: alpine/arg.c:90
msgid "\t\tadded to Attachment list. Attachlist must be the last"
msgstr ""
-#: alpine/arg.c:90
+#: alpine/arg.c:91
msgid "\t\toption on the command line"
msgstr ""
-#: alpine/arg.c:91
+#: alpine/arg.c:92
msgid " -bail\t\tExit if pinerc file doesn't already exist"
msgstr ""
-#: alpine/arg.c:93
+#: alpine/arg.c:94
msgid " -d n\t\tDebug - set debug level to 'n', or use the following:"
msgstr ""
-#: alpine/arg.c:94
+#: alpine/arg.c:95
msgid ""
" -d keywords...\tflush,timestamp,imap=0..4,tcp,numfiles=0..31,verbose=0..9"
msgstr ""
-#: alpine/arg.c:96
+#: alpine/arg.c:97
msgid " -f <folder>\tFolder - give folder name to open"
msgstr ""
-#: alpine/arg.c:97
+#: alpine/arg.c:98
msgid " -c <number>\tContext - which context to apply to -f arg"
msgstr ""
-#: alpine/arg.c:98
+#: alpine/arg.c:99
msgid " -F <file>\tFile - give file name to open and page through and"
msgstr ""
-#: alpine/arg.c:99
+#: alpine/arg.c:100
msgid "\t\tforward as email."
msgstr ""
-#: alpine/arg.c:100
+#: alpine/arg.c:101
msgid " -h \t\tHelp - give this list of options"
msgstr ""
-#: alpine/arg.c:101
+#: alpine/arg.c:102
msgid " -k \t\tKeys - Force use of function keys"
msgstr ""
-#: alpine/arg.c:102
+#: alpine/arg.c:103
msgid " -z \t\tSuspend - allow use of ^Z suspension"
msgstr ""
-#: alpine/arg.c:103
+#: alpine/arg.c:104
msgid " -r \t\tRestricted - can only send mail to oneself"
msgstr ""
-#: alpine/arg.c:104
+#: alpine/arg.c:105
msgid " -sort <sort>\tSort - Specify sort order of folder:"
msgstr ""
-#: alpine/arg.c:105
+#: alpine/arg.c:106
msgid "\t\t\tarrival, subject, threaded, orderedsubject, date,"
msgstr ""
-#: alpine/arg.c:106
+#: alpine/arg.c:107
msgid "\t\t\tfrom, size, score, to, cc, /reverse"
msgstr ""
-#: alpine/arg.c:107
+#: alpine/arg.c:108
msgid " -i\t\tIndex - Go directly to index, bypassing main menu"
msgstr ""
-#: alpine/arg.c:108
+#: alpine/arg.c:109
msgid " -I <keystroke_list> Initial keystrokes to be executed"
msgstr ""
-#: alpine/arg.c:109
+#: alpine/arg.c:110
msgid " -n <number>\tEntry in index to begin on"
msgstr ""
-#: alpine/arg.c:110
+#: alpine/arg.c:111
msgid " -o \t\tReadOnly - Open first folder read-only"
msgstr ""
-#: alpine/arg.c:111
+#: alpine/arg.c:112
msgid " -conf\t\tConfiguration - Print out fresh global configuration. The"
msgstr ""
-#: alpine/arg.c:112
+#: alpine/arg.c:113
msgid "\t\tvalues of your global configuration affect all Alpine users"
msgstr ""
-#: alpine/arg.c:113
+#: alpine/arg.c:114
msgid "\t\ton your system unless they have overridden the values in their"
msgstr ""
-#: alpine/arg.c:114
+#: alpine/arg.c:115
msgid "\t\tpinerc files."
msgstr ""
-#: alpine/arg.c:115
+#: alpine/arg.c:116
msgid ""
" -pinerc <file>\tConfiguration - Put fresh pinerc configuration in <file>"
msgstr ""
-#: alpine/arg.c:116
+#: alpine/arg.c:117
msgid " -p <pinerc>\tUse alternate .pinerc file"
msgstr ""
-#: alpine/arg.c:118
+#: alpine/arg.c:119
msgid " -P <pine.conf>\tUse alternate pine.conf file"
msgstr ""
-#: alpine/arg.c:120
+#: alpine/arg.c:121
msgid " -aux <aux_files_dir>\tUse this with remote pinerc"
msgstr ""
-#: alpine/arg.c:121
+#: alpine/arg.c:122
msgid " -P <pine.conf>\tUse pine.conf file for default settings"
msgstr ""
-#: alpine/arg.c:122
+#: alpine/arg.c:123
msgid " -nosplash \tDisable the PC-Alpine splash screen"
msgstr ""
-#: alpine/arg.c:126
+#: alpine/arg.c:127
msgid " -erase_stored_passwords\tEliminate any stored passwords"
msgstr ""
-#: alpine/arg.c:130
+#: alpine/arg.c:131
msgid ""
" -passfile <fully_qualified_filename>\tSet the password file to something "
"other"
msgstr ""
-#: alpine/arg.c:131
+#: alpine/arg.c:132
msgid "\t\tthan the default"
msgstr ""
-#: alpine/arg.c:135
+#: alpine/arg.c:136
msgid ""
" -nowrite_password_cache\tRead from a password cache if there is one, but"
msgstr ""
-#: alpine/arg.c:136
+#: alpine/arg.c:137
msgid "\t\t\t\tnever offer to write a password to the cache"
msgstr ""
-#: alpine/arg.c:139
+#: alpine/arg.c:140
msgid " -x <config>\tUse configuration exceptions in <config>."
msgstr ""
-#: alpine/arg.c:140
+#: alpine/arg.c:141
msgid "\t\tExceptions are used to override your default pinerc"
msgstr ""
-#: alpine/arg.c:141
+#: alpine/arg.c:142
msgid "\t\tsettings for a particular platform, can be a local file or"
msgstr ""
-#: alpine/arg.c:142
+#: alpine/arg.c:143
msgid "\t\ta remote folder."
msgstr ""
-#: alpine/arg.c:143
+#: alpine/arg.c:144
msgid " -v \t\tVersion - show version information"
msgstr ""
-#: alpine/arg.c:144
+#: alpine/arg.c:145
msgid " -version\tVersion - show version information"
msgstr ""
-#: alpine/arg.c:145
+#: alpine/arg.c:146
msgid " -supported\tList supported options"
msgstr ""
-#: alpine/arg.c:146
+#: alpine/arg.c:147
msgid " -url <url>\tOpen the given URL"
msgstr ""
-#: alpine/arg.c:147
+#: alpine/arg.c:148
msgid "\t\tNote: Can't be used if -f, -F"
msgstr ""
-#: alpine/arg.c:148
+#: alpine/arg.c:149
msgid "\t\tStandard input redirection is not allowed with URLs."
msgstr ""
-#: alpine/arg.c:149
+#: alpine/arg.c:150
msgid "\t\tFor mailto URLs, 'body='text should be used in place of"
msgstr ""
-#: alpine/arg.c:150
+#: alpine/arg.c:151
msgid "\t\tinput redirection."
msgstr ""
-#: alpine/arg.c:151
+#: alpine/arg.c:152
msgid ""
" -copy_pinerc <local_pinerc> <remote_pinerc> copy local pinerc to remote"
msgstr ""
-#: alpine/arg.c:152
+#: alpine/arg.c:153
msgid ""
" -copy_abook <local_abook> <remote_abook> copy local addressbook to "
"remote"
msgstr ""
-#: alpine/arg.c:153
+#: alpine/arg.c:154
msgid " -convert_sigs -p <pinerc> convert signatures to literal signatures"
msgstr ""
-#: alpine/arg.c:155
+#: alpine/arg.c:156
msgid " -install \tPrompt for some basic setup information"
msgstr ""
-#: alpine/arg.c:156
+#: alpine/arg.c:157
msgid " -uninstall \tRemove traces of Alpine from Windows system settings"
msgstr ""
-#: alpine/arg.c:157
+#: alpine/arg.c:158
msgid " -registry <cmd>\tWhere cmd is set,noset,clear,clearsilent,dump"
msgstr ""
-#: alpine/arg.c:506
+#: alpine/arg.c:507
msgid "Alpine related Registry values removed."
msgstr ""
-#: alpine/arg.c:510
+#: alpine/arg.c:511
msgid "Not all Alpine related Registry values could be removed"
msgstr ""
-#: alpine/arg.c:528
+#: alpine/arg.c:529
msgid "unknown registry command"
msgstr ""
-#: alpine/arg.c:817
+#: alpine/arg.c:818
msgid "May only have one of -conf and -pinerc"
msgstr ""
-#: alpine/arg.c:970
+#: alpine/arg.c:971
#, c-format
msgid "unknown debug keyword \"%s\""
msgstr ""
-#: alpine/arg.c:1020
+#: alpine/arg.c:1021
#, c-format
msgid "unknown flag \"d\", debugging not compiled in"
msgstr ""
-#: alpine/arg.c:1110
+#: alpine/arg.c:1111
msgid "Argument Error"
msgstr ""
-#: alpine/arg.c:1170
+#: alpine/arg.c:1171
#, c-format
msgid "Missing \"=\" after -%s\n"
msgstr ""
-#: alpine/arg.c:1206
+#: alpine/arg.c:1207
#, c-format
msgid "Option \"%s\" is obsolete\n"
msgstr ""
-#: alpine/arg.c:1208
+#: alpine/arg.c:1209
#, c-format
msgid "Option \"%s\" is not user settable\n"
msgstr ""
-#: alpine/mailview.c:137
+#: alpine/mailview.c:138
msgid ""
"Selectable items in text -- Use Up/Down Arrows to choose, Return to view"
msgstr ""
-#: alpine/mailview.c:139
+#: alpine/mailview.c:140
msgid "No selected item displayed -- Use PrevPage to bring choice into view"
msgstr ""
-#: alpine/mailview.c:141
+#: alpine/mailview.c:142
msgid "No selected item displayed -- Use NextPage to bring choice into view"
msgstr ""
-#: alpine/mailview.c:247
+#: alpine/mailview.c:248
msgid "Screen too small to view message"
msgstr ""
-#: alpine/mailview.c:264
+#: alpine/mailview.c:265
msgid "No messages to read!"
msgstr ""
#. TRANSLATORS: a screen title
#. TRANSLATORS: this is a screen title
-#: alpine/mailview.c:377 alpine/adrbkcmd.c:820
+#: alpine/mailview.c:381 alpine/adrbkcmd.c:823
msgid "MESSAGE TEXT"
msgstr ""
-#: alpine/mailview.c:381
+#: alpine/mailview.c:385
msgid "HELP FOR MESSAGE TEXT VIEW"
msgstr ""
-#: alpine/mailview.c:728
+#: alpine/mailview.c:732
msgid "editURL"
msgstr ""
-#: alpine/mailview.c:729
+#: alpine/mailview.c:733
msgid "editApp"
msgstr ""
-#: alpine/mailview.c:755
+#: alpine/mailview.c:760
msgid "URL-Viewer is disabled by sys-admin"
msgstr ""
#. TRANSLATORS: a question
-#: alpine/mailview.c:760
+#: alpine/mailview.c:765
msgid "No URL-Viewer application defined. Define now"
msgstr ""
-#: alpine/mailview.c:771
+#: alpine/mailview.c:776
msgid "Web Browser: "
msgstr ""
-#: alpine/mailview.c:805
+#: alpine/mailview.c:810
#, c-format
msgid "Browser not found: %s"
msgstr ""
-#: alpine/mailview.c:874
+#: alpine/mailview.c:880
msgid "Edit URL: "
msgstr ""
-#: alpine/mailview.c:912
+#: alpine/mailview.c:918
msgid "Viewer Command: "
msgstr ""
-#: alpine/mailview.c:1538
+#: alpine/mailview.c:1451
msgid "VIEWER command completed"
msgstr ""
#. TRANSLATORS: Cannot start command : <command name>
-#: alpine/mailview.c:1543
+#: alpine/mailview.c:1456
#, c-format
msgid "Cannot start command : %s"
msgstr ""
-#: alpine/mailview.c:1551
+#: alpine/mailview.c:1464
#, c-format
msgid "\"URL-Viewer\" not defined: Can't open %s"
msgstr ""
-#: alpine/mailview.c:1874
+#: alpine/mailview.c:1788
msgid "Can't create space for composer"
msgstr ""
#. TRANSLATORS: these are errors in news group URLs
-#: alpine/mailview.c:2049
+#: alpine/mailview.c:1963
msgid "Invalid newsgroup specified"
msgstr ""
-#: alpine/mailview.c:2058
+#: alpine/mailview.c:1972
msgid "No newsgroup specified"
msgstr ""
-#: alpine/mailview.c:2061
+#: alpine/mailview.c:1975
msgid "No server specified"
msgstr ""
-#: alpine/mailview.c:2096
+#: alpine/mailview.c:2010
msgid "Couldn't find specified article number"
msgstr ""
#. TRANSLATORS: this is a warning that the file URL can cause programs to run which may
#. be a security problem. We are asking the user to confirm that they want to do this.
-#: alpine/mailview.c:2195
+#: alpine/mailview.c:2109
msgid "\"file\" URL may cause programs to be run on your system. Run anyway"
msgstr ""
-#: alpine/mailview.c:2208
+#: alpine/mailview.c:2122
msgid "No viewer for \"file\" URL. VIEWER command cancelled"
msgstr ""
-#: alpine/mailview.c:2212
+#: alpine/mailview.c:2126
msgid "VIEWER command cancelled"
msgstr ""
-#: alpine/mailview.c:2748
+#: alpine/mailview.c:2663
msgid "No help text currently available"
msgstr ""
-#: alpine/mailview.c:2803 alpine/mailview.c:3007
+#: alpine/mailview.c:2718 alpine/mailview.c:2922
#, c-format
msgid "Already at start of %s"
msgstr ""
-#: alpine/mailview.c:2826 alpine/mailview.c:2935
+#: alpine/mailview.c:2741 alpine/mailview.c:2850
#, c-format
msgid "Already at end of %s"
msgstr ""
-#: alpine/mailview.c:3042
+#: alpine/mailview.c:2957
#, c-format
msgid "Already on last item in %s"
msgstr ""
-#: alpine/mailview.c:3077
+#: alpine/mailview.c:2992
#, c-format
msgid "Already on first item in %s"
msgstr ""
-#: alpine/mailview.c:3201 alpine/confscroll.c:1258 alpine/addrbook.c:5769
+#: alpine/mailview.c:3124 alpine/confscroll.c:1266 alpine/addrbook.c:5770
msgid "Current line contains the only match"
msgstr ""
-#: alpine/mailview.c:3256 alpine/takeaddr.c:1636 alpine/confscroll.c:1273
-#: alpine/mailindx.c:3182 alpine/addrbook.c:5761 alpine/mailpart.c:782
+#: alpine/mailview.c:3179 alpine/takeaddr.c:1637 alpine/confscroll.c:1281
+#: alpine/mailindx.c:3185 alpine/addrbook.c:5762 alpine/mailpart.c:783
msgid "Word not found"
msgstr ""
-#: alpine/mailview.c:3662
+#: alpine/mailview.c:3585
msgid "First Line"
msgstr ""
-#: alpine/mailview.c:3663
+#: alpine/mailview.c:3586
msgid "Last Line"
msgstr ""
-#: alpine/mailview.c:3682 alpine/mailindx.c:2978
+#: alpine/mailview.c:3605 alpine/mailindx.c:2981
#, c-format
msgid "Word to search for [%s] : "
msgstr ""
-#: alpine/mailview.c:3715
+#: alpine/mailview.c:3638
msgid "Searched to First Line."
msgstr ""
-#: alpine/mailview.c:3721
+#: alpine/mailview.c:3644
msgid "Searched to Last Line."
msgstr ""
-#: alpine/mailview.c:5097 alpine/mailview.c:5118 alpine/adrbkcmd.c:155
-#: alpine/adrbkcmd.c:241 alpine/adrbkcmd.c:673 alpine/adrbkcmd.c:804
-#: alpine/alpine.c:2337
+#: alpine/mailview.c:5020 alpine/mailview.c:5041 alpine/adrbkcmd.c:158
+#: alpine/adrbkcmd.c:244 alpine/adrbkcmd.c:676 alpine/adrbkcmd.c:807
+#: alpine/alpine.c:2347
msgid "Error allocating space."
msgstr ""
#. TRANSLATORS: Justify is to reformat a paragraph automatically
#. TRANSLATORS: Del Char is Delete Character
-#: alpine/keymenu.c:55 alpine/keymenu.c:918 alpine/radio.c:375
-#: pico/display.c:86 pico/display.c:1359 pico/display.c:1642 pico/word.c:578
-#: pico/composer.c:134
+#: alpine/keymenu.c:56 alpine/keymenu.c:918 alpine/radio.c:376
+#: pico/display.c:87 pico/display.c:1360 pico/display.c:1643 pico/word.c:662
+#: pico/composer.c:140
msgid "Cancel"
msgstr ""
#. TRANSLATORS: go to Previous Entry
-#: alpine/keymenu.c:78
+#: alpine/keymenu.c:79
msgid "PrevEntry"
msgstr ""
#. TRANSLATORS: go to Next Entry
-#: alpine/keymenu.c:80
+#: alpine/keymenu.c:81
msgid "NextEntry"
msgstr ""
#. TRANSLATORS: Select this Entry
#. TRANSLATORS: Select something, choose something
-#: alpine/keymenu.c:104 alpine/keymenu.c:126 alpine/keymenu.c:345
+#: alpine/keymenu.c:105 alpine/keymenu.c:127 alpine/keymenu.c:345
#: alpine/keymenu.c:375 alpine/keymenu.c:404 alpine/keymenu.c:430
#: alpine/keymenu.c:462 alpine/keymenu.c:636 alpine/keymenu.c:666
#: alpine/keymenu.c:714 alpine/keymenu.c:1240 alpine/keymenu.c:1257
@@ -653,58 +654,58 @@ msgstr ""
#: alpine/keymenu.c:1697 alpine/keymenu.c:2270 alpine/keymenu.c:2302
#: alpine/keymenu.c:2319 alpine/keymenu.c:2335 alpine/keymenu.c:2353
#: alpine/keymenu.c:2382 alpine/keymenu.c:2411 alpine/keymenu.c:2502
-#: alpine/mailcmd.c:7052 alpine/folder.c:3018 alpine/roleconf.c:165
-#: alpine/addrbook.c:2451 alpine/addrbook.c:2455 alpine/addrbook.c:2460
-#: alpine/addrbook.c:2489 pico/browse.c:2203
+#: alpine/mailcmd.c:7063 alpine/folder.c:3176 alpine/roleconf.c:166
+#: alpine/addrbook.c:2452 alpine/addrbook.c:2456 alpine/addrbook.c:2461
+#: alpine/addrbook.c:2490 pico/browse.c:2204
msgid "Select"
msgstr ""
#. TRANSLATORS: Apply a command to several objects at once
-#: alpine/keymenu.c:106 alpine/keymenu.c:637 alpine/keymenu.c:715
+#: alpine/keymenu.c:107 alpine/keymenu.c:637 alpine/keymenu.c:715
msgid "Apply"
msgstr ""
#. TRANSLATORS: Select Current entry
#. TRANSLATORS: Select current item
#. TRANSLATORS: Select the current item
-#: alpine/keymenu.c:108 alpine/keymenu.c:347 alpine/keymenu.c:647
+#: alpine/keymenu.c:109 alpine/keymenu.c:347 alpine/keymenu.c:647
#: alpine/keymenu.c:725 alpine/keymenu.c:855
msgid "SelectCur"
msgstr ""
#. TRANSLATORS: Zoom refers to zooming in on a smaller set of
#. items, like with a camera zoom lense
-#: alpine/keymenu.c:111 alpine/keymenu.c:344 alpine/keymenu.c:648
+#: alpine/keymenu.c:112 alpine/keymenu.c:344 alpine/keymenu.c:648
#: alpine/keymenu.c:726
msgid "ZoomMode"
msgstr ""
-#: alpine/keymenu.c:125 alpine/keymenu.c:1332 alpine/keymenu.c:1349
+#: alpine/keymenu.c:126 alpine/keymenu.c:1332 alpine/keymenu.c:1349
#: alpine/keymenu.c:1457 alpine/keymenu.c:1489 alpine/keymenu.c:1547
-#: alpine/keymenu.c:1605 alpine/keymenu.c:1714 pico/display.c:69
-#: pico/display.c:1116
+#: alpine/keymenu.c:1605 alpine/keymenu.c:1714 pico/display.c:70
+#: pico/display.c:1117
msgid "Exit"
msgstr ""
#. TRANSLATORS: go to Previous entry
-#: alpine/keymenu.c:128 alpine/keymenu.c:1459 alpine/keymenu.c:1475
+#: alpine/keymenu.c:129 alpine/keymenu.c:1459 alpine/keymenu.c:1475
#: alpine/keymenu.c:1491 alpine/keymenu.c:1520 alpine/keymenu.c:1549
#: alpine/keymenu.c:1578 alpine/keymenu.c:1607 alpine/keymenu.c:1636
msgid "Prev"
msgstr ""
-#: alpine/keymenu.c:129 alpine/keymenu.c:1460 alpine/keymenu.c:1476
+#: alpine/keymenu.c:130 alpine/keymenu.c:1460 alpine/keymenu.c:1476
#: alpine/keymenu.c:1492 alpine/keymenu.c:1521 alpine/keymenu.c:1550
#: alpine/keymenu.c:1579 alpine/keymenu.c:1608 alpine/keymenu.c:1637
msgid "Next"
msgstr ""
#. TRANSLATORS: Abook is an abbreviation for Address Book
-#: alpine/keymenu.c:143
+#: alpine/keymenu.c:144
msgid "Abook"
msgstr ""
-#: alpine/keymenu.c:144
+#: alpine/keymenu.c:145
msgid "Update"
msgstr ""
@@ -713,114 +714,114 @@ msgstr ""
#. TRANSLATORS: compose a message to the current address
#. TRANSLATORS: Compose a message to be sent to the current address
#. book entry
-#: alpine/keymenu.c:147 alpine/keymenu.c:197 alpine/keymenu.c:1279
-#: alpine/keymenu.c:1309 alpine/addrbook.c:2601 alpine/addrbook.c:2672
+#: alpine/keymenu.c:148 alpine/keymenu.c:198 alpine/keymenu.c:1279
+#: alpine/keymenu.c:1309 alpine/addrbook.c:2602 alpine/addrbook.c:2673
msgid "ComposeTo"
msgstr ""
#. TRANSLATORS: abbreviation for Forward as Email
-#: alpine/keymenu.c:154
+#: alpine/keymenu.c:155
msgid "Fwd Email"
msgstr ""
#. TRANSLATORS: View the highlighted link, for example, a URL
-#: alpine/keymenu.c:160 alpine/keymenu.c:208
+#: alpine/keymenu.c:161 alpine/keymenu.c:209
msgid "ViewLink"
msgstr ""
#. TRANSLATORS: go to the previous link, for example, the previous URL
-#: alpine/keymenu.c:163 alpine/keymenu.c:210 alpine/keymenu.c:479
+#: alpine/keymenu.c:164 alpine/keymenu.c:211 alpine/keymenu.c:479
msgid "PrevLink"
msgstr ""
-#: alpine/keymenu.c:164 alpine/keymenu.c:211 alpine/keymenu.c:480
+#: alpine/keymenu.c:165 alpine/keymenu.c:212 alpine/keymenu.c:480
msgid "NextLink"
msgstr ""
-#: alpine/keymenu.c:177 alpine/keymenu.c:506 alpine/keymenu.c:890
+#: alpine/keymenu.c:178 alpine/keymenu.c:506 alpine/keymenu.c:890
#: alpine/keymenu.c:1302
msgid "Exit Viewer"
msgstr ""
-#: alpine/keymenu.c:186 alpine/keymenu.c:515 alpine/keymenu.c:562
+#: alpine/keymenu.c:187 alpine/keymenu.c:515 alpine/keymenu.c:562
#: alpine/keymenu.c:578 alpine/keymenu.c:755 alpine/keymenu.c:899
-#: alpine/keymenu.c:1022 alpine/takeaddr.c:65 alpine/mailcmd.c:176
-#: alpine/adrbkcmd.c:5237 alpine/adrbkcmd.c:5268
+#: alpine/keymenu.c:1022 alpine/takeaddr.c:66 alpine/mailcmd.c:177
+#: alpine/adrbkcmd.c:5242 alpine/adrbkcmd.c:5273
msgid "Save"
msgstr ""
#. TRANSLATORS: go back to the index of results instead of
#. viewing this particular entry
-#: alpine/keymenu.c:195
+#: alpine/keymenu.c:196
msgid "Results Index"
msgstr ""
-#: alpine/keymenu.c:224 alpine/folder.c:2826 alpine/addrbook.c:2585
-#: alpine/addrbook.c:2643 alpine/addrbook.c:2665 alpine/addrbook.c:2684
+#: alpine/keymenu.c:225 alpine/folder.c:2984 alpine/addrbook.c:2586
+#: alpine/addrbook.c:2644 alpine/addrbook.c:2666 alpine/addrbook.c:2685
msgid "Main Menu"
msgstr ""
#. TRANSLATORS: View this Collection of folders
#. TRANSLATORS: View this collection
-#: alpine/keymenu.c:226 alpine/keymenu.c:288 alpine/keymenu.c:305
-#: alpine/folder.c:2863 alpine/folder.c:3033
+#: alpine/keymenu.c:227 alpine/keymenu.c:289 alpine/keymenu.c:306
+#: alpine/folder.c:3021 alpine/folder.c:3191
msgid "View Cltn"
msgstr ""
#. TRANSLATORS: a command name for a particular key
-#: alpine/keymenu.c:255 alpine/keymenu.c:938 alpine/keymenu.c:1425
-#: alpine/keymenu.c:1731 alpine/addrbook.c:2366
+#: alpine/keymenu.c:256 alpine/keymenu.c:938 alpine/keymenu.c:1425
+#: alpine/keymenu.c:1731 alpine/addrbook.c:2367
msgid "Exit Setup"
msgstr ""
#. TRANSLATORS: Change is a command meaning Change some item,
#. or Edit some item to change it
-#: alpine/keymenu.c:256 alpine/keymenu.c:1426 alpine/keymenu.c:1675
+#: alpine/keymenu.c:257 alpine/keymenu.c:1426 alpine/keymenu.c:1675
#: alpine/keymenu.c:1732 alpine/keymenu.c:2286 alpine/keymenu.c:2442
-#: alpine/keymenu.c:2472 alpine/keymenu.c:2518 alpine/addrbook.c:2396
+#: alpine/keymenu.c:2472 alpine/keymenu.c:2518 alpine/addrbook.c:2397
msgid "Change"
msgstr ""
-#: alpine/keymenu.c:262
+#: alpine/keymenu.c:263
msgid "Add Cltn"
msgstr ""
#. TRANSLATORS: Shuffle refers to shuffling the order of things,
#. that is, changing the order
-#: alpine/keymenu.c:265 alpine/keymenu.c:355 alpine/keymenu.c:1436
+#: alpine/keymenu.c:266 alpine/keymenu.c:355 alpine/keymenu.c:1436
#: alpine/keymenu.c:1740 alpine/keymenu.c:1777 alpine/keymenu.c:1806
-#: alpine/addrbook.c:2392
+#: alpine/addrbook.c:2393
msgid "Shuffle"
msgstr ""
#. TRANSLATORS: Command to Exit the Select screen. This would
#. be a way to make no Selection and go back to where you
#. came from.
-#: alpine/keymenu.c:285 alpine/keymenu.c:303 alpine/keymenu.c:368
+#: alpine/keymenu.c:286 alpine/keymenu.c:304 alpine/keymenu.c:368
#: alpine/keymenu.c:397 alpine/keymenu.c:461 alpine/keymenu.c:664
-#: alpine/keymenu.c:1238 alpine/keymenu.c:1264 alpine/folder.c:2971
-#: alpine/addrbook.c:2415
+#: alpine/keymenu.c:1238 alpine/keymenu.c:1264 alpine/folder.c:3129
+#: alpine/addrbook.c:2416
msgid "ExitSelect"
msgstr ""
#. TRANSLATORS: make an addition, for example add a new folder
#. or a new entry in an address book
-#: alpine/keymenu.c:329 alpine/keymenu.c:1738 alpine/takeaddr.c:601
-#: alpine/folder.c:1220 pico/browse.c:2205
+#: alpine/keymenu.c:329 alpine/keymenu.c:1738 alpine/takeaddr.c:602
+#: alpine/folder.c:1270 pico/browse.c:2206
msgid "Add"
msgstr ""
#. TRANSLATORS: change the name of something
-#: alpine/keymenu.c:332 alpine/folder.c:5176 pico/browse.c:117
+#: alpine/keymenu.c:332 alpine/folder.c:5355 pico/browse.c:118
msgid "Rename"
msgstr ""
-#: alpine/keymenu.c:339 alpine/folder.c:2850
+#: alpine/keymenu.c:339 alpine/folder.c:3008
msgid "View Fldr"
msgstr ""
#: alpine/keymenu.c:343 alpine/keymenu.c:767 alpine/keymenu.c:813
-#: alpine/mailcmd.c:174
+#: alpine/mailcmd.c:175
msgid "Print"
msgstr ""
@@ -831,12 +832,12 @@ msgid "Import"
msgstr ""
#. TRANSLATORS: Add a new entry (this is a command)
-#: alpine/keymenu.c:406 alpine/addrbook.c:2595 alpine/addrbook.c:2653
+#: alpine/keymenu.c:406 alpine/addrbook.c:2596 alpine/addrbook.c:2654
msgid "AddNew"
msgstr ""
#. TRANSLATORS: Subscribe to a news group
-#: alpine/keymenu.c:427 alpine/folder.c:2141 alpine/folder.c:3077
+#: alpine/keymenu.c:427 alpine/folder.c:2299 alpine/folder.c:3235
msgid "Subscribe"
msgstr ""
@@ -856,6 +857,10 @@ msgstr ""
msgid "Print All"
msgstr ""
+#: alpine/keymenu.c:485 alpine/print.c:982 pith/ldap.c:1737
+msgid "Name"
+msgstr ""
+
#. TRANSLATORS: Continue means to keep going. The user is paused to read
#. something and has to tell us to continue when they are finished.
#: alpine/keymenu.c:538
@@ -866,7 +871,7 @@ msgstr ""
msgid "Yes, continue"
msgstr ""
-#: alpine/keymenu.c:554 alpine/imap.c:1523
+#: alpine/keymenu.c:554 alpine/imap.c:1573
msgid "Details"
msgstr ""
@@ -902,8 +907,12 @@ msgstr ""
msgid "Collapse/Expand"
msgstr ""
+#: alpine/keymenu.c:657 alpine/keymenu.c:733
+msgid "Quota"
+msgstr ""
+
#. TRANSLATORS: go to the Folder List
-#: alpine/keymenu.c:682 alpine/mailindx.c:136
+#: alpine/keymenu.c:682 alpine/mailindx.c:137
msgid "FldrList"
msgstr ""
@@ -923,7 +932,7 @@ msgid "NextThd"
msgstr ""
#: alpine/keymenu.c:742 alpine/keymenu.c:1272 alpine/keymenu.c:1303
-#: alpine/folder.c:882 alpine/folder.c:970 pico/browse.c:2197
+#: alpine/folder.c:893 alpine/folder.c:983 pico/browse.c:2198
msgid "View"
msgstr ""
@@ -974,7 +983,7 @@ msgstr ""
msgid "TogglePreferPlain"
msgstr ""
-#: alpine/keymenu.c:917 alpine/radio.c:287 alpine/radio.c:367
+#: alpine/keymenu.c:917 alpine/radio.c:288 alpine/radio.c:368
msgid "Help"
msgstr ""
@@ -995,7 +1004,7 @@ msgid "Newpassword"
msgstr ""
#. TRANSLATORS: Configure Alpine
-#: alpine/keymenu.c:943 alpine/adrbkcmd.c:3177
+#: alpine/keymenu.c:943 alpine/adrbkcmd.c:3182
msgid "Config"
msgstr ""
@@ -1020,7 +1029,7 @@ msgid "Rules"
msgstr ""
#. TRANSLATORS: configure directory servers
-#: alpine/keymenu.c:953 alpine/folder.c:4301
+#: alpine/keymenu.c:953 alpine/folder.c:4458
msgid "Directory"
msgstr ""
@@ -1058,7 +1067,7 @@ msgstr ""
msgid "KBLock"
msgstr ""
-#: alpine/keymenu.c:997 alpine/mailcmd.c:5892
+#: alpine/keymenu.c:997 alpine/mailcmd.c:5903
msgid "Index"
msgstr ""
@@ -1105,7 +1114,7 @@ msgstr ""
#. be a way to mark which addresses to send a message to.
#: alpine/keymenu.c:1097 alpine/keymenu.c:1553 alpine/keymenu.c:1582
#: alpine/keymenu.c:1611 alpine/keymenu.c:1640 alpine/keymenu.c:2569
-#: alpine/folder.c:3070 alpine/addrbook.c:2517 pico/browse.c:2210
+#: alpine/folder.c:3228 alpine/addrbook.c:2518 pico/browse.c:2211
msgid "Set/Unset"
msgstr ""
@@ -1131,7 +1140,7 @@ msgstr ""
#. the name of the command to go into the List mode style
#. of operating.
#: alpine/keymenu.c:1120 alpine/keymenu.c:1496 alpine/keymenu.c:1525
-#: alpine/keymenu.c:2556 alpine/addrbook.c:2526 pico/browse.c:2214
+#: alpine/keymenu.c:2556 alpine/addrbook.c:2527 pico/browse.c:2215
msgid "ListMode"
msgstr ""
@@ -1161,6 +1170,11 @@ msgstr ""
msgid "Delete Val"
msgstr ""
+#: alpine/keymenu.c:1158 alpine/keymenu.c:2455 alpine/keymenu.c:2484
+#: alpine/keymenu.c:2530
+msgid "IndxHdr"
+msgstr ""
+
#: alpine/keymenu.c:1221
msgid "Add KW"
msgstr ""
@@ -1171,8 +1185,8 @@ msgid "Exit Flags"
msgstr ""
#. TRANSLATORS: go to address book list
-#: alpine/keymenu.c:1256 alpine/keymenu.c:1271 alpine/addrbook.c:2435
-#: alpine/addrbook.c:2638
+#: alpine/keymenu.c:1256 alpine/keymenu.c:1271 alpine/addrbook.c:2436
+#: alpine/addrbook.c:2639
msgid "AddressBkList"
msgstr ""
@@ -1242,8 +1256,8 @@ msgstr ""
msgid "NextRule"
msgstr ""
-#: alpine/keymenu.c:1739 alpine/addrbook.c:2597 alpine/addrbook.c:2655
-#: pico/browse.c:114
+#: alpine/keymenu.c:1739 alpine/addrbook.c:2598 alpine/addrbook.c:2656
+#: pico/browse.c:115
msgid "Delete"
msgstr ""
@@ -1262,7 +1276,7 @@ msgstr ""
#. TRANSLATORS: go to list of folders
#: alpine/keymenu.c:1807 alpine/keymenu.c:2150 alpine/keymenu.c:2179
-#: alpine/mailcmd.c:5314
+#: alpine/mailcmd.c:5321
msgid "ToFldrs"
msgstr ""
@@ -1355,29 +1369,29 @@ msgstr ""
msgid "Transfer"
msgstr ""
-#: alpine/takeaddr.c:66 alpine/mailcmd.c:177 alpine/adrbkcmd.c:5238
-#: alpine/mailpart.c:432
+#: alpine/takeaddr.c:67 alpine/mailcmd.c:178 alpine/adrbkcmd.c:5243
+#: alpine/mailpart.c:433
msgid "Export"
msgstr ""
#. TRANSLATORS: To AddrBk is a command that takes the user to
#. the address book screen to select an entry from there.
-#: alpine/takeaddr.c:137 alpine/send.c:1097 alpine/adrbkcmd.c:845
-#: alpine/adrbkcmd.c:860
+#: alpine/takeaddr.c:138 alpine/send.c:1099 alpine/adrbkcmd.c:848
+#: alpine/adrbkcmd.c:863
msgid "To AddrBk"
msgstr ""
#. TRANSLATORS: command asks alpine to complete the name when tab is typed
#. TRANSLATORS: Complete is a verb, complete the name of a folder
-#: alpine/takeaddr.c:143 alpine/send.c:1103 alpine/mailcmd.c:2699
-#: alpine/mailcmd.c:3473 alpine/mailcmd.c:3884 alpine/mailcmd.c:5337
-#: alpine/adrbkcmd.c:4241 alpine/folder.c:3570 alpine/folder.c:3704
-#: alpine/folder.c:4812 alpine/mailpart.c:1323 alpine/mailpart.c:1732
-#: alpine/mailpart.c:1811 pico/attach.c:73 pico/file.c:157 pico/file.c:579
+#: alpine/takeaddr.c:144 alpine/send.c:1105 alpine/mailcmd.c:2700
+#: alpine/mailcmd.c:3474 alpine/mailcmd.c:3885 alpine/mailcmd.c:5344
+#: alpine/adrbkcmd.c:4246 alpine/folder.c:3728 alpine/folder.c:3862
+#: alpine/folder.c:4991 alpine/mailpart.c:1324 alpine/mailpart.c:1733
+#: alpine/mailpart.c:1812 pico/attach.c:74 pico/file.c:158 pico/file.c:580
msgid "Complete"
msgstr ""
-#: alpine/takeaddr.c:175
+#: alpine/takeaddr.c:176
#, c-format
msgid "Already an entry with nickname \"%s\""
msgstr ""
@@ -1386,131 +1400,131 @@ msgstr ""
#. happened and alpine is re-initializing the address book.
#. TRANSLATORS: a warning message telling the user that the address book
#. is being reset (re-sychronized, restarted)
-#: alpine/takeaddr.c:421 alpine/adrbkcmd.c:1469 alpine/addrbook.c:1527
-#: alpine/addrbook.c:1557 alpine/addrbook.c:1589 alpine/addrbook.c:1630
-#: alpine/addrbook.c:1670 alpine/addrbook.c:1712 alpine/addrbook.c:1755
-#: alpine/addrbook.c:1803 alpine/addrbook.c:1845 alpine/addrbook.c:1885
-#: alpine/addrbook.c:1929 alpine/addrbook.c:1977 pith/ablookup.c:80
-#: pith/ablookup.c:151 pith/ablookup.c:275
+#: alpine/takeaddr.c:422 alpine/adrbkcmd.c:1474 alpine/addrbook.c:1528
+#: alpine/addrbook.c:1558 alpine/addrbook.c:1590 alpine/addrbook.c:1631
+#: alpine/addrbook.c:1671 alpine/addrbook.c:1713 alpine/addrbook.c:1756
+#: alpine/addrbook.c:1804 alpine/addrbook.c:1846 alpine/addrbook.c:1886
+#: alpine/addrbook.c:1930 alpine/addrbook.c:1978 pith/ablookup.c:81
+#: pith/ablookup.c:152 pith/ablookup.c:229 pith/ablookup.c:358
msgid "Resetting address book..."
msgstr ""
-#: alpine/takeaddr.c:526
+#: alpine/takeaddr.c:527
#, c-format
msgid "Warning: address exists with %s%s, continue "
msgstr ""
-#: alpine/takeaddr.c:558
+#: alpine/takeaddr.c:559
#, c-format
msgid "Enter new or existing nickname (one word and easy to remember): "
msgstr ""
-#: alpine/takeaddr.c:571
+#: alpine/takeaddr.c:572
#, c-format
msgid "Already an entry %s in address book!"
msgstr ""
-#: alpine/takeaddr.c:579 alpine/takeaddr.c:600 alpine/confscroll.c:1698
-#: alpine/print.c:746 pico/search.c:613
+#: alpine/takeaddr.c:580 alpine/takeaddr.c:601 alpine/confscroll.c:1706
+#: alpine/print.c:747 pico/search.c:616
msgid "Replace"
msgstr ""
-#: alpine/takeaddr.c:583
+#: alpine/takeaddr.c:584
#, c-format
msgid "Entry %s (%s) exists, replace ? "
msgstr ""
-#: alpine/takeaddr.c:606
+#: alpine/takeaddr.c:607
#, c-format
msgid "%s %s (%s) exists, replace or add addresses to it ? "
msgstr ""
-#: alpine/takeaddr.c:647
+#: alpine/takeaddr.c:648
msgid "Address book is at maximum size, cancelled."
msgstr ""
-#: alpine/takeaddr.c:790
+#: alpine/takeaddr.c:791
#, c-format
msgid "All of the addresses are already included in \"%s\""
msgstr ""
-#: alpine/takeaddr.c:868 alpine/takeaddr.c:1324
+#: alpine/takeaddr.c:869 alpine/takeaddr.c:1325
msgid "Address book addition cancelled"
msgstr ""
-#: alpine/takeaddr.c:896
+#: alpine/takeaddr.c:897
msgid "No address book configured!"
msgstr ""
-#: alpine/takeaddr.c:917
+#: alpine/takeaddr.c:918
msgid "Can't open address book!"
msgstr ""
#. TRANSLATORS: Address book can be viewed but not changed
-#: alpine/takeaddr.c:923 alpine/adrbkcmd.c:414 alpine/adrbkcmd.c:432
-#: alpine/addrbook.c:2132 alpine/addrbook.c:3358 alpine/addrbook.c:4109
+#: alpine/takeaddr.c:924 alpine/adrbkcmd.c:417 alpine/adrbkcmd.c:435
+#: alpine/addrbook.c:2133 alpine/addrbook.c:3359 alpine/addrbook.c:4110
msgid "AddressBook is Read Only"
msgstr ""
-#: alpine/takeaddr.c:926 alpine/addrbook.c:2135
+#: alpine/takeaddr.c:927 alpine/addrbook.c:2136
msgid "AddressBook not accessible, permission denied"
msgstr ""
-#: alpine/takeaddr.c:955
+#: alpine/takeaddr.c:956
msgid "Prev AddrBook"
msgstr ""
-#: alpine/takeaddr.c:956
+#: alpine/takeaddr.c:957
msgid "Next AddrBook"
msgstr ""
-#: alpine/takeaddr.c:1008
+#: alpine/takeaddr.c:1009
#, c-format
msgid "No addressbook \"%s\""
msgstr ""
-#: alpine/takeaddr.c:1159 alpine/takeaddr.c:1473
+#: alpine/takeaddr.c:1160 alpine/takeaddr.c:1474
msgid "List mode: Use \"X\" to mark addresses to be included in list"
msgstr ""
-#: alpine/takeaddr.c:1162 alpine/takeaddr.c:1468
+#: alpine/takeaddr.c:1163 alpine/takeaddr.c:1469
msgid "Single mode: Use \"P\" or \"N\" to select desired address"
msgstr ""
-#: alpine/takeaddr.c:1318
+#: alpine/takeaddr.c:1319
msgid "HELP FOR TAKE ADDRESS SCREEN"
msgstr ""
-#: alpine/takeaddr.c:1342 alpine/addrbook.c:3807
+#: alpine/takeaddr.c:1343 alpine/addrbook.c:3808
msgid "Already on last line."
msgstr ""
-#: alpine/takeaddr.c:1350 alpine/addrbook.c:3749
+#: alpine/takeaddr.c:1351 alpine/addrbook.c:3750
msgid "Already on first line."
msgstr ""
-#: alpine/takeaddr.c:1366 alpine/addrbook.c:4043
+#: alpine/takeaddr.c:1367 alpine/addrbook.c:4044
msgid "Already on last page."
msgstr ""
-#: alpine/takeaddr.c:1393 alpine/addrbook.c:4007
+#: alpine/takeaddr.c:1394 alpine/addrbook.c:4008
msgid "Already on first page."
msgstr ""
-#: alpine/takeaddr.c:1525 alpine/takeaddr.c:2652
+#: alpine/takeaddr.c:1526 alpine/takeaddr.c:2653
msgid "save"
msgstr ""
#. TRANSLATORS: go to Top of screen
-#: alpine/takeaddr.c:1560 alpine/confscroll.c:1052
+#: alpine/takeaddr.c:1561 alpine/confscroll.c:1060
msgid "Top"
msgstr ""
-#: alpine/takeaddr.c:1561 alpine/confscroll.c:1053
+#: alpine/takeaddr.c:1562 alpine/confscroll.c:1061
msgid "Bottom"
msgstr ""
-#: alpine/takeaddr.c:1569
+#: alpine/takeaddr.c:1570
#, c-format
msgid "Word to find %s%.*s%s: "
msgstr ""
@@ -1518,740 +1532,740 @@ msgstr ""
#. TRANSLATORS: Searched to ... is the result of the search, searched
#. to top means the search went past the bottom of the screen and
#. wrapped back around to the top.
-#: alpine/takeaddr.c:1618 alpine/confscroll.c:1233
+#: alpine/takeaddr.c:1619 alpine/confscroll.c:1241
msgid "Searched to top"
msgstr ""
-#: alpine/takeaddr.c:1622 alpine/confscroll.c:1247
+#: alpine/takeaddr.c:1623 alpine/confscroll.c:1255
msgid "Searched to bottom"
msgstr ""
-#: alpine/takeaddr.c:1626 alpine/confscroll.c:1250 alpine/mailpart.c:772
+#: alpine/takeaddr.c:1627 alpine/confscroll.c:1258 alpine/mailpart.c:773
msgid "WhereIs cancelled"
msgstr ""
-#: alpine/takeaddr.c:1631 alpine/addrbook.c:5766
+#: alpine/takeaddr.c:1632 alpine/addrbook.c:5767
msgid "Search wrapped to beginning"
msgstr ""
-#: alpine/takeaddr.c:1631 alpine/confscroll.c:1269
+#: alpine/takeaddr.c:1632 alpine/confscroll.c:1277
msgid "Word found"
msgstr ""
-#: alpine/takeaddr.c:1659
+#: alpine/takeaddr.c:1660
msgid "No addresses marked for taking. Use ExitTake to leave TakeAddr screen"
msgstr ""
-#: alpine/takeaddr.c:1999
+#: alpine/takeaddr.c:2000
msgid "Can't find anything to export"
msgstr ""
-#: alpine/takeaddr.c:2021 alpine/adrbkcmd.c:1577
+#: alpine/takeaddr.c:2022 alpine/adrbkcmd.c:1582
msgid "take"
msgstr ""
-#: alpine/takeaddr.c:2465 alpine/takeaddr.c:2592
+#: alpine/takeaddr.c:2466 alpine/takeaddr.c:2593
msgid "Nothing to save, cancelled"
msgstr ""
-#: alpine/takeaddr.c:2496
+#: alpine/takeaddr.c:2497
msgid "Backup"
msgstr ""
-#: alpine/takeaddr.c:2497
+#: alpine/takeaddr.c:2498
msgid "LDAP"
msgstr ""
-#: alpine/takeaddr.c:2502
+#: alpine/takeaddr.c:2503
msgid "Copy backup address or retain LDAP search criteria ? "
msgstr ""
-#: alpine/takeaddr.c:2611 alpine/takeaddr.c:3041 alpine/adrbkcmd.c:5248
+#: alpine/takeaddr.c:2612 alpine/takeaddr.c:3042 alpine/adrbkcmd.c:5253
#, c-format
msgid "Save to address book or Export to filesystem ? "
msgstr ""
-#: alpine/takeaddr.c:2617 alpine/takeaddr.c:3047 alpine/adrbkcmd.c:5254
-#: alpine/adrbkcmd.c:5447 alpine/adrbkcmd.c:5612
+#: alpine/takeaddr.c:2618 alpine/takeaddr.c:3048 alpine/adrbkcmd.c:5259
+#: alpine/adrbkcmd.c:5452 alpine/adrbkcmd.c:5617
msgid "Address book save cancelled"
msgstr ""
-#: alpine/takeaddr.c:2664
+#: alpine/takeaddr.c:2665
msgid "Save cancelled: no entries in attachment"
msgstr ""
-#: alpine/takeaddr.c:2681 alpine/adrbkcmd.c:4177
+#: alpine/takeaddr.c:2682 alpine/adrbkcmd.c:4182
msgid "Address List"
msgstr ""
#. TRANSLATORS: A VCard is kind of like an electronic business card. It is not
#. something specific to alpine, it is universal.
-#: alpine/takeaddr.c:2682 alpine/takeaddr.c:3271 alpine/adrbkcmd.c:381
-#: alpine/adrbkcmd.c:4178
+#: alpine/takeaddr.c:2683 alpine/takeaddr.c:3272 alpine/adrbkcmd.c:384
+#: alpine/adrbkcmd.c:4183
msgid "VCard"
msgstr ""
-#: alpine/takeaddr.c:2693
+#: alpine/takeaddr.c:2694
msgid "Export list of addresses or vCard text ? "
msgstr ""
-#: alpine/takeaddr.c:2699 alpine/takeaddr.c:3281 alpine/adrbkcmd.c:4208
-#: alpine/adrbkcmd.c:4254
+#: alpine/takeaddr.c:2700 alpine/takeaddr.c:3282 alpine/adrbkcmd.c:4213
+#: alpine/adrbkcmd.c:4259
msgid "Address book export cancelled"
msgstr ""
-#: alpine/takeaddr.c:2710
+#: alpine/takeaddr.c:2711
msgid "can't happen in export_vcard_att"
msgstr ""
-#: alpine/takeaddr.c:2746
+#: alpine/takeaddr.c:2747
msgid "No addresses to export"
msgstr ""
-#: alpine/takeaddr.c:2752 alpine/takeaddr.c:2860
+#: alpine/takeaddr.c:2753 alpine/takeaddr.c:2861
msgid "Nothing to export"
msgstr ""
-#: alpine/takeaddr.c:2754 alpine/takeaddr.c:2854 alpine/takeaddr.c:3287
-#: alpine/takeaddr.c:3301 alpine/takeaddr.c:3319 alpine/mailcmd.c:3888
-#: alpine/adrbkcmd.c:6955 alpine/adrbkcmd.c:7146 alpine/reply.c:2203
-#: alpine/mailpart.c:2817
+#: alpine/takeaddr.c:2755 alpine/takeaddr.c:2855 alpine/takeaddr.c:3288
+#: alpine/takeaddr.c:3302 alpine/takeaddr.c:3320 alpine/mailcmd.c:3889
+#: alpine/adrbkcmd.c:6960 alpine/adrbkcmd.c:7151 alpine/reply.c:2234
+#: alpine/mailpart.c:2818
msgid "Error allocating space"
msgstr ""
-#: alpine/takeaddr.c:2765
+#: alpine/takeaddr.c:2766
msgid "HELP FOR TAKE EXPORT SCREEN"
msgstr ""
-#: alpine/takeaddr.c:2804
+#: alpine/takeaddr.c:2805
msgid "No lines to export"
msgstr ""
-#: alpine/takeaddr.c:2807
+#: alpine/takeaddr.c:2808
msgid "Take Export"
msgstr ""
-#: alpine/takeaddr.c:2858
+#: alpine/takeaddr.c:2859
msgid "Use \"X\" to mark selections"
msgstr ""
#. TRANSLATORS: Text refers to plain old text, probably the text of
#. an email message
-#: alpine/takeaddr.c:3269 alpine/mailcmd.c:154 alpine/mailcmd.c:194
-#: alpine/adrbkcmd.c:378 alpine/folder.c:3115
+#: alpine/takeaddr.c:3270 alpine/mailcmd.c:155 alpine/mailcmd.c:195
+#: alpine/adrbkcmd.c:381 alpine/folder.c:3273
msgid "Text"
msgstr ""
#. TRANSLATORS: Addresses refers to email Addresses
-#: alpine/takeaddr.c:3270 alpine/adrbkcmd.c:199 alpine/adrbkcmd.c:859
-#: alpine/adrbkcmd.c:1070 alpine/adrbkcmd.c:5920 alpine/adrbkcmd.c:5934
-#: alpine/adrbkcmd.c:5943 alpine/adrbkcmd.c:5954 alpine/adrbkcmd.c:5961
+#: alpine/takeaddr.c:3271 alpine/adrbkcmd.c:202 alpine/adrbkcmd.c:862
+#: alpine/adrbkcmd.c:1073 alpine/adrbkcmd.c:5925 alpine/adrbkcmd.c:5939
+#: alpine/adrbkcmd.c:5948 alpine/adrbkcmd.c:5959 alpine/adrbkcmd.c:5966
msgid "Addresses"
msgstr ""
-#: alpine/takeaddr.c:3275
+#: alpine/takeaddr.c:3276
msgid "Export text of entry, address, or VCard format ? "
msgstr ""
-#: alpine/ldapconf.c:59
+#: alpine/ldapconf.c:60
msgid "HELP FOR SEARCH RESULTS INDEX"
msgstr ""
-#: alpine/ldapconf.c:61
+#: alpine/ldapconf.c:62
msgid "Use Add to add a directory server"
msgstr ""
-#: alpine/ldapconf.c:68
+#: alpine/ldapconf.c:69
msgid "Directory Server on "
msgstr ""
-#: alpine/ldapconf.c:381
+#: alpine/ldapconf.c:382
#, c-format
msgid "(%d email addresses)"
msgstr ""
-#: alpine/ldapconf.c:399
+#: alpine/ldapconf.c:400
msgid "<No Email Address Available>"
msgstr ""
#. TRANSLATORS: No matches returned for an LDAP search
-#: alpine/ldapconf.c:441
+#: alpine/ldapconf.c:442
#, c-format
msgid "%s, No Matches Returned"
msgstr ""
-#: alpine/ldapconf.c:444
+#: alpine/ldapconf.c:445
msgid "No Matches"
msgstr ""
#. TRANSLATORS: a request for user to choose Exit after they read text
-#: alpine/ldapconf.c:449
+#: alpine/ldapconf.c:450
msgid " -- Choose Exit ]"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. "this" is something1
-#: alpine/ldapconf.c:473
+#: alpine/ldapconf.c:474
msgid "this"
msgstr ""
-#: alpine/ldapconf.c:553
+#: alpine/ldapconf.c:554
msgid "No email address available for this entry; choose another or ExitSelect"
msgstr ""
-#: alpine/ldapconf.c:634
+#: alpine/ldapconf.c:635
msgid "Bad Server Config, Delete this"
msgstr ""
-#: alpine/ldapconf.c:681
+#: alpine/ldapconf.c:682
msgid "Exception Setup not implemented for directory"
msgstr ""
-#: alpine/ldapconf.c:724
+#: alpine/ldapconf.c:725
msgid "SETUP DIRECTORY SERVERS"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. servers is something1
-#: alpine/ldapconf.c:724 alpine/ldapconf.c:1760
+#: alpine/ldapconf.c:725 alpine/ldapconf.c:1761
msgid "servers"
msgstr ""
-#: alpine/ldapconf.c:740 alpine/roleconf.c:1095
+#: alpine/ldapconf.c:741 alpine/roleconf.c:1096
msgid "Nothing to Delete, use Add"
msgstr ""
-#: alpine/ldapconf.c:766 alpine/roleconf.c:1116
+#: alpine/ldapconf.c:767 alpine/roleconf.c:1117
msgid "Nothing to Shuffle, use Add"
msgstr ""
-#: alpine/ldapconf.c:905
+#: alpine/ldapconf.c:906
msgid "Add cancelled, no server name"
msgstr ""
-#: alpine/ldapconf.c:937
+#: alpine/ldapconf.c:938
msgid "Shuffle only makes sense when there is more than one server in list"
msgstr ""
#. TRANSLATORS: shuffle something Up or Down in a list
-#: alpine/ldapconf.c:948 alpine/adrbkcmd.c:3513 alpine/confscroll.c:2318
-#: alpine/roleconf.c:1685 alpine/colorconf.c:2148 alpine/context.c:603
+#: alpine/ldapconf.c:949 alpine/adrbkcmd.c:3518 alpine/confscroll.c:2326
+#: alpine/roleconf.c:1686 alpine/colorconf.c:2267 alpine/context.c:604
msgid "Up"
msgstr ""
-#: alpine/ldapconf.c:953 alpine/adrbkcmd.c:3518 alpine/confscroll.c:2323
-#: alpine/roleconf.c:1690 alpine/colorconf.c:2153 alpine/context.c:621
+#: alpine/ldapconf.c:954 alpine/adrbkcmd.c:3523 alpine/confscroll.c:2331
+#: alpine/roleconf.c:1691 alpine/colorconf.c:2272 alpine/context.c:622
msgid "Down"
msgstr ""
-#: alpine/ldapconf.c:967 alpine/adrbkcmd.c:3566 alpine/roleconf.c:1762
-#: alpine/colorconf.c:2166 alpine/context.c:630
+#: alpine/ldapconf.c:968 alpine/adrbkcmd.c:3571 alpine/roleconf.c:1763
+#: alpine/colorconf.c:2285 alpine/context.c:631
msgid "UP"
msgstr ""
-#: alpine/ldapconf.c:969 alpine/adrbkcmd.c:3568 alpine/roleconf.c:1764
-#: alpine/colorconf.c:2168 alpine/context.c:632
+#: alpine/ldapconf.c:970 alpine/adrbkcmd.c:3573 alpine/roleconf.c:1765
+#: alpine/colorconf.c:2287 alpine/context.c:633
msgid "DOWN"
msgstr ""
-#: alpine/ldapconf.c:1018 alpine/adrbkcmd.c:3628
+#: alpine/ldapconf.c:1019 alpine/adrbkcmd.c:3633
msgid "Shuffle cancelled: couldn't save configuration file"
msgstr ""
-#: alpine/ldapconf.c:1074
+#: alpine/ldapconf.c:1075
msgid "No change, cancelled"
msgstr ""
-#: alpine/ldapconf.c:1077
+#: alpine/ldapconf.c:1078
msgid "Change cancelled, use Delete if you want to remove this server"
msgstr ""
#. TRANSLATORS: Features is a section title in the LDAP configuration screen. Following
#. this are a list of features or options that can be turned on or off.
-#: alpine/ldapconf.c:1336 alpine/roleconf.c:4602
+#: alpine/ldapconf.c:1337 alpine/roleconf.c:4603
msgid "Features"
msgstr ""
-#: alpine/ldapconf.c:1362
+#: alpine/ldapconf.c:1363
msgid "HELP FOR LDAP SERVER"
msgstr ""
-#: alpine/ldapconf.c:1378
+#: alpine/ldapconf.c:1379
msgid "HELP FOR SERVER SEARCH BASE"
msgstr ""
-#: alpine/ldapconf.c:1392
+#: alpine/ldapconf.c:1393
msgid "HELP FOR PORT NUMBER"
msgstr ""
-#: alpine/ldapconf.c:1407
+#: alpine/ldapconf.c:1408
msgid "HELP FOR SERVER BIND DN"
msgstr ""
-#: alpine/ldapconf.c:1421
+#: alpine/ldapconf.c:1422
msgid "HELP FOR SERVER NICKNAME"
msgstr ""
-#: alpine/ldapconf.c:1479
+#: alpine/ldapconf.c:1480
msgid "HELP FOR LDAP FEATURES"
msgstr ""
-#: alpine/ldapconf.c:1558
+#: alpine/ldapconf.c:1559
msgid "HELP FOR SEARCH TYPE"
msgstr ""
-#: alpine/ldapconf.c:1622
+#: alpine/ldapconf.c:1623
msgid "HELP FOR SEARCH RULE"
msgstr ""
-#: alpine/ldapconf.c:1646
+#: alpine/ldapconf.c:1647
msgid "HELP FOR EMAIL ATTRIBUTE NAME"
msgstr ""
-#: alpine/ldapconf.c:1660
+#: alpine/ldapconf.c:1661
msgid "HELP FOR NAME ATTRIBUTE NAME"
msgstr ""
-#: alpine/ldapconf.c:1674
+#: alpine/ldapconf.c:1675
msgid "HELP FOR SURNAME ATTRIBUTE NAME"
msgstr ""
-#: alpine/ldapconf.c:1688
+#: alpine/ldapconf.c:1689
msgid "HELP FOR GIVEN NAME ATTRIBUTE NAME"
msgstr ""
-#: alpine/ldapconf.c:1707
+#: alpine/ldapconf.c:1708
msgid "HELP FOR SERVER TIMELIMIT"
msgstr ""
-#: alpine/ldapconf.c:1723
+#: alpine/ldapconf.c:1724
msgid "HELP FOR SERVER SIZELIMIT"
msgstr ""
-#: alpine/ldapconf.c:1741
+#: alpine/ldapconf.c:1742
msgid "HELP FOR CUSTOM SEARCH FILTER"
msgstr ""
-#: alpine/ldapconf.c:2022
+#: alpine/ldapconf.c:2023
msgid "Delete (unused) directory servers "
msgstr ""
-#: alpine/ldapconf.c:2030
+#: alpine/ldapconf.c:2031
msgid "Can't delete sys-admin defined value"
msgstr ""
#. TRANSLATORS: Ignore All means ignore all of the default values,
#. and Remove One means just remove this one default value.
-#: alpine/ldapconf.c:2056 alpine/adrbkcmd.c:3121
+#: alpine/ldapconf.c:2057 alpine/adrbkcmd.c:3126
msgid "Ignore All"
msgstr ""
-#: alpine/ldapconf.c:2057 alpine/adrbkcmd.c:3122
+#: alpine/ldapconf.c:2058 alpine/adrbkcmd.c:3127
msgid "Remove One"
msgstr ""
-#: alpine/ldapconf.c:2060
+#: alpine/ldapconf.c:2061
msgid "Ignore all default directory servers or just remove this one ? "
msgstr ""
-#: alpine/ldapconf.c:2066
+#: alpine/ldapconf.c:2067
#, c-format
msgid "Really delete %s \"%s\" from directory servers "
msgstr ""
-#: alpine/ldapconf.c:2167
+#: alpine/ldapconf.c:2168
msgid "Reverting to default directory server"
msgstr ""
-#: alpine/ldapconf.c:2207
+#: alpine/ldapconf.c:2208
msgid "Server not deleted"
msgstr ""
-#: alpine/ldapconf.c:2227 alpine/ldapconf.c:2282
+#: alpine/ldapconf.c:2228 alpine/ldapconf.c:2283
msgid "HELP FOR DIRECTORY SERVER CONFIGURATION"
msgstr ""
-#: alpine/send.c:144
+#: alpine/send.c:146
msgid "Continue INTERRUPTED composition (answering \"n\" won't erase it)"
msgstr ""
-#: alpine/send.c:146
+#: alpine/send.c:148
msgid "Continue postponed composition (answering \"No\" won't erase it)"
msgstr ""
-#: alpine/send.c:148
+#: alpine/send.c:150
msgid "Start composition from Form Letter Folder"
msgstr ""
-#: alpine/send.c:150
+#: alpine/send.c:152
msgid "Save to Postponed or Form letter folder? "
msgstr ""
-#: alpine/send.c:152
+#: alpine/send.c:154
msgid "Posted message may go to thousands of readers. Really post"
msgstr ""
-#: alpine/send.c:154
+#: alpine/send.c:156
msgid "Deleted messages will be removed from folder after use. Proceed"
msgstr ""
-#: alpine/send.c:505 alpine/send.c:547 alpine/send.c:585 alpine/send.c:853
+#: alpine/send.c:507 alpine/send.c:549 alpine/send.c:587 alpine/send.c:855
msgid "Composition cancelled"
msgstr ""
-#: alpine/send.c:512
+#: alpine/send.c:514
#, c-format
msgid "Can't open Interrupted mailbox: %s"
msgstr ""
-#: alpine/send.c:593
+#: alpine/send.c:595
msgid "Form letter folder doesn't exist!"
msgstr ""
-#: alpine/send.c:646 alpine/adrbkcmd.c:4561 alpine/reply.c:1754
+#: alpine/send.c:648 alpine/adrbkcmd.c:4566 alpine/reply.c:1785
#, c-format
msgid "Composing using role \"%s\""
msgstr ""
-#: alpine/send.c:666 alpine/mailpart.c:1699
+#: alpine/send.c:668 alpine/mailpart.c:1700
msgid "Problem creating space for message text."
msgstr ""
-#: alpine/send.c:800
+#: alpine/send.c:802
msgid "Empty folder! No messages really postponed!"
msgstr ""
-#: alpine/send.c:802
+#: alpine/send.c:804
msgid "Empty folder! No messages really interrupted!"
msgstr ""
-#: alpine/send.c:840
+#: alpine/send.c:842
msgid "Undelete messages to remain postponed, and then continue message"
msgstr ""
-#: alpine/send.c:842
+#: alpine/send.c:844
msgid "Undelete form letters you want to keep, and then continue message"
msgstr ""
-#: alpine/send.c:891
+#: alpine/send.c:893
#, c-format
msgid "%s folder unavailable while background posting"
msgstr ""
-#: alpine/send.c:1083 alpine/send.c:2297
+#: alpine/send.c:1085 alpine/send.c:2301
msgid ""
"Site policy doesn't allow changing From address so role's From has no effect"
msgstr ""
-#: alpine/send.c:1160
+#: alpine/send.c:1162
msgid "FORWARD (as e-mail) to : "
msgstr ""
-#: alpine/send.c:1161
+#: alpine/send.c:1163
msgid "BOUNCE (redirect) message to : "
msgstr ""
#. TRANSLATORS: several possible key labels follow
-#: alpine/send.c:1371 alpine/send.c:4783
+#: alpine/send.c:1373 alpine/send.c:4802
msgid "Normal"
msgstr ""
-#: alpine/send.c:1371 alpine/send.c:4783
+#: alpine/send.c:1373 alpine/send.c:4802
msgid "Verbose"
msgstr ""
-#: alpine/send.c:1377 alpine/send.c:4796
+#: alpine/send.c:1379 alpine/send.c:4815
msgid "NoDelay"
msgstr ""
-#: alpine/send.c:1377 alpine/send.c:4796
+#: alpine/send.c:1379 alpine/send.c:4815
msgid "Delay"
msgstr ""
-#: alpine/send.c:1381 alpine/send.c:4799
+#: alpine/send.c:1383 alpine/send.c:4818
msgid "NoSuccess"
msgstr ""
-#: alpine/send.c:1381 alpine/send.c:4799
+#: alpine/send.c:1383 alpine/send.c:4818
msgid "Success"
msgstr ""
-#: alpine/send.c:1385 alpine/send.c:4802
+#: alpine/send.c:1387 alpine/send.c:4821
msgid "ErrRets"
msgstr ""
-#: alpine/send.c:1385 alpine/send.c:4802
+#: alpine/send.c:1387 alpine/send.c:4821
msgid "NoErrRets"
msgstr ""
-#: alpine/send.c:1389 alpine/send.c:4805
+#: alpine/send.c:1391 alpine/send.c:4824
msgid "RetHdrs"
msgstr ""
-#: alpine/send.c:1389 alpine/send.c:4805
+#: alpine/send.c:1391 alpine/send.c:4824
msgid "RetFull"
msgstr ""
-#: alpine/send.c:1439
+#: alpine/send.c:1441
#, c-format
msgid "DSN requested[%s%s%s%s]"
msgstr ""
-#: alpine/send.c:1441
+#: alpine/send.c:1443
msgid "Never"
msgstr ""
-#: alpine/send.c:1503 alpine/send.c:3615
+#: alpine/send.c:1505 alpine/send.c:3624
msgid "No recipients specified!"
msgstr ""
-#: alpine/send.c:1513
+#: alpine/send.c:1515
msgid "Use of a role-defined smtp-server is administratively prohibited"
msgstr ""
-#: alpine/send.c:1528 alpine/send.c:1571
+#: alpine/send.c:1530 alpine/send.c:1573
msgid "Message sent"
msgstr ""
-#: alpine/send.c:1553 alpine/send.c:3855 alpine/send.c:3949
+#: alpine/send.c:1555 alpine/send.c:3864 alpine/send.c:3958
msgid "Fcc Failed!. No message saved."
msgstr ""
-#: alpine/send.c:1600 alpine/send.c:1628
+#: alpine/send.c:1602 alpine/send.c:1630
msgid "Send cancelled"
msgstr ""
-#: alpine/send.c:1606
+#: alpine/send.c:1608
#, c-format
msgid "Error in address: %s"
msgstr ""
-#: alpine/send.c:1619
+#: alpine/send.c:1621
msgid "No addressee! No e-mail sent."
msgstr ""
-#: alpine/send.c:1880
+#: alpine/send.c:1884
#, c-format
msgid "Post to current newsgroup (%s)"
msgstr ""
-#: alpine/send.c:1923
+#: alpine/send.c:1927
msgid "Message cancelled"
msgstr ""
-#: alpine/send.c:2714
+#: alpine/send.c:2718
msgid "Not allowed to change header \"From\""
msgstr ""
-#: alpine/send.c:3113
+#: alpine/send.c:3122
msgid "Not allowed to postpone message until addresses are qualified"
msgstr ""
-#: alpine/send.c:3216 pith/send.c:2168
+#: alpine/send.c:3225 pith/send.c:2172
msgid "No postponed file defined"
msgstr ""
-#: alpine/send.c:3559
+#: alpine/send.c:3568
msgid "Composition saved to Form Letter Folder. Select Compose to send."
msgstr ""
-#: alpine/send.c:3562
+#: alpine/send.c:3571
msgid "Composition postponed. Select Compose to resume."
msgstr ""
-#: alpine/send.c:3573
+#: alpine/send.c:3582
#, c-format
msgid "Message cancelled%s%s%s"
msgstr ""
-#: alpine/send.c:3581
+#: alpine/send.c:3590
msgid "Continuing composition. Message not postponed or sent"
msgstr ""
-#: alpine/send.c:3598
+#: alpine/send.c:3607
msgid "Message not posted"
msgstr ""
-#: alpine/send.c:3607
+#: alpine/send.c:3616
msgid "No recipients, really copy only to Fcc "
msgstr ""
-#: alpine/send.c:3631
+#: alpine/send.c:3640
msgid "No To, Cc, or Newsgroup specified, send anyway "
msgstr ""
-#: alpine/send.c:3714
+#: alpine/send.c:3723
#, c-format
msgid "Problem filtering! Nothing sent%s."
msgstr ""
-#: alpine/send.c:3878
+#: alpine/send.c:3887
msgid "Message handed off for posting"
msgstr ""
-#: alpine/send.c:4126
+#: alpine/send.c:4135
msgid "Postponed Folder"
msgstr ""
-#: alpine/send.c:4127
+#: alpine/send.c:4136
msgid "Form Letter Folder"
msgstr ""
-#: alpine/send.c:4524
+#: alpine/send.c:4543
msgid "Prev Filter"
msgstr ""
-#: alpine/send.c:4529
+#: alpine/send.c:4548
msgid "Next Filter"
msgstr ""
-#: alpine/send.c:4572
+#: alpine/send.c:4591
msgid "Priority"
msgstr ""
-#: alpine/send.c:4600
+#: alpine/send.c:4619
msgid "DSNOpts"
msgstr ""
-#: alpine/send.c:4780
+#: alpine/send.c:4799
msgid "NoFlow"
msgstr ""
-#: alpine/send.c:4780
+#: alpine/send.c:4799
msgid "Flow"
msgstr ""
-#: alpine/send.c:4787
+#: alpine/send.c:4806
msgid "Foreground"
msgstr ""
-#: alpine/send.c:4787
+#: alpine/send.c:4806
msgid "Background"
msgstr ""
-#: alpine/send.c:4790
+#: alpine/send.c:4809
msgid "Fcc Attchmnts"
msgstr ""
-#: alpine/send.c:4791
+#: alpine/send.c:4810
msgid "No Fcc Atmts "
msgstr ""
-#: alpine/send.c:4838
+#: alpine/send.c:4857
msgid "No Message Sent"
msgstr ""
-#: alpine/send.c:4842
+#: alpine/send.c:4861
msgid "Send Cancelled"
msgstr ""
-#: alpine/send.c:5004
+#: alpine/send.c:5023
msgid "NONE - No X-Priority header included"
msgstr ""
#. TRANSLATORS: SELECT A PRIORITY is a screen title
#. TRANSLATORS: Print something1 using something2.
#. "priorities" is something1
-#: alpine/send.c:5012
+#: alpine/send.c:5031
msgid "SELECT A PRIORITY"
msgstr ""
-#: alpine/send.c:5013
+#: alpine/send.c:5032
msgid "priorities"
msgstr ""
-#: alpine/send.c:5014
+#: alpine/send.c:5033
msgid "HELP FOR SELECTING A PRIORITY"
msgstr ""
-#: alpine/send.c:5018 alpine/context.c:754
+#: alpine/send.c:5037 alpine/context.c:755
msgid "No change"
msgstr ""
-#: alpine/send.c:5066
+#: alpine/send.c:5085
#, c-format
msgid "File %s attached as type %s/%s"
msgstr ""
-#: alpine/send.c:5137 alpine/mailpart.c:3752
+#: alpine/send.c:5156 alpine/mailpart.c:3753
msgid "Error opening pipe"
msgstr ""
-#: alpine/send.c:5152
+#: alpine/send.c:5171
msgid ""
"Cancel message (answering \"Confirm\" will abandon your mail message) ? "
msgstr ""
-#: alpine/send.c:5155
+#: alpine/send.c:5174
msgid "Confirm"
msgstr ""
-#: alpine/send.c:5172
+#: alpine/send.c:5191
msgid " Type \"C\" to cancel message "
msgstr ""
-#: alpine/send.c:5430
+#: alpine/send.c:5449
#, c-format
msgid "Problem filtering: %s"
msgstr ""
-#: alpine/send.c:6014
+#: alpine/send.c:6033
#, c-format
msgid "Error \"%s\", couldn't attach file \"%s\""
msgstr ""
-#: alpine/send.c:6219
+#: alpine/send.c:6238
msgid "Can't post while posting!"
msgstr ""
-#: alpine/send.c:6251
+#: alpine/send.c:6270
msgid "News postings MUST have a subject! Please add one!"
msgstr ""
-#: alpine/send.c:6941
+#: alpine/send.c:6960
#, c-format
msgid "User-id for From address : "
msgstr ""
-#: alpine/send.c:6963
+#: alpine/send.c:6982
msgid "Send cancelled (User-id must be provided before sending)"
msgstr ""
-#: alpine/send.c:6968
+#: alpine/send.c:6987
#, c-format
msgid "Preserve %.*s as \"user-id\" in PINERC"
msgstr ""
-#: alpine/send.c:6986
+#: alpine/send.c:7005
#, c-format
msgid "Personal name for From address : "
msgstr ""
-#: alpine/send.c:7007
+#: alpine/send.c:7026
#, c-format
msgid "Preserve %.*s as \"personal-name\" in PINERC"
msgstr ""
-#: alpine/send.c:7038
+#: alpine/send.c:7057
#, c-format
msgid "Host/domain for From address : "
msgstr ""
-#: alpine/send.c:7060
+#: alpine/send.c:7079
msgid "Send cancelled (Host/domain name must be provided before sending)"
msgstr ""
-#: alpine/send.c:7065
+#: alpine/send.c:7084
#, c-format
msgid "Preserve %.*s as \"user-domain\" in PINERC"
msgstr ""
-#: alpine/send.c:7098
+#: alpine/send.c:7117
#, c-format
msgid "SMTP server to forward message : "
msgstr ""
-#: alpine/send.c:7120
+#: alpine/send.c:7139
msgid "Send cancelled (SMTP server must be provided before sending)"
msgstr ""
@@ -2259,11 +2273,11 @@ msgstr ""
#. which other commands are available. 12 commands are shown at
#. the bottom of the screen, this command would show the next set
#. of 12
-#: alpine/radio.c:817 alpine/addrbook.c:2560
+#: alpine/radio.c:818 alpine/addrbook.c:2561
msgid "OTHER CMDS"
msgstr ""
-#: alpine/mailcmd.c:123
+#: alpine/mailcmd.c:124
msgid "ALTER message selection : "
msgstr ""
@@ -2272,19 +2286,19 @@ msgstr ""
#. remove some selections (like a logical AND instead of logical OR), and Flip
#. Selected means that all the messages that are currently selected become unselected,
#. and all the unselected messages become selected.
-#: alpine/mailcmd.c:130
+#: alpine/mailcmd.c:131
msgid "unselect All"
msgstr ""
-#: alpine/mailcmd.c:132
+#: alpine/mailcmd.c:133
msgid "Broaden selctn"
msgstr ""
-#: alpine/mailcmd.c:133
+#: alpine/mailcmd.c:134
msgid "Narrow selctn"
msgstr ""
-#: alpine/mailcmd.c:134
+#: alpine/mailcmd.c:135
msgid "Flip selected"
msgstr ""
@@ -2296,40 +2310,40 @@ msgstr ""
#. and Rule is an alpine rule
#. TRANSLATORS: keymenu descriptions, select all folders, current folder, select
#. based on folder properties, or select based on text contents in folders
-#: alpine/mailcmd.c:150 alpine/mailcmd.c:189 alpine/folder.c:3112
+#: alpine/mailcmd.c:151 alpine/mailcmd.c:190 alpine/folder.c:3270
msgid "select All"
msgstr ""
-#: alpine/mailcmd.c:151 alpine/mailcmd.c:6615 alpine/folder.c:3113
-#: alpine/folder.c:3127
+#: alpine/mailcmd.c:152 alpine/mailcmd.c:6626 alpine/folder.c:3271
+#: alpine/folder.c:3285
msgid "select Cur"
msgstr ""
-#: alpine/mailcmd.c:152 alpine/mailcmd.c:192
+#: alpine/mailcmd.c:153 alpine/mailcmd.c:193
msgid "Number"
msgstr ""
-#: alpine/mailcmd.c:153 alpine/mailcmd.c:193
+#: alpine/mailcmd.c:154 alpine/mailcmd.c:194
msgid "Date"
msgstr ""
-#: alpine/mailcmd.c:155 alpine/mailcmd.c:195
+#: alpine/mailcmd.c:156 alpine/mailcmd.c:196
msgid "Status"
msgstr ""
-#: alpine/mailcmd.c:156 alpine/mailcmd.c:196
+#: alpine/mailcmd.c:157 alpine/mailcmd.c:197
msgid "siZe"
msgstr ""
-#: alpine/mailcmd.c:157 alpine/mailcmd.c:197
+#: alpine/mailcmd.c:158 alpine/mailcmd.c:198
msgid "Keyword"
msgstr ""
-#: alpine/mailcmd.c:158 alpine/mailcmd.c:198
+#: alpine/mailcmd.c:159 alpine/mailcmd.c:199
msgid "Rule"
msgstr ""
-#: alpine/mailcmd.c:159 alpine/mailcmd.c:199
+#: alpine/mailcmd.c:160 alpine/mailcmd.c:200
msgid "tHread"
msgstr ""
@@ -2338,38 +2352,38 @@ msgstr ""
#. the address book; Save means to save the messages into another alpine folder;
#. Export means to copy the messages to a file outside of alpine, external to
#. alpine's world.
-#: alpine/mailcmd.c:170
+#: alpine/mailcmd.c:171
msgid "Del"
msgstr ""
-#: alpine/mailcmd.c:171
+#: alpine/mailcmd.c:172
msgid "Undel"
msgstr ""
-#: alpine/mailcmd.c:172 alpine/mailcmd.c:261 alpine/mailcmd.c:2576
-#: alpine/reply.c:832 alpine/reply.c:1127
+#: alpine/mailcmd.c:173 alpine/mailcmd.c:263 alpine/mailcmd.c:2577
+#: alpine/reply.c:833 alpine/reply.c:1161
msgid "Reply"
msgstr ""
-#: alpine/mailcmd.c:173 alpine/mailcmd.c:262 alpine/mailcmd.c:2575
-#: alpine/folder.c:6463 alpine/reply.c:834
+#: alpine/mailcmd.c:174 alpine/mailcmd.c:264 alpine/mailcmd.c:2576
+#: alpine/folder.c:6644 alpine/reply.c:835
msgid "Forward"
msgstr ""
-#: alpine/mailcmd.c:175
+#: alpine/mailcmd.c:176
msgid "TakeAddr"
msgstr ""
#. TRANSLATORS: select currrently highlighted message Thread
-#: alpine/mailcmd.c:191 alpine/mailcmd.c:6610
+#: alpine/mailcmd.c:192 alpine/mailcmd.c:6621
msgid "select Curthrd"
msgstr ""
-#: alpine/mailcmd.c:205
+#: alpine/mailcmd.c:206
msgid "Select New, Deleted, Answered, Forwarded, or Important messages ? "
msgstr ""
-#: alpine/mailcmd.c:207
+#: alpine/mailcmd.c:208
msgid ""
"Select NOT New, NOT Deleted, NOT Answered, NOT Forwarded or NOT Important "
"msgs ? "
@@ -2381,988 +2395,1036 @@ msgstr ""
#. thing, so message is not New or not Important.
#. TRANSLATORS: these are types of flags (markers) that the user can
#. set. For example, they can flag the message as an important message.
-#: alpine/mailcmd.c:213 alpine/mailcmd.c:295 alpine/mailcmd.c:1648
-#: alpine/mailcmd.c:9323
+#: alpine/mailcmd.c:214 alpine/mailcmd.c:297 alpine/mailcmd.c:1643
+#: alpine/mailcmd.c:9452
msgid "New"
msgstr ""
-#: alpine/mailcmd.c:214 alpine/mailcmd.c:296 alpine/mailcmd.c:1647
-#: alpine/mailcmd.c:9322
+#: alpine/mailcmd.c:215 alpine/mailcmd.c:298 alpine/mailcmd.c:1642
+#: alpine/mailcmd.c:9451
msgid "Important"
msgstr ""
-#: alpine/mailcmd.c:215 alpine/mailcmd.c:297 alpine/mailcmd.c:1651
-#: alpine/mailcmd.c:9325 alpine/confscroll.c:2741 alpine/confscroll.c:2968
-#: alpine/colorconf.c:1224
+#: alpine/mailcmd.c:216 alpine/mailcmd.c:299 alpine/mailcmd.c:1646
+#: alpine/mailcmd.c:9454 alpine/confscroll.c:2749 alpine/confscroll.c:2976
+#: alpine/colorconf.c:1281
msgid "Deleted"
msgstr ""
-#: alpine/mailcmd.c:216 alpine/mailcmd.c:298 alpine/mailcmd.c:1649
-#: alpine/mailcmd.c:9324
+#: alpine/mailcmd.c:217 alpine/mailcmd.c:300 alpine/mailcmd.c:1644
+#: alpine/mailcmd.c:9453
msgid "Answered"
msgstr ""
-#: alpine/mailcmd.c:217 alpine/mailcmd.c:299 alpine/mailcmd.c:1650
+#: alpine/mailcmd.c:218 alpine/mailcmd.c:301 alpine/mailcmd.c:1645
msgid "Forwarded"
msgstr ""
-#: alpine/mailcmd.c:219 alpine/mailcmd.c:252 alpine/mailcmd.c:288
-#: alpine/mailcmd.c:300
+#: alpine/mailcmd.c:220 alpine/mailcmd.c:253 alpine/mailcmd.c:290
+#: alpine/mailcmd.c:302
msgid "Not"
msgstr ""
-#: alpine/mailcmd.c:221 alpine/folder.c:3169
+#: alpine/mailcmd.c:222 alpine/folder.c:3327
msgid "Recent"
msgstr ""
-#: alpine/mailcmd.c:222 alpine/folder.c:3175
+#: alpine/mailcmd.c:223 alpine/folder.c:3333
msgid "Unseen"
msgstr ""
#. TRANSLATORS: options when selecting messages by Date
-#: alpine/mailcmd.c:230
+#: alpine/mailcmd.c:231
msgid "Prev Day"
msgstr ""
-#: alpine/mailcmd.c:231
+#: alpine/mailcmd.c:232
msgid "Next Day"
msgstr ""
-#: alpine/mailcmd.c:232
+#: alpine/mailcmd.c:233
msgid "Cur Msg"
msgstr ""
-#: alpine/mailcmd.c:233
+#: alpine/mailcmd.c:234
msgid "Toggle When"
msgstr ""
-#: alpine/mailcmd.c:241
+#: alpine/mailcmd.c:242
msgid ""
"Select based on To, From, Cc, Recip, Partic, Subject fields or All msg "
"text ? "
msgstr ""
-#: alpine/mailcmd.c:243
+#: alpine/mailcmd.c:244
msgid ""
"Select based on NOT To, From, Cc, Recip, Partic, Subject or All msg text ? "
msgstr ""
#. TRANSLATORS: Select messages based on the text contained in the From line, or
#. the Subject line, and so on.
-#: alpine/mailcmd.c:247
+#: alpine/mailcmd.c:248
msgid "From"
msgstr ""
-#: alpine/mailcmd.c:248
+#: alpine/mailcmd.c:249
msgid "Subject"
msgstr ""
-#: alpine/mailcmd.c:249
+#: alpine/mailcmd.c:250
msgid "To"
msgstr ""
-#: alpine/mailcmd.c:250
+#: alpine/mailcmd.c:251
msgid "All Text"
msgstr ""
-#: alpine/mailcmd.c:251
+#: alpine/mailcmd.c:252
msgid "Cc"
msgstr ""
-#: alpine/mailcmd.c:253
+#: alpine/mailcmd.c:254
msgid "Recipient"
msgstr ""
-#: alpine/mailcmd.c:254
+#: alpine/mailcmd.c:255
msgid "Participant"
msgstr ""
-#: alpine/mailcmd.c:255
+#: alpine/mailcmd.c:256
msgid "Body"
msgstr ""
-#: alpine/mailcmd.c:260 alpine/reply.c:836
+#: alpine/mailcmd.c:257
+msgid "Header"
+msgstr ""
+
+#: alpine/mailcmd.c:262 alpine/reply.c:837
msgid "Compose"
msgstr ""
-#: alpine/mailcmd.c:263 alpine/mailcmd.c:2577 alpine/mailcmd.c:7034
+#: alpine/mailcmd.c:265 alpine/mailcmd.c:2578 alpine/mailcmd.c:7045
msgid "Bounce"
msgstr ""
-#: alpine/mailcmd.c:268
+#: alpine/mailcmd.c:270
msgid "Enter comma-delimited list of numbers (dash between ranges): "
msgstr ""
-#: alpine/mailcmd.c:271
+#: alpine/mailcmd.c:273
msgid "Select messages with size larger than: "
msgstr ""
-#: alpine/mailcmd.c:274
+#: alpine/mailcmd.c:276
msgid "Select messages with size smaller than: "
msgstr ""
-#: alpine/mailcmd.c:276
+#: alpine/mailcmd.c:278
msgid "Larger"
msgstr ""
-#: alpine/mailcmd.c:277
+#: alpine/mailcmd.c:279
msgid "Smaller"
msgstr ""
-#: alpine/mailcmd.c:286
+#: alpine/mailcmd.c:288
msgid "To List"
msgstr ""
-#: alpine/mailcmd.c:301
+#: alpine/mailcmd.c:303
msgid "To Flag Details"
msgstr ""
-#: alpine/mailcmd.c:358
+#: alpine/mailcmd.c:360
msgid "HELP FOR MESSAGE INDEX"
msgstr ""
-#: alpine/mailcmd.c:360
+#: alpine/mailcmd.c:362
msgid "HELP FOR MESSAGE TEXT"
msgstr ""
-#: alpine/mailcmd.c:361
+#: alpine/mailcmd.c:363
msgid "HELP FOR THREAD INDEX"
msgstr ""
-#: alpine/mailcmd.c:409 alpine/mailcmd.c:475
+#: alpine/mailcmd.c:411 alpine/mailcmd.c:477
#, c-format
msgid "Already on first %s in Zoomed Index"
msgstr ""
-#: alpine/mailcmd.c:410 alpine/mailcmd.c:476 alpine/mailcmd.c:490
+#: alpine/mailcmd.c:412 alpine/mailcmd.c:478 alpine/mailcmd.c:492
msgid "thread"
msgstr ""
-#: alpine/mailcmd.c:410 alpine/mailcmd.c:476 alpine/mailcmd.c:490
-#: alpine/mailcmd.c:1154
+#: alpine/mailcmd.c:412 alpine/mailcmd.c:478 alpine/mailcmd.c:492
+#: alpine/mailcmd.c:1159
msgid "message"
msgstr ""
-#: alpine/mailcmd.c:416
+#: alpine/mailcmd.c:418
msgid "View previous thread"
msgstr ""
-#: alpine/mailcmd.c:421
+#: alpine/mailcmd.c:423
msgid "Viewing previous thread"
msgstr ""
-#: alpine/mailcmd.c:489
+#: alpine/mailcmd.c:491
#, c-format
msgid "Already on first %s"
msgstr ""
-#: alpine/mailcmd.c:525
+#: alpine/mailcmd.c:527
msgid "View next thread"
msgstr ""
-#: alpine/mailcmd.c:530
+#: alpine/mailcmd.c:532
msgid "Viewing next thread"
msgstr ""
-#: alpine/mailcmd.c:587
+#: alpine/mailcmd.c:589
msgid "Expand collapsed thread to see more messages"
msgstr ""
-#: alpine/mailcmd.c:605
+#: alpine/mailcmd.c:607
msgid ". Press TAB for next folder."
msgstr ""
-#: alpine/mailcmd.c:608
+#: alpine/mailcmd.c:610
msgid ". No more folders to TAB to."
msgstr ""
-#: alpine/mailcmd.c:806 alpine/mailcmd.c:1092
+#: alpine/mailcmd.c:808 alpine/mailcmd.c:1094
msgid "NextNew"
msgstr ""
-#: alpine/mailcmd.c:811
+#: alpine/mailcmd.c:813
#, c-format
msgid "View thread number %s? "
msgstr ""
-#: alpine/mailcmd.c:815
+#: alpine/mailcmd.c:817
#, c-format
msgid "View message in thread number %s? "
msgstr ""
-#: alpine/mailcmd.c:979
+#: alpine/mailcmd.c:981
msgid "To Inbox"
msgstr ""
-#: alpine/mailcmd.c:989
+#: alpine/mailcmd.c:991
#, c-format
msgid "No more incoming folders. Return to \"%s\"? "
msgstr ""
-#: alpine/mailcmd.c:991
+#: alpine/mailcmd.c:993
#, c-format
msgid "No more news groups. Return to \"%s\"? "
msgstr ""
-#: alpine/mailcmd.c:1015
+#: alpine/mailcmd.c:1017
msgid "No more incoming folders"
msgstr ""
-#: alpine/mailcmd.c:1017
+#: alpine/mailcmd.c:1019
msgid "No more news groups"
msgstr ""
-#: alpine/mailcmd.c:1145 alpine/mailindx.c:2914
+#: alpine/mailcmd.c:1150 alpine/mailindx.c:2917
msgid "Index Zoom Mode is now off"
msgstr ""
-#: alpine/mailcmd.c:1151
+#: alpine/mailcmd.c:1156
#, c-format
msgid "In Zoomed Index of %s%s%s%s. Use \"Z\" to restore regular Index"
msgstr ""
-#: alpine/mailcmd.c:1154
+#: alpine/mailcmd.c:1159
msgid "threads"
msgstr ""
-#: alpine/mailcmd.c:1159
+#: alpine/mailcmd.c:1164
msgid "All messages selected, so not entering Index Zoom Mode"
msgstr ""
-#: alpine/mailcmd.c:1213
+#: alpine/mailcmd.c:1218
msgid "Unexclude not available for mail folders"
msgstr ""
-#: alpine/mailcmd.c:1413 alpine/mailpart.c:521 alpine/mailpart.c:2608
+#: alpine/mailcmd.c:1408 alpine/mailpart.c:522 alpine/mailpart.c:2609
msgid "Display of full headers is now off."
msgstr ""
-#: alpine/mailcmd.c:1418 alpine/mailpart.c:526 alpine/mailpart.c:2613
+#: alpine/mailcmd.c:1413 alpine/mailpart.c:527 alpine/mailpart.c:2614
#, c-format
msgid "Quotes displayed, use %s to see full headers"
msgstr ""
-#: alpine/mailcmd.c:1424 alpine/mailpart.c:532 alpine/mailpart.c:2619
+#: alpine/mailcmd.c:1419 alpine/mailpart.c:533 alpine/mailpart.c:2620
msgid "Display of full headers is now on."
msgstr ""
-#: alpine/mailcmd.c:1633
+#: alpine/mailcmd.c:1628
msgid " Set desired flags for current message below. An 'X' means set"
msgstr ""
-#: alpine/mailcmd.c:1634
+#: alpine/mailcmd.c:1629
msgid " it, and a ' ' means to unset it. Choose \"Exit\" when finished."
msgstr ""
-#: alpine/mailcmd.c:1639
+#: alpine/mailcmd.c:1634
msgid " Set desired flags below for selected messages. A '?' means to"
msgstr ""
-#: alpine/mailcmd.c:1640
+#: alpine/mailcmd.c:1635
msgid " leave the flag unchanged, 'X' means to set it, and a ' ' means"
msgstr ""
-#: alpine/mailcmd.c:1641
+#: alpine/mailcmd.c:1636
msgid " to unset it. Use the \"Return\" key to toggle, and choose"
msgstr ""
-#: alpine/mailcmd.c:1642
+#: alpine/mailcmd.c:1637
msgid " \"Exit\" when finished."
msgstr ""
-#: alpine/mailcmd.c:1727 alpine/mailcmd.c:1729
+#: alpine/mailcmd.c:1722 alpine/mailcmd.c:1724
msgid "User-defined Keywords from Setup/Config"
msgstr ""
-#: alpine/mailcmd.c:1762 alpine/mailcmd.c:1764
+#: alpine/mailcmd.c:1757 alpine/mailcmd.c:1759
msgid "Other keywords in the mailbox that are not user-defined"
msgstr ""
-#: alpine/mailcmd.c:1838
+#: alpine/mailcmd.c:1833
msgid "Error accessing message data"
msgstr ""
-#: alpine/mailcmd.c:2064
+#: alpine/mailcmd.c:2059
msgid "No more keywords allowed in this folder!"
msgstr ""
-#: alpine/mailcmd.c:2067
+#: alpine/mailcmd.c:2062
msgid "Cannot add keywords for this folder so cannot set Forwarded flag"
msgstr ""
-#: alpine/mailcmd.c:2070
+#: alpine/mailcmd.c:2065
msgid "Cannot add keywords for this folder"
msgstr ""
-#: alpine/mailcmd.c:2105
+#: alpine/mailcmd.c:2100
msgid "No flags changed."
msgstr ""
-#: alpine/mailcmd.c:2128
+#: alpine/mailcmd.c:2123
msgid "Flag New, Deleted, Answered, Forwarded or Important ? "
msgstr ""
-#: alpine/mailcmd.c:2130
+#: alpine/mailcmd.c:2125
msgid "Flag New, Deleted, Answered, Forwarded, Important or Keyword initial ? "
msgstr ""
-#: alpine/mailcmd.c:2132
+#: alpine/mailcmd.c:2127
msgid "Flag !New, !Deleted, !Answered, !Forwarded, or !Important ? "
msgstr ""
-#: alpine/mailcmd.c:2134
+#: alpine/mailcmd.c:2129
msgid ""
"Flag !New, !Deleted, !Answered, !Forwarded, !Important or !Keyword initial ? "
msgstr ""
-#: alpine/mailcmd.c:2381
+#: alpine/mailcmd.c:2379
msgid "Saved copy will NOT include entire message! Continue"
msgstr ""
-#: alpine/mailcmd.c:2398
+#: alpine/mailcmd.c:2394
msgid "Can't save message. Error accessing folder"
msgstr ""
-#: alpine/mailcmd.c:2428
+#: alpine/mailcmd.c:2432
msgid "Saving"
msgstr ""
-#: alpine/mailcmd.c:2546
+#: alpine/mailcmd.c:2547
msgid "Compose, Forward, Reply, or Bounce? "
msgstr ""
-#: alpine/mailcmd.c:2552 alpine/roleconf.c:143
+#: alpine/mailcmd.c:2553 alpine/roleconf.c:144
msgid "No roles available. Use Setup/Rules to add roles."
msgstr ""
-#: alpine/mailcmd.c:2577
+#: alpine/mailcmd.c:2578
msgid "Composition"
msgstr ""
#. TRANSLATORS: command means go to Folders list
#. TRANSLATORS: To Folders
-#: alpine/mailcmd.c:2680 alpine/adrbkcmd.c:854
+#: alpine/mailcmd.c:2681 alpine/adrbkcmd.c:857
msgid "To Fldrs"
msgstr ""
-#: alpine/mailcmd.c:2686 alpine/mailcmd.c:5320
+#: alpine/mailcmd.c:2687 alpine/mailcmd.c:5327
msgid "Prev Collection"
msgstr ""
-#: alpine/mailcmd.c:2691 alpine/mailcmd.c:5325
+#: alpine/mailcmd.c:2692 alpine/mailcmd.c:5332
msgid "Next Collection"
msgstr ""
#. TRANSLATORS: list all the matches
-#: alpine/mailcmd.c:2707 alpine/mailcmd.c:3482 alpine/mailcmd.c:5344
+#: alpine/mailcmd.c:2708 alpine/mailcmd.c:3483 alpine/mailcmd.c:5351
msgid "ListMatches"
msgstr ""
-#: alpine/mailcmd.c:2829 alpine/mailcmd.c:5457
+#: alpine/mailcmd.c:2830 alpine/mailcmd.c:5468
msgid "Error reading folder name"
msgstr ""
-#: alpine/mailcmd.c:2860 alpine/mailcmd.c:5532 alpine/mailcmd.c:5543
+#: alpine/mailcmd.c:2861 alpine/mailcmd.c:5543 alpine/mailcmd.c:5554
#, c-format
msgid "Problem accessing folder \"%s\""
msgstr ""
-#: alpine/mailcmd.c:2909 alpine/folder.c:2586
+#: alpine/mailcmd.c:2910 alpine/folder.c:2744
#, c-format
msgid "\"%s\" is a directory"
msgstr ""
-#: alpine/mailcmd.c:2955
+#: alpine/mailcmd.c:2956
msgid "HELP FOR SAVE"
msgstr ""
-#: alpine/mailcmd.c:3101
+#: alpine/mailcmd.c:3102
#, c-format
msgid "\"%.15s%s\" doesn't exist - Add it in FOLDER LIST screen"
msgstr ""
-#: alpine/mailcmd.c:3108
+#: alpine/mailcmd.c:3109
#, c-format
msgid "Folder \"%.15s%s\" in <%.15s%s> doesn't exist. Create"
msgstr ""
-#: alpine/mailcmd.c:3115
+#: alpine/mailcmd.c:3116
#, c-format
msgid "Folder \"%.40s%s\" doesn't exist. Create"
msgstr ""
-#: alpine/mailcmd.c:3194
+#: alpine/mailcmd.c:3195
msgid "Can't expunge. Folder is read-only"
msgstr ""
-#: alpine/mailcmd.c:3243
+#: alpine/mailcmd.c:3244
msgid "Expunging"
msgstr ""
-#: alpine/mailcmd.c:3275
+#: alpine/mailcmd.c:3276
#, c-format
msgid "No messages expunged from folder \"%s\""
msgstr ""
-#: alpine/mailcmd.c:3279
+#: alpine/mailcmd.c:3280
msgid "No messages marked deleted. No messages expunged."
msgstr ""
-#: alpine/mailcmd.c:3457 alpine/mailcmd.c:3876 alpine/adrbkcmd.c:4173
-#: alpine/folder.c:3561 alpine/folder.c:3696 alpine/mailpart.c:1297
-#: alpine/mailpart.c:1724 alpine/mailpart.c:1803 pico/attach.c:68
-#: pico/file.c:131 pico/file.c:576
+#: alpine/mailcmd.c:3458 alpine/mailcmd.c:3877 alpine/adrbkcmd.c:4178
+#: alpine/folder.c:3719 alpine/folder.c:3854 alpine/mailpart.c:1298
+#: alpine/mailpart.c:1725 alpine/mailpart.c:1804 pico/attach.c:69
+#: pico/file.c:132 pico/file.c:577
msgid "To Files"
msgstr ""
#. TRANSLATORS: this is an abbreviation for Download Messages
-#: alpine/mailcmd.c:3465 alpine/mailpart.c:1315
+#: alpine/mailcmd.c:3466 alpine/mailpart.c:1316
msgid "Downld Msg"
msgstr ""
-#: alpine/mailcmd.c:3535 alpine/mailcmd.c:3971 alpine/adrbkcmd.c:4259
-#: alpine/folder.c:3593 alpine/mailpart.c:1752 alpine/mailpart.c:1829
+#: alpine/mailcmd.c:3536 alpine/mailcmd.c:3972 alpine/adrbkcmd.c:4264
+#: alpine/folder.c:3751 alpine/mailpart.c:1753 alpine/mailpart.c:1830
#, c-format
msgid "Can't export to file outside of %s"
msgstr ""
-#: alpine/mailcmd.c:3596
+#: alpine/mailcmd.c:3597
msgid "Error running download command"
msgstr ""
-#: alpine/mailcmd.c:3609
+#: alpine/mailcmd.c:3610
msgid "Download Command Completed"
msgstr ""
#. TRANSLATORS: error opening file "<filename>" to export message: <error text>
#. TRANSLATORS: Error opening file <filename> to export message: <error text>
-#: alpine/mailcmd.c:3627 alpine/mailpart.c:1781
+#: alpine/mailcmd.c:3628 alpine/mailpart.c:1782
#, c-format
msgid "Error opening file \"%s\" to export message: %s"
msgstr ""
-#: alpine/mailcmd.c:3639
+#: alpine/mailcmd.c:3640
msgid "Can't export message. Error accessing mail folder"
msgstr ""
#. TRANSLATORS: Error exporting to <filename>: <error text>
-#: alpine/mailcmd.c:3680 alpine/adrbkcmd.c:4464
+#: alpine/mailcmd.c:3681 alpine/adrbkcmd.c:4469
#, c-format
msgid "Error exporting to \"%s\" : %s"
msgstr ""
-#: alpine/mailcmd.c:3706
+#: alpine/mailcmd.c:3707
#, c-format
msgid "Can't save attachments, filename too long: %s"
msgstr ""
-#: alpine/mailcmd.c:3747
+#: alpine/mailcmd.c:3748
msgid "Problem saving attachments"
msgstr ""
-#: alpine/mailcmd.c:3754
+#: alpine/mailcmd.c:3755
#, c-format
msgid "Problem saving attachments: %s: %s"
msgstr ""
-#: alpine/mailcmd.c:3765
+#: alpine/mailcmd.c:3766
msgid "Problem reading message"
msgstr ""
-#: alpine/mailcmd.c:3816
+#: alpine/mailcmd.c:3817
msgid "Problems saving attachments"
msgstr ""
#. TRANSLATORS: Saved <how many> attachements to <directory name>
-#: alpine/mailcmd.c:3822
+#: alpine/mailcmd.c:3823
#, c-format
msgid "Saved %s attachments to %s"
msgstr ""
-#: alpine/mailcmd.c:3825
+#: alpine/mailcmd.c:3826
msgid "No attachments to save"
msgstr ""
#. TRANSLATORS: Problem saving to <filename>: <error text>
-#: alpine/mailcmd.c:3924 alpine/mailcmd.c:3934
+#: alpine/mailcmd.c:3925 alpine/mailcmd.c:3935
#, c-format
msgid "Problem saving to \"%s\": %s"
msgstr ""
-#: alpine/mailcmd.c:3941
+#: alpine/mailcmd.c:3942
#, c-format
msgid "Error opening file \"%s\" for export: %s"
msgstr ""
#. TRANSLATORS: Export all attachment parts
-#: alpine/mailcmd.c:4073 alpine/mailcmd.c:4498
+#: alpine/mailcmd.c:4074 alpine/mailcmd.c:4499
msgid "AllParts"
msgstr ""
-#: alpine/mailcmd.c:4270
+#: alpine/mailcmd.c:4271
msgid "HELP FOR IMPORT FILE SELECT"
msgstr ""
-#: alpine/mailcmd.c:4272 alpine/mailcmd.c:4274
+#: alpine/mailcmd.c:4273 alpine/mailcmd.c:4275
msgid "HELP FOR EXPORT FILE SELECT"
msgstr ""
-#: alpine/mailcmd.c:4503
+#: alpine/mailcmd.c:4504
msgid "NoAllParts"
msgstr ""
-#: alpine/mailcmd.c:4576
+#: alpine/mailcmd.c:4580
#, c-format
msgid "Error expanding file name: \"%s\" unknown user"
msgstr ""
#. TRANSLATORS: asking user if they want to overwrite (replace contents of)
#. a file or append to the end of the file
-#: alpine/mailcmd.c:4628
+#: alpine/mailcmd.c:4632
msgid "Overwrite"
msgstr ""
-#: alpine/mailcmd.c:4629
+#: alpine/mailcmd.c:4633
msgid "Append"
msgstr ""
#. TRANSLATORS: asking user whether to overwrite a file or not,
#. File <filename> already exists. Overwrite it ?
-#: alpine/mailcmd.c:4639
+#: alpine/mailcmd.c:4643
#, c-format
msgid "File \"%s%s\" already exists. Overwrite it "
msgstr ""
#. TRANSLATORS: Cannot remove old <filename>: <error text>
-#: alpine/mailcmd.c:4650
+#: alpine/mailcmd.c:4654
#, c-format
msgid "Cannot remove old %s: %s"
msgstr ""
#. TRANSLATORS: File <filename> already exists. Overwrite or append to it ?
-#: alpine/mailcmd.c:4663
+#: alpine/mailcmd.c:4667
#, c-format
msgid "File \"%s%s\" already exists. Overwrite or append to it ? "
msgstr ""
#. TRANSLATORS: Warning: Cannot truncate old <filename>: <error text>
-#: alpine/mailcmd.c:4677
+#: alpine/mailcmd.c:4681
#, c-format
msgid "Warning: Cannot truncate old %s: %s"
msgstr ""
#. TRANSLATORS: go to First Message
-#: alpine/mailcmd.c:4818 alpine/mailindx.c:2946
+#: alpine/mailcmd.c:4825 alpine/mailindx.c:2949
msgid "First Msg"
msgstr ""
-#: alpine/mailcmd.c:4819 alpine/mailindx.c:2947
+#: alpine/mailcmd.c:4826 alpine/mailindx.c:2950
msgid "Last Msg"
msgstr ""
-#: alpine/mailcmd.c:4902 alpine/mailcmd.c:5160
+#: alpine/mailcmd.c:4909 alpine/mailcmd.c:5167
msgid "Invalid number entered. Use only digits 0-9"
msgstr ""
-#: alpine/mailcmd.c:5167
+#: alpine/mailcmd.c:5174
msgid "Number should be >= 0"
msgstr ""
-#: alpine/mailcmd.c:5170
+#: alpine/mailcmd.c:5177
#, c-format
msgid "Maximum is %s"
msgstr ""
-#: alpine/mailcmd.c:5331
+#: alpine/mailcmd.c:5338
msgid "INBOX"
msgstr ""
-#: alpine/mailcmd.c:5547
+#: alpine/mailcmd.c:5558
#, c-format
msgid "Can't find Incoming Folder: %s"
msgstr ""
-#: alpine/mailcmd.c:5551
+#: alpine/mailcmd.c:5562
#, c-format
msgid "Can't find folder \"%s\" in %s"
msgstr ""
-#: alpine/mailcmd.c:5555
+#: alpine/mailcmd.c:5566
#, c-format
msgid "Can't find folder \"%s\""
msgstr ""
#. TRANSLATORS: This is a question, Print Index ?
-#: alpine/mailcmd.c:5898
+#: alpine/mailcmd.c:5909
msgid "Print Index"
msgstr ""
-#: alpine/mailcmd.c:5961
+#: alpine/mailcmd.c:5972
msgid "Error printing folder index"
msgstr ""
-#: alpine/mailcmd.c:5990
+#: alpine/mailcmd.c:6001
msgid "Error printing message"
msgstr ""
-#: alpine/mailcmd.c:6120
+#: alpine/mailcmd.c:6131
msgid "Shown Text"
msgstr ""
-#: alpine/mailcmd.c:6120
+#: alpine/mailcmd.c:6131
msgid "Raw Text"
msgstr ""
-#: alpine/mailcmd.c:6121
+#: alpine/mailcmd.c:6132
msgid "Free Output"
msgstr ""
-#: alpine/mailcmd.c:6121
+#: alpine/mailcmd.c:6132
msgid "Capture Output"
msgstr ""
-#: alpine/mailcmd.c:6122
+#: alpine/mailcmd.c:6133
msgid "No Delimiter"
msgstr ""
-#: alpine/mailcmd.c:6122
+#: alpine/mailcmd.c:6133
msgid "With Delimiter"
msgstr ""
-#: alpine/mailcmd.c:6124
+#: alpine/mailcmd.c:6135
msgid "To Same Pipe"
msgstr ""
-#: alpine/mailcmd.c:6124
+#: alpine/mailcmd.c:6135
msgid "To Individual Pipes"
msgstr ""
-#: alpine/mailcmd.c:6150
+#: alpine/mailcmd.c:6161
msgid "Internal problem encountered"
msgstr ""
-#: alpine/mailcmd.c:6273
+#: alpine/mailcmd.c:6284
#, c-format
msgid "Internal Error: %s"
msgstr ""
-#: alpine/mailcmd.c:6296
+#: alpine/mailcmd.c:6307
msgid "Error piping message"
msgstr ""
-#: alpine/mailcmd.c:6306
+#: alpine/mailcmd.c:6317
msgid "Pipe command completed"
msgstr ""
-#: alpine/mailcmd.c:6320
+#: alpine/mailcmd.c:6331
msgid "HELP FOR PIPE COMMAND"
msgstr ""
-#: alpine/mailcmd.c:6390
+#: alpine/mailcmd.c:6401
msgid " has information associated with it "
msgstr ""
-#: alpine/mailcmd.c:6391
+#: alpine/mailcmd.c:6402
msgid "that explains how to participate in an email list. An "
msgstr ""
-#: alpine/mailcmd.c:6392
+#: alpine/mailcmd.c:6403
msgid "email list is represented by a single email address that "
msgstr ""
-#: alpine/mailcmd.c:6393
+#: alpine/mailcmd.c:6404
msgid "users sharing a common interest can send messages to (known "
msgstr ""
-#: alpine/mailcmd.c:6394
+#: alpine/mailcmd.c:6405
msgid "as posting) which are then redistributed to all members "
msgstr ""
-#: alpine/mailcmd.c:6395
+#: alpine/mailcmd.c:6406
msgid "of the list (sometimes after review by a moderator)."
msgstr ""
-#: alpine/mailcmd.c:6396
+#: alpine/mailcmd.c:6407
msgid "<P>List participation commands in this message include:"
msgstr ""
-#: alpine/mailcmd.c:6441
+#: alpine/mailcmd.c:6452
msgid "With the provided comment:<P><BLOCKQUOTE>"
msgstr ""
-#: alpine/mailcmd.c:6450
+#: alpine/mailcmd.c:6461
msgid "Posting is <EM>not</EM> allowed on this list"
msgstr ""
-#: alpine/mailcmd.c:6534
+#: alpine/mailcmd.c:6545
msgid "MAIL LIST COMMANDS"
msgstr ""
-#: alpine/mailcmd.c:6538
+#: alpine/mailcmd.c:6549
msgid "HELP FOR LIST COMMANDS"
msgstr ""
-#: alpine/mailcmd.c:6610
+#: alpine/mailcmd.c:6621
msgid "unselect Curthrd"
msgstr ""
-#: alpine/mailcmd.c:6615 alpine/folder.c:3127
+#: alpine/mailcmd.c:6626 alpine/folder.c:3285
msgid "unselect Cur"
msgstr ""
-#: alpine/mailcmd.c:6660
+#: alpine/mailcmd.c:6671
msgid "HELP FOR SELECT"
msgstr ""
-#: alpine/mailcmd.c:6835
+#: alpine/mailcmd.c:6846
msgid "No change resulted. Matching messages already selected."
msgstr ""
-#: alpine/mailcmd.c:6838
+#: alpine/mailcmd.c:6849
#, c-format
msgid "Select failed. No %smessages selected."
msgstr ""
-#: alpine/mailcmd.c:6839
+#: alpine/mailcmd.c:6850
msgid "additional "
msgstr ""
-#: alpine/mailcmd.c:6854
+#: alpine/mailcmd.c:6865
#, c-format
msgid "Select matched %s message%s!"
msgstr ""
-#: alpine/mailcmd.c:7020
+#: alpine/mailcmd.c:7031
msgid "Flag"
msgstr ""
-#: alpine/mailcmd.c:7027
+#: alpine/mailcmd.c:7038
msgid "Pipe"
msgstr ""
-#: alpine/mailcmd.c:7042
+#: alpine/mailcmd.c:7053
msgid "Collapse"
msgstr ""
-#: alpine/mailcmd.c:7043 alpine/addrbook.c:2502 alpine/addrbook.c:2724
+#: alpine/mailcmd.c:7054 alpine/addrbook.c:2503 alpine/addrbook.c:2725
msgid "Expand"
msgstr ""
-#: alpine/mailcmd.c:7050
+#: alpine/mailcmd.c:7061
msgid "UnSelect"
msgstr ""
-#: alpine/mailcmd.c:7233 alpine/mailcmd.c:7385
+#: alpine/mailcmd.c:7244 alpine/mailcmd.c:7396
#, c-format
msgid "Invalid number range, missing number before \"-\": %s"
msgstr ""
-#: alpine/mailcmd.c:7243
+#: alpine/mailcmd.c:7254
#, c-format
msgid "Invalid message number: %s"
msgstr ""
-#: alpine/mailcmd.c:7252 alpine/mailcmd.c:7282
+#: alpine/mailcmd.c:7263 alpine/mailcmd.c:7293
#, c-format
msgid "\"%s\" out of message number range"
msgstr ""
-#: alpine/mailcmd.c:7272 alpine/mailcmd.c:7425
+#: alpine/mailcmd.c:7283 alpine/mailcmd.c:7436
#, c-format
msgid "Invalid number range, missing number after \"-\": %s"
msgstr ""
-#: alpine/mailcmd.c:7293 alpine/mailcmd.c:7446
+#: alpine/mailcmd.c:7304 alpine/mailcmd.c:7457
#, c-format
msgid "Invalid reverse message number range: %s-%s"
msgstr ""
-#: alpine/mailcmd.c:7395
+#: alpine/mailcmd.c:7406
#, c-format
msgid "Invalid thread number: %s"
msgstr ""
-#: alpine/mailcmd.c:7404 alpine/mailcmd.c:7435
+#: alpine/mailcmd.c:7415 alpine/mailcmd.c:7446
#, c-format
msgid "\"%s\" out of thread number range"
msgstr ""
-#: alpine/mailcmd.c:7637 alpine/mailcmd.c:7953 alpine/mailcmd.c:8106
-#: alpine/mailcmd.c:8204 alpine/mailcmd.c:8291 alpine/mailcmd.c:8512
+#: alpine/mailcmd.c:7648 alpine/mailcmd.c:7998 alpine/mailcmd.c:8151
+#: alpine/mailcmd.c:8249 alpine/mailcmd.c:8336 alpine/mailcmd.c:8557
msgid "Selecting"
msgstr ""
-#: alpine/mailcmd.c:7651
+#: alpine/mailcmd.c:7662
#, c-format
msgid "Invalid date entered: %s"
msgstr ""
-#: alpine/mailcmd.c:7683
+#: alpine/mailcmd.c:7694
msgid "[Match_My_Addresses]"
msgstr ""
-#: alpine/mailcmd.c:7684
+#: alpine/mailcmd.c:7695
msgid "[Don't_Match_My_Addresses]"
msgstr ""
#. TRANSLATORS: use Current To Address
-#: alpine/mailcmd.c:7723
+#: alpine/mailcmd.c:7734
msgid "Cur To"
msgstr ""
#. TRANSLATORS: use Current From Address
-#: alpine/mailcmd.c:7728
+#: alpine/mailcmd.c:7739
msgid "Cur From"
msgstr ""
#. TRANSLATORS: use Current Cc Address
-#: alpine/mailcmd.c:7733
+#: alpine/mailcmd.c:7744
msgid "Cur Cc"
msgstr ""
#. TRANSLATORS: Match Me means match my address
-#: alpine/mailcmd.c:7738
+#: alpine/mailcmd.c:7749
msgid "Match Me"
msgstr ""
#. TRANSLATORS: use Current Subject
-#: alpine/mailcmd.c:7751
+#: alpine/mailcmd.c:7762
msgid "Cur Subject"
msgstr ""
-#: alpine/mailcmd.c:8028 alpine/mailcmd.c:8047
+#: alpine/mailcmd.c:8073 alpine/mailcmd.c:8092
#, c-format
msgid "Invalid size entered: %s"
msgstr ""
-#: alpine/mailcmd.c:8189
+#: alpine/mailcmd.c:8234
msgid "HELP FOR SELECT BASED ON STATUS"
msgstr ""
-#: alpine/mailcmd.c:8242
+#: alpine/mailcmd.c:8287
msgid "Rule to NOT match: "
msgstr ""
-#: alpine/mailcmd.c:8243
+#: alpine/mailcmd.c:8288
msgid "Rule to match: "
msgstr ""
-#: alpine/mailcmd.c:8260
+#: alpine/mailcmd.c:8305
msgid "HELP FOR SELECT BY RULE"
msgstr ""
-#: alpine/mailcmd.c:8325
+#: alpine/mailcmd.c:8370
msgid "No rules available. Use Setup/Rules to add some."
msgstr ""
-#: alpine/mailcmd.c:8337
+#: alpine/mailcmd.c:8382
msgid "No rules defined, use Setup/Rules"
msgstr ""
#. TRANSLATORS: SELECT A RULE is a screen title
#. TRANSLATORS: Print something1 using something2.
#. "rules" is something1
-#: alpine/mailcmd.c:8351
+#: alpine/mailcmd.c:8396
msgid "SELECT A RULE"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. "rules" is something1
-#: alpine/mailcmd.c:8352 alpine/roleconf.c:376
+#: alpine/mailcmd.c:8397 alpine/roleconf.c:377
msgid "rules"
msgstr ""
-#: alpine/mailcmd.c:8353
+#: alpine/mailcmd.c:8398
msgid "HELP FOR SELECTING A RULE NICKNAME"
msgstr ""
-#: alpine/mailcmd.c:8436
+#: alpine/mailcmd.c:8481
msgid "Keyword (or keyword initial) to NOT match: "
msgstr ""
-#: alpine/mailcmd.c:8438
+#: alpine/mailcmd.c:8483
msgid "Keyword (or keyword initial) to match: "
msgstr ""
-#: alpine/mailcmd.c:8442
+#: alpine/mailcmd.c:8487
msgid "Keyword to NOT match: "
msgstr ""
-#: alpine/mailcmd.c:8444
+#: alpine/mailcmd.c:8489
msgid "Keyword to match: "
msgstr ""
-#: alpine/mailcmd.c:8549
+#: alpine/mailcmd.c:8594
msgid "No keywords defined, use \"keywords\" option in Setup/Config"
msgstr ""
#. TRANSLATORS: SELECT A KEYWORD is a screen title
#. TRANSLATORS: Print something1 using something2.
#. "keywords" is something1
-#: alpine/mailcmd.c:8562
+#: alpine/mailcmd.c:8607
msgid "SELECT A KEYWORD"
msgstr ""
-#: alpine/mailcmd.c:8563 alpine/mailcmd.c:8614
+#: alpine/mailcmd.c:8608 alpine/mailcmd.c:8659
msgid "keywords"
msgstr ""
-#: alpine/mailcmd.c:8564
+#: alpine/mailcmd.c:8609
msgid "HELP FOR SELECTING A KEYWORD"
msgstr ""
-#: alpine/mailcmd.c:8614
+#: alpine/mailcmd.c:8659
msgid "SELECT KEYWORDS"
msgstr ""
-#: alpine/mailcmd.c:8616
+#: alpine/mailcmd.c:8661
msgid "HELP FOR SELECTING KEYWORDS"
msgstr ""
-#: alpine/mailcmd.c:8664
+#: alpine/mailcmd.c:8709
msgid "No charsets found? Enter charset manually."
msgstr ""
#. TRANSLATORS: SELECT A CHARACTER SET is a screen title
#. TRANSLATORS: Print something1 using something2.
#. "character sets" is something1
-#: alpine/mailcmd.c:8685
+#: alpine/mailcmd.c:8730
msgid "SELECT A CHARACTER SET"
msgstr ""
-#: alpine/mailcmd.c:8686 alpine/mailcmd.c:8860
+#: alpine/mailcmd.c:8731 alpine/mailcmd.c:8905
msgid "character sets"
msgstr ""
-#: alpine/mailcmd.c:8687
+#: alpine/mailcmd.c:8732
msgid "HELP FOR SELECTING A CHARACTER SET"
msgstr ""
-#: alpine/mailcmd.c:8797
+#: alpine/mailcmd.c:8842
msgid "Scripts representing groups of related character sets"
msgstr ""
-#: alpine/mailcmd.c:8827
+#: alpine/mailcmd.c:8872
msgid "Individual character sets, may be mixed with scripts"
msgstr ""
-#: alpine/mailcmd.c:8860
+#: alpine/mailcmd.c:8905
msgid "SELECT CHARACTER SETS"
msgstr ""
-#: alpine/mailcmd.c:8862
+#: alpine/mailcmd.c:8907
msgid "HELP FOR SELECTING CHARACTER SETS"
msgstr ""
-#: alpine/mailcmd.c:8920
+#: alpine/mailcmd.c:8959
+msgid "Resource : "
+msgstr ""
+
+#: alpine/mailcmd.c:8963
+msgid "Usage : "
+msgstr ""
+
+#: alpine/mailcmd.c:8968 alpine/mailcmd.c:8983
+msgid " message"
+msgstr ""
+
+#: alpine/mailcmd.c:8970
+msgid "s "
+msgstr ""
+
+#: alpine/mailcmd.c:8972
+msgid " "
+msgstr ""
+
+#: alpine/mailcmd.c:8978
+msgid "Limit : "
+msgstr ""
+
+#: alpine/mailcmd.c:8985
+msgid ""
+"s\n"
+"\n"
+msgstr ""
+
+#: alpine/mailcmd.c:8987
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: alpine/mailcmd.c:8994
+msgid "Quota Resources Summary"
+msgstr ""
+
+#: alpine/mailcmd.c:8995
+msgid "QUOTA SUMMARY"
+msgstr ""
+
+#: alpine/mailcmd.c:9049
msgid "Choose type of sort : "
msgstr ""
-#: alpine/mailcmd.c:8922
+#: alpine/mailcmd.c:9051
msgid "Choose type of sort, or 'R' to reverse current sort : "
msgstr ""
-#: alpine/mailcmd.c:8942
+#: alpine/mailcmd.c:9071
msgid "Reverse"
msgstr ""
@@ -3372,42 +3434,42 @@ msgstr ""
#. of the message or thread, as in
#. Message 17
#. when reading message number 17.
-#: alpine/titlebar.c:517 alpine/titlebar.c:527
+#: alpine/titlebar.c:521 alpine/titlebar.c:531
msgid "Thd"
msgstr ""
-#: alpine/titlebar.c:517 alpine/titlebar.c:527
+#: alpine/titlebar.c:521 alpine/titlebar.c:531
msgid "Thread"
msgstr ""
-#: alpine/titlebar.c:519
+#: alpine/titlebar.c:523
msgid "Msg"
msgstr ""
-#: alpine/titlebar.c:519
+#: alpine/titlebar.c:523
msgid "Message"
msgstr ""
#. TRANSLATORS: it might say READONLY or CLOSED in the titlebar, referring to
#. the current folder.
-#: alpine/titlebar.c:674
+#: alpine/titlebar.c:678
msgid "(CLOSED)"
msgstr ""
-#: alpine/titlebar.c:677
+#: alpine/titlebar.c:681
msgid "(READONLY)"
msgstr ""
#. TRANSLATORS: the name of the open folder follows this in the titlebar
-#: alpine/titlebar.c:762
+#: alpine/titlebar.c:766
msgid "Folder: "
msgstr ""
-#: alpine/adrbkcmd.c:145
+#: alpine/adrbkcmd.c:148
msgid "Error reading entry"
msgstr ""
-#: alpine/adrbkcmd.c:150
+#: alpine/adrbkcmd.c:153
msgid "Nothing to view"
msgstr ""
@@ -3415,11 +3477,11 @@ msgstr ""
#. TRANSLATORS: these are the headings for setting up a collection of
#. folders, PATH is a filesystem path, VIEW is sort of a technical
#. term that can be used to restrict the View to fewer folders
-#: alpine/adrbkcmd.c:159 alpine/adrbkcmd.c:162 alpine/adrbkcmd.c:566
-#: alpine/adrbkcmd.c:842 alpine/adrbkcmd.c:1025 alpine/adrbkcmd.c:1033
-#: alpine/adrbkcmd.c:1601 alpine/adrbkcmd.c:1862 alpine/adrbkcmd.c:5743
-#: alpine/adrbkcmd.c:5855 alpine/folder.c:873 alpine/folder.c:943
-#: alpine/folder.c:948 alpine/roleconf.c:2927
+#: alpine/adrbkcmd.c:162 alpine/adrbkcmd.c:165 alpine/adrbkcmd.c:569
+#: alpine/adrbkcmd.c:845 alpine/adrbkcmd.c:1028 alpine/adrbkcmd.c:1036
+#: alpine/adrbkcmd.c:1606 alpine/adrbkcmd.c:1867 alpine/adrbkcmd.c:5748
+#: alpine/adrbkcmd.c:5860 alpine/folder.c:884 alpine/folder.c:956
+#: alpine/folder.c:961 alpine/roleconf.c:2928
msgid "Nickname"
msgstr ""
@@ -3427,8 +3489,8 @@ msgstr ""
#. For example, in
#. Fred Flintstone <fred@bedrock.org>
#. Fred Flintstone is the Full Name.
-#: alpine/adrbkcmd.c:173 alpine/adrbkcmd.c:583 alpine/adrbkcmd.c:847
-#: alpine/adrbkcmd.c:1043 alpine/adrbkcmd.c:5863
+#: alpine/adrbkcmd.c:176 alpine/adrbkcmd.c:586 alpine/adrbkcmd.c:850
+#: alpine/adrbkcmd.c:1046 alpine/adrbkcmd.c:5868
msgid "Fullname"
msgstr ""
@@ -3436,41 +3498,41 @@ msgstr ""
#. a cc which is a copy of a message that goes to somebody other than the
#. main recipient, only this is a copy of a message which is put into a
#. file on the user's computer.
-#: alpine/adrbkcmd.c:184 alpine/adrbkcmd.c:1051 alpine/adrbkcmd.c:5871
+#: alpine/adrbkcmd.c:187 alpine/adrbkcmd.c:1054 alpine/adrbkcmd.c:5876
msgid "Fcc"
msgstr ""
#. TRANSLATORS: %s is the error message
-#: alpine/adrbkcmd.c:272
+#: alpine/adrbkcmd.c:275
#, c-format
msgid "Can't format entry: %s"
msgstr ""
-#: alpine/adrbkcmd.c:282 alpine/adrbkcmd.c:746 alpine/adrbkcmd.c:818
-#: alpine/adrbkcmd.c:6931
+#: alpine/adrbkcmd.c:285 alpine/adrbkcmd.c:749 alpine/adrbkcmd.c:821
+#: alpine/adrbkcmd.c:6936
msgid "expanded entry"
msgstr ""
#. TRANSLATORS: a screen title. We are viewing an address book
#. TRANSLATORS: screen titles
-#: alpine/adrbkcmd.c:292 alpine/adrbkcmd.c:966
+#: alpine/adrbkcmd.c:295 alpine/adrbkcmd.c:969
#, c-format
msgid "ADDRESS BOOK (View)"
msgstr ""
#. TRANSLATORS: help screen title
-#: alpine/adrbkcmd.c:299
+#: alpine/adrbkcmd.c:302
msgid "HELP FOR ADDRESS BOOK VIEW"
msgstr ""
#. TRANSLATORS: The address book was changed by some other
#. process. The user is being told that their change (their
#. Update) has been canceled and they should try again.
-#: alpine/adrbkcmd.c:425
+#: alpine/adrbkcmd.c:428
msgid "Address book changed. Update cancelled. Try again."
msgstr ""
-#: alpine/adrbkcmd.c:454
+#: alpine/adrbkcmd.c:457
msgid "update"
msgstr ""
@@ -3479,107 +3541,107 @@ msgstr ""
#. in the new message. Forward as a Vcard attachment means to
#. attach it to the message in a special format so it is recognizable
#. as a Vcard.
-#: alpine/adrbkcmd.c:504
+#: alpine/adrbkcmd.c:507
msgid "Forward as text or forward as Vcard attachment ? "
msgstr ""
-#: alpine/adrbkcmd.c:509 alpine/adrbkcmd.c:4666
+#: alpine/adrbkcmd.c:512 alpine/adrbkcmd.c:4671
msgid "Address book forward cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:567 alpine/adrbkcmd.c:581
+#: alpine/adrbkcmd.c:570 alpine/adrbkcmd.c:584
msgid "Address"
msgstr ""
#. TRANSLATORS: screen title for viewing an address book entry in Rich
#. view mode. Rich just means it is expanded to include everything.
-#: alpine/adrbkcmd.c:749
+#: alpine/adrbkcmd.c:752
msgid "ADDRESS BOOK (Rich View)"
msgstr ""
-#: alpine/adrbkcmd.c:848 alpine/adrbkcmd.c:857
+#: alpine/adrbkcmd.c:851 alpine/adrbkcmd.c:860
msgid "To Message"
msgstr ""
#. TRANSLATORS: a File Copy is a copy of a sent message saved in a regular
#. file on the computer's disk
-#: alpine/adrbkcmd.c:852
+#: alpine/adrbkcmd.c:855
msgid "FileCopy"
msgstr ""
-#: alpine/adrbkcmd.c:856 alpine/adrbkcmd.c:1059 alpine/adrbkcmd.c:5890
-#: alpine/roleconf.c:2946
+#: alpine/adrbkcmd.c:859 alpine/adrbkcmd.c:1062 alpine/adrbkcmd.c:5895
+#: alpine/roleconf.c:2947
msgid "Comment"
msgstr ""
-#: alpine/adrbkcmd.c:962
+#: alpine/adrbkcmd.c:965
msgid "RichView"
msgstr ""
-#: alpine/adrbkcmd.c:968
+#: alpine/adrbkcmd.c:971
#, c-format
msgid "ADDRESS BOOK (%c%s)"
msgstr ""
-#: alpine/adrbkcmd.c:997
+#: alpine/adrbkcmd.c:1000
msgid ""
"\n"
" Fill in the fields. It is ok to leave fields blank."
msgstr ""
-#: alpine/adrbkcmd.c:999
+#: alpine/adrbkcmd.c:1002
msgid ""
"\n"
" To form a list, just enter multiple comma-separated addresses."
msgstr ""
#. TRANSLATORS: Same here, but a different version of the screen.
-#: alpine/adrbkcmd.c:1004
+#: alpine/adrbkcmd.c:1007
msgid ""
"\n"
" Change any of the fields. It is ok to leave fields blank."
msgstr ""
-#: alpine/adrbkcmd.c:1007
+#: alpine/adrbkcmd.c:1010
msgid ""
"\n"
" Since this entry does a directory lookup you may not edit the address field."
msgstr ""
-#: alpine/adrbkcmd.c:1010
+#: alpine/adrbkcmd.c:1013
msgid ""
"\n"
" Additional comma-separated addresses may be entered in the address field."
msgstr ""
-#: alpine/adrbkcmd.c:1014
+#: alpine/adrbkcmd.c:1017
msgid ""
"\n"
" Press \"^X\" to save the entry, \"^C\" to cancel, \"^G\" for help."
msgstr ""
-#: alpine/adrbkcmd.c:1016
+#: alpine/adrbkcmd.c:1019
msgid ""
"\n"
" If you want to use quotation marks inside the Fullname field, it is best"
msgstr ""
-#: alpine/adrbkcmd.c:1018
+#: alpine/adrbkcmd.c:1021
msgid ""
"\n"
" to use single quotation marks; for example: George 'Husky' Washington."
msgstr ""
-#: alpine/adrbkcmd.c:1146
+#: alpine/adrbkcmd.c:1149
#, c-format
msgid "Address book %s cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:1173
+#: alpine/adrbkcmd.c:1178
msgid "Warning: entry has no addresses"
msgstr ""
-#: alpine/adrbkcmd.c:1252 alpine/adrbkcmd.c:6467
+#: alpine/adrbkcmd.c:1257 alpine/adrbkcmd.c:6472
#, c-format
msgid "Error updating address book: %s"
msgstr ""
@@ -3589,155 +3651,155 @@ msgstr ""
#. The second %s is the name of the other address book.
#. The third %s is " as " because it will say something
#. like also exists in <name> as <description>.
-#: alpine/adrbkcmd.c:1275
+#: alpine/adrbkcmd.c:1280
#, c-format
msgid "Warning! Nickname %s also exists in \"%s\"%s%s"
msgstr ""
-#: alpine/adrbkcmd.c:1277
+#: alpine/adrbkcmd.c:1282
msgid " as "
msgstr ""
#. TRANSLATORS: The %s is the nickname of an entry that is already
#. in the address book
-#: alpine/adrbkcmd.c:1372
+#: alpine/adrbkcmd.c:1377
#, c-format
msgid "\"%s\" already in address book."
msgstr ""
#. TRANSLATORS: A question
-#: alpine/adrbkcmd.c:1524
+#: alpine/adrbkcmd.c:1529
msgid "Exit and save changes "
msgstr ""
-#: alpine/adrbkcmd.c:1529 alpine/folder.c:1206
+#: alpine/adrbkcmd.c:1534 alpine/folder.c:1256
msgid "Use ^C to abandon changes you've made"
msgstr ""
#. TRANSLATORS: A question. The %s is a noun describing what is being cancelled.
-#: alpine/adrbkcmd.c:1555 alpine/folder.c:1241
+#: alpine/adrbkcmd.c:1560 alpine/folder.c:1291
#, c-format
msgid "Cancel %s (answering \"Yes\" will abandon any changes made) "
msgstr ""
-#: alpine/adrbkcmd.c:1584
+#: alpine/adrbkcmd.c:1589
msgid "changes"
msgstr ""
-#: alpine/adrbkcmd.c:1595 alpine/folder.c:876 alpine/folder.c:955
+#: alpine/adrbkcmd.c:1600 alpine/folder.c:887 alpine/folder.c:968
msgid "Server"
msgstr ""
-#: alpine/adrbkcmd.c:1598 alpine/folder.c:4306
+#: alpine/adrbkcmd.c:1603 alpine/folder.c:4463
msgid "Folder"
msgstr ""
-#: alpine/adrbkcmd.c:1633
+#: alpine/adrbkcmd.c:1638
msgid "New address book added. Use \"$\" to adjust order"
msgstr ""
#. TRANSLATORS: Change was the name of the command the user was
#. trying to perform. It is what was cancelled.
-#: alpine/adrbkcmd.c:1702
+#: alpine/adrbkcmd.c:1707
msgid "Change cancelled: config file not changeable"
msgstr ""
#. TRANSLATORS: Add was the command that is being cancelled.
-#: alpine/adrbkcmd.c:1705
+#: alpine/adrbkcmd.c:1710
msgid "Add cancelled: config file not changeable"
msgstr ""
#. TRANSLATORS: Operation was cancelled because the system management
#. does not allow the changing of global address books
-#: alpine/adrbkcmd.c:1717
+#: alpine/adrbkcmd.c:1722
msgid "Cancelled: Sys. Mgmt. does not allow changing global address books"
msgstr ""
-#: alpine/adrbkcmd.c:1719
+#: alpine/adrbkcmd.c:1724
msgid "Cancelled: Sys. Mgmt. does not allow changing address books"
msgstr ""
#. TRANSLATORS: screen title
-#: alpine/adrbkcmd.c:1747
+#: alpine/adrbkcmd.c:1752
msgid "CHANGE ADDRESS BOOK"
msgstr ""
#. TRANSLATORS: screen title
-#: alpine/adrbkcmd.c:1750
+#: alpine/adrbkcmd.c:1755
msgid "ADD ADDRESS BOOK"
msgstr ""
#. TRANSLATORS: The next few lines go together to explain how to add
#. the address book entry the user is working on.
-#: alpine/adrbkcmd.c:1766
+#: alpine/adrbkcmd.c:1771
msgid ""
" To add a local address book that will be accessed *only* by Alpine running\n"
" on this machine, leave the server field blank."
msgstr ""
-#: alpine/adrbkcmd.c:1768
+#: alpine/adrbkcmd.c:1773
msgid ""
" To add an address book that will be accessed by IMAP, fill in the\n"
" server name."
msgstr ""
-#: alpine/adrbkcmd.c:1770
+#: alpine/adrbkcmd.c:1775
msgid ""
" (NOTE: An address book cannot be accessed by IMAP from\n"
" one Alpine and as a local file from another. It is either always accessed\n"
" by IMAP or it is a local address book which is never accessed by IMAP.)"
msgstr ""
-#: alpine/adrbkcmd.c:1772
+#: alpine/adrbkcmd.c:1777
msgid " In the Folder field, type the remote folder name or local file name."
msgstr ""
-#: alpine/adrbkcmd.c:1774
+#: alpine/adrbkcmd.c:1779
msgid ""
" In the Nickname field, give the address book a nickname or leave it blank."
msgstr ""
-#: alpine/adrbkcmd.c:1776
+#: alpine/adrbkcmd.c:1781
msgid " To get help specific to an item, press ^G."
msgstr ""
-#: alpine/adrbkcmd.c:1778
+#: alpine/adrbkcmd.c:1783
msgid " To exit and save the configuration, press ^X. To cancel, press ^C."
msgstr ""
-#: alpine/adrbkcmd.c:1842 alpine/adrbkcmd.c:1848
+#: alpine/adrbkcmd.c:1847 alpine/adrbkcmd.c:1853
msgid "Server Name"
msgstr ""
-#: alpine/adrbkcmd.c:1855
+#: alpine/adrbkcmd.c:1860
msgid "Folder Name"
msgstr ""
-#: alpine/adrbkcmd.c:1884 alpine/adrbkcmd.c:1965
+#: alpine/adrbkcmd.c:1889 alpine/adrbkcmd.c:1970
msgid "Address book change is cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:1886 alpine/adrbkcmd.c:1967
+#: alpine/adrbkcmd.c:1891 alpine/adrbkcmd.c:1972
msgid "Address book add is cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:1895
+#: alpine/adrbkcmd.c:1900
msgid "No change: Address book change is cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:1897
+#: alpine/adrbkcmd.c:1902
msgid "No change: Address book add is cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:1993
+#: alpine/adrbkcmd.c:1998
msgid "Change cancelled: couldn't save configuration file"
msgstr ""
-#: alpine/adrbkcmd.c:1995
+#: alpine/adrbkcmd.c:2000
msgid "Add cancelled: couldn't save configuration file"
msgstr ""
-#: alpine/adrbkcmd.c:2114
+#: alpine/adrbkcmd.c:2119
#, c-format
msgid "Convert addressbook%s to a remote addrbook "
msgstr ""
@@ -3745,71 +3807,71 @@ msgstr ""
#. TRANSLATORS: The user is defining an address book which will be
#. stored on another server. This is called a remote addrbook and
#. this is a question asking for the name of the server.
-#: alpine/adrbkcmd.c:2140
+#: alpine/adrbkcmd.c:2145
#, c-format
msgid "Name of server to contain remote addrbook : "
msgstr ""
-#: alpine/adrbkcmd.c:2207
+#: alpine/adrbkcmd.c:2212
msgid "You now have a chance to change the name of the remote addrbook..."
msgstr ""
-#: alpine/adrbkcmd.c:2256 alpine/adrbkcmd.c:2410 alpine/adrbkcmd.c:2518
-#: alpine/adrbkcmd.c:2593 alpine/adrbkcmd.c:2864 alpine/mailpart.c:2343
-#: alpine/mailpart.c:2394 alpine/mailpart.c:2850
+#: alpine/adrbkcmd.c:2261 alpine/adrbkcmd.c:2415 alpine/adrbkcmd.c:2523
+#: alpine/adrbkcmd.c:2598 alpine/adrbkcmd.c:2869 alpine/mailpart.c:2344
+#: alpine/mailpart.c:2395 alpine/mailpart.c:2851
msgid "Error allocating space for message."
msgstr ""
#. TRANSLATORS: Several lines in a row here that go together.
-#: alpine/adrbkcmd.c:2261
+#: alpine/adrbkcmd.c:2266
#, c-format
msgid ""
"\n"
"Your addressbook%s has been copied to the"
msgstr ""
-#: alpine/adrbkcmd.c:2264
+#: alpine/adrbkcmd.c:2269
msgid ""
"\n"
"remote folder \""
msgstr ""
-#: alpine/adrbkcmd.c:2267
+#: alpine/adrbkcmd.c:2272
msgid ""
"\n"
"A definition for this remote address book has been added to your list"
msgstr ""
-#: alpine/adrbkcmd.c:2268
+#: alpine/adrbkcmd.c:2273
msgid ""
"\n"
"of address books. The definition for the address book it was copied"
msgstr ""
-#: alpine/adrbkcmd.c:2269
+#: alpine/adrbkcmd.c:2274
msgid ""
"\n"
"from is also still there. You may want to remove that after you"
msgstr ""
-#: alpine/adrbkcmd.c:2270
+#: alpine/adrbkcmd.c:2275
msgid ""
"\n"
"are confident that the new address book is complete and working."
msgstr ""
-#: alpine/adrbkcmd.c:2271
+#: alpine/adrbkcmd.c:2276
msgid ""
"\n"
"Use the Setup/AddressBooks command to do that.\n"
msgstr ""
-#: alpine/adrbkcmd.c:2276
+#: alpine/adrbkcmd.c:2281
msgid "Remote Address Book Information"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2278
+#: alpine/adrbkcmd.c:2283
msgid "ABOUT REMOTE ABOOK"
msgstr ""
@@ -3817,13 +3879,13 @@ msgstr ""
#. in alpine. It isn't a very descriptive name. Instead of
#. storing it in its own file it is stored in the configuration
#. file.
-#: alpine/adrbkcmd.c:2385
+#: alpine/adrbkcmd.c:2390
#, c-format
msgid "Convert signature file \"%s\" to a literal sig "
msgstr ""
#. TRANSLATORS: following lines go together
-#: alpine/adrbkcmd.c:2416
+#: alpine/adrbkcmd.c:2421
#, c-format
msgid ""
"\n"
@@ -3831,55 +3893,55 @@ msgid ""
msgstr ""
#. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2420 alpine/adrbkcmd.c:2534
+#: alpine/adrbkcmd.c:2425 alpine/adrbkcmd.c:2539
msgid ""
"\n"
"to a literal signature, which means it is contained in your"
msgstr ""
-#: alpine/adrbkcmd.c:2422 alpine/adrbkcmd.c:2536
+#: alpine/adrbkcmd.c:2427 alpine/adrbkcmd.c:2541
msgid ""
"\n"
"Alpine configuration instead of being in a file of its own."
msgstr ""
-#: alpine/adrbkcmd.c:2424 alpine/adrbkcmd.c:2538
+#: alpine/adrbkcmd.c:2429 alpine/adrbkcmd.c:2543
msgid ""
"\n"
"If that configuration is copied to a remote folder then the"
msgstr ""
-#: alpine/adrbkcmd.c:2426 alpine/adrbkcmd.c:2540
+#: alpine/adrbkcmd.c:2431 alpine/adrbkcmd.c:2545
msgid ""
"\n"
"signature will be available remotely also."
msgstr ""
-#: alpine/adrbkcmd.c:2428 alpine/adrbkcmd.c:2542
+#: alpine/adrbkcmd.c:2433 alpine/adrbkcmd.c:2547
msgid ""
"\n"
"Changes to the signature file itself will no longer have any"
msgstr ""
-#: alpine/adrbkcmd.c:2430
+#: alpine/adrbkcmd.c:2435
msgid ""
"\n"
"effect on Alpine but you may still edit the signature with the"
msgstr ""
-#: alpine/adrbkcmd.c:2432
+#: alpine/adrbkcmd.c:2437
msgid ""
"\n"
"Setup/Signature command.\n"
msgstr ""
-#: alpine/adrbkcmd.c:2437 alpine/adrbkcmd.c:2552
+#: alpine/adrbkcmd.c:2442 alpine/adrbkcmd.c:2557
msgid "Literal Signature Information"
msgstr ""
#. TRANSLATORS: screen title
#. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2439 alpine/adrbkcmd.c:2554
+#: alpine/adrbkcmd.c:2444 alpine/adrbkcmd.c:2559
msgid "ABOUT LITERAL SIG"
msgstr ""
@@ -3887,689 +3949,689 @@ msgstr ""
#. we call a literal signature, which is one contained in the regular
#. configuration file. Think of the set of 4 %s arguments as a
#. single argument which is the name of the signature file.
-#: alpine/adrbkcmd.c:2474
+#: alpine/adrbkcmd.c:2479
#, c-format
msgid "Convert signature file \"%s\"%s%s%s to a literal sig "
msgstr ""
#. TRANSLATORS: Keep the %s's together, they are sort of
#. the name of the file.
-#: alpine/adrbkcmd.c:2525
+#: alpine/adrbkcmd.c:2530
#, c-format
msgid "Your signature file \"%s\"%s%s%s has been converted"
msgstr ""
-#: alpine/adrbkcmd.c:2544
+#: alpine/adrbkcmd.c:2549
msgid ""
"\n"
"effect on Alpine. You may edit the signature with the"
msgstr ""
-#: alpine/adrbkcmd.c:2546
+#: alpine/adrbkcmd.c:2551
msgid ""
"\n"
"Setup/Rules/Roles command.\n"
msgstr ""
#. TRANSLATORS: config is an abbreviation for configuration
-#: alpine/adrbkcmd.c:2567
+#: alpine/adrbkcmd.c:2572
msgid "Error writing rules config."
msgstr ""
#. TRANSLATORS: sig is signature
-#: alpine/adrbkcmd.c:2571
+#: alpine/adrbkcmd.c:2576
#, c-format
msgid "Error converting role sig\n"
msgstr ""
#. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2598
+#: alpine/adrbkcmd.c:2603
msgid ""
"\n"
"Some of your Rules are contained in Rule files instead of being directly"
msgstr ""
-#: alpine/adrbkcmd.c:2599
+#: alpine/adrbkcmd.c:2604
msgid ""
"\n"
"contained in your Alpine configuration file. To make those rules"
msgstr ""
-#: alpine/adrbkcmd.c:2600
+#: alpine/adrbkcmd.c:2605
msgid ""
"\n"
"available remotely you will need to move them out of the files."
msgstr ""
-#: alpine/adrbkcmd.c:2601
+#: alpine/adrbkcmd.c:2606
msgid ""
"\n"
"That can be done using the Shuffle command in the appropriate"
msgstr ""
-#: alpine/adrbkcmd.c:2602
+#: alpine/adrbkcmd.c:2607
msgid ""
"\n"
"Setup/Rules subcommands.\n"
msgstr ""
-#: alpine/adrbkcmd.c:2607
+#: alpine/adrbkcmd.c:2612
msgid "Rule Files Information"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2609
+#: alpine/adrbkcmd.c:2614
msgid "ABOUT RULE FILES"
msgstr ""
-#: alpine/adrbkcmd.c:2632
+#: alpine/adrbkcmd.c:2637
msgid "eXceptions does not make sense with this command"
msgstr ""
#. TRANSLATORS: AddressBooks is Address Books
-#: alpine/adrbkcmd.c:2655
+#: alpine/adrbkcmd.c:2660
#, c-format
msgid "Config is already remote, convert AddressBooks and signature files "
msgstr ""
-#: alpine/adrbkcmd.c:2657
+#: alpine/adrbkcmd.c:2662
#, c-format
msgid "Config is already remote, convert AddressBooks "
msgstr ""
-#: alpine/adrbkcmd.c:2659
+#: alpine/adrbkcmd.c:2664
#, c-format
msgid "Config is already remote, convert signature files "
msgstr ""
-#: alpine/adrbkcmd.c:2724
+#: alpine/adrbkcmd.c:2729
msgid "Cannot copy config file since it is already remote."
msgstr ""
-#: alpine/adrbkcmd.c:2744
+#: alpine/adrbkcmd.c:2749
#, c-format
msgid "Name of server to contain remote Alpine config : "
msgstr ""
-#: alpine/adrbkcmd.c:2806
+#: alpine/adrbkcmd.c:2811
#, c-format
msgid "Folder to contain remote config : "
msgstr ""
#. TRANSLATORS: several lines that go together
-#: alpine/adrbkcmd.c:2869
+#: alpine/adrbkcmd.c:2874
msgid ""
"\n"
"You may want to save a copy of this information!"
msgstr ""
-#: alpine/adrbkcmd.c:2870
+#: alpine/adrbkcmd.c:2875
msgid ""
"\n"
"\n"
"Your Alpine configuration data has been copied to"
msgstr ""
-#: alpine/adrbkcmd.c:2874
+#: alpine/adrbkcmd.c:2879
msgid ""
"\n"
"To use that remote configuration from this computer you will"
msgstr ""
-#: alpine/adrbkcmd.c:2875
+#: alpine/adrbkcmd.c:2880
msgid ""
"\n"
"have to change the way you start Alpine by using the command line option"
msgstr ""
-#: alpine/adrbkcmd.c:2876
+#: alpine/adrbkcmd.c:2881
msgid ""
"\n"
"\"alpine -p <remote_folder>\". The command should probably be"
msgstr ""
-#: alpine/adrbkcmd.c:2882
+#: alpine/adrbkcmd.c:2887
msgid ""
"\n"
"With PC-Alpine, you may want to create a shortcut which"
msgstr ""
-#: alpine/adrbkcmd.c:2883
+#: alpine/adrbkcmd.c:2888
msgid ""
"\n"
"has the required arguments."
msgstr ""
-#: alpine/adrbkcmd.c:2889
+#: alpine/adrbkcmd.c:2894
msgid ""
"\n"
"The quotes are there around the last argument to protect the special"
msgstr ""
-#: alpine/adrbkcmd.c:2890
+#: alpine/adrbkcmd.c:2895
msgid ""
"\n"
"characters in the folder name (like braces) from the command shell"
msgstr ""
-#: alpine/adrbkcmd.c:2891
+#: alpine/adrbkcmd.c:2896
msgid ""
"\n"
"you use. If you are not running Alpine from a command shell which knows"
msgstr ""
-#: alpine/adrbkcmd.c:2892
+#: alpine/adrbkcmd.c:2897
msgid ""
"\n"
"about quoting, it is possible you will have to remove those quotes"
msgstr ""
-#: alpine/adrbkcmd.c:2893
+#: alpine/adrbkcmd.c:2898
msgid ""
"\n"
"from the command. For example, if you also use PC-Alpine you will probably"
msgstr ""
-#: alpine/adrbkcmd.c:2894
+#: alpine/adrbkcmd.c:2899
msgid ""
"\n"
"want to create a shortcut, and you would not need the quotes there."
msgstr ""
-#: alpine/adrbkcmd.c:2895
+#: alpine/adrbkcmd.c:2900
msgid ""
"\n"
"Without the quotes, the command might look like"
msgstr ""
-#: alpine/adrbkcmd.c:2900
+#: alpine/adrbkcmd.c:2905
msgid ""
"\n"
"Consider creating an alias or shell script to execute this command to make"
msgstr ""
-#: alpine/adrbkcmd.c:2901
+#: alpine/adrbkcmd.c:2906
msgid ""
"\n"
"it more convenient."
msgstr ""
-#: alpine/adrbkcmd.c:2903
+#: alpine/adrbkcmd.c:2908
msgid ""
"\n"
"\n"
"If you want to use your new remote configuration for this session, quit"
msgstr ""
-#: alpine/adrbkcmd.c:2904
+#: alpine/adrbkcmd.c:2909
msgid ""
"\n"
"Alpine now and restart with the changed command line options mentioned "
"above.\n"
msgstr ""
-#: alpine/adrbkcmd.c:2909
+#: alpine/adrbkcmd.c:2914
msgid "Remote Config Information"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:2911
+#: alpine/adrbkcmd.c:2916
msgid "ABOUT REMOTE CONFIG"
msgstr ""
#. TRANSLATORS: Double quote refers to the " character
-#: alpine/adrbkcmd.c:2982
+#: alpine/adrbkcmd.c:2987
msgid "Double quote not allowed in nickname"
msgstr ""
-#: alpine/adrbkcmd.c:2995
+#: alpine/adrbkcmd.c:3000
msgid "Nickname is already being used"
msgstr ""
-#: alpine/adrbkcmd.c:3044
+#: alpine/adrbkcmd.c:3049
msgid "Delete cancelled: config file not changeable"
msgstr ""
-#: alpine/adrbkcmd.c:3062 alpine/adrbkcmd.c:3526 alpine/adrbkcmd.c:3669
+#: alpine/adrbkcmd.c:3067 alpine/adrbkcmd.c:3531 alpine/adrbkcmd.c:3674
msgid ""
"Cancelled: Sys. Mgmt. does not allow changing global address book config"
msgstr ""
-#: alpine/adrbkcmd.c:3065 alpine/adrbkcmd.c:3546
+#: alpine/adrbkcmd.c:3070 alpine/adrbkcmd.c:3551
msgid "Cancelled: Sys. Mgmt. does not allow changing address book config"
msgstr ""
#. TRANSLATORS: %s is an adjective modifying address books
-#: alpine/adrbkcmd.c:3127
+#: alpine/adrbkcmd.c:3132
#, c-format
msgid "Ignore all default %s address books or just remove this one ? "
msgstr ""
#. TRANSLATORS: global or personal address books
-#: alpine/adrbkcmd.c:3129
+#: alpine/adrbkcmd.c:3134
msgid "global"
msgstr ""
-#: alpine/adrbkcmd.c:3129
+#: alpine/adrbkcmd.c:3134
msgid "personal"
msgstr ""
-#: alpine/adrbkcmd.c:3143 alpine/adrbkcmd.c:3155 alpine/adrbkcmd.c:3202
-#: alpine/adrbkcmd.c:3223 alpine/adrbkcmd.c:3285 alpine/folder.c:5517
-#: alpine/folder.c:5554
+#: alpine/adrbkcmd.c:3148 alpine/adrbkcmd.c:3160 alpine/adrbkcmd.c:3207
+#: alpine/adrbkcmd.c:3228 alpine/adrbkcmd.c:3290 alpine/folder.c:5696
+#: alpine/folder.c:5735
msgid "Delete cancelled"
msgstr ""
#. TRANSLATORS: a question
-#: alpine/adrbkcmd.c:3150
+#: alpine/adrbkcmd.c:3155
msgid "Delete this default address book from config "
msgstr ""
#. TRANSLATORS: user is asked whether to remove just data files, just configuration,
#. or both for an address book.
-#: alpine/adrbkcmd.c:3176
+#: alpine/adrbkcmd.c:3181
msgid "Data"
msgstr ""
-#: alpine/adrbkcmd.c:3178 alpine/reply.c:1128
+#: alpine/adrbkcmd.c:3183 alpine/reply.c:1162
msgid "Both"
msgstr ""
-#: alpine/adrbkcmd.c:3181
+#: alpine/adrbkcmd.c:3186
msgid "Delete data, config, or both ? "
msgstr ""
#. TRANSLATORS: a question
-#: alpine/adrbkcmd.c:3213
+#: alpine/adrbkcmd.c:3218
msgid "Delete configuration for highlighted addressbook "
msgstr ""
#. TRANSLATORS: %s is an error message
-#: alpine/adrbkcmd.c:3253
+#: alpine/adrbkcmd.c:3258
#, c-format
msgid "Can't delete data: %s"
msgstr ""
-#: alpine/adrbkcmd.c:3255
+#: alpine/adrbkcmd.c:3260
msgid "Can't delete address book data"
msgstr ""
-#: alpine/adrbkcmd.c:3275
+#: alpine/adrbkcmd.c:3280
#, c-format
msgid ""
"About to delete the contents of address book (%ld entries), really delete "
msgstr ""
-#: alpine/adrbkcmd.c:3352
+#: alpine/adrbkcmd.c:3357
#, c-format
msgid "Trouble deleting data %s%s%s%s"
msgstr ""
-#: alpine/adrbkcmd.c:3371
+#: alpine/adrbkcmd.c:3376
msgid "Addressbook data deleted"
msgstr ""
-#: alpine/adrbkcmd.c:3438
+#: alpine/adrbkcmd.c:3443
msgid "Delete cancelled: couldn't save pine configuration file"
msgstr ""
#. TRANSLATORS: the %s may be "global " or nothing
-#: alpine/adrbkcmd.c:3450
+#: alpine/adrbkcmd.c:3455
#, c-format
msgid "Reverting to default %saddress books"
msgstr ""
-#: alpine/adrbkcmd.c:3451
+#: alpine/adrbkcmd.c:3456
msgid "global "
msgstr ""
-#: alpine/adrbkcmd.c:3502
+#: alpine/adrbkcmd.c:3507
msgid "Shuffle cancelled: config file not changeable"
msgstr ""
-#: alpine/adrbkcmd.c:3564
+#: alpine/adrbkcmd.c:3569
#, c-format
msgid "Shuffle \"%s\" %s%s%s ? "
msgstr ""
-#: alpine/adrbkcmd.c:3586
+#: alpine/adrbkcmd.c:3591
msgid "Shuffle cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:3645
+#: alpine/adrbkcmd.c:3650
msgid "Shuffle cancelled: highlight entry you wish to shuffle"
msgstr ""
-#: alpine/adrbkcmd.c:3662
+#: alpine/adrbkcmd.c:3667
msgid ""
"Cancelled: Sys. Mgmt. does not allow changing address book configuration"
msgstr ""
#. TRANSLATORS: TabSep is a command key label meaning Tab Separated List
-#: alpine/adrbkcmd.c:4180
+#: alpine/adrbkcmd.c:4185
msgid "TabSep"
msgstr ""
-#: alpine/adrbkcmd.c:4193
+#: alpine/adrbkcmd.c:4198
msgid "Export list of addresses, vCard format, or Tab Separated ? "
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/adrbkcmd.c:4198
+#: alpine/adrbkcmd.c:4203
msgid "HELP FOR EXPORT FORMAT"
msgstr ""
-#: alpine/adrbkcmd.c:4247 alpine/addrbook.c:7271
+#: alpine/adrbkcmd.c:4252 alpine/addrbook.c:7274
msgid "addresses"
msgstr ""
-#: alpine/adrbkcmd.c:4247
+#: alpine/adrbkcmd.c:4252
msgid "address"
msgstr ""
-#: alpine/adrbkcmd.c:4248
+#: alpine/adrbkcmd.c:4253
msgid "EXPORT"
msgstr ""
-#: alpine/adrbkcmd.c:4271
+#: alpine/adrbkcmd.c:4276
#, c-format
msgid "Error opening file \"%s\" for address export: %s"
msgstr ""
-#: alpine/adrbkcmd.c:4391
+#: alpine/adrbkcmd.c:4396
msgid "List is empty, nothing to export!"
msgstr ""
-#: alpine/adrbkcmd.c:4520
+#: alpine/adrbkcmd.c:4525
msgid "Trouble accessing current entry"
msgstr ""
-#: alpine/adrbkcmd.c:4580 alpine/adrbkcmd.c:4723
+#: alpine/adrbkcmd.c:4585 alpine/adrbkcmd.c:4728
msgid "Problem creating space for message text"
msgstr ""
-#: alpine/adrbkcmd.c:4663
+#: alpine/adrbkcmd.c:4668
msgid "Expand nicknames"
msgstr ""
-#: alpine/adrbkcmd.c:4729
+#: alpine/adrbkcmd.c:4734
msgid "FORWARDING ADDRESS BOOK ENTRY"
msgstr ""
-#: alpine/adrbkcmd.c:5242
+#: alpine/adrbkcmd.c:5247
#, c-format
msgid "Save highlighted entry to address book or Export to filesystem ? "
msgstr ""
-#: alpine/adrbkcmd.c:5244
+#: alpine/adrbkcmd.c:5249
#, c-format
msgid "Save selected entries to address book or Export to filesystem ? "
msgstr ""
-#: alpine/adrbkcmd.c:5246
+#: alpine/adrbkcmd.c:5251
#, c-format
msgid "Save selected entry to address book or Export to filesystem ? "
msgstr ""
-#: alpine/adrbkcmd.c:5307
+#: alpine/adrbkcmd.c:5312
#, c-format
msgid "Can't re-open address book %s to save from"
msgstr ""
-#: alpine/adrbkcmd.c:5365
+#: alpine/adrbkcmd.c:5370
msgid "No current entry to save"
msgstr ""
-#: alpine/adrbkcmd.c:5408
+#: alpine/adrbkcmd.c:5413
#, c-format
msgid "Saved %d entries to %s"
msgstr ""
-#: alpine/adrbkcmd.c:5410
+#: alpine/adrbkcmd.c:5415
#, c-format
msgid "Saved %d entry to %s"
msgstr ""
-#: alpine/adrbkcmd.c:5427
+#: alpine/adrbkcmd.c:5432
#, c-format
msgid "Entry with nickname \"%.*s\" already exists, replace "
msgstr ""
-#: alpine/adrbkcmd.c:5431
+#: alpine/adrbkcmd.c:5436
#, c-format
msgid "Nicknames \"%.*s\" and \"%.*s\" already exist, replace "
msgstr ""
-#: alpine/adrbkcmd.c:5434
+#: alpine/adrbkcmd.c:5439
#, c-format
msgid "%d of the nicknames already exist, replace "
msgstr ""
-#: alpine/adrbkcmd.c:5477
+#: alpine/adrbkcmd.c:5482
msgid "Saving entries"
msgstr ""
-#: alpine/adrbkcmd.c:5491 alpine/adrbkcmd.c:5576
+#: alpine/adrbkcmd.c:5496 alpine/adrbkcmd.c:5581
#, c-format
msgid "Error saving entry: %s"
msgstr ""
-#: alpine/adrbkcmd.c:5510
+#: alpine/adrbkcmd.c:5515
#, c-format
msgid "Error replacing entry in %s: %s"
msgstr ""
-#: alpine/adrbkcmd.c:5574
+#: alpine/adrbkcmd.c:5579
#, c-format
msgid "Error saving %s: %s"
msgstr ""
-#: alpine/adrbkcmd.c:5610
+#: alpine/adrbkcmd.c:5615
msgid "Save only partially completed"
msgstr ""
-#: alpine/adrbkcmd.c:5689
+#: alpine/adrbkcmd.c:5694
msgid "AddressBook"
msgstr ""
-#: alpine/adrbkcmd.c:5690
+#: alpine/adrbkcmd.c:5695
msgid "Entry"
msgstr ""
-#: alpine/adrbkcmd.c:5693
+#: alpine/adrbkcmd.c:5698
msgid "Print Address Book or just this Entry? "
msgstr ""
-#: alpine/adrbkcmd.c:5697 alpine/adrbkcmd.c:5782
+#: alpine/adrbkcmd.c:5702 alpine/adrbkcmd.c:5787
msgid "Address book print cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:5715
+#: alpine/adrbkcmd.c:5720
msgid "selected entries"
msgstr ""
-#: alpine/adrbkcmd.c:5718
+#: alpine/adrbkcmd.c:5723
msgid "address book list"
msgstr ""
-#: alpine/adrbkcmd.c:5720
+#: alpine/adrbkcmd.c:5725
msgid "entry"
msgstr ""
-#: alpine/adrbkcmd.c:5722
+#: alpine/adrbkcmd.c:5727
msgid "address book"
msgstr ""
#. TRANSLATORS: a screen title for address book screen. Almost all of
#. the translatable strings which are all upper case are screen titles.
-#: alpine/adrbkcmd.c:6086 alpine/addrbook.c:1536 alpine/addrbook.c:2287
+#: alpine/adrbkcmd.c:6091 alpine/addrbook.c:1537 alpine/addrbook.c:2288
#, c-format
msgid "ADDRESS BOOK"
msgstr ""
-#: alpine/adrbkcmd.c:6153
+#: alpine/adrbkcmd.c:6158
#, c-format
msgid "Really delete %d selected entries"
msgstr ""
-#: alpine/adrbkcmd.c:6239
+#: alpine/adrbkcmd.c:6244
msgid "Deletions completed"
msgstr ""
-#: alpine/adrbkcmd.c:6360
+#: alpine/adrbkcmd.c:6365
#, c-format
msgid "Really delete \"%s\""
msgstr ""
-#: alpine/adrbkcmd.c:6368
+#: alpine/adrbkcmd.c:6373
#, c-format
msgid "Really delete ENTIRE list \"%s\""
msgstr ""
-#: alpine/adrbkcmd.c:6374
+#: alpine/adrbkcmd.c:6379
#, c-format
msgid "Really delete \"%s\" from list"
msgstr ""
-#: alpine/adrbkcmd.c:6450
+#: alpine/adrbkcmd.c:6455
msgid "Entry deleted, address book updated"
msgstr ""
-#: alpine/adrbkcmd.c:6479
+#: alpine/adrbkcmd.c:6484
msgid "Entry not deleted"
msgstr ""
#. TRANSLATORS: go to more complex search screen
-#: alpine/adrbkcmd.c:6599
+#: alpine/adrbkcmd.c:6604
msgid "To complex search"
msgstr ""
-#: alpine/adrbkcmd.c:6608
+#: alpine/adrbkcmd.c:6613
msgid "No LDAP server available for lookup"
msgstr ""
-#: alpine/adrbkcmd.c:6618
+#: alpine/adrbkcmd.c:6623
msgid "String to search for : "
msgstr ""
-#: alpine/adrbkcmd.c:6630 alpine/alpine.c:813 pico/pico.c:942
+#: alpine/adrbkcmd.c:6635 alpine/alpine.c:823 pico/pico.c:943
msgid "Cancelled"
msgstr ""
-#: alpine/adrbkcmd.c:6642 alpine/mailindx.c:3083 alpine/addrbook.c:2472
-#: alpine/addrbook.c:2725
+#: alpine/adrbkcmd.c:6647 alpine/mailindx.c:3086 alpine/addrbook.c:2473
+#: alpine/addrbook.c:2726
msgid "Search"
msgstr ""
-#: alpine/adrbkcmd.c:6646
+#: alpine/adrbkcmd.c:6651
msgid "Restore"
msgstr ""
-#: alpine/adrbkcmd.c:6649
+#: alpine/adrbkcmd.c:6654
msgid "SEARCH DIRECTORY SERVER"
msgstr ""
-#: alpine/adrbkcmd.c:6667
+#: alpine/adrbkcmd.c:6672
msgid ""
"\n"
" Fill in some of the fields above to create a query."
msgstr ""
-#: alpine/adrbkcmd.c:6669
+#: alpine/adrbkcmd.c:6674
msgid ""
"\n"
" The match will be for the exact string unless you include wildcards (*)."
msgstr ""
-#: alpine/adrbkcmd.c:6671
+#: alpine/adrbkcmd.c:6676
msgid ""
"\n"
" All filled-in fields must match in order to be counted as a match."
msgstr ""
-#: alpine/adrbkcmd.c:6673
+#: alpine/adrbkcmd.c:6678
msgid ""
"\n"
" Press \"^R\" to restore previous query values (if you've queried "
"previously)."
msgstr ""
-#: alpine/adrbkcmd.c:6675
+#: alpine/adrbkcmd.c:6680
msgid ""
"\n"
" \"^G\" for help specific to each item. \"^X\" to make the query, or \"^C\" "
"to cancel."
msgstr ""
-#: alpine/adrbkcmd.c:6756
+#: alpine/adrbkcmd.c:6761
msgid "Search strings too long"
msgstr ""
-#: alpine/adrbkcmd.c:6859 pith/ldap.c:196
+#: alpine/adrbkcmd.c:6864 pith/ldap.c:197
msgid "Missing hostname in LDAP address"
msgstr ""
-#: alpine/adrbkcmd.c:6874 pith/ldap.c:221
+#: alpine/adrbkcmd.c:6879 pith/ldap.c:222
#, c-format
msgid "No email address available for \"%s\""
msgstr ""
-#: alpine/adrbkcmd.c:6933
+#: alpine/adrbkcmd.c:6938
msgid "DIRECTORY ENTRY"
msgstr ""
-#: alpine/adrbkcmd.c:6937
+#: alpine/adrbkcmd.c:6942
msgid "HELP FOR DIRECTORY VIEW"
msgstr ""
-#: alpine/adrbkcmd.c:7112
+#: alpine/adrbkcmd.c:7117
msgid "No address to compose to"
msgstr ""
-#: alpine/adrbkcmd.c:7580
+#: alpine/adrbkcmd.c:7585
#, c-format
msgid "No host in %s"
msgstr ""
-#: alpine/adrbkcmd.c:7588
+#: alpine/adrbkcmd.c:7593
msgid "Searching for LDAP url"
msgstr ""
-#: alpine/adrbkcmd.c:7602
+#: alpine/adrbkcmd.c:7607
msgid "LDAP search failed: can't initialize"
msgstr ""
-#: alpine/adrbkcmd.c:7626
+#: alpine/adrbkcmd.c:7631
#, c-format
msgid "LDAP search failed: %s"
msgstr ""
-#: alpine/adrbkcmd.c:7643
+#: alpine/adrbkcmd.c:7648
msgid "No matches found for url"
msgstr ""
#. TRANSLATORS: sigs refers to signatures, which the user was trying to convert
-#: alpine/alpine.c:475
+#: alpine/alpine.c:485
#, c-format
msgid "trouble converting sigs\n"
msgstr ""
-#: alpine/alpine.c:588
+#: alpine/alpine.c:598
#, c-format
msgid "Failed to disable mail driver \"%s\": name not found"
msgstr ""
-#: alpine/alpine.c:609
+#: alpine/alpine.c:619
#, c-format
msgid "Failed to disable SASL authenticator \"%s\": name not found"
msgstr ""
-#: alpine/alpine.c:642
+#: alpine/alpine.c:652
#, c-format
msgid "Who are you? (Unable to look up login name)\n"
msgstr ""
-#: alpine/alpine.c:663
+#: alpine/alpine.c:673
#, c-format
msgid ""
"Can't access terminal or input is not a terminal. Redirection of\n"
@@ -4577,1330 +4639,1330 @@ msgid ""
"%c"
msgstr ""
-#: alpine/alpine.c:675
+#: alpine/alpine.c:685
#, c-format
msgid "Terminal type (environment variable TERM) not set.\n"
msgstr ""
-#: alpine/alpine.c:678
+#: alpine/alpine.c:688
#, c-format
msgid "Terminal type \"%s\" is unknown.\n"
msgstr ""
-#: alpine/alpine.c:681
+#: alpine/alpine.c:691
#, c-format
msgid "Can't open terminal capabilities database.\n"
msgstr ""
-#: alpine/alpine.c:684
+#: alpine/alpine.c:694
#, c-format
msgid ""
"Your terminal, of type \"%s\", is lacking functions needed to run alpine.\n"
msgstr ""
-#: alpine/alpine.c:719
+#: alpine/alpine.c:729
msgid "Warning: sensitive authentication data included in debug file"
msgstr ""
#. TRANSLATORS: file is computer data
-#: alpine/alpine.c:801
+#: alpine/alpine.c:811
msgid "File to open : "
msgstr ""
#. TRANSLATORS: file is computer data
-#: alpine/alpine.c:828
+#: alpine/alpine.c:838
msgid "No file to open"
msgstr ""
-#: alpine/alpine.c:844
+#: alpine/alpine.c:854
#, c-format
msgid "Problem reading standard input: %s"
msgstr ""
#. TRANSLATORS: file is computer file being read by user
-#: alpine/alpine.c:869
+#: alpine/alpine.c:879
msgid "file"
msgstr ""
#. TRANSLATORS: this is in the title bar at top of screen
-#: alpine/alpine.c:871
+#: alpine/alpine.c:881
msgid "FILE VIEW"
msgstr ""
-#: alpine/alpine.c:884
+#: alpine/alpine.c:894
#, c-format
msgid "Can't display \"%s\": %s"
msgstr ""
-#: alpine/alpine.c:885
+#: alpine/alpine.c:895
msgid "Standard Input"
msgstr ""
#. TRANSLATORS: refers to bad email address
-#: alpine/alpine.c:941
+#: alpine/alpine.c:951
#, c-format
msgid "Bad address: %s"
msgstr ""
-#: alpine/alpine.c:992
+#: alpine/alpine.c:1002
msgid "Only mailto URLs are allowed with file attachments"
msgstr ""
-#: alpine/alpine.c:1001
+#: alpine/alpine.c:1011
#, c-format
msgid "Unrecognized URL \"%s\""
msgstr ""
#. TRANSLATORS: Initial Keystroke List is the literal name of an option
-#: alpine/alpine.c:1023
+#: alpine/alpine.c:1033
msgid "Executing Initial Keystroke List......"
msgstr ""
-#: alpine/alpine.c:1071
+#: alpine/alpine.c:1081
msgid "Please wait, opening mail folder......"
msgstr ""
-#: alpine/alpine.c:1124
+#: alpine/alpine.c:1134
msgid "No folder to open"
msgstr ""
-#: alpine/alpine.c:1156
+#: alpine/alpine.c:1166
#, c-format
msgid "Unable to open folder \"%s\""
msgstr ""
-#: alpine/alpine.c:1181
+#: alpine/alpine.c:1191
msgid "No inbox! Folder to open as inbox : "
msgstr ""
-#: alpine/alpine.c:1193
+#: alpine/alpine.c:1203
msgid "Folder open cancelled"
msgstr ""
#. TRANSLATORS: Inbox-Path and PINERC are literal, not to be translated
-#: alpine/alpine.c:1206
+#: alpine/alpine.c:1216
msgid "Preserve folder as \"Inbox-Path\" in PINERC"
msgstr ""
-#: alpine/alpine.c:1227 pith/mailcmd.c:884
+#: alpine/alpine.c:1237 pith/mailcmd.c:900
msgid "No folder opened"
msgstr ""
-#: alpine/alpine.c:1271
+#: alpine/alpine.c:1281
msgid "Use Compose command to continue interrupted message."
msgstr ""
-#: alpine/alpine.c:1280
+#: alpine/alpine.c:1290
#, c-format
msgid "WARNING! Over your disk quota by %s bytes (%s)"
msgstr ""
#. TRANSLATORS: config is an abbreviation for configuration
-#: alpine/alpine.c:1293
+#: alpine/alpine.c:1303
msgid ""
"Note: some of your config options conflict with site policy and are ignored"
msgstr ""
#. TRANSLATORS: Pruned-Folders is literal
-#: alpine/alpine.c:1298
+#: alpine/alpine.c:1308
msgid "Note: ignoring Pruned-Folders outside of default collection for saves"
msgstr ""
-#: alpine/alpine.c:1304
+#: alpine/alpine.c:1314
msgid ""
"Note: Mail-Check-Interval=0 may cause IMAP server connection to time out"
msgstr ""
-#: alpine/alpine.c:1484
+#: alpine/alpine.c:1494
#, c-format
msgid " %s HELP - Get help using Alpine"
msgstr ""
-#: alpine/alpine.c:1486
+#: alpine/alpine.c:1496
#, c-format
msgid " %s COMPOSE MESSAGE - Compose and send%s a message"
msgstr ""
#. TRANSLATORS: We think of sending an email message or posting a news message.
#. The message is shown as Compose and send/post a message
-#: alpine/alpine.c:1489
+#: alpine/alpine.c:1499
msgid "/post"
msgstr ""
-#: alpine/alpine.c:1490
+#: alpine/alpine.c:1500
#, c-format
msgid " %s MESSAGE INDEX - View messages in current folder"
msgstr ""
-#: alpine/alpine.c:1492
+#: alpine/alpine.c:1502
#, c-format
msgid " %s FOLDER LIST - Select a folder%s to view"
msgstr ""
#. TRANSLATORS: When news is supported the message above becomes
#. Select a folder OR news group to view
-#: alpine/alpine.c:1495
+#: alpine/alpine.c:1505
msgid " OR news group"
msgstr ""
-#: alpine/alpine.c:1496
+#: alpine/alpine.c:1506
#, c-format
msgid " %s ADDRESS BOOK - Update address book"
msgstr ""
-#: alpine/alpine.c:1498
+#: alpine/alpine.c:1508
#, c-format
msgid " %s SETUP - Configure Alpine Options"
msgstr ""
#. TRANSLATORS: final Main menu line
-#: alpine/alpine.c:1501
+#: alpine/alpine.c:1511
#, c-format
msgid " %s QUIT - Leave the Alpine program"
msgstr ""
-#: alpine/alpine.c:1698
+#: alpine/alpine.c:1708
#, c-format
msgid "Debug level set to %s"
msgstr ""
#. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1733
+#: alpine/alpine.c:1743
msgid "HELP FOR MAIN MENU"
msgstr ""
#. TRANSLATORS: list refers to list of commands in main menu
-#: alpine/alpine.c:1762
+#: alpine/alpine.c:1772
msgid "Already at top of list"
msgstr ""
-#: alpine/alpine.c:1778
+#: alpine/alpine.c:1788
msgid "Already at bottom of list"
msgstr ""
#. TRANSLATORS: This is a screen title
-#: alpine/alpine.c:1786
+#: alpine/alpine.c:1796
msgid "ALPINE RELEASE NOTES"
msgstr ""
#. TRANSLATORS: screen title
-#: alpine/alpine.c:2051
+#: alpine/alpine.c:2061
msgid "MAIN MENU"
msgstr ""
#. TRANSLATORS: screen title
-#: alpine/alpine.c:2286
+#: alpine/alpine.c:2296
msgid "SETUP EXCEPTIONS"
msgstr ""
-#: alpine/alpine.c:2292
+#: alpine/alpine.c:2302
msgid "not eXceptions"
msgstr ""
#. TRANSLATORS: screen title
-#: alpine/alpine.c:2297 alpine/alpine.c:2492
+#: alpine/alpine.c:2307 alpine/alpine.c:2502
msgid "SETUP"
msgstr ""
-#: alpine/alpine.c:2300 alpine/alpine.c:2520 alpine/alpine.c:2523
+#: alpine/alpine.c:2310 alpine/alpine.c:2530 alpine/alpine.c:2533
msgid "eXceptions"
msgstr ""
-#: alpine/alpine.c:2311
+#: alpine/alpine.c:2321
msgid ""
"Need argument \"-x <except_config>\" or \"PINERCEX\" file to use eXceptions"
msgstr ""
-#: alpine/alpine.c:2313
+#: alpine/alpine.c:2323
msgid ""
"Need argument \"-x <except_config>\" or \".pinercex\" file to use eXceptions"
msgstr ""
#. TRANSLATORS: starting here we have a whole screen of help text
-#: alpine/alpine.c:2369
+#: alpine/alpine.c:2379
msgid ""
"This is the Setup screen for Alpine. Choose from the following commands:\n"
msgstr ""
-#: alpine/alpine.c:2372
+#: alpine/alpine.c:2382
msgid "(E) Exit Setup:\n"
msgstr ""
-#: alpine/alpine.c:2373
+#: alpine/alpine.c:2383
msgid " This puts you back at the Main Menu.\n"
msgstr ""
-#: alpine/alpine.c:2377 alpine/alpine.c:2469
+#: alpine/alpine.c:2387 alpine/alpine.c:2479
msgid "(X) eXceptions:\n"
msgstr ""
-#: alpine/alpine.c:2378 alpine/alpine.c:2470
+#: alpine/alpine.c:2388 alpine/alpine.c:2480
msgid ""
" This command is different from the rest. It is not actually a command\n"
msgstr ""
-#: alpine/alpine.c:2379 alpine/alpine.c:2471
+#: alpine/alpine.c:2389 alpine/alpine.c:2481
msgid ""
" itself. Instead, it is a toggle which modifies the behavior of the\n"
msgstr ""
-#: alpine/alpine.c:2380 alpine/alpine.c:2472
+#: alpine/alpine.c:2390 alpine/alpine.c:2482
msgid ""
" other commands. You toggle Exceptions editing on and off with this\n"
msgstr ""
-#: alpine/alpine.c:2381 alpine/alpine.c:2473
+#: alpine/alpine.c:2391 alpine/alpine.c:2483
msgid ""
" command. When it is off you will be editing (changing) your regular\n"
msgstr ""
-#: alpine/alpine.c:2382 alpine/alpine.c:2474
+#: alpine/alpine.c:2392 alpine/alpine.c:2484
msgid ""
" configuration file. When it is on you will be editing your exceptions\n"
msgstr ""
-#: alpine/alpine.c:2383 alpine/alpine.c:2475
+#: alpine/alpine.c:2393 alpine/alpine.c:2485
msgid ""
" configuration file. For example, you might want to type the command \n"
msgstr ""
-#: alpine/alpine.c:2384 alpine/alpine.c:2476
+#: alpine/alpine.c:2394 alpine/alpine.c:2486
msgid ""
" \"eXceptions\" followed by \"Kolor\" to setup different screen colors\n"
msgstr ""
-#: alpine/alpine.c:2385 alpine/alpine.c:2477
+#: alpine/alpine.c:2395 alpine/alpine.c:2487
msgid " on a particular platform.\n"
msgstr ""
-#: alpine/alpine.c:2386 alpine/alpine.c:2462
+#: alpine/alpine.c:2396 alpine/alpine.c:2472
msgid ""
" (Note: this command does not show up on the keymenu at the bottom of\n"
msgstr ""
-#: alpine/alpine.c:2387 alpine/alpine.c:2463
+#: alpine/alpine.c:2397 alpine/alpine.c:2473
msgid ""
" the screen unless you press \"O\" for \"Other Commands\" --but you "
"don't\n"
msgstr ""
-#: alpine/alpine.c:2388 alpine/alpine.c:2464
+#: alpine/alpine.c:2398 alpine/alpine.c:2474
msgid " need to press the \"O\" in order to invoke the command.)\n"
msgstr ""
-#: alpine/alpine.c:2393
+#: alpine/alpine.c:2403
msgid "(P) Printer:\n"
msgstr ""
-#: alpine/alpine.c:2394
+#: alpine/alpine.c:2404
msgid " Allows you to set a default printer and to define custom\n"
msgstr ""
-#: alpine/alpine.c:2395
+#: alpine/alpine.c:2405
msgid " print commands.\n"
msgstr ""
-#: alpine/alpine.c:2400
+#: alpine/alpine.c:2410
msgid "(N) Newpassword:\n"
msgstr ""
-#: alpine/alpine.c:2401
+#: alpine/alpine.c:2411
msgid " Change your password.\n"
msgstr ""
-#: alpine/alpine.c:2406
+#: alpine/alpine.c:2416
msgid "(C) Config:\n"
msgstr ""
-#: alpine/alpine.c:2407
+#: alpine/alpine.c:2417
msgid " Allows you to set or unset many features of Alpine.\n"
msgstr ""
-#: alpine/alpine.c:2408
+#: alpine/alpine.c:2418
msgid " You may also set the values of many options with this command.\n"
msgstr ""
-#: alpine/alpine.c:2413
+#: alpine/alpine.c:2423
msgid "(S) Signature:\n"
msgstr ""
-#: alpine/alpine.c:2414
+#: alpine/alpine.c:2424
msgid " Enter or edit a custom signature which will\n"
msgstr ""
-#: alpine/alpine.c:2415
+#: alpine/alpine.c:2425
msgid " be included with each new message you send.\n"
msgstr ""
-#: alpine/alpine.c:2419
+#: alpine/alpine.c:2429
msgid "(A) AddressBooks:\n"
msgstr ""
-#: alpine/alpine.c:2420
+#: alpine/alpine.c:2430
msgid " Define a non-default address book.\n"
msgstr ""
-#: alpine/alpine.c:2423
+#: alpine/alpine.c:2433
msgid "(L) collectionLists:\n"
msgstr ""
-#: alpine/alpine.c:2424
+#: alpine/alpine.c:2434
msgid ""
" You may define groups of folders to help you better organize your mail.\n"
msgstr ""
-#: alpine/alpine.c:2427
+#: alpine/alpine.c:2437
msgid "(R) Rules:\n"
msgstr ""
-#: alpine/alpine.c:2428
+#: alpine/alpine.c:2438
msgid " This has up to six sub-categories: Roles, Index Colors, Filters,\n"
msgstr ""
-#: alpine/alpine.c:2429
+#: alpine/alpine.c:2439
msgid " SetScores, Search, and Other. If the Index Colors option is\n"
msgstr ""
-#: alpine/alpine.c:2430
+#: alpine/alpine.c:2440
msgid " missing you may turn it on (if possible) with Setup/Kolor.\n"
msgstr ""
-#: alpine/alpine.c:2431
+#: alpine/alpine.c:2441
msgid ""
" If Roles is missing it has probably been administratively disabled.\n"
msgstr ""
-#: alpine/alpine.c:2435
+#: alpine/alpine.c:2445
msgid "(D) Directory:\n"
msgstr ""
-#: alpine/alpine.c:2436
+#: alpine/alpine.c:2446
msgid ""
" Define an LDAP Directory server for Alpine's use. A directory server is\n"
msgstr ""
-#: alpine/alpine.c:2437
+#: alpine/alpine.c:2447
msgid " similar to an address book, but it is usually maintained by an\n"
msgstr ""
-#: alpine/alpine.c:2438
+#: alpine/alpine.c:2448
msgid " organization. It is similar to a telephone directory.\n"
msgstr ""
-#: alpine/alpine.c:2442
+#: alpine/alpine.c:2452
msgid "(K) Kolor:\n"
msgstr ""
-#: alpine/alpine.c:2443
+#: alpine/alpine.c:2453
msgid ""
" Set custom colors for various parts of the Alpine screens. For example, "
"the\n"
msgstr ""
-#: alpine/alpine.c:2444
+#: alpine/alpine.c:2454
msgid ""
" command key labels, the titlebar at the top of each page, and quoted\n"
msgstr ""
-#: alpine/alpine.c:2445
+#: alpine/alpine.c:2455
msgid " sections of messages you are viewing.\n"
msgstr ""
-#: alpine/alpine.c:2449
+#: alpine/alpine.c:2459
msgid "(M) S/MIME:\n"
msgstr ""
-#: alpine/alpine.c:2450
+#: alpine/alpine.c:2460
msgid " Setup for using S/MIME to verify signed messages, decrypt\n"
msgstr ""
-#: alpine/alpine.c:2451
+#: alpine/alpine.c:2461
msgid " encrypted messages, and to sign or encrypt outgoing messages.\n"
msgstr ""
-#: alpine/alpine.c:2455
+#: alpine/alpine.c:2465
msgid "(Z) RemoteConfigSetup:\n"
msgstr ""
-#: alpine/alpine.c:2456
+#: alpine/alpine.c:2466
msgid ""
" This is a command you will probably only want to use once, if at all.\n"
msgstr ""
-#: alpine/alpine.c:2457
+#: alpine/alpine.c:2467
msgid ""
" It helps you transfer your Alpine configuration data to an IMAP server,\n"
msgstr ""
-#: alpine/alpine.c:2458
+#: alpine/alpine.c:2468
msgid ""
" where it will be accessible from any of the computers you read mail\n"
msgstr ""
-#: alpine/alpine.c:2459
+#: alpine/alpine.c:2469
msgid ""
" from (using Alpine). The idea behind a remote configuration is that you\n"
msgstr ""
-#: alpine/alpine.c:2460
+#: alpine/alpine.c:2470
msgid ""
" can change your configuration in one place and have that change show\n"
msgstr ""
-#: alpine/alpine.c:2461
+#: alpine/alpine.c:2471
msgid " up on all of the computers you use.\n"
msgstr ""
-#: alpine/alpine.c:2478
+#: alpine/alpine.c:2488
msgid ""
" (Note: this command does not do anything unless you have a "
"configuration\n"
msgstr ""
-#: alpine/alpine.c:2479
+#: alpine/alpine.c:2489
msgid ""
" with exceptions enabled (you don't have that). Common ways to enable an\n"
msgstr ""
-#: alpine/alpine.c:2480
+#: alpine/alpine.c:2490
msgid ""
" exceptions config are the command line argument \"-x <exception_config>"
"\";\n"
msgstr ""
-#: alpine/alpine.c:2481
+#: alpine/alpine.c:2491
msgid ""
" or the existence of the file \".pinercex\" for Unix Alpine, or \"PINERCEX"
"\")\n"
msgstr ""
-#: alpine/alpine.c:2482
+#: alpine/alpine.c:2492
msgid " for PC-Alpine.)\n"
msgstr ""
-#: alpine/alpine.c:2483
+#: alpine/alpine.c:2493
msgid ""
" (Another note: this command does not show up on the keymenu at the "
"bottom\n"
msgstr ""
-#: alpine/alpine.c:2484
+#: alpine/alpine.c:2494
msgid ""
" of the screen unless you press \"O\" for \"Other Commands\" --but you\n"
msgstr ""
-#: alpine/alpine.c:2485
+#: alpine/alpine.c:2495
msgid " don't need to press the \"O\" in order to invoke the command.)\n"
msgstr ""
-#: alpine/alpine.c:2491
+#: alpine/alpine.c:2501
msgid "Information About Setup Command"
msgstr ""
-#: alpine/alpine.c:2613
+#: alpine/alpine.c:2623
msgid "Config file not changeable"
msgstr ""
-#: alpine/alpine.c:2618
+#: alpine/alpine.c:2628
msgid "Problem accessing configuration"
msgstr ""
-#: alpine/alpine.c:2627 alpine/alpine.c:2649
+#: alpine/alpine.c:2637 alpine/alpine.c:2659
msgid "SIGNATURE EDITOR"
msgstr ""
-#: alpine/alpine.c:2697
+#: alpine/alpine.c:2707
msgid "Type of rule setup : "
msgstr ""
-#: alpine/alpine.c:2716
+#: alpine/alpine.c:2726
msgid "Try turning on color with the Setup/Kolor command."
msgstr ""
-#: alpine/alpine.c:2759
+#: alpine/alpine.c:2769
msgid "Password changing not configured for this version of Alpine."
msgstr ""
-#: alpine/alpine.c:3094
+#: alpine/alpine.c:3104
msgid "Quit even though new mail just arrived"
msgstr ""
-#: alpine/alpine.c:3103
+#: alpine/alpine.c:3113
msgid "Really quit Alpine"
msgstr ""
-#: alpine/alpine.c:3127
+#: alpine/alpine.c:3137
msgid "Alpine finished"
msgstr ""
-#: alpine/alpine.c:3337
+#: alpine/alpine.c:3347
#, c-format
msgid ""
"No more available memory.\n"
"Alpine Exiting"
msgstr ""
-#: alpine/alpine.c:3339
+#: alpine/alpine.c:3349
#, c-format
msgid ""
"Problem detected: \"%s\".\n"
"Alpine Exiting."
msgstr ""
-#: alpine/alpine.c:3553
+#: alpine/alpine.c:3563
msgid "PC-Alpine MAIN MENU Help"
msgstr ""
-#: alpine/folder.c:62
+#: alpine/folder.c:64
msgid "Enter newsgroup name (or partial name to get a list): "
msgstr ""
-#: alpine/folder.c:63
+#: alpine/folder.c:65
msgid "Use \"X\" to mark selections in list mode"
msgstr ""
-#: alpine/folder.c:64
+#: alpine/folder.c:66
msgid "ALTER folder selection : "
msgstr ""
-#: alpine/folder.c:65
+#: alpine/folder.c:67
msgid "Select by folder Name or Contents ? "
msgstr ""
-#: alpine/folder.c:66
+#: alpine/folder.c:68
msgid "Select by which folder property ? "
msgstr ""
-#: alpine/folder.c:68
+#: alpine/folder.c:70
msgid "Folder and directory of the same name will be deleted. Continue"
msgstr ""
#. TRANSLATORS: The all upper case things are screen titles
-#: alpine/folder.c:251
+#: alpine/folder.c:262
msgid "FOLDER LIST"
msgstr ""
-#: alpine/folder.c:254
+#: alpine/folder.c:265
msgid "HELP FOR FOLDERS"
msgstr ""
-#: alpine/folder.c:358
+#: alpine/folder.c:369
#, c-format
msgid "SETUP EXCEPTIONS COLLECTION LIST"
msgstr ""
-#: alpine/folder.c:359
+#: alpine/folder.c:370
#, c-format
msgid "HELP FOR SETUP EXCEPTIONS COLLECTIONS"
msgstr ""
-#: alpine/folder.c:362
+#: alpine/folder.c:373
#, c-format
msgid "SETUP COLLECTION LIST"
msgstr ""
-#: alpine/folder.c:363
+#: alpine/folder.c:374
#, c-format
msgid "HELP FOR SETUP COLLECTIONS"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. contexts is something1
-#: alpine/folder.c:370 alpine/folder.c:850
+#: alpine/folder.c:381 alpine/folder.c:861
msgid "contexts"
msgstr ""
-#: alpine/folder.c:411
+#: alpine/folder.c:422
msgid "GOTO: SELECT FOLDER"
msgstr ""
-#: alpine/folder.c:414
+#: alpine/folder.c:425
msgid "HELP FOR OPENING FOLDERS"
msgstr ""
-#: alpine/folder.c:423 alpine/folder.c:482
+#: alpine/folder.c:434 alpine/folder.c:493
msgid "All folders displayed for Incoming Collection"
msgstr ""
-#: alpine/folder.c:470
+#: alpine/folder.c:481
msgid "SAVE: SELECT FOLDER"
msgstr ""
-#: alpine/folder.c:473
+#: alpine/folder.c:484
msgid "HELP FOR SAVING MESSAGES TO FOLDERS"
msgstr ""
-#: alpine/folder.c:527
+#: alpine/folder.c:538
msgid "SUBSCRIBE: SELECT FOLDER"
msgstr ""
-#: alpine/folder.c:530
+#: alpine/folder.c:541
msgid "HELP SELECTING NEWSGROUP TO SUBSCRIBE TO"
msgstr ""
-#: alpine/folder.c:567
+#: alpine/folder.c:578
msgid "NEWS: SELECT GROUP"
msgstr ""
-#: alpine/folder.c:570
+#: alpine/folder.c:581
msgid "HELP FOR SELECTING NEWSGROUP TO POST TO"
msgstr ""
-#: alpine/folder.c:649
+#: alpine/folder.c:660
#, c-format
msgid "List of folders matching \"%s*\""
msgstr ""
-#: alpine/folder.c:681
+#: alpine/folder.c:692
msgid "FCC: SELECT FOLDER"
msgstr ""
-#: alpine/folder.c:684
+#: alpine/folder.c:695
msgid "HELP FOR SELECTING THE FCC"
msgstr ""
-#: alpine/folder.c:755
+#: alpine/folder.c:766
msgid "SELECT FOLDER"
msgstr ""
-#: alpine/folder.c:760
+#: alpine/folder.c:771
msgid "HELP FOR SELECTING CURRENT FOLDER"
msgstr ""
-#: alpine/folder.c:764 alpine/folder.c:768
+#: alpine/folder.c:775 alpine/folder.c:779
msgid "HELP FOR SELECTING FOLDER"
msgstr ""
-#: alpine/folder.c:849
+#: alpine/folder.c:860
msgid "COLLECTION LIST"
msgstr ""
-#: alpine/folder.c:854
+#: alpine/folder.c:865
msgid "HELP FOR COLLECTION LIST"
msgstr ""
-#: alpine/folder.c:879 alpine/folder.c:963
+#: alpine/folder.c:890 alpine/folder.c:976
msgid "Path"
msgstr ""
-#: alpine/folder.c:912
+#: alpine/folder.c:925
#, c-format
msgid "FOLDER COLLECTION %s"
msgstr ""
-#: alpine/folder.c:923
+#: alpine/folder.c:936
msgid ""
"\n"
" Fill in the fields above to add a Folder Collection to your"
msgstr ""
-#: alpine/folder.c:925
+#: alpine/folder.c:938
msgid ""
"\n"
" COLLECTION LIST screen."
msgstr ""
-#: alpine/folder.c:927
+#: alpine/folder.c:940
msgid ""
"\n"
" Use the \"^G\" command to get help specific to each item, and"
msgstr ""
-#: alpine/folder.c:929
+#: alpine/folder.c:942
msgid ""
"\n"
" use \"^X\" when finished."
msgstr ""
-#: alpine/folder.c:1188
+#: alpine/folder.c:1238
msgid "Problem testing for directory existence"
msgstr ""
-#: alpine/folder.c:1194
+#: alpine/folder.c:1244
#, c-format
msgid "Exit and save changes"
msgstr ""
-#: alpine/folder.c:1196
+#: alpine/folder.c:1246
#, c-format
msgid "Exit, saving changes and creating Path"
msgstr ""
-#: alpine/folder.c:1227 pico/browse.c:2199
+#: alpine/folder.c:1277 pico/browse.c:2200
msgid "Edit"
msgstr ""
-#: alpine/folder.c:1239
+#: alpine/folder.c:1289
msgid "Cancel Add (answering \"Yes\" will abandon any changes made) "
msgstr ""
-#: alpine/folder.c:1242
+#: alpine/folder.c:1292
#, c-format
msgid "%s Cancelled) "
msgstr ""
-#: alpine/folder.c:1307
+#: alpine/folder.c:1357
msgid "Fetching default directory"
msgstr ""
-#: alpine/folder.c:1351
+#: alpine/folder.c:1401
#, c-format
msgid "Already subscribed to \"%s\""
msgstr ""
-#: alpine/folder.c:1395
+#: alpine/folder.c:1445
msgid "Fetching folder data"
msgstr ""
-#: alpine/folder.c:1820
+#: alpine/folder.c:1893
msgid "[No Folders in Collection]"
msgstr ""
-#: alpine/folder.c:1837
+#: alpine/folder.c:1912
msgid "[Select Here to See Expanded List]"
msgstr ""
-#: alpine/folder.c:2152
+#: alpine/folder.c:2310
msgid "Already in List Mode"
msgstr ""
-#: alpine/folder.c:2156
+#: alpine/folder.c:2314
msgid "No Folders! Can't enter List Mode"
msgstr ""
-#: alpine/folder.c:2182
+#: alpine/folder.c:2340
msgid "No Folders! Nothing to View"
msgstr ""
-#: alpine/folder.c:2335 alpine/folder.c:5125
+#: alpine/folder.c:2493 alpine/folder.c:5304
msgid "Empty folder collection. No folder to rename!"
msgstr ""
-#: alpine/folder.c:2345
+#: alpine/folder.c:2503
msgid "Empty folder collection. No folder to delete!"
msgstr ""
-#: alpine/folder.c:2382
+#: alpine/folder.c:2540
msgid "May only shuffle Incoming-Folders."
msgstr ""
-#: alpine/folder.c:2385
+#: alpine/folder.c:2543
msgid "No folders to shuffle."
msgstr ""
-#: alpine/folder.c:2388
+#: alpine/folder.c:2546
msgid "Shuffle only makes sense with more than one folder."
msgstr ""
-#: alpine/folder.c:2494
+#: alpine/folder.c:2652
msgid "Empty folder collection. No folder to select!"
msgstr ""
-#: alpine/folder.c:2510
+#: alpine/folder.c:2668
msgid "Folder List Zoom mode is now off"
msgstr ""
-#: alpine/folder.c:2514
+#: alpine/folder.c:2672
#, c-format
msgid "In Zoomed list of %s folders. Use \"Z\" to restore regular list"
msgstr ""
-#: alpine/folder.c:2536
+#: alpine/folder.c:2694
msgid "No selected folders to Zoom on"
msgstr ""
-#: alpine/folder.c:2539
+#: alpine/folder.c:2697
msgid "No Folders to Zoom on!"
msgstr ""
#. TRANSLATORS: we are asking for confirmation about abandonding selections
#. in the address book.
-#: alpine/folder.c:2559 alpine/addrbook.c:3001
+#: alpine/folder.c:2717 alpine/addrbook.c:3002
msgid "Really abandon your selections "
msgstr ""
-#: alpine/folder.c:2582
+#: alpine/folder.c:2740
msgid "Invalid Folder Name"
msgstr ""
-#: alpine/folder.c:2601
+#: alpine/folder.c:2759
#, c-format
msgid "%lu total message%s, %lu of them recent"
msgstr ""
-#: alpine/folder.c:2605
+#: alpine/folder.c:2763
#, c-format
msgid "%s: Trouble checking for recent mail"
msgstr ""
-#: alpine/folder.c:2612
+#: alpine/folder.c:2770
msgid "No folder to check! Can't get recent info"
msgstr ""
-#: alpine/folder.c:2706 alpine/folder.c:3673
+#: alpine/folder.c:2864 alpine/folder.c:3831
msgid "Empty folder list!"
msgstr ""
-#: alpine/folder.c:2756
+#: alpine/folder.c:2914
msgid "Name of new folder : "
msgstr ""
-#: alpine/folder.c:2768 alpine/folder.c:4336 alpine/folder.c:5202
+#: alpine/folder.c:2926 alpine/folder.c:4504 alpine/folder.c:5381
msgid "Folder name can't begin with dot"
msgstr ""
-#: alpine/folder.c:2771 alpine/folder.c:4339
+#: alpine/folder.c:2929 alpine/folder.c:4507
#, c-format
msgid "Config feature \"%s\" enables names beginning with dot"
msgstr ""
-#: alpine/folder.c:2779
+#: alpine/folder.c:2937
#, c-format
msgid "Can't add folder named %s"
msgstr ""
#. TRANSLATORS: go to parent directory one level up
-#: alpine/folder.c:2816 alpine/folder.c:2931
+#: alpine/folder.c:2974 alpine/folder.c:3089
msgid "ParentDir"
msgstr ""
#. TRANSLATORS: go to Collection List
-#: alpine/folder.c:2822 alpine/folder.c:2950
+#: alpine/folder.c:2980 alpine/folder.c:3108
msgid "ClctnList"
msgstr ""
-#: alpine/folder.c:2840 alpine/folder.c:3004 alpine/folder.c:3011
+#: alpine/folder.c:2998 alpine/folder.c:3162 alpine/folder.c:3169
msgid "View Dir"
msgstr ""
#. TRANSLATORS: New Messages
-#: alpine/folder.c:2893
+#: alpine/folder.c:3051
msgid "NewMsgs"
msgstr ""
-#: alpine/folder.c:3114
+#: alpine/folder.c:3272
msgid "Properties"
msgstr ""
-#: alpine/folder.c:3145
+#: alpine/folder.c:3303
#, c-format
msgid "Select \"%s\" not supported in Incoming Folders"
msgstr ""
-#: alpine/folder.c:3159 alpine/folder.c:3246
+#: alpine/folder.c:3317 alpine/folder.c:3404
msgid "Unsupported Select option"
msgstr ""
-#: alpine/folder.c:3282
+#: alpine/folder.c:3440
msgid "No change resulted"
msgstr ""
-#: alpine/folder.c:3283
+#: alpine/folder.c:3441
msgid "No messages in intersection"
msgstr ""
-#: alpine/folder.c:3288
+#: alpine/folder.c:3446
msgid "No change resulted. Matching folders already selected."
msgstr ""
-#: alpine/folder.c:3382
+#: alpine/folder.c:3540
#, c-format
msgid "Now in directory: %s"
msgstr ""
-#: alpine/folder.c:3387
+#: alpine/folder.c:3545
msgid "Returned to collection's top directory"
msgstr ""
-#: alpine/folder.c:3505 pith/mailcmd.c:566
+#: alpine/folder.c:3663 pith/mailcmd.c:569
#, c-format
msgid "Can't find Incoming Folder %s."
msgstr ""
-#: alpine/folder.c:3620
+#: alpine/folder.c:3778
msgid "Error creating file"
msgstr ""
-#: alpine/folder.c:3635
+#: alpine/folder.c:3793
msgid "Copying folder"
msgstr ""
-#: alpine/folder.c:3648
+#: alpine/folder.c:3806
#, c-format
msgid "Error exporting to %s"
msgstr ""
-#: alpine/folder.c:3659
+#: alpine/folder.c:3817
#, c-format
msgid "No messages in %s to export"
msgstr ""
-#: alpine/folder.c:3662
+#: alpine/folder.c:3820
msgid "Can't open folder for exporting"
msgstr ""
-#: alpine/folder.c:3726
+#: alpine/folder.c:3884
#, c-format
msgid "Can't import file outside of %s"
msgstr ""
-#: alpine/folder.c:3786
+#: alpine/folder.c:3944
#, c-format
msgid "Error importing to %s"
msgstr ""
-#: alpine/folder.c:3792
+#: alpine/folder.c:3950
#, c-format
msgid "No messages in file %s"
msgstr ""
-#: alpine/folder.c:3796
+#: alpine/folder.c:3954
#, c-format
msgid "Can't open file %s for import"
msgstr ""
-#: alpine/folder.c:3919
+#: alpine/folder.c:4076
msgid "Cancelled: config file not editable"
msgstr ""
-#: alpine/folder.c:4020
+#: alpine/folder.c:4177
msgid "Use Inbox Host"
msgstr ""
#. TRANSLATORS: a mail drop is a place where mail is copied to so you
#. can read it.
-#: alpine/folder.c:4035
+#: alpine/folder.c:4192
msgid "Use a Mail Drop"
msgstr ""
-#: alpine/folder.c:4041
+#: alpine/folder.c:4198
msgid "Do Not use a Mail Drop"
msgstr ""
-#: alpine/folder.c:4050
+#: alpine/folder.c:4207
#, c-format
msgid "Name of Mail Drop server : "
msgstr ""
-#: alpine/folder.c:4052
+#: alpine/folder.c:4209
#, c-format
msgid "Name of server to contain destination folder : "
msgstr ""
-#: alpine/folder.c:4054
+#: alpine/folder.c:4211
#, c-format
msgid "Name of Inbox server : "
msgstr ""
-#: alpine/folder.c:4056
+#: alpine/folder.c:4213
#, c-format
msgid "Name of server to contain added folder : "
msgstr ""
-#: alpine/folder.c:4141 alpine/folder.c:4144
+#: alpine/folder.c:4298 alpine/folder.c:4301
msgid "HELP FOR DESTINATION SERVER "
msgstr ""
-#: alpine/folder.c:4146 alpine/folder.c:4149
+#: alpine/folder.c:4303 alpine/folder.c:4306
msgid "HELP FOR MAILDROP NAME "
msgstr ""
-#: alpine/folder.c:4152
+#: alpine/folder.c:4309
msgid "HELP FOR INBOX SERVER "
msgstr ""
-#: alpine/folder.c:4155
+#: alpine/folder.c:4312
msgid "HELP FOR SERVER NAME "
msgstr ""
-#: alpine/folder.c:4184 alpine/folder.c:4378 alpine/folder.c:4502
+#: alpine/folder.c:4341 alpine/folder.c:4546 alpine/folder.c:4681
msgid "INBOX change cancelled"
msgstr ""
-#: alpine/folder.c:4185 alpine/folder.c:4379 alpine/folder.c:4452
-#: alpine/folder.c:4503
+#: alpine/folder.c:4342 alpine/folder.c:4547 alpine/folder.c:4631
+#: alpine/folder.c:4682
msgid "Addition of new folder cancelled"
msgstr ""
-#: alpine/folder.c:4299
+#: alpine/folder.c:4456
msgid "Create Folder"
msgstr ""
-#: alpine/folder.c:4304
+#: alpine/folder.c:4461
msgid "Create Directory"
msgstr ""
-#: alpine/folder.c:4326
+#: alpine/folder.c:4494
msgid "#move folders may only be the INBOX or in the Incoming Collection"
msgstr ""
-#: alpine/folder.c:4361
+#: alpine/folder.c:4529
msgid "Can't have trailing directory delimiters!"
msgstr ""
-#: alpine/folder.c:4373
+#: alpine/folder.c:4541
msgid "HELP FOR FOLDER NAME "
msgstr ""
-#: alpine/folder.c:4439
+#: alpine/folder.c:4618
msgid "A subfolder name is required, there is no default subfolder name"
msgstr ""
-#: alpine/folder.c:4448
+#: alpine/folder.c:4627
msgid "HELP FOR SUBFOLDER NAME "
msgstr ""
-#: alpine/folder.c:4465
+#: alpine/folder.c:4644
#, c-format
msgid "Cannot add folder %s in current context"
msgstr ""
-#: alpine/folder.c:4479
+#: alpine/folder.c:4658
#, c-format
msgid "Nickname for folder \"%s\" : "
msgstr ""
-#: alpine/folder.c:4492
+#: alpine/folder.c:4671
#, c-format
msgid "Nickname cannot be \"%s\""
msgstr ""
-#: alpine/folder.c:4535
+#: alpine/folder.c:4714
#, c-format
msgid "Incoming folder \"%s\" already exists"
msgstr ""
-#: alpine/folder.c:4565
+#: alpine/folder.c:4744
#, c-format
msgid "Error checking for %s"
msgstr ""
-#: alpine/folder.c:4806
+#: alpine/folder.c:4985
msgid "To All Grps"
msgstr ""
-#: alpine/folder.c:4840
+#: alpine/folder.c:5019
msgid "Fetching newsgroup list"
msgstr ""
-#: alpine/folder.c:4875
+#: alpine/folder.c:5054
msgid "No group substring to match! Use ^T to list all news groups."
msgstr ""
-#: alpine/folder.c:4929
+#: alpine/folder.c:5108
msgid "No groups to select from!"
msgstr ""
-#: alpine/folder.c:4932
+#: alpine/folder.c:5111
#, c-format
msgid "News group \"%s\" didn't match any existing groups"
msgstr ""
-#: alpine/folder.c:4978
+#: alpine/folder.c:5157
msgid "Subscribe cancelled"
msgstr ""
-#: alpine/folder.c:5008 alpine/folder.c:5056 alpine/folder.c:5073
+#: alpine/folder.c:5187 alpine/folder.c:5235 alpine/folder.c:5252
#, c-format
msgid "Error subscribing to \"%s\""
msgstr ""
-#: alpine/folder.c:5039
+#: alpine/folder.c:5218
msgid "Subscriptions failed, subscribed to no new groups"
msgstr ""
-#: alpine/folder.c:5079
+#: alpine/folder.c:5258
#, c-format
msgid "Subscribed to \"%s\""
msgstr ""
-#: alpine/folder.c:5120
+#: alpine/folder.c:5299
msgid "Can't rename news groups!"
msgstr ""
-#: alpine/folder.c:5133
+#: alpine/folder.c:5312
#, c-format
msgid "Can't change special folder name \"%s\""
msgstr ""
-#: alpine/folder.c:5163
+#: alpine/folder.c:5342
msgid "Rename cancelled: folder not in editable config file"
msgstr ""
-#: alpine/folder.c:5178
+#: alpine/folder.c:5357
msgid "nickname"
msgstr ""
-#: alpine/folder.c:5180 pith/bldaddr.c:657
+#: alpine/folder.c:5359 pith/bldaddr.c:658
msgid "directory"
msgstr ""
-#: alpine/folder.c:5180
+#: alpine/folder.c:5359
msgid "folder"
msgstr ""
-#: alpine/folder.c:5205
+#: alpine/folder.c:5384
msgid "Config feature \"s\" enables names beginning with dot"
msgstr ""
-#: alpine/folder.c:5214
+#: alpine/folder.c:5393
#, c-format
msgid "Folder \"%s\" already exists"
msgstr ""
-#: alpine/folder.c:5223
+#: alpine/folder.c:5402
#, c-format
msgid "Can't rename incoming folder to %s"
msgstr ""
-#: alpine/folder.c:5226
+#: alpine/folder.c:5405
#, c-format
msgid "Can't rename folder to %s"
msgstr ""
-#: alpine/folder.c:5250
+#: alpine/folder.c:5429
msgid "Folder rename cancelled"
msgstr ""
-#: alpine/folder.c:5396
+#: alpine/folder.c:5575
#, c-format
msgid "Really unsubscribe from \"%s\""
msgstr ""
-#: alpine/folder.c:5417
+#: alpine/folder.c:5596
#, c-format
msgid "Error unsubscribing from \"%s\""
msgstr ""
-#: alpine/folder.c:5475
+#: alpine/folder.c:5654
#, c-format
msgid "Can't delete special folder \"%s\"."
msgstr ""
-#: alpine/folder.c:5481
+#: alpine/folder.c:5660
msgid "Deletion cancelled: folder not in editable config file"
msgstr ""
-#: alpine/folder.c:5506
+#: alpine/folder.c:5685
#, c-format
msgid "Can't delete non-empty directory \"%s\"%s."
msgstr ""
-#: alpine/folder.c:5518
+#: alpine/folder.c:5697
msgid "No folder deleted"
msgstr ""
-#: alpine/folder.c:5525
+#: alpine/folder.c:5704
msgid "Nickname only"
msgstr ""
-#: alpine/folder.c:5526
+#: alpine/folder.c:5705
msgid "Both Folder and Nickname"
msgstr ""
-#: alpine/folder.c:5529
+#: alpine/folder.c:5708
msgid "DELETE only Nickname or Both nickname and folder? "
msgstr ""
-#: alpine/folder.c:5555
+#: alpine/folder.c:5736
msgid "Nothing deleted"
msgstr ""
-#: alpine/folder.c:5685
+#: alpine/folder.c:5866
msgid "folder list"
msgstr ""
-#: alpine/folder.c:5700
+#: alpine/folder.c:5881
#, c-format
msgid "String in folder %s to match : "
msgstr ""
-#: alpine/folder.c:5733
+#: alpine/folder.c:5914
msgid "Name Select"
msgstr ""
-#: alpine/folder.c:5734
+#: alpine/folder.c:5915
msgid "Content Select"
msgstr ""
-#: alpine/folder.c:5740
+#: alpine/folder.c:5921
msgid "Select \"Text\" not supported in Incoming Folders"
msgstr ""
-#: alpine/folder.c:5872
+#: alpine/folder.c:6053
msgid "Unseen msgs"
msgstr ""
-#: alpine/folder.c:5873
+#: alpine/folder.c:6054
msgid "New msgs"
msgstr ""
-#: alpine/folder.c:5874
+#: alpine/folder.c:6055
msgid "msg Count"
msgstr ""
-#: alpine/folder.c:5880
+#: alpine/folder.c:6061
msgid "Select \"Properties\" not supported in Incoming Folders"
msgstr ""
-#: alpine/folder.c:5948
+#: alpine/folder.c:6129
msgid "Toggle Comparison"
msgstr ""
-#: alpine/folder.c:6348
+#: alpine/folder.c:6529
#, c-format
msgid "Check of folder %s failed. Continue "
msgstr ""
-#: alpine/folder.c:6350 alpine/folder.c:6353
+#: alpine/folder.c:6531 alpine/folder.c:6534
#, c-format
msgid "Check of %s failed. Continue "
msgstr ""
-#: alpine/folder.c:6355
+#: alpine/folder.c:6536
#, c-format
msgid "Check failed. Continue "
msgstr ""
-#: alpine/folder.c:6414
+#: alpine/folder.c:6595
msgid "Cannot shuffle INBOX"
msgstr ""
-#: alpine/folder.c:6445
+#: alpine/folder.c:6626
msgid "Shuffle cancelled: config file not editable"
msgstr ""
-#: alpine/folder.c:6458
+#: alpine/folder.c:6639
msgid "Back"
msgstr ""
-#: alpine/folder.c:6482
+#: alpine/folder.c:6663
msgid "Shuffle cancelled: unexpected trouble shuffling"
msgstr ""
-#: alpine/folder.c:6496
+#: alpine/folder.c:6677
msgid "Cannot shuffle from one config file to another."
msgstr ""
-#: alpine/folder.c:6670
+#: alpine/folder.c:6851
msgid "Can't post messages, NNTP server needs to be configured"
msgstr ""
-#: alpine/folder.c:6677
+#: alpine/folder.c:6858
msgid "Getting full list of groups for posting"
msgstr ""
#. TRANSLATORS: the first %s is the folder type, it may be address book or
#. configuration. The second %s is the folder name. Of course, the HTML
#. tags should be left as is.
-#: alpine/remote.c:106
+#: alpine/remote.c:107
#, c-format
msgid ""
"<HTML><P>The data in the remote %s folder<P><CENTER>%s</CENTER><P>looks "
"suspicious. The reason for the suspicion is<P><CENTER>"
msgstr ""
-#: alpine/remote.c:112
+#: alpine/remote.c:113
#, c-format
msgid ""
"header \"%s\" is missing</CENTER><P>The special header \"%s\" is missing "
@@ -5909,7 +5971,7 @@ msgid ""
"Then you should investigate further."
msgstr ""
-#: alpine/remote.c:118
+#: alpine/remote.c:119
msgid ""
"\"Received\" headers detected</CENTER><P>The last message in the folder "
"contains \"Received\" headers. This usually indicates that the message was "
@@ -5918,7 +5980,7 @@ msgid ""
"data. Then you should investigate further."
msgstr ""
-#: alpine/remote.c:121
+#: alpine/remote.c:122
#, c-format
msgid ""
"Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -5928,7 +5990,7 @@ msgid ""
"the corrupt data. Then you should investigate further."
msgstr ""
-#: alpine/remote.c:127
+#: alpine/remote.c:128
#, c-format
msgid ""
"Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -5941,7 +6003,7 @@ msgid ""
"corrupt data. Then you should investigate further."
msgstr ""
-#: alpine/remote.c:133
+#: alpine/remote.c:134
#, c-format
msgid ""
"Unexpected value for header \"%s\"</CENTER><P>The special header \"%s\" in "
@@ -5953,11 +6015,11 @@ msgid ""
"corrupt data. Then you should investigate further."
msgstr ""
-#: alpine/remote.c:156
+#: alpine/remote.c:157
msgid "REMOTE DATA FORGERY WARNING"
msgstr ""
-#: alpine/remote.c:181
+#: alpine/remote.c:182
#, c-format
msgid ""
"\n"
@@ -5970,7 +6032,7 @@ msgid ""
" "
msgstr ""
-#: alpine/remote.c:187
+#: alpine/remote.c:188
#, c-format
msgid ""
"header \"%s\" is missing\n"
@@ -5982,7 +6044,7 @@ msgid ""
"\n"
msgstr ""
-#: alpine/remote.c:192
+#: alpine/remote.c:193
#, c-format
msgid ""
"\"Received\" headers detected\n"
@@ -5995,7 +6057,7 @@ msgid ""
"\n"
msgstr ""
-#: alpine/remote.c:196
+#: alpine/remote.c:197
#, c-format
msgid ""
"Unexpected value for header \"%s\"\n"
@@ -6008,7 +6070,7 @@ msgid ""
"\n"
msgstr ""
-#: alpine/remote.c:201
+#: alpine/remote.c:202
#, c-format
msgid ""
"Unexpected value for header \"%s\"\n"
@@ -6024,7 +6086,7 @@ msgid ""
"\n"
msgstr ""
-#: alpine/remote.c:206
+#: alpine/remote.c:207
#, c-format
msgid ""
"Unexpected value for header \"%s\"\n"
@@ -6041,67 +6103,67 @@ msgid ""
"\n"
msgstr ""
-#: alpine/remote.c:213
+#: alpine/remote.c:214
#, c-format
msgid "Suspicious data in \"%s\": Continue anyway "
msgstr ""
-#: alpine/remote.c:226
+#: alpine/remote.c:227
#, c-format
msgid "Can't open remote %s"
msgstr ""
#. TRANSLATORS: The argument is the command name being piped to.
-#: alpine/pipe.c:144
+#: alpine/pipe.c:145
#, c-format
msgid "Error opening pipe: %s"
msgstr ""
-#: alpine/setup.c:48
+#: alpine/setup.c:49
msgid "SETUP CONFIGURATION"
msgstr ""
-#: alpine/setup.c:49
+#: alpine/setup.c:50
msgid "SETUP CONFIGURATION EXCEPTIONS"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. configuration is something1
-#: alpine/setup.c:436 alpine/flagmaint.c:167 alpine/colorconf.c:106
-#: alpine/colorconf.c:2782 alpine/smime.c:612
+#: alpine/setup.c:437 alpine/flagmaint.c:168 alpine/colorconf.c:109
+#: alpine/colorconf.c:2921 alpine/smime.c:613
msgid "configuration"
msgstr ""
-#: alpine/setup.c:526 alpine/confscroll.c:1861
+#: alpine/setup.c:527 alpine/confscroll.c:1869
msgid "Leave unset and use default "
msgstr ""
-#: alpine/setup.c:688 alpine/setup.c:835
+#: alpine/setup.c:689 alpine/setup.c:836
#, c-format
msgid "Turn on incoming folders with Config feature \"%s\""
msgstr ""
-#: alpine/setup.c:707 alpine/setup.c:728 alpine/setup.c:740
+#: alpine/setup.c:708 alpine/setup.c:729 alpine/setup.c:741
msgid "Using default, monitor all incoming folders"
msgstr ""
-#: alpine/setup.c:726
+#: alpine/setup.c:727
msgid "List is unchanged"
msgstr ""
-#: alpine/setup.c:823
+#: alpine/setup.c:824
msgid "Incoming folders to be monitored"
msgstr ""
-#: alpine/setup.c:841
+#: alpine/setup.c:842
msgid "SELECT FOLDERS TO MONITOR"
msgstr ""
-#: alpine/setup.c:841
+#: alpine/setup.c:842
msgid "folders"
msgstr ""
-#: alpine/setup.c:843
+#: alpine/setup.c:844
msgid "HELP FOR SELECTING FOLDERS"
msgstr ""
@@ -6110,32 +6172,32 @@ msgstr ""
#. will be a column where one possibility is turned on (is Set).
#. The other column will be very short descriptions of what
#. the possibilities are (the Rule Values).
-#: alpine/flagmaint.c:116 alpine/confscroll.c:248
+#: alpine/flagmaint.c:117 alpine/confscroll.c:249
msgid "Set"
msgstr ""
-#: alpine/flagmaint.c:116
+#: alpine/flagmaint.c:117
msgid "Flag/Keyword Name"
msgstr ""
-#: alpine/flagmaint.c:166
+#: alpine/flagmaint.c:167
msgid "FLAG MAINTENANCE"
msgstr ""
-#: alpine/flagmaint.c:194
+#: alpine/flagmaint.c:195
msgid "Keyword to be added : "
msgstr ""
-#: alpine/flagmaint.c:212
+#: alpine/flagmaint.c:213
msgid "Keyword already configured, changing nickname"
msgstr ""
-#: alpine/flagmaint.c:217
+#: alpine/flagmaint.c:218
#, c-format
msgid "Optional nickname for \"%s\" : "
msgstr ""
-#: alpine/confscroll.c:55
+#: alpine/confscroll.c:56
msgid "HELP FOR SETUP CONFIGURATION"
msgstr ""
@@ -6143,18 +6205,18 @@ msgstr ""
#. screen when the user not only does not set an option but also
#. wants to explicitly not use the default value. Empty value means
#. an option with no value.
-#: alpine/confscroll.c:61
+#: alpine/confscroll.c:62
msgid "Empty Value"
msgstr ""
-#: alpine/confscroll.c:62
+#: alpine/confscroll.c:63
msgid "<Empty Value>"
msgstr ""
#. TRANSLATORS: No Value set is similar to Empty Value, but the
#. user has not explicitly decided to not use the default. It is
#. just an option which the user has left at the default value.
-#: alpine/confscroll.c:66
+#: alpine/confscroll.c:67
msgid "No Value Set"
msgstr ""
@@ -6163,1450 +6225,1450 @@ msgstr ""
#. value and they don't allow the user to change it. The value
#. is fixed to a certain value. This isn't the same word as
#. Repaired, it means Unchanging.
-#: alpine/confscroll.c:72
+#: alpine/confscroll.c:73
msgid "Value is Fixed"
msgstr ""
-#: alpine/confscroll.c:248
+#: alpine/confscroll.c:249
msgid "Rule Values"
msgstr ""
-#: alpine/confscroll.c:470
+#: alpine/confscroll.c:478
msgid "Screen too small"
msgstr ""
#. TRANSLATORS: "Config file not changeable," is what replaces the %s
-#: alpine/confscroll.c:477 alpine/confscroll.c:1322
+#: alpine/confscroll.c:485 alpine/confscroll.c:1330
#, c-format
msgid "%s can't change options or settings"
msgstr ""
-#: alpine/confscroll.c:479 alpine/confscroll.c:1324
+#: alpine/confscroll.c:487 alpine/confscroll.c:1332
msgid "Config file not changeable,"
msgstr ""
-#: alpine/confscroll.c:666 alpine/roleconf.c:6537
+#: alpine/confscroll.c:674 alpine/roleconf.c:6538
msgid "No help yet."
msgstr ""
-#: alpine/confscroll.c:740 alpine/confscroll.c:826
+#: alpine/confscroll.c:748 alpine/confscroll.c:834
msgid "Already at end of screen"
msgstr ""
-#: alpine/confscroll.c:782 alpine/confscroll.c:871
+#: alpine/confscroll.c:790 alpine/confscroll.c:879
msgid "Already at start of screen"
msgstr ""
-#: alpine/confscroll.c:1256
+#: alpine/confscroll.c:1264
msgid "Current item contains the only match"
msgstr ""
-#: alpine/confscroll.c:1261
+#: alpine/confscroll.c:1269
msgid "Search wrapped: word found in text above current line"
msgstr ""
-#: alpine/confscroll.c:1262
+#: alpine/confscroll.c:1270
msgid "Search wrapped: word found in text below current line"
msgstr ""
-#: alpine/confscroll.c:1264
+#: alpine/confscroll.c:1272
msgid "Search wrapped to beginning: word found"
msgstr ""
-#: alpine/confscroll.c:1267
+#: alpine/confscroll.c:1275
msgid "Word found in text above current line"
msgstr ""
-#: alpine/confscroll.c:1268
+#: alpine/confscroll.c:1276
msgid "Word found in text below current line"
msgstr ""
-#: alpine/confscroll.c:1290
+#: alpine/confscroll.c:1298
msgid "Moved to top"
msgstr ""
-#: alpine/confscroll.c:1305
+#: alpine/confscroll.c:1313
msgid "Moved to bottom"
msgstr ""
#. TRANSLATORS: Command <command letter> not defined here.
#. Leave the trailing %s which might be a parenthetical
#. remark.
-#: alpine/confscroll.c:1339
+#: alpine/confscroll.c:1347
#, c-format
msgid "Command \"%s\" not defined here.%s"
msgstr ""
-#: alpine/confscroll.c:1639
+#: alpine/confscroll.c:1647
msgid "Decrease"
msgstr ""
-#: alpine/confscroll.c:1643
+#: alpine/confscroll.c:1651
msgid "Increase"
msgstr ""
-#: alpine/confscroll.c:1662
+#: alpine/confscroll.c:1670
msgid "Only single value allowed. Use \"Change\"."
msgstr ""
-#: alpine/confscroll.c:1688
+#: alpine/confscroll.c:1696
msgid "Enter text to insert before \"%.*w\": "
msgstr ""
-#: alpine/confscroll.c:1702 alpine/print.c:750
+#: alpine/confscroll.c:1710 alpine/print.c:751
msgid "Add To"
msgstr ""
-#: alpine/confscroll.c:1704 alpine/print.c:752
+#: alpine/confscroll.c:1712 alpine/print.c:753
msgid "Replace or Add To default value ? "
msgstr ""
-#: alpine/confscroll.c:1725 alpine/confscroll.c:1753
+#: alpine/confscroll.c:1733 alpine/confscroll.c:1761
#, c-format
msgid "Enter the numeric text to be added : "
msgstr ""
-#: alpine/confscroll.c:1727 alpine/confscroll.c:1755
+#: alpine/confscroll.c:1735 alpine/confscroll.c:1763
#, c-format
msgid "Enter the text to be added : "
msgstr ""
-#: alpine/confscroll.c:1739
+#: alpine/confscroll.c:1747
#, c-format
msgid "Enter the numeric replacement text : "
msgstr ""
-#: alpine/confscroll.c:1741
+#: alpine/confscroll.c:1749
#, c-format
msgid "Enter the replacement text : "
msgstr ""
#. TRANSLATORS: Insert new item before current item
-#: alpine/confscroll.c:1774 alpine/print.c:803
+#: alpine/confscroll.c:1782 alpine/print.c:804
msgid "InsertBefore"
msgstr ""
-#: alpine/confscroll.c:1774 alpine/print.c:803
+#: alpine/confscroll.c:1782 alpine/print.c:804
msgid "InsertAfter"
msgstr ""
-#: alpine/confscroll.c:1835 alpine/confscroll.c:1843 alpine/print.c:892
+#: alpine/confscroll.c:1843 alpine/confscroll.c:1851 alpine/print.c:893
#, c-format
msgid "Can't add %s to list"
msgstr ""
-#: alpine/confscroll.c:1851 alpine/confscroll.c:2223
+#: alpine/confscroll.c:1859 alpine/confscroll.c:2231
msgid "Entry must be numeric"
msgstr ""
-#: alpine/confscroll.c:1895
+#: alpine/confscroll.c:1903
#, c-format
msgid "Enter text to insert after \"%.*s\": "
msgstr ""
-#: alpine/confscroll.c:1897
+#: alpine/confscroll.c:1905
#, c-format
msgid "Enter text to insert before \"%.*s\": "
msgstr ""
-#: alpine/confscroll.c:1918 alpine/confscroll.c:2255
+#: alpine/confscroll.c:1926 alpine/confscroll.c:2263
#, c-format
msgid "Minimum value is %s"
msgstr ""
-#: alpine/confscroll.c:1943 alpine/confscroll.c:2272
+#: alpine/confscroll.c:1951 alpine/confscroll.c:2280
#, c-format
msgid "Maximum value is %s"
msgstr ""
-#: alpine/confscroll.c:1969 alpine/confscroll.c:1983 alpine/print.c:919
+#: alpine/confscroll.c:1977 alpine/confscroll.c:1991 alpine/print.c:920
#, c-format
msgid "Override default with %s"
msgstr ""
-#: alpine/confscroll.c:1999 alpine/print.c:934
+#: alpine/confscroll.c:2007 alpine/print.c:935
msgid "No set value to delete"
msgstr ""
-#: alpine/confscroll.c:2003
+#: alpine/confscroll.c:2011
#, c-format
msgid "Delete (unused) %s from %s "
msgstr ""
-#: alpine/confscroll.c:2015
+#: alpine/confscroll.c:2023
#, c-format
msgid "Really delete %s%s from %s "
msgstr ""
-#: alpine/confscroll.c:2051
+#: alpine/confscroll.c:2059
msgid "Value not deleted"
msgstr ""
-#: alpine/confscroll.c:2115
+#: alpine/confscroll.c:2123
#, c-format
msgid "Change field %s list entry : "
msgstr ""
-#: alpine/confscroll.c:2122
+#: alpine/confscroll.c:2130
#, c-format
msgid "Change numeric field %s value : "
msgstr ""
-#: alpine/confscroll.c:2124
+#: alpine/confscroll.c:2132
#, c-format
msgid "Change field %s value : "
msgstr ""
-#: alpine/confscroll.c:2294
+#: alpine/confscroll.c:2302
msgid "Can't shuffle single-valued setting"
msgstr ""
-#: alpine/confscroll.c:2309
+#: alpine/confscroll.c:2317
msgid "Shuffle only makes sense when there is more than one value defined"
msgstr ""
-#: alpine/confscroll.c:2738 alpine/confscroll.c:2965 alpine/colorconf.c:1220
+#: alpine/confscroll.c:2746 alpine/confscroll.c:2973 alpine/colorconf.c:1277
msgid "Delete old unused personal option setting"
msgstr ""
-#: alpine/confscroll.c:4266
+#: alpine/confscroll.c:4279
msgid "<Ignored: using Literal-Signature instead>"
msgstr ""
#. TRANSLATORS: In the configuration screen, telling the user we
#. can't change this option because the system administrator
#. prohibits it.
-#: alpine/confscroll.c:4520 pith/conf.c:6849
+#: alpine/confscroll.c:4533 pith/conf.c:6972
msgid "Can't change value fixed by sys-admin."
msgstr ""
-#: alpine/confscroll.c:4785
+#: alpine/confscroll.c:4798
#, c-format
msgid "Warning: \"%s\" is overridden in your exceptions configuration"
msgstr ""
-#: alpine/confscroll.c:4811
+#: alpine/confscroll.c:4824
msgid "FIXING PINERC"
msgstr ""
-#: alpine/confscroll.c:4815
+#: alpine/confscroll.c:4828
msgid "Some of your options conflict with site policy. Investigate"
msgstr ""
-#: alpine/confscroll.c:4839
+#: alpine/confscroll.c:4852
#, c-format
msgid "Your setting for %s is "
msgstr ""
-#: alpine/confscroll.c:4859 alpine/confscroll.c:4868 alpine/confscroll.c:4872
+#: alpine/confscroll.c:4872 alpine/confscroll.c:4881 alpine/confscroll.c:4885
#, c-format
msgid "Your setting for %s is %s"
msgstr ""
-#: alpine/confscroll.c:4928 alpine/confscroll.c:4932
+#: alpine/confscroll.c:4941 alpine/confscroll.c:4945
msgid "ON"
msgstr ""
-#: alpine/confscroll.c:4928 alpine/confscroll.c:4932
+#: alpine/confscroll.c:4941 alpine/confscroll.c:4945
msgid "OFF"
msgstr ""
-#: alpine/confscroll.c:5016
+#: alpine/confscroll.c:5029
msgid "Using default value"
msgstr ""
-#: alpine/confscroll.c:5027
+#: alpine/confscroll.c:5040
#, c-format
msgid "User-Domain (%s) cannot contain \"@\"; using %s"
msgstr ""
-#: alpine/confscroll.c:5036
+#: alpine/confscroll.c:5049
#, c-format
msgid "User-domain (%s) cannot contain \"@\"; deleting"
msgstr ""
-#: alpine/confscroll.c:5107 alpine/confscroll.c:5120 alpine/confscroll.c:5133
-#: alpine/confscroll.c:5140 pith/conf.c:6958
+#: alpine/confscroll.c:5120 alpine/confscroll.c:5133 alpine/confscroll.c:5146
+#: alpine/confscroll.c:5153 pith/conf.c:7081
msgid "This option has no effect without Enable-Incoming-Folders-Checking"
msgstr ""
-#: alpine/confscroll.c:5175
+#: alpine/confscroll.c:5188
msgid "Initial command changes will affect your next Alpine session."
msgstr ""
-#: alpine/confscroll.c:5228 alpine/confscroll.c:5244 pith/conf.c:6709
+#: alpine/confscroll.c:5241 alpine/confscroll.c:5257 pith/conf.c:6832
msgid "This change has no effect because feature Use-System-Translation is on"
msgstr ""
-#: alpine/confscroll.c:5298
+#: alpine/confscroll.c:5311
#, c-format
msgid "Ignoring Quote-Suppression-Threshold value of %s, see help"
msgstr ""
-#: alpine/confscroll.c:5323
+#: alpine/confscroll.c:5336
msgid "Active Example"
msgstr ""
-#: alpine/confscroll.c:5393 alpine/roleconf.c:5207
+#: alpine/confscroll.c:5406 alpine/roleconf.c:5208
#, c-format
msgid "Warning: Sig file can't be outside of %s"
msgstr ""
-#: alpine/confscroll.c:5427
+#: alpine/confscroll.c:5440
msgid ""
"Warning: automatic new mail checking and mailbox checkpointing is disabled"
msgstr ""
-#: alpine/confscroll.c:5430
+#: alpine/confscroll.c:5443
msgid ""
"Warning: Mail-Check-Interval=0 may cause IMAP server connection to time out"
msgstr ""
-#: alpine/confscroll.c:5547
+#: alpine/confscroll.c:5560
#, c-format
msgid "\"%s\" can't be Empty, using default"
msgstr ""
-#: alpine/confscroll.c:5598
+#: alpine/confscroll.c:5611
#, c-format
msgid "Can't set \"%s\" to that value, see Setup/Printer"
msgstr ""
-#: alpine/confscroll.c:5637
+#: alpine/confscroll.c:5651
#, c-format
msgid "Score Value must be in range %s to %s"
msgstr ""
-#: alpine/confscroll.c:5682
+#: alpine/confscroll.c:5696
#, c-format
msgid "Changes%s%s will affect your next Alpine session."
msgstr ""
-#: alpine/confscroll.c:5693
+#: alpine/confscroll.c:5707
msgid "Timeout changes will affect your next Alpine session."
msgstr ""
#. TRANSLATORS: these are some screen titles
-#: alpine/mailindx.c:103
+#: alpine/mailindx.c:104
msgid "THREAD INDEX"
msgstr ""
-#: alpine/mailindx.c:106
+#: alpine/mailindx.c:107
msgid "MESSAGE INDEX"
msgstr ""
-#: alpine/mailindx.c:107
+#: alpine/mailindx.c:108
msgid "ZOOMED MESSAGE INDEX"
msgstr ""
-#: alpine/mailindx.c:109
+#: alpine/mailindx.c:110
msgid "COMPOSE: SELECT INTERRUPTED"
msgstr ""
-#: alpine/mailindx.c:112
+#: alpine/mailindx.c:113
msgid "COMPOSE: SELECT FORM LETTER"
msgstr ""
-#: alpine/mailindx.c:113
+#: alpine/mailindx.c:114
msgid "COMPOSE: SELECT POSTPONED"
msgstr ""
-#: alpine/mailindx.c:131
+#: alpine/mailindx.c:132
msgid "ThrdIndex"
msgstr ""
-#: alpine/mailindx.c:164
+#: alpine/mailindx.c:165
msgid "eXclude"
msgstr ""
-#: alpine/mailindx.c:169
+#: alpine/mailindx.c:170
msgid "eXpunge"
msgstr ""
-#: alpine/mailindx.c:222
+#: alpine/mailindx.c:223
msgid "No folder is currently open"
msgstr ""
-#: alpine/mailindx.c:622
+#: alpine/mailindx.c:623
msgid "First Index page"
msgstr ""
-#: alpine/mailindx.c:636
+#: alpine/mailindx.c:637
msgid "Already at start of Index"
msgstr ""
-#: alpine/mailindx.c:656
+#: alpine/mailindx.c:657
msgid "Last Index page"
msgstr ""
-#: alpine/mailindx.c:665
+#: alpine/mailindx.c:666
msgid "Already at end of Index"
msgstr ""
-#: alpine/mailindx.c:694
+#: alpine/mailindx.c:695
msgid "First Index Page"
msgstr ""
-#: alpine/mailindx.c:715
+#: alpine/mailindx.c:716
msgid "Last Index Page"
msgstr ""
-#: alpine/mailindx.c:1071
+#: alpine/mailindx.c:1074
msgid "HELP FOR SELECTING INTERRUPTED MSG"
msgstr ""
-#: alpine/mailindx.c:1072
+#: alpine/mailindx.c:1075
msgid "HELP FOR SELECTING POSTPONED MSG"
msgstr ""
-#: alpine/mailindx.c:1099
+#: alpine/mailindx.c:1102
#, c-format
msgid "Message %s deleted"
msgstr ""
-#: alpine/mailindx.c:1099
+#: alpine/mailindx.c:1102
#, c-format
msgid "Message %s already deleted"
msgstr ""
-#: alpine/mailindx.c:1128
+#: alpine/mailindx.c:1131
#, c-format
msgid "Message %s UNdeleted"
msgstr ""
-#: alpine/mailindx.c:1128
+#: alpine/mailindx.c:1131
#, c-format
msgid "Message %s NOT deleted"
msgstr ""
-#: alpine/mailindx.c:2849
+#: alpine/mailindx.c:2852
msgid "Remember the \"O\" command is always optional"
msgstr ""
-#: alpine/mailindx.c:2984
+#: alpine/mailindx.c:2987
msgid "Select Matches"
msgstr ""
-#: alpine/mailindx.c:3020
+#: alpine/mailindx.c:3023
msgid "Searched to First Message."
msgstr ""
-#: alpine/mailindx.c:3036
+#: alpine/mailindx.c:3039
msgid "Searched to Last Message."
msgstr ""
-#: alpine/mailindx.c:3162
+#: alpine/mailindx.c:3165
#, c-format
msgid "Search cancelled.%s"
msgstr ""
-#: alpine/mailindx.c:3163
+#: alpine/mailindx.c:3166
msgid " Selected set may be incomplete."
msgstr ""
-#: alpine/mailindx.c:3172
+#: alpine/mailindx.c:3175
#, c-format
msgid "%s messages found matching word"
msgstr ""
-#: alpine/mailindx.c:3176
+#: alpine/mailindx.c:3179
#, c-format
msgid "Word found%s"
msgstr ""
-#: alpine/mailindx.c:3177
+#: alpine/mailindx.c:3180
msgid ". Search wrapped to beginning"
msgstr ""
-#: alpine/mailindx.c:3178
+#: alpine/mailindx.c:3181
msgid ". Current line contains only match"
msgstr ""
-#: alpine/kblock.c:45 alpine/kblock.c:64
+#: alpine/kblock.c:46 alpine/kblock.c:65
msgid "KEYBOARD LOCK"
msgstr ""
-#: alpine/kblock.c:50
+#: alpine/kblock.c:51
msgid "You may lock this keyboard so that no one else can access your mail"
msgstr ""
-#: alpine/kblock.c:52
+#: alpine/kblock.c:53
msgid "while you are away. The screen will be locked after entering the "
msgstr ""
-#: alpine/kblock.c:54
+#: alpine/kblock.c:55
msgid "password to be used for unlocking the keyboard when you return."
msgstr ""
-#: alpine/kblock.c:68
+#: alpine/kblock.c:69
#, c-format
msgid "This keyboard is locked by %s <%s>."
msgstr ""
-#: alpine/kblock.c:69
+#: alpine/kblock.c:70
msgid "To unlock, enter password used to lock the keyboard."
msgstr ""
-#: alpine/kblock.c:119
+#: alpine/kblock.c:120
#, c-format
msgid "Retype password to LOCK keyboard (Yes, again) : "
msgstr ""
-#: alpine/kblock.c:121
+#: alpine/kblock.c:122
#, c-format
msgid "Retype password to LOCK keyboard : "
msgstr ""
-#: alpine/kblock.c:123
+#: alpine/kblock.c:124
#, c-format
msgid "Enter password to LOCK keyboard : "
msgstr ""
-#: alpine/kblock.c:132 alpine/kblock.c:152
+#: alpine/kblock.c:133 alpine/kblock.c:153
msgid "Keyboard lock cancelled"
msgstr ""
-#: alpine/kblock.c:145
+#: alpine/kblock.c:146
msgid "Mismatch with initial password: keyboard lock cancelled"
msgstr ""
-#: alpine/kblock.c:150
+#: alpine/kblock.c:151
msgid "Really lock keyboard with entered password"
msgstr ""
-#: alpine/kblock.c:166
+#: alpine/kblock.c:167
msgid "Password to UNLOCK doesn't match password used to LOCK"
msgstr ""
-#: alpine/kblock.c:175
+#: alpine/kblock.c:176
msgid "Enter password to UNLOCK keyboard : "
msgstr ""
-#: alpine/kblock.c:190
+#: alpine/kblock.c:191
msgid "Keyboard Unlocked"
msgstr ""
-#: alpine/roleconf.c:53
+#: alpine/roleconf.c:54
msgid "HELP FOR ARBITRARY HEADER PATTERNS"
msgstr ""
-#: alpine/roleconf.c:54
+#: alpine/roleconf.c:55
msgid "Add Extra Headers"
msgstr ""
-#: alpine/roleconf.c:157
+#: alpine/roleconf.c:158
msgid "ForwardAs"
msgstr ""
-#: alpine/roleconf.c:158
+#: alpine/roleconf.c:159
msgid "ReplyAs"
msgstr ""
-#: alpine/roleconf.c:159
+#: alpine/roleconf.c:160
msgid "ComposeAs"
msgstr ""
-#: alpine/roleconf.c:159
+#: alpine/roleconf.c:160
msgid "BounceAs"
msgstr ""
-#: alpine/roleconf.c:173
+#: alpine/roleconf.c:174
msgid "HELP FOR SELECTING A ROLE TO BOUNCE AS"
msgstr ""
-#: alpine/roleconf.c:175
+#: alpine/roleconf.c:176
msgid "HELP FOR SELECTING A ROLE TO COMPOSE AS"
msgstr ""
-#: alpine/roleconf.c:177
+#: alpine/roleconf.c:178
msgid "HELP FOR SELECTING A ROLE"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. "roles" is something1
-#: alpine/roleconf.c:204
+#: alpine/roleconf.c:205
msgid "SELECT ROLE"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. "roles" is something1
-#: alpine/roleconf.c:205 alpine/roleconf.c:4910
+#: alpine/roleconf.c:206 alpine/roleconf.c:4911
msgid "roles"
msgstr ""
-#: alpine/roleconf.c:242
+#: alpine/roleconf.c:243
msgid "Default role will be changed to the role you Select"
msgstr ""
-#: alpine/roleconf.c:245
+#: alpine/roleconf.c:246
msgid "Default role will be set to the role you Select"
msgstr ""
-#: alpine/roleconf.c:248
+#: alpine/roleconf.c:249
msgid "Default role will be unset"
msgstr ""
-#: alpine/roleconf.c:252
+#: alpine/roleconf.c:253
msgid "Default role will remain unchanged"
msgstr ""
-#: alpine/roleconf.c:254
+#: alpine/roleconf.c:255
msgid "Default role will remain unset"
msgstr ""
-#: alpine/roleconf.c:340
+#: alpine/roleconf.c:341
#, c-format
msgid "Warning: \"%sRules\" are overridden in your exceptions configuration"
msgstr ""
-#: alpine/roleconf.c:363
+#: alpine/roleconf.c:364
msgid "Unexpected problem: config file modified externally?"
msgstr ""
-#: alpine/roleconf.c:365
+#: alpine/roleconf.c:366
#, c-format
msgid "Perhaps a newer version of pine was used to set variable \"%s\"?"
msgstr ""
-#: alpine/roleconf.c:481
+#: alpine/roleconf.c:482
msgid "problem getting addresses from message"
msgstr ""
-#: alpine/roleconf.c:529
+#: alpine/roleconf.c:530
msgid "problem accessing rules"
msgstr ""
-#: alpine/roleconf.c:639 alpine/roleconf.c:1183 alpine/roleconf.c:1337
-#: alpine/roleconf.c:1468
+#: alpine/roleconf.c:640 alpine/roleconf.c:1184 alpine/roleconf.c:1338
+#: alpine/roleconf.c:1469
msgid "Site policy doesn't allow changing From address so From is ignored"
msgstr ""
-#: alpine/roleconf.c:649 alpine/roleconf.c:1196 alpine/roleconf.c:1350
+#: alpine/roleconf.c:650 alpine/roleconf.c:1197 alpine/roleconf.c:1351
msgid "Warning: The nickname of the new role is already in use."
msgstr ""
-#: alpine/roleconf.c:997 alpine/roleconf.c:1061
+#: alpine/roleconf.c:998 alpine/roleconf.c:1062
#, c-format
msgid "HELP FOR %sRULE CONFIGURATION"
msgstr ""
-#: alpine/roleconf.c:1062
+#: alpine/roleconf.c:1063
#, c-format
msgid "Use Add to add a %sRule"
msgstr ""
-#: alpine/roleconf.c:1138
+#: alpine/roleconf.c:1139
msgid "Nothing to Replicate, use Add"
msgstr ""
-#: alpine/roleconf.c:1171 alpine/roleconf.c:1299
+#: alpine/roleconf.c:1172 alpine/roleconf.c:1300
msgid "Can't add rule to ReadOnly file"
msgstr ""
-#: alpine/roleconf.c:1453
+#: alpine/roleconf.c:1454
msgid "Can't change ReadOnly rule"
msgstr ""
-#: alpine/roleconf.c:1478
+#: alpine/roleconf.c:1479
msgid "Warning: The nickname of this role is also used for another role."
msgstr ""
-#: alpine/roleconf.c:1545
+#: alpine/roleconf.c:1546
msgid "Can't delete ReadOnly rule"
msgstr ""
-#: alpine/roleconf.c:1549
+#: alpine/roleconf.c:1550
#, c-format
msgid "Really delete %srule"
msgstr ""
-#: alpine/roleconf.c:1559
+#: alpine/roleconf.c:1560
msgid "Rule not deleted"
msgstr ""
-#: alpine/roleconf.c:1676
+#: alpine/roleconf.c:1677
msgid "Shuffle only makes sense when there is more than one rule defined"
msgstr ""
-#: alpine/roleconf.c:1695
+#: alpine/roleconf.c:1696
msgid "Before File"
msgstr ""
-#: alpine/roleconf.c:1700
+#: alpine/roleconf.c:1701
msgid "After File"
msgstr ""
-#: alpine/roleconf.c:1747
+#: alpine/roleconf.c:1748
msgid "Can't change ReadOnly file"
msgstr ""
-#: alpine/roleconf.c:1767
+#: alpine/roleconf.c:1768
msgid "BEFORE"
msgstr ""
-#: alpine/roleconf.c:1771
+#: alpine/roleconf.c:1772
msgid "AFTER"
msgstr ""
-#: alpine/roleconf.c:1788
+#: alpine/roleconf.c:1789
msgid "Can't shuffle into ReadOnly file"
msgstr ""
-#: alpine/roleconf.c:1899
+#: alpine/roleconf.c:1900
msgid "Current rule is already part of a file. Move outside any files first."
msgstr ""
-#: alpine/roleconf.c:2057
+#: alpine/roleconf.c:2058
msgid "Current rule is not part of a file. Use Delete to remove current rule"
msgstr ""
-#: alpine/roleconf.c:2061
+#: alpine/roleconf.c:2062
#, c-format
msgid "Really remove rule file \"%s\" from rules config "
msgstr ""
-#: alpine/roleconf.c:2138
+#: alpine/roleconf.c:2139
msgid "Rule file not removed"
msgstr ""
#. TRANSLATORS: These next 4 are subheading for sections of a configuration screen.
-#: alpine/roleconf.c:2792
+#: alpine/roleconf.c:2793
msgid " CURRENT FOLDER CONDITIONS BEGIN HERE "
msgstr ""
-#: alpine/roleconf.c:2794
+#: alpine/roleconf.c:2795
msgid " ACTIONS BEGIN HERE "
msgstr ""
-#: alpine/roleconf.c:2795
+#: alpine/roleconf.c:2796
msgid " USES BEGIN HERE "
msgstr ""
-#: alpine/roleconf.c:2796
+#: alpine/roleconf.c:2797
msgid " OPTIONS BEGIN HERE "
msgstr ""
-#: alpine/roleconf.c:2797
+#: alpine/roleconf.c:2798
msgid "Subject pattern"
msgstr ""
-#: alpine/roleconf.c:2798
+#: alpine/roleconf.c:2799
msgid "Use SMTP Server"
msgstr ""
-#: alpine/roleconf.c:2799
+#: alpine/roleconf.c:2800
msgid "Exit Status Interval"
msgstr ""
-#: alpine/roleconf.c:2909
+#: alpine/roleconf.c:2910
#, c-format
msgid "Rule contains unknown %s element, possibly from newer Alpine"
msgstr ""
-#: alpine/roleconf.c:2914
+#: alpine/roleconf.c:2915
msgid "Editing with this version of Alpine will destroy information"
msgstr ""
#. TRANSLATORS: Quite a few of the translations to follow are from the
#. rules editing screens. These are mostly headings of individual categories
#. of criteria which can be set in a rule.
-#: alpine/roleconf.c:2957
+#: alpine/roleconf.c:2958
msgid "To pattern"
msgstr ""
-#: alpine/roleconf.c:2959
+#: alpine/roleconf.c:2960
msgid "From pattern"
msgstr ""
-#: alpine/roleconf.c:2961
+#: alpine/roleconf.c:2962
msgid "Sender pattern"
msgstr ""
-#: alpine/roleconf.c:2963
+#: alpine/roleconf.c:2964
msgid "Cc pattern"
msgstr ""
-#: alpine/roleconf.c:2965
+#: alpine/roleconf.c:2966
msgid "News pattern"
msgstr ""
#. TRANSLATORS: Recip is an abbreviation for Recipients which stands for
#. all of the recipients of a message.
-#: alpine/roleconf.c:2971
+#: alpine/roleconf.c:2972
msgid "Recip pattern"
msgstr ""
#. TRANSLATORS: Partic is an abbreviation for Participants which stands for
#. all of the recipients plus the sender of a message.
-#: alpine/roleconf.c:2975
+#: alpine/roleconf.c:2976
msgid "Partic pattern"
msgstr ""
#. TRANSLATORS: AllText means all of the text of a message
-#: alpine/roleconf.c:2978
+#: alpine/roleconf.c:2979
msgid "AllText pattern"
msgstr ""
#. TRANSLATORS: BdyText means the text of a message but not the text in the headers
-#: alpine/roleconf.c:2981
+#: alpine/roleconf.c:2982
msgid "BdyText pattern"
msgstr ""
-#: alpine/roleconf.c:2984
+#: alpine/roleconf.c:2985
msgid "Keyword pattern"
msgstr ""
-#: alpine/roleconf.c:2986
+#: alpine/roleconf.c:2987
msgid "Charset pattern"
msgstr ""
#. TRANSLATORS: Age interval is a setting for how old the message is.
-#: alpine/roleconf.c:2991
+#: alpine/roleconf.c:2992
msgid "Age interval"
msgstr ""
-#: alpine/roleconf.c:3002
+#: alpine/roleconf.c:3003
msgid "Size interval"
msgstr ""
#. TRANSLATORS: Score is an alpine concept where the score can be kept for a
#. message to see if it is a message you want to look at.
-#: alpine/roleconf.c:3015
+#: alpine/roleconf.c:3016
msgid "Score interval"
msgstr ""
-#: alpine/roleconf.c:3026
+#: alpine/roleconf.c:3027
msgid "Message is Deleted?"
msgstr ""
-#: alpine/roleconf.c:3034
+#: alpine/roleconf.c:3035
msgid "Message is New (Unseen)?"
msgstr ""
-#: alpine/roleconf.c:3042
+#: alpine/roleconf.c:3043
msgid "Message is Important?"
msgstr ""
-#: alpine/roleconf.c:3050
+#: alpine/roleconf.c:3051
msgid "Message is Answered?"
msgstr ""
-#: alpine/roleconf.c:3058
+#: alpine/roleconf.c:3059
msgid "Subject contains raw 8-bit?"
msgstr ""
-#: alpine/roleconf.c:3066
+#: alpine/roleconf.c:3067
msgid "Message is Recent?"
msgstr ""
-#: alpine/roleconf.c:3074
+#: alpine/roleconf.c:3075
msgid "Beginning of Month?"
msgstr ""
-#: alpine/roleconf.c:3082
+#: alpine/roleconf.c:3083
msgid "Beginning of Year?"
msgstr ""
#. TRANSLATORS: these are actions that might be taken by the rule
-#: alpine/roleconf.c:3094
+#: alpine/roleconf.c:3095
msgid "Set Deleted Status"
msgstr ""
-#: alpine/roleconf.c:3102
+#: alpine/roleconf.c:3103
msgid "Set New Status"
msgstr ""
-#: alpine/roleconf.c:3110
+#: alpine/roleconf.c:3111
msgid "Set Important Status"
msgstr ""
-#: alpine/roleconf.c:3118
+#: alpine/roleconf.c:3119
msgid "Set Answered Status"
msgstr ""
-#: alpine/roleconf.c:3125
+#: alpine/roleconf.c:3126
msgid "Initialize settings using role"
msgstr ""
-#: alpine/roleconf.c:3134
+#: alpine/roleconf.c:3135
msgid "Current Folder Type"
msgstr ""
-#: alpine/roleconf.c:3141 alpine/roleconf.c:4403
+#: alpine/roleconf.c:3142 alpine/roleconf.c:4404
msgid "Folder List"
msgstr ""
-#: alpine/roleconf.c:3156
+#: alpine/roleconf.c:3157
msgid "Address in address book?"
msgstr ""
#. TRANSLATORS: Abook is an abbreviation for Address Book
-#: alpine/roleconf.c:3164
+#: alpine/roleconf.c:3165
msgid "Abook List"
msgstr ""
-#: alpine/roleconf.c:3172
+#: alpine/roleconf.c:3173
msgid "External Categorizer Commands"
msgstr ""
-#: alpine/roleconf.c:3195
+#: alpine/roleconf.c:3196
msgid "Character Limit"
msgstr ""
-#: alpine/roleconf.c:3209
+#: alpine/roleconf.c:3210
msgid "Set From"
msgstr ""
-#: alpine/roleconf.c:3226
+#: alpine/roleconf.c:3227
msgid "Set Reply-To"
msgstr ""
-#: alpine/roleconf.c:3243
+#: alpine/roleconf.c:3244
msgid "Set Fcc"
msgstr ""
-#: alpine/roleconf.c:3250
+#: alpine/roleconf.c:3251
msgid "Set Sort Order"
msgstr ""
-#: alpine/roleconf.c:3264
+#: alpine/roleconf.c:3265
msgid "Set Index Format"
msgstr ""
-#: alpine/roleconf.c:3277
+#: alpine/roleconf.c:3278
msgid "Set Startup Rule"
msgstr ""
#. TRANSLATORS: LiteralSig is a way to keep the signature in the configuration
#. file instead of in a separate Signature file.
-#: alpine/roleconf.c:3294
+#: alpine/roleconf.c:3295
msgid "Set LiteralSig"
msgstr ""
-#: alpine/roleconf.c:3301
+#: alpine/roleconf.c:3302
msgid "Set Signature"
msgstr ""
#. TRANSLATORS: A template is a skeleton of a message to be used
#. for composing a new message
-#: alpine/roleconf.c:3310
+#: alpine/roleconf.c:3311
msgid "Set Template"
msgstr ""
#. TRANSLATORS: Hdrs is an abbreviation for Headers
-#: alpine/roleconf.c:3318
+#: alpine/roleconf.c:3319
msgid "Set Other Hdrs"
msgstr ""
-#: alpine/roleconf.c:3334
+#: alpine/roleconf.c:3335
msgid "Use NNTP Server"
msgstr ""
-#: alpine/roleconf.c:3343
+#: alpine/roleconf.c:3344
msgid "Score Value"
msgstr ""
-#: alpine/roleconf.c:3360
+#: alpine/roleconf.c:3361
msgid "Score From Header"
msgstr ""
#. TRANSLATORS: For these, Use is a now. This part of the rule describes how
#. it will be used when Replying so it is the Reply Use
-#: alpine/roleconf.c:3373
+#: alpine/roleconf.c:3374
msgid "Reply Use"
msgstr ""
-#: alpine/roleconf.c:3381
+#: alpine/roleconf.c:3382
msgid "Forward Use"
msgstr ""
-#: alpine/roleconf.c:3388
+#: alpine/roleconf.c:3389
msgid "Compose Use"
msgstr ""
-#: alpine/roleconf.c:3435
+#: alpine/roleconf.c:3436
msgid "HELP FOR NICKNAME"
msgstr ""
-#: alpine/roleconf.c:3458
+#: alpine/roleconf.c:3459
msgid "HELP FOR COMMENT"
msgstr ""
-#: alpine/roleconf.c:3534
+#: alpine/roleconf.c:3535
msgid "HELP FOR CURRENT FOLDER TYPE"
msgstr ""
-#: alpine/roleconf.c:3567
+#: alpine/roleconf.c:3568
msgid "HELP FOR FOLDER LIST"
msgstr ""
#. TRANSLATORS: The %s is replaced with one of the 4 or 5 words below, CURRENT,
#. SCORED, and so on.
-#: alpine/roleconf.c:3582
+#: alpine/roleconf.c:3583
#, c-format
msgid " %s MESSAGE CONDITIONS BEGIN HERE "
msgstr ""
-#: alpine/roleconf.c:3583 alpine/roleconf.c:3586
+#: alpine/roleconf.c:3584 alpine/roleconf.c:3587
msgid "CURRENT"
msgstr ""
-#: alpine/roleconf.c:3584
+#: alpine/roleconf.c:3585
msgid "SCORED"
msgstr ""
-#: alpine/roleconf.c:3585
+#: alpine/roleconf.c:3586
msgid "COLORED"
msgstr ""
-#: alpine/roleconf.c:3586
+#: alpine/roleconf.c:3587
msgid "FILTERED"
msgstr ""
-#: alpine/roleconf.c:3610
+#: alpine/roleconf.c:3611
msgid "HELP FOR TO PATTERN"
msgstr ""
-#: alpine/roleconf.c:3614
+#: alpine/roleconf.c:3615
msgid "HELP FOR FROM PATTERN"
msgstr ""
-#: alpine/roleconf.c:3618
+#: alpine/roleconf.c:3619
msgid "HELP FOR SENDER PATTERN"
msgstr ""
-#: alpine/roleconf.c:3622
+#: alpine/roleconf.c:3623
msgid "HELP FOR CC PATTERN"
msgstr ""
-#: alpine/roleconf.c:3626
+#: alpine/roleconf.c:3627
msgid "HELP FOR NEWS PATTERN"
msgstr ""
-#: alpine/roleconf.c:3630
+#: alpine/roleconf.c:3631
msgid "HELP FOR SUBJECT PATTERN"
msgstr ""
-#: alpine/roleconf.c:3634
+#: alpine/roleconf.c:3635
msgid "HELP FOR RECIPIENT PATTERN"
msgstr ""
-#: alpine/roleconf.c:3638
+#: alpine/roleconf.c:3639
msgid "HELP FOR PARTICIPANT PATTERN"
msgstr ""
-#: alpine/roleconf.c:3676
+#: alpine/roleconf.c:3677
msgid "HELP FOR EXTRA HEADERS"
msgstr ""
-#: alpine/roleconf.c:3685
+#: alpine/roleconf.c:3686
msgid "HELP FOR ALL TEXT PATTERN"
msgstr ""
-#: alpine/roleconf.c:3689
+#: alpine/roleconf.c:3690
msgid "HELP FOR BODY TEXT PATTERN"
msgstr ""
-#: alpine/roleconf.c:3694
+#: alpine/roleconf.c:3695
msgid "HELP FOR AGE INTERVAL"
msgstr ""
-#: alpine/roleconf.c:3708
+#: alpine/roleconf.c:3709
msgid "HELP FOR SIZE INTERVAL"
msgstr ""
-#: alpine/roleconf.c:3723
+#: alpine/roleconf.c:3724
msgid "HELP FOR SCORE INTERVAL"
msgstr ""
-#: alpine/roleconf.c:3738
+#: alpine/roleconf.c:3739
msgid "HELP FOR KEYWORD PATTERN"
msgstr ""
-#: alpine/roleconf.c:3744
+#: alpine/roleconf.c:3745
msgid "HELP FOR CHARACTER SET PATTERN"
msgstr ""
-#: alpine/roleconf.c:3750
+#: alpine/roleconf.c:3751
msgid "HELP FOR IMPORTANT STATUS"
msgstr ""
-#: alpine/roleconf.c:3753
+#: alpine/roleconf.c:3754
msgid "HELP FOR NEW STATUS"
msgstr ""
-#: alpine/roleconf.c:3756
+#: alpine/roleconf.c:3757
msgid "HELP FOR RECENT STATUS"
msgstr ""
-#: alpine/roleconf.c:3759
+#: alpine/roleconf.c:3760
msgid "HELP FOR DELETED STATUS"
msgstr ""
-#: alpine/roleconf.c:3762
+#: alpine/roleconf.c:3763
msgid "HELP FOR ANSWERED STATUS"
msgstr ""
-#: alpine/roleconf.c:3765
+#: alpine/roleconf.c:3766
msgid "HELP FOR 8-BIT SUBJECT"
msgstr ""
-#: alpine/roleconf.c:3768
+#: alpine/roleconf.c:3769
msgid "HELP FOR BEGINNING OF MONTH"
msgstr ""
-#: alpine/roleconf.c:3771
+#: alpine/roleconf.c:3772
msgid "HELP FOR BEGINNING OF YEAR"
msgstr ""
-#: alpine/roleconf.c:3819
+#: alpine/roleconf.c:3820
msgid "HELP FOR ADDRESS IN ADDRESS BOOK"
msgstr ""
-#: alpine/roleconf.c:3843
+#: alpine/roleconf.c:3844
msgid "HELP FOR ABOOK LIST"
msgstr ""
-#: alpine/roleconf.c:3848
+#: alpine/roleconf.c:3849
msgid "Types of addresses to check for in address book"
msgstr ""
-#: alpine/roleconf.c:3918
+#: alpine/roleconf.c:3919
msgid "HELP FOR ADDRESS TYPES"
msgstr ""
-#: alpine/roleconf.c:3970
+#: alpine/roleconf.c:3971
msgid "HELP FOR CATEGORIZER COMMAND"
msgstr ""
-#: alpine/roleconf.c:4003
+#: alpine/roleconf.c:4004
msgid "HELP FOR CATEGORIZER EXIT STATUS"
msgstr ""
-#: alpine/roleconf.c:4018
+#: alpine/roleconf.c:4019
msgid "HELP FOR CHARACTER LIMIT"
msgstr ""
-#: alpine/roleconf.c:4066
+#: alpine/roleconf.c:4067
msgid "HELP FOR INITIAL SET NICKNAME"
msgstr ""
-#: alpine/roleconf.c:4080
+#: alpine/roleconf.c:4081
msgid "HELP FOR SET FROM ACTION"
msgstr ""
-#: alpine/roleconf.c:4094
+#: alpine/roleconf.c:4095
msgid "HELP FOR SET REPLY-TO ACTION"
msgstr ""
-#: alpine/roleconf.c:4108
+#: alpine/roleconf.c:4109
msgid "HELP FOR SET FCC ACTION"
msgstr ""
-#: alpine/roleconf.c:4122
+#: alpine/roleconf.c:4123
msgid "HELP FOR SET LITERAL SIGNATURE ACTION"
msgstr ""
-#: alpine/roleconf.c:4136
+#: alpine/roleconf.c:4137
msgid "HELP FOR SET SIGNATURE ACTION"
msgstr ""
-#: alpine/roleconf.c:4154
+#: alpine/roleconf.c:4155
msgid "HELP FOR SET TEMPLATE ACTION"
msgstr ""
-#: alpine/roleconf.c:4172
+#: alpine/roleconf.c:4173
msgid "HELP FOR SET OTHER HEADERS ACTION"
msgstr ""
-#: alpine/roleconf.c:4204
+#: alpine/roleconf.c:4205
msgid "HELP FOR SMTP SERVER ACTION"
msgstr ""
-#: alpine/roleconf.c:4236
+#: alpine/roleconf.c:4237
msgid "HELP FOR NNTP SERVER ACTION"
msgstr ""
-#: alpine/roleconf.c:4281
+#: alpine/roleconf.c:4282
msgid "HELP FOR SCORE VALUE ACTION"
msgstr ""
-#: alpine/roleconf.c:4300
+#: alpine/roleconf.c:4301
msgid "HELP FOR SCORE VALUE FROM HEADER ACTION"
msgstr ""
-#: alpine/roleconf.c:4336
+#: alpine/roleconf.c:4337
msgid "Filter Action"
msgstr ""
-#: alpine/roleconf.c:4388
+#: alpine/roleconf.c:4389
msgid "HELP FOR FILTER ACTION"
msgstr ""
-#: alpine/roleconf.c:4409
+#: alpine/roleconf.c:4410
msgid "HELP FOR FILTER FOLDER NAME"
msgstr ""
-#: alpine/roleconf.c:4414
+#: alpine/roleconf.c:4415
msgid "HELP FOR SET IMPORTANT STATUS"
msgstr ""
-#: alpine/roleconf.c:4416
+#: alpine/roleconf.c:4417
msgid "HELP FOR SET NEW STATUS"
msgstr ""
-#: alpine/roleconf.c:4418
+#: alpine/roleconf.c:4419
msgid "HELP FOR SET DELETED STATUS"
msgstr ""
-#: alpine/roleconf.c:4420
+#: alpine/roleconf.c:4421
msgid "HELP FOR SET ANSWERED STATUS"
msgstr ""
-#: alpine/roleconf.c:4427
+#: alpine/roleconf.c:4428
msgid "Set These Keywords"
msgstr ""
-#: alpine/roleconf.c:4431
+#: alpine/roleconf.c:4432
msgid "HELP FOR KEYWORDS TO BE SET"
msgstr ""
-#: alpine/roleconf.c:4436
+#: alpine/roleconf.c:4437
msgid "Clear These Keywords"
msgstr ""
-#: alpine/roleconf.c:4440
+#: alpine/roleconf.c:4441
msgid "HELP FOR KEYWORDS TO BE CLEARED"
msgstr ""
-#: alpine/roleconf.c:4519
+#: alpine/roleconf.c:4520
msgid "HELP FOR SET INDEX FORMAT ACTION"
msgstr ""
-#: alpine/roleconf.c:4553
+#: alpine/roleconf.c:4554
msgid "Index Line Color ="
msgstr ""
-#: alpine/roleconf.c:4667
+#: alpine/roleconf.c:4668
msgid "HELP FOR FILTER FEATURES"
msgstr ""
-#: alpine/roleconf.c:4758
+#: alpine/roleconf.c:4759
msgid "HELP FOR ROLE REPLY USE"
msgstr ""
-#: alpine/roleconf.c:4822
+#: alpine/roleconf.c:4823
msgid "HELP FOR ROLE FORWARD USE"
msgstr ""
-#: alpine/roleconf.c:4886
+#: alpine/roleconf.c:4887
msgid "HELP FOR ROLE COMPOSE USE"
msgstr ""
-#: alpine/roleconf.c:5215
+#: alpine/roleconf.c:5216
#, c-format
msgid "Warning: Template file can't be outside of %s"
msgstr ""
-#: alpine/roleconf.c:5224
+#: alpine/roleconf.c:5225
#, c-format
msgid "Warning: Folder can't be outside of %s"
msgstr ""
-#: alpine/roleconf.c:5344
+#: alpine/roleconf.c:5345
#, c-format
msgid "Warning: command must be absolute path: \"%s\""
msgstr ""
-#: alpine/roleconf.c:6332 alpine/roleconf.c:6432 alpine/roleconf.c:6689
+#: alpine/roleconf.c:6333 alpine/roleconf.c:6433 alpine/roleconf.c:6690
msgid "Set a valid Filter Action before Exiting"
msgstr ""
-#: alpine/roleconf.c:6335 alpine/roleconf.c:6434
+#: alpine/roleconf.c:6336 alpine/roleconf.c:6435
msgid "Set a valid Specific Folder before Exiting"
msgstr ""
-#: alpine/roleconf.c:6364
+#: alpine/roleconf.c:6365
#, c-format
msgid "Folder \"%s\" in <%s> doesn't exist. Create"
msgstr ""
-#: alpine/roleconf.c:6375
+#: alpine/roleconf.c:6376
#, c-format
msgid "Folder \"%s\" in <%s> doesn't exist. Exit and save anyway"
msgstr ""
-#: alpine/roleconf.c:6384
+#: alpine/roleconf.c:6385
#, c-format
msgid "Folder \"%s\" doesn't exist. Create"
msgstr ""
-#: alpine/roleconf.c:6392
+#: alpine/roleconf.c:6393
#, c-format
msgid "Folder \"%s\" doesn't exist. Exit and save anyway"
msgstr ""
-#: alpine/roleconf.c:6401
+#: alpine/roleconf.c:6402
msgid "Folder created"
msgstr ""
-#: alpine/roleconf.c:6411
+#: alpine/roleconf.c:6412
msgid "Folder not created"
msgstr ""
-#: alpine/roleconf.c:6414 pico/pico.c:774
+#: alpine/roleconf.c:6415 pico/pico.c:775
msgid "Exit cancelled"
msgstr ""
-#: alpine/roleconf.c:6529
+#: alpine/roleconf.c:6530
#, c-format
msgid "Nickname \"%s\" is already in use"
msgstr ""
-#: alpine/roleconf.c:6540
+#: alpine/roleconf.c:6541
#, c-format
msgid "Not adding nickname to %s list"
msgstr ""
-#: alpine/roleconf.c:6656
+#: alpine/roleconf.c:6657
msgid "Commit changes (\"Yes\" means matching messages will be deleted)"
msgstr ""
-#: alpine/roleconf.c:6665 alpine/roleconf.c:6669
+#: alpine/roleconf.c:6666 alpine/roleconf.c:6670
msgid "Ok, messages matching that Pattern will be deleted"
msgstr ""
-#: alpine/roleconf.c:6712
+#: alpine/roleconf.c:6713
msgid "No filter changes saved"
msgstr ""
-#: alpine/roleconf.c:6718 alpine/roleconf.c:7150
+#: alpine/roleconf.c:6719 alpine/roleconf.c:7151
msgid "Changes not yet saved"
msgstr ""
-#: alpine/roleconf.c:7145
+#: alpine/roleconf.c:7146
msgid "No changes saved"
msgstr ""
-#: alpine/roleconf.c:7401 alpine/colorconf.c:1906
+#: alpine/roleconf.c:7402 alpine/colorconf.c:2004
msgid "Enter the name of the header field to be added: "
msgstr ""
-#: alpine/roleconf.c:7538
+#: alpine/roleconf.c:7539
#, c-format
msgid "Really remove \"%s\" pattern from this rule"
msgstr ""
-#: alpine/listsel.c:233
+#: alpine/listsel.c:234
msgid "Nothing selected, use Exit to exit without a selection."
msgstr ""
-#: alpine/status.c:1275
+#: alpine/status.c:1276
#, c-format
msgid "Command \"%s\" not allowed. Press RETURN to continue Alpine."
msgstr ""
#. TRANSLATORS: This is a placeholder for a list of addresses in address book
-#: alpine/addrbook.c:102
+#: alpine/addrbook.c:103
msgid "[ Address List ]"
msgstr ""
#. TRANSLATORS: This is an empty address list
-#: alpine/addrbook.c:104
+#: alpine/addrbook.c:105
msgid "[ Empty ]"
msgstr ""
-#: alpine/addrbook.c:105
+#: alpine/addrbook.c:106
msgid "[ No Selected Entries in this Address Book ]"
msgstr ""
#. TRANSLATORS: Move here means to move the cursor to this line of the screen
-#: alpine/addrbook.c:107
+#: alpine/addrbook.c:108
msgid " [ Move here to add a Personal Address Book ]"
msgstr ""
#. TRANSLATORS: A global address book is a shared address book
-#: alpine/addrbook.c:109
+#: alpine/addrbook.c:110
msgid " [ Move here to add a Global Address Book ]"
msgstr ""
#. TRANSLATORS: A heading for an address book distribution list
-#: alpine/addrbook.c:111
+#: alpine/addrbook.c:112
msgid "DISTRIBUTION LIST:"
msgstr ""
-#: alpine/addrbook.c:112
+#: alpine/addrbook.c:113
msgid "[ No Address Book Configured ]"
msgstr ""
#. TRANSLATORS: Select here means to move the cursor to this line and then type
#. the Select command.
-#: alpine/addrbook.c:115
+#: alpine/addrbook.c:116
msgid "[ Select Here to See Expanded List ]"
msgstr ""
#. TRANSLATORS: continuation line meaning there is more on the next page
-#: alpine/addrbook.c:737 alpine/addrbook.c:738
+#: alpine/addrbook.c:738 alpine/addrbook.c:739
msgid "(continued)"
msgstr ""
-#: alpine/addrbook.c:1548
+#: alpine/addrbook.c:1549
msgid "Exception Setup not implemented for address books"
msgstr ""
#. TRANSLATORS: A screen title
-#: alpine/addrbook.c:1565
+#: alpine/addrbook.c:1566
msgid "SETUP ADDRESS BOOKS"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/addrbook.c:1598 alpine/addrbook.c:1638 alpine/addrbook.c:1678
+#: alpine/addrbook.c:1599 alpine/addrbook.c:1639 alpine/addrbook.c:1679
msgid "SELECT ADDRESS"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/addrbook.c:1721
+#: alpine/addrbook.c:1722
msgid "COMPOSER: SELECT ADDRESS"
msgstr ""
#. TRANSLATORS: a screen title, user is composing a message and should select
#. a distribution list from a list of addresses in the address book.
-#: alpine/addrbook.c:1769
+#: alpine/addrbook.c:1770
msgid "COMPOSER: SELECT LIST"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/addrbook.c:1812
+#: alpine/addrbook.c:1813
msgid "ADDRESS BOOK (Update): SELECT ADDRESSES"
msgstr ""
-#: alpine/addrbook.c:1853
+#: alpine/addrbook.c:1854
msgid "SELECT ADDRESSES"
msgstr ""
#. TRANSLATORS: a screen title
-#: alpine/addrbook.c:1894
+#: alpine/addrbook.c:1895
msgid "TAKEADDR: SELECT NICKNAME"
msgstr ""
#. TRANSLATORS: a screen title, user selecting a nickname from the address book
-#: alpine/addrbook.c:1944 alpine/addrbook.c:1985
+#: alpine/addrbook.c:1945 alpine/addrbook.c:1986
msgid "SELECT NICKNAME"
msgstr ""
-#: alpine/addrbook.c:2117
+#: alpine/addrbook.c:2118
msgid "No Address Book Configured"
msgstr ""
-#: alpine/addrbook.c:2125
+#: alpine/addrbook.c:2126
msgid "No Address Book Configured, Use SETUP Addressbook screen"
msgstr ""
-#: alpine/addrbook.c:2140
+#: alpine/addrbook.c:2141
msgid "Screen too small to use Address book"
msgstr ""
-#: alpine/addrbook.c:2285
+#: alpine/addrbook.c:2286
#, c-format
msgid "ADDRESS BOOKS"
msgstr ""
@@ -7615,40 +7677,40 @@ msgstr ""
#. of the title. Move them as a group. There are two normal cases.
#. Either ADDRESS BOOK LIST when a list of names of address books is
#. displayed, or ADDRESS BOOK <name of address book> when one is open.
-#: alpine/addrbook.c:2294
+#: alpine/addrbook.c:2295
#, c-format
msgid "ADDRESS BOOK%s%s%s"
msgstr ""
#. TRANSLATORS: This is the LIST that goes with title above
-#: alpine/addrbook.c:2296
+#: alpine/addrbook.c:2297
msgid " LIST"
msgstr ""
#. TRANSLATORS: Add Global Address book (one defined by someone else)
-#: alpine/addrbook.c:2380 alpine/addrbook.c:2400
+#: alpine/addrbook.c:2381 alpine/addrbook.c:2401
msgid "Add Glob Abook"
msgstr ""
#. TRANSLATORS: Add Personal Address book
-#: alpine/addrbook.c:2382 alpine/addrbook.c:2401
+#: alpine/addrbook.c:2383 alpine/addrbook.c:2402
msgid "Add Pers Abook"
msgstr ""
#. TRANSLATORS: Delete Address book command
-#: alpine/addrbook.c:2388
+#: alpine/addrbook.c:2389
msgid "Del Abook"
msgstr ""
#. TRANSLATORS: Unexpand is the opposite of Expand.
#. We might expand an address book distribution
#. list to see all the members of the list.
-#: alpine/addrbook.c:2439 alpine/addrbook.c:2579 alpine/addrbook.c:2630
+#: alpine/addrbook.c:2440 alpine/addrbook.c:2580 alpine/addrbook.c:2631
msgid "Unexpand"
msgstr ""
#. TRANSLATORS: View this address book
-#: alpine/addrbook.c:2481 alpine/addrbook.c:2732
+#: alpine/addrbook.c:2482 alpine/addrbook.c:2733
msgid "ViewAbook"
msgstr ""
@@ -7657,15 +7719,15 @@ msgstr ""
#. with nothing selected.
#. The set all command means select everything
#. in the list.
-#: alpine/addrbook.c:2539
+#: alpine/addrbook.c:2540
msgid "unsetAll"
msgstr ""
-#: alpine/addrbook.c:2539
+#: alpine/addrbook.c:2540
msgid "setAll"
msgstr ""
-#: alpine/addrbook.c:2604 alpine/addrbook.c:2675
+#: alpine/addrbook.c:2605 alpine/addrbook.c:2676
msgid "Role"
msgstr ""
@@ -7674,928 +7736,941 @@ msgstr ""
#. called View/Update because the way to update
#. an entry is to first view it and then there
#. will be an opportunity to update it from there.
-#: alpine/addrbook.c:2731
+#: alpine/addrbook.c:2732
msgid "View/Update"
msgstr ""
-#: alpine/addrbook.c:2871
+#: alpine/addrbook.c:2872
msgid "HELP ON CONFIGURING ADDRESS BOOKS"
msgstr ""
-#: alpine/addrbook.c:2874 alpine/addrbook.c:2877
+#: alpine/addrbook.c:2875 alpine/addrbook.c:2878
msgid "HELP ON ADDRESS BOOK"
msgstr ""
-#: alpine/addrbook.c:3028
+#: alpine/addrbook.c:3029
#, c-format
msgid "AddressBook %s is Read Only"
msgstr ""
-#: alpine/addrbook.c:3060
+#: alpine/addrbook.c:3061
msgid "Cannot access address book."
msgstr ""
-#: alpine/addrbook.c:3122
+#: alpine/addrbook.c:3123
msgid "No entries in address book. Use ExitSelect to leave address books"
msgstr ""
-#: alpine/addrbook.c:3145
+#: alpine/addrbook.c:3146
msgid "Use \"X\" to mark addresses or lists"
msgstr ""
-#: alpine/addrbook.c:3231
+#: alpine/addrbook.c:3232
msgid "You may only select lists for Lcc, use Bcc for other addresses"
msgstr ""
-#: alpine/addrbook.c:3318
+#: alpine/addrbook.c:3319
msgid "Use select to select an address or addresses from address books"
msgstr ""
-#: alpine/addrbook.c:3320
+#: alpine/addrbook.c:3321
msgid "No address selected"
msgstr ""
-#: alpine/addrbook.c:3351
+#: alpine/addrbook.c:3352
msgid "Address book changed. AddNew cancelled. Try again."
msgstr ""
-#: alpine/addrbook.c:3367
+#: alpine/addrbook.c:3368
msgid "add"
msgstr ""
-#: alpine/addrbook.c:3510
+#: alpine/addrbook.c:3511
#, c-format
msgid "Missing \"}\" in config: %s"
msgstr ""
#. TRANSLATORS: the user tried to change the current line of the address
#. book but the line could not be changed
-#: alpine/addrbook.c:3548
+#: alpine/addrbook.c:3549
msgid "Not a changeable line"
msgstr ""
-#: alpine/addrbook.c:3556
+#: alpine/addrbook.c:3557
msgid "Nothing to delete"
msgstr ""
#. TRANSLATORS: This is just comforting confirmation that the
#. address book being deleted was successfully deleted
-#: alpine/addrbook.c:3629
+#: alpine/addrbook.c:3630
msgid "Address book deleted"
msgstr ""
-#: alpine/addrbook.c:3648
+#: alpine/addrbook.c:3649
msgid "Highlight entry you wish to shuffle"
msgstr ""
-#: alpine/addrbook.c:3721
+#: alpine/addrbook.c:3722
msgid "Shuffle failed"
msgstr ""
-#: alpine/addrbook.c:3722
+#: alpine/addrbook.c:3723
msgid "Address books shuffled"
msgstr ""
-#: alpine/addrbook.c:4092
+#: alpine/addrbook.c:4093
msgid "Address book changed. Delete cancelled. Try again."
msgstr ""
-#: alpine/addrbook.c:4099
+#: alpine/addrbook.c:4100
msgid "No entries to delete"
msgstr ""
-#: alpine/addrbook.c:4161 alpine/addrbook.c:4218 alpine/addrbook.c:4365
-#: alpine/addrbook.c:4405
+#: alpine/addrbook.c:4162 alpine/addrbook.c:4219 alpine/addrbook.c:4366
+#: alpine/addrbook.c:4406
msgid "No entries to select"
msgstr ""
-#: alpine/addrbook.c:4180
+#: alpine/addrbook.c:4181
msgid "You may only select whole lists for Lcc"
msgstr ""
-#: alpine/addrbook.c:4183
+#: alpine/addrbook.c:4184
msgid "You may only select lists for Lcc, use Bcc for personal entries"
msgstr ""
-#: alpine/addrbook.c:4205 alpine/addrbook.c:4563
+#: alpine/addrbook.c:4206 alpine/addrbook.c:4564
msgid "You may not select list members, only whole lists or personal entries"
msgstr ""
-#: alpine/addrbook.c:4209 alpine/addrbook.c:4567
+#: alpine/addrbook.c:4210 alpine/addrbook.c:4568
msgid "You may only select addresses or lists"
msgstr ""
-#: alpine/addrbook.c:4278
+#: alpine/addrbook.c:4279
msgid "Use \"X\" to select addresses or lists"
msgstr ""
-#: alpine/addrbook.c:4372
+#: alpine/addrbook.c:4373
msgid "Select is only available from within an expanded address book"
msgstr ""
-#: alpine/addrbook.c:4467
+#: alpine/addrbook.c:4468
msgid "Zoom Mode is now off, no entries selected"
msgstr ""
-#: alpine/addrbook.c:4580
+#: alpine/addrbook.c:4581
msgid "Zoom Mode is now off"
msgstr ""
-#: alpine/addrbook.c:4622
+#: alpine/addrbook.c:4623
msgid "No selected entries to apply command to"
msgstr ""
-#: alpine/addrbook.c:4673
+#: alpine/addrbook.c:4674
msgid "No entries to save"
msgstr ""
-#: alpine/addrbook.c:4695
+#: alpine/addrbook.c:4696
msgid "No entries to forward"
msgstr ""
-#: alpine/addrbook.c:4710
+#: alpine/addrbook.c:4711
msgid "Nothing to forward"
msgstr ""
-#: alpine/addrbook.c:4717
+#: alpine/addrbook.c:4718
msgid "Can only forward whole entries"
msgstr ""
-#: alpine/addrbook.c:4754
+#: alpine/addrbook.c:4755
msgid "Command \"E\" not defined. Use \"View/Update\" to edit an entry"
msgstr ""
-#: alpine/addrbook.c:4760
+#: alpine/addrbook.c:4761
msgid "Command \"S\" not defined. Use \"AddNew\" to create a list"
msgstr ""
-#: alpine/addrbook.c:4765
+#: alpine/addrbook.c:4766
msgid "Command \"Z\" not defined. Use \"View/Update\" to add to a list"
msgstr ""
-#: alpine/addrbook.c:4799
+#: alpine/addrbook.c:4800
msgid "Zoom Mode is now on"
msgstr ""
-#: alpine/addrbook.c:4847
+#: alpine/addrbook.c:4848
msgid "No selected entries to zoom on"
msgstr ""
-#: alpine/addrbook.c:4909
+#: alpine/addrbook.c:4910
msgid "No address books configured, use Setup"
msgstr ""
-#: alpine/addrbook.c:4911
+#: alpine/addrbook.c:4912
msgid "Address Book is Empty"
msgstr ""
-#: alpine/addrbook.c:4913
+#: alpine/addrbook.c:4914
msgid "Distribution List is Empty"
msgstr ""
-#: alpine/addrbook.c:4930
+#: alpine/addrbook.c:4931
msgid "Address Book not expanded, use \">\" to expand"
msgstr ""
-#: alpine/addrbook.c:4932
+#: alpine/addrbook.c:4933
msgid "Distribution List not expanded, use \">\" to expand"
msgstr ""
-#: alpine/addrbook.c:5758
+#: alpine/addrbook.c:5759
msgid "Address book search cancelled"
msgstr ""
-#: alpine/addrbook.c:6327
+#: alpine/addrbook.c:6328
#, c-format
msgid "Word to search for [%.*s]: "
msgstr ""
#. TRANSLATORS: User is searching in address book. One of the options is to
#. search for the First Address
-#: alpine/addrbook.c:6342
+#: alpine/addrbook.c:6343
msgid "First Adr"
msgstr ""
#. TRANSLATORS: Last Address
-#: alpine/addrbook.c:6348
+#: alpine/addrbook.c:6349
msgid "Last Adr"
msgstr ""
-#: alpine/addrbook.c:6395
+#: alpine/addrbook.c:6396
msgid "Searched to first entry"
msgstr ""
-#: alpine/addrbook.c:6399 alpine/addrbook.c:6412
+#: alpine/addrbook.c:6400 alpine/addrbook.c:6413
msgid "No entries"
msgstr ""
-#: alpine/addrbook.c:6408
+#: alpine/addrbook.c:6409
msgid "Searched to last entry"
msgstr ""
#. TRANSLATORS: These "matched" messages are advisory messages explaining
#. how a search command matched an entry
-#: alpine/addrbook.c:6509
+#: alpine/addrbook.c:6510
#, c-format
msgid "Also matched string in %s other fields"
msgstr ""
-#: alpine/addrbook.c:6512
+#: alpine/addrbook.c:6513
#, c-format
msgid "Matched string in %s fields"
msgstr ""
-#: alpine/addrbook.c:6518
+#: alpine/addrbook.c:6519
msgid "Also matched string in Nickname field"
msgstr ""
-#: alpine/addrbook.c:6520
+#: alpine/addrbook.c:6521
msgid "Also matched string in Fullname field"
msgstr ""
-#: alpine/addrbook.c:6522
+#: alpine/addrbook.c:6523
msgid "Also matched string in Address field"
msgstr ""
-#: alpine/addrbook.c:6524
+#: alpine/addrbook.c:6525
msgid "Also matched string in Fcc field"
msgstr ""
-#: alpine/addrbook.c:6526
+#: alpine/addrbook.c:6527
msgid "Also matched string in Comment field"
msgstr ""
-#: alpine/addrbook.c:6528
+#: alpine/addrbook.c:6529
msgid "Also matched string in list member address"
msgstr ""
-#: alpine/addrbook.c:6530
+#: alpine/addrbook.c:6531
msgid "Also matched string in ?"
msgstr ""
-#: alpine/addrbook.c:6534
+#: alpine/addrbook.c:6535
msgid "Matched string in Nickname field"
msgstr ""
-#: alpine/addrbook.c:6536
+#: alpine/addrbook.c:6537
msgid "Matched string in Fullname field"
msgstr ""
-#: alpine/addrbook.c:6538
+#: alpine/addrbook.c:6539
msgid "Matched string in Address field"
msgstr ""
-#: alpine/addrbook.c:6540
+#: alpine/addrbook.c:6541
msgid "Matched string in Fcc field"
msgstr ""
-#: alpine/addrbook.c:6542
+#: alpine/addrbook.c:6543
msgid "Matched string in Comment field"
msgstr ""
-#: alpine/addrbook.c:6544
+#: alpine/addrbook.c:6545
msgid "Matched string in list member address"
msgstr ""
-#: alpine/addrbook.c:6546
+#: alpine/addrbook.c:6547
msgid "Matched string in ?"
msgstr ""
-#: alpine/addrbook.c:6895
+#: alpine/addrbook.c:6896
#, c-format
msgid "%s not allowed in nicknames"
msgstr ""
-#: alpine/addrbook.c:6897
+#: alpine/addrbook.c:6898
msgid "Blank spaces"
msgstr ""
-#: alpine/addrbook.c:6899
+#: alpine/addrbook.c:6900
msgid "Commas"
msgstr ""
-#: alpine/addrbook.c:6901
+#: alpine/addrbook.c:6902
msgid "Quotes"
msgstr ""
-#: alpine/addrbook.c:6925
+#: alpine/addrbook.c:6926
msgid "HELP FOR SELECTING AN ADDRESS BOOK"
msgstr ""
#. TRANSLATORS: Print something1 using something2.
#. abooks is something1
-#: alpine/addrbook.c:6958
+#: alpine/addrbook.c:6959
msgid "SELECT ADDRESS BOOK"
msgstr ""
-#: alpine/addrbook.c:6958
+#: alpine/addrbook.c:6959
msgid "abooks"
msgstr ""
-#: alpine/addrbook.c:6961
+#: alpine/addrbook.c:6962
msgid "No address books defined!"
msgstr ""
-#: alpine/addrbook.c:7270
+#: alpine/addrbook.c:7273
msgid "SELECT AN ADDRESS"
msgstr ""
-#: alpine/addrbook.c:7273
+#: alpine/addrbook.c:7276
msgid "HELP FOR SELECTING AN ADDRESS"
msgstr ""
-#: alpine/addrbook.c:7425
+#: alpine/addrbook.c:7428
msgid "Alpine CONFIGURING ADDRESS BOOKS Help"
msgstr ""
-#: alpine/addrbook.c:7426
+#: alpine/addrbook.c:7429
msgid "Alpine ADDRESS_BOOK Help"
msgstr ""
-#: alpine/reply.c:157 alpine/reply.c:200 alpine/reply.c:543 alpine/reply.c:665
+#: alpine/reply.c:158 alpine/reply.c:201 alpine/reply.c:544 alpine/reply.c:666
#, c-format
msgid "Error fetching message %s. Can't reply to it."
msgstr ""
-#: alpine/reply.c:415 alpine/mailpart.c:3433
+#: alpine/reply.c:416 alpine/mailpart.c:3434
#, c-format
msgid "Replying using role \"%s\" and To as From"
msgstr ""
-#: alpine/reply.c:418 alpine/mailpart.c:3436
+#: alpine/reply.c:419 alpine/mailpart.c:3437
#, c-format
msgid "Replying using role \"%s\""
msgstr ""
-#: alpine/reply.c:421 alpine/mailpart.c:3439
+#: alpine/reply.c:422 alpine/mailpart.c:3440
msgid "Replying using incoming To as outgoing From"
msgstr ""
-#: alpine/reply.c:440 alpine/mailpart.c:3449
+#: alpine/reply.c:441 alpine/mailpart.c:3450
msgid "Warning: no valid addresses to reply to!"
msgstr ""
-#: alpine/reply.c:450 alpine/reply.c:1392 alpine/reply.c:1787
-#: alpine/mailpart.c:3108 alpine/mailpart.c:3267 alpine/mailpart.c:3506
-#: pith/reply.c:2432
+#: alpine/reply.c:451 alpine/reply.c:1423 alpine/reply.c:1818
+#: alpine/mailpart.c:3109 alpine/mailpart.c:3268 alpine/mailpart.c:3507
+#: pith/reply.c:2450
msgid "Error allocating message text"
msgstr ""
-#: alpine/reply.c:563
+#: alpine/reply.c:564
msgid "WARNING! Attachments not included in multiple reply."
msgstr ""
-#: alpine/reply.c:582
+#: alpine/reply.c:583
msgid "Multipart with no leading text part."
msgstr ""
-#: alpine/reply.c:588
+#: alpine/reply.c:589
msgid "Non-text message not included."
msgstr ""
-#: alpine/reply.c:696
+#: alpine/reply.c:697
msgid "COMPOSE MESSAGE REPLY"
msgstr ""
-#: alpine/reply.c:848
+#: alpine/reply.c:849
msgid "No, use default role"
msgstr ""
-#: alpine/reply.c:850
+#: alpine/reply.c:851
msgid "No, use default settings"
msgstr ""
-#: alpine/reply.c:852
+#: alpine/reply.c:853
msgid "To Select Alternate Role"
msgstr ""
#. TRANSLATORS: This is something like Use role <nickname of role> for Reply?
-#: alpine/reply.c:856
+#: alpine/reply.c:857
#, c-format
msgid "Use role \"%s\" for %s? "
msgstr ""
-#: alpine/reply.c:861
+#: alpine/reply.c:862
#, c-format
msgid "Use role \"<a role without a nickname>\" for %s? "
msgstr ""
-#: alpine/reply.c:870
+#: alpine/reply.c:871
msgid "To Select Role"
msgstr ""
-#: alpine/reply.c:872
+#: alpine/reply.c:873
#, c-format
msgid "Press Return to %s using %s role, or ^T to select a role "
msgstr ""
-#: alpine/reply.c:873
+#: alpine/reply.c:874
msgid "default"
msgstr ""
-#: alpine/reply.c:873
+#: alpine/reply.c:874
msgid "no"
msgstr ""
+#: alpine/reply.c:955
+msgid "Not Preserve"
+msgstr ""
+
+#: alpine/reply.c:955
+msgid "Preserve"
+msgstr ""
+
+#: alpine/reply.c:956
+#, c-format
+msgid "Reply to all recipients%s"
+msgstr ""
+
+#: alpine/reply.c:957
+msgid " (preserving fields)? "
+msgstr ""
+
#. TRANSLATORS: The final three %s's can probably be safely ignored
-#: alpine/reply.c:990
+#: alpine/reply.c:1024
#, c-format
msgid "Include %s original messages in Reply%s%s%s? "
msgstr ""
-#: alpine/reply.c:996
+#: alpine/reply.c:1030
#, c-format
msgid "Include original message in Reply%s%s%s? "
msgstr ""
-#: alpine/reply.c:1005
+#: alpine/reply.c:1039
msgid "Edit Indent String"
msgstr ""
-#: alpine/reply.c:1105
+#: alpine/reply.c:1139
msgid "Replying to Poster as specified in \"Followup-To\""
msgstr ""
-#: alpine/reply.c:1126
+#: alpine/reply.c:1160
msgid "Follow-up"
msgstr ""
-#: alpine/reply.c:1137
+#: alpine/reply.c:1171
msgid "Follow-up to news group(s), Reply via email to author or Both? "
msgstr ""
-#: alpine/reply.c:1162
+#: alpine/reply.c:1196
msgid "Posting to specified Followup-To groups"
msgstr ""
-#: alpine/reply.c:1169
-msgid "Replying to message that MAY or MAY NOT have been posted to newsgroup"
-msgstr ""
-
-#: alpine/reply.c:1201
+#: alpine/reply.c:1232
msgid "Pipes for signatures are administratively disabled"
msgstr ""
-#: alpine/reply.c:1206
+#: alpine/reply.c:1237
msgid "Pipes for templates are administratively disabled"
msgstr ""
#. TRANSLATORS: First arg is the directory name, second is
#. the file user wants to read but can't.
-#: alpine/reply.c:1220 pith/smime.c:278 pith/smime.c:340 pith/smime.c:444
+#: alpine/reply.c:1251 pith/smime.c:287 pith/smime.c:349 pith/smime.c:453
#, c-format
msgid "Can't read file outside %s: %s"
msgstr ""
-#: alpine/reply.c:1255
+#: alpine/reply.c:1286
#, c-format
msgid "Can't get file: %s"
msgstr ""
-#: alpine/reply.c:1264
+#: alpine/reply.c:1295
#, c-format
msgid "Error running program \"%s\"%s"
msgstr ""
-#: alpine/reply.c:1293
+#: alpine/reply.c:1324
#, c-format
msgid "Error running program \"%s\""
msgstr ""
#. TRANSLATORS: Arg is a program name
-#: alpine/reply.c:1304
+#: alpine/reply.c:1335
#, c-format
msgid "Can't execute \"%s\": Permission denied"
msgstr ""
#. TRANSLATORS: First arg is error description, 2nd is
#. filename
-#: alpine/reply.c:1315
+#: alpine/reply.c:1346
#, c-format
msgid "Error \"%s\" reading file \"%s\""
msgstr ""
-#: alpine/reply.c:1380 alpine/reply.c:1566 alpine/reply.c:1618
-#: alpine/mailpart.c:3271
+#: alpine/reply.c:1411 alpine/reply.c:1597 alpine/reply.c:1649
+#: alpine/mailpart.c:3272
#, c-format
msgid "Error fetching message %s. Can't forward it."
msgstr ""
-#: alpine/reply.c:1399
+#: alpine/reply.c:1430
msgid "Forward messages as a MIME digest"
msgstr ""
-#: alpine/reply.c:1401 alpine/mailpart.c:3145
+#: alpine/reply.c:1432 alpine/mailpart.c:3146
msgid "Forward message as an attachment"
msgstr ""
-#: alpine/reply.c:1445 alpine/mailpart.c:3037 alpine/mailpart.c:3163
+#: alpine/reply.c:1476 alpine/mailpart.c:3038 alpine/mailpart.c:3164
#, c-format
msgid "Forwarding using role \"%s\""
msgstr ""
-#: alpine/reply.c:1489
+#: alpine/reply.c:1520
msgid "Insufficient memory for message text"
msgstr ""
-#: alpine/reply.c:1585
+#: alpine/reply.c:1616
msgid "WARNING! Attachments not included in multiple forward."
msgstr ""
-#: alpine/reply.c:1603
+#: alpine/reply.c:1634
msgid "Multipart with no leading text part!"
msgstr ""
-#: alpine/reply.c:1608
+#: alpine/reply.c:1639
msgid "Non-text message not included!"
msgstr ""
-#: alpine/reply.c:1700 alpine/mailpart.c:3103 alpine/mailpart.c:3262
+#: alpine/reply.c:1731 alpine/mailpart.c:3104 alpine/mailpart.c:3263
msgid "Error fetching message contents. Can't forward message."
msgstr ""
-#: alpine/reply.c:1777
+#: alpine/reply.c:1808
#, c-format
msgid "Error reading text \"%s\""
msgstr ""
-#: alpine/reply.c:1819
+#: alpine/reply.c:1850
#, c-format
msgid "BOUNCE (redirect) %ld messages to : "
msgstr ""
-#: alpine/reply.c:1823
+#: alpine/reply.c:1854
#, c-format
msgid "Send %ld messages "
msgstr ""
-#: alpine/reply.c:1838
+#: alpine/reply.c:1869
msgid "Can't fetch Subject for Bounce"
msgstr ""
-#: alpine/reply.c:1919
+#: alpine/reply.c:1950
msgid "No signature file defined."
msgstr ""
-#: alpine/reply.c:1924
+#: alpine/reply.c:1955
msgid "Can't access remote configuration."
msgstr ""
-#: alpine/reply.c:1926
+#: alpine/reply.c:1957
msgid "Error attempting to edit remote configuration"
msgstr ""
-#: alpine/reply.c:1962
+#: alpine/reply.c:1993
msgid "Can't access remote sig"
msgstr ""
-#: alpine/reply.c:1970
+#: alpine/reply.c:2001
msgid "Can't get write permission for remote sig"
msgstr ""
-#: alpine/reply.c:2010
+#: alpine/reply.c:2041
#, c-format
msgid "Can't edit file outside of %s"
msgstr ""
-#: alpine/reply.c:2019
+#: alpine/reply.c:2050
msgid "Error allocating space for file"
msgstr ""
-#: alpine/reply.c:2030
+#: alpine/reply.c:2061
#, c-format
msgid "Error editing \"%s\": %s"
msgstr ""
-#: alpine/reply.c:2044
+#: alpine/reply.c:2075
#, c-format
msgid "Error reading file: \"%s\""
msgstr ""
-#: alpine/reply.c:2084 alpine/reply.c:2094
+#: alpine/reply.c:2115 alpine/reply.c:2125
#, c-format
msgid "Error writing file: \"%s\""
msgstr ""
-#: alpine/reply.c:2110
+#: alpine/reply.c:2141
#, c-format
msgid "Error opening temporary sig file %s: %s"
msgstr ""
-#: alpine/reply.c:2118 pith/smime.c:753 pith/smkeys.c:434
+#: alpine/reply.c:2149 pith/smime.c:762 pith/smkeys.c:454
#, c-format
msgid "Error copying to %s: %s"
msgstr ""
-#: alpine/reply.c:2126
+#: alpine/reply.c:2157
msgid "Copy of sig to remote folder failed, changes NOT saved remotely"
msgstr ""
-#: alpine/reply.c:2140
+#: alpine/reply.c:2171
#, c-format
msgid "Error writing \"%s\""
msgstr ""
-#: alpine/reply.c:2233
+#: alpine/reply.c:2264
msgid "Edit Cancelled"
msgstr ""
-#: alpine/reply.c:2274
+#: alpine/reply.c:2305
msgid "Save changes"
msgstr ""
-#: alpine/reply.c:2275
+#: alpine/reply.c:2306
msgid "Don't save changes"
msgstr ""
-#: alpine/reply.c:2283
+#: alpine/reply.c:2314
msgid "Exit editor? "
msgstr ""
-#: alpine/reply.c:2290
+#: alpine/reply.c:2321
msgid "No Changes Saved"
msgstr ""
-#: alpine/reply.c:2294
+#: alpine/reply.c:2325
msgid "Exit Cancelled"
msgstr ""
-#: alpine/mailpart.c:192
+#: alpine/mailpart.c:193
msgid "Screen too small to view attachment"
msgstr ""
-#: alpine/mailpart.c:199
+#: alpine/mailpart.c:200
msgid "Can only view one message's attachments at a time."
msgstr ""
-#: alpine/mailpart.c:204
+#: alpine/mailpart.c:205
#, c-format
msgid "Message %s has only one part (the message body), and no attachments."
msgstr ""
-#: alpine/mailpart.c:237
+#: alpine/mailpart.c:238
#, c-format
msgid "Malformed message: %s"
msgstr ""
-#: alpine/mailpart.c:499
+#: alpine/mailpart.c:500
msgid "HELP FOR ATTACHMENT INDEX"
msgstr ""
-#: alpine/mailpart.c:559
+#: alpine/mailpart.c:560
msgid "Already on last attachment"
msgstr ""
-#: alpine/mailpart.c:567
+#: alpine/mailpart.c:568
msgid "Already on first attachment"
msgstr ""
-#: alpine/mailpart.c:581
+#: alpine/mailpart.c:582
msgid "Already on last page of attachments"
msgstr ""
-#: alpine/mailpart.c:601
+#: alpine/mailpart.c:602
msgid "Already on first page of attachments"
msgstr ""
-#: alpine/mailpart.c:1158
+#: alpine/mailpart.c:1159
msgid "ATTACHMENT INDEX"
msgstr ""
-#: alpine/mailpart.c:1284
+#: alpine/mailpart.c:1285
#, c-format
msgid "Can't Export %s. Use \"Save\" to write file, \"<\" to leave index."
msgstr ""
-#: alpine/mailpart.c:1343
+#: alpine/mailpart.c:1344
#, c-format
msgid "Can't save to file outside of %s"
msgstr ""
#. TRANSLATORS: Error opening destination <filename>: <error text>
-#: alpine/mailpart.c:1459
+#: alpine/mailpart.c:1460
#, c-format
msgid "Error opening destination %s: %s"
msgstr ""
#. TRANSLATORS: <error text>: Error writing attachment to <filename>
-#: alpine/mailpart.c:1486
+#: alpine/mailpart.c:1487
#, c-format
msgid "%s: Error writing attachment to \"%s\""
msgstr ""
-#: alpine/mailpart.c:1565
+#: alpine/mailpart.c:1566
#, c-format
msgid "Attached Msg (part %s) "
msgstr ""
-#: alpine/mailpart.c:1600
+#: alpine/mailpart.c:1601
#, c-format
msgid "Attached message (part %s) saved to \"%s\""
msgstr ""
-#: alpine/mailpart.c:1666
+#: alpine/mailpart.c:1667
#, c-format
msgid "Attached digest (part %s) saved to \"%s\""
msgstr ""
#. TRANSLATORS: Message Attachment (a screen title)
-#: alpine/mailpart.c:1740
+#: alpine/mailpart.c:1741
msgid "MSG ATTACHMENT"
msgstr ""
-#: alpine/mailpart.c:1766
+#: alpine/mailpart.c:1767
#, c-format
msgid "Attached message (part %s) %s to \"%s\""
msgstr ""
-#: alpine/mailpart.c:1769
+#: alpine/mailpart.c:1770
msgid "overwritten"
msgstr ""
-#: alpine/mailpart.c:1770
+#: alpine/mailpart.c:1771
msgid "appended"
msgstr ""
-#: alpine/mailpart.c:1770
+#: alpine/mailpart.c:1771
msgid "written"
msgstr ""
-#: alpine/mailpart.c:1775
+#: alpine/mailpart.c:1776
#, c-format
msgid "Error writing %s: %s"
msgstr ""
-#: alpine/mailpart.c:1817
+#: alpine/mailpart.c:1818
msgid "DIGEST ATTACHMENT"
msgstr ""
-#: alpine/mailpart.c:1858
+#: alpine/mailpart.c:1859
#, c-format
msgid "Error exporting: %s"
msgstr ""
-#: alpine/mailpart.c:1860
+#: alpine/mailpart.c:1861
#, c-format
msgid "%s messages exported before error occurred"
msgstr ""
-#: alpine/mailpart.c:1874
+#: alpine/mailpart.c:1875
#, c-format
msgid "Error opening file \"%s\" to export digest: %s"
msgstr ""
-#: alpine/mailpart.c:1940
+#: alpine/mailpart.c:1941
#, c-format
msgid "Error printing message %s, part %s"
msgstr ""
-#: alpine/mailpart.c:1968
+#: alpine/mailpart.c:1969
#, c-format
msgid "Can't print digest: %s"
msgstr ""
#. TRANSLATORS: Don't know how to display <certain type> attachments. <might say Try Save.>
-#: alpine/mailpart.c:2008
+#: alpine/mailpart.c:2009
#, c-format
msgid "Don't know how to display %s%s%s attachments.%s"
msgstr ""
-#: alpine/mailpart.c:2012
+#: alpine/mailpart.c:2013
msgid " Try Save."
msgstr ""
-#: alpine/mailpart.c:2015
+#: alpine/mailpart.c:2016
#, c-format
msgid "Don't know how to unpack \"%s\" encoding"
msgstr ""
-#: alpine/mailpart.c:2028
+#: alpine/mailpart.c:2029
#, c-format
msgid "Can't display Multipart/%s"
msgstr ""
-#: alpine/mailpart.c:2033
+#: alpine/mailpart.c:2034
msgid "Can't display unknown Multipart Subtype"
msgstr ""
-#: alpine/mailpart.c:2056
+#: alpine/mailpart.c:2057
msgid "View selected Attachment"
msgstr ""
-#: alpine/mailpart.c:2143
+#: alpine/mailpart.c:2144
#, c-format
msgid "Error \"%s\", Can't create temporary file"
msgstr ""
-#: alpine/mailpart.c:2150
+#: alpine/mailpart.c:2151
#, c-format
msgid "Error \"%s\", Can't write file %s"
msgstr ""
-#: alpine/mailpart.c:2252
+#: alpine/mailpart.c:2253
#, c-format
msgid "Cannot display %s attachment"
msgstr ""
-#: alpine/mailpart.c:2311 alpine/mailpart.c:2735
+#: alpine/mailpart.c:2312 alpine/mailpart.c:2736
msgid "Error allocating space for attachment."
msgstr ""
#. TRANSLATORS: User is viewing a message and all of
#. the header text is being shown.
-#: alpine/mailpart.c:2352 alpine/mailpart.c:2452 pith/mailview.c:174
+#: alpine/mailpart.c:2353 alpine/mailpart.c:2453 pith/mailview.c:175
msgid "Full header mode ON. All header text being included"
msgstr ""
-#: alpine/mailpart.c:2423 alpine/mailpart.c:2435
+#: alpine/mailpart.c:2424 alpine/mailpart.c:2436
#, c-format
msgid "Can't format digest: %s"
msgstr ""
-#: alpine/mailpart.c:2454
+#: alpine/mailpart.c:2455
msgid "ATTACHED MESSAGES"
msgstr ""
-#: alpine/mailpart.c:2478
+#: alpine/mailpart.c:2479
msgid "HELP FOR ATTACHED TEXT VIEW"
msgstr ""
-#: alpine/mailpart.c:2484
+#: alpine/mailpart.c:2485
msgid "MsgText"
msgstr ""
-#: alpine/mailpart.c:2487
+#: alpine/mailpart.c:2488
msgid "AttchIndex"
msgstr ""
-#: alpine/mailpart.c:2728
+#: alpine/mailpart.c:2729
msgid "Error accessing attachment."
msgstr ""
-#: alpine/mailpart.c:2800
+#: alpine/mailpart.c:2801
msgid ""
"This is a vCard which has been forwarded to you. You may add parts of it to "
"your address book with the Save command. You will have a chance to edit it "
"before committing it to your address book."
msgstr ""
-#: alpine/mailpart.c:2801
+#: alpine/mailpart.c:2802
msgid ""
"This is a vCard which has been forwarded to you. You may add the entries to "
"your address book with the Save command."
msgstr ""
-#: alpine/mailpart.c:2810
+#: alpine/mailpart.c:2811
msgid "ADDRESS BOOK ATTACHMENT"
msgstr ""
-#: alpine/mailpart.c:2823
+#: alpine/mailpart.c:2824
#, c-format
msgid "Can't format entry : %s"
msgstr ""
-#: alpine/mailpart.c:2980
+#: alpine/mailpart.c:2981
msgid "ABOUT ATTACHMENT"
msgstr ""
-#: alpine/mailpart.c:2982
+#: alpine/mailpart.c:2983
msgid "HELP FOR \"ABOUT ATTACHMENT\""
msgstr ""
-#: alpine/mailpart.c:3498
+#: alpine/mailpart.c:3499
msgid "Error building message body"
msgstr ""
-#: alpine/mailpart.c:3740
+#: alpine/mailpart.c:3741
#, c-format
msgid "Error detaching for pipe: %s"
msgstr ""
-#: alpine/mailpart.c:3744
+#: alpine/mailpart.c:3745
msgid "PIPE ATTACHMENT (ERROR)"
msgstr ""
-#: alpine/mailpart.c:3745
+#: alpine/mailpart.c:3746
msgid "PIPE ATTACHMENT"
msgstr ""
-#: alpine/mailpart.c:3779
+#: alpine/mailpart.c:3780
#, c-format
msgid "Part %s will be omitted only if message is Saved"
msgstr ""
-#: alpine/mailpart.c:3784
+#: alpine/mailpart.c:3785
#, c-format
msgid "Part %s already deleted"
msgstr ""
-#: alpine/mailpart.c:3805
+#: alpine/mailpart.c:3806
#, c-format
msgid "Part %s already UNdeleted"
msgstr ""
-#: alpine/signal.c:266
+#: alpine/signal.c:267
#, c-format
msgid ""
"\n"
@@ -8603,7 +8678,7 @@ msgid ""
"Alpine timed out (No user input for %d %s)\n"
msgstr ""
-#: alpine/signal.c:301
+#: alpine/signal.c:302
#, c-format
msgid ""
"\n"
@@ -8612,218 +8687,232 @@ msgid ""
"\n"
msgstr ""
-#: alpine/signal.c:418
+#: alpine/signal.c:419
#, c-format
msgid "Another email program is accessing %s. Session now Read-Only."
msgstr ""
-#: alpine/signal.c:786
+#: alpine/signal.c:791
msgid "Alpine suspension not enabled - see help text"
msgstr ""
-#: alpine/signal.c:867
+#: alpine/signal.c:874
#, c-format
msgid "Error loading \"%s\""
msgstr ""
-#: alpine/signal.c:872
+#: alpine/signal.c:880
msgid "Suspended for too long, IMAP connection broken"
msgstr ""
-#: alpine/signal.c:885
+#: alpine/signal.c:893
#, c-format
msgid ""
"\n"
"Alpine suspended. Give the \"%s\" command to come back.\n"
msgstr ""
-#: alpine/signal.c:895
+#: alpine/signal.c:903
msgid "Warning: Your IMAP connection will be closed if Alpine"
msgstr ""
-#: alpine/signal.c:896
+#: alpine/signal.c:904
msgid "is suspended for more than 30 minutes\n"
msgstr ""
-#: alpine/colorconf.c:102 alpine/colorconf.c:2780
+#: alpine/colorconf.c:105 alpine/colorconf.c:2919
msgid "SETUP COLOR EXCEPTIONS"
msgstr ""
-#: alpine/colorconf.c:103 alpine/colorconf.c:2781
+#: alpine/colorconf.c:106 alpine/colorconf.c:2920
msgid "SETUP COLOR"
msgstr ""
-#: alpine/colorconf.c:120
+#: alpine/colorconf.c:123
msgid "conf_scroll_screen bad ret in color_config"
msgstr ""
-#: alpine/colorconf.c:400
+#: alpine/colorconf.c:404
msgid "Current Indexline Style"
msgstr ""
-#: alpine/colorconf.c:415
+#: alpine/colorconf.c:419
msgid "Titlebar Color Style"
msgstr ""
-#: alpine/colorconf.c:432
+#: alpine/colorconf.c:436
msgid "GENERAL COLORS"
msgstr ""
-#: alpine/colorconf.c:461
+#: alpine/colorconf.c:465
msgid "INDEX COLORS"
msgstr ""
-#: alpine/colorconf.c:500
-msgid "HEADER COLORS"
-msgstr ""
-
-#: alpine/colorconf.c:686
+#: alpine/colorconf.c:710
msgid "[ Use Setup/Config command to add Keywords ]"
msgstr ""
-#: alpine/colorconf.c:708
+#: alpine/colorconf.c:733
msgid " (overridden by exceptions)"
msgstr ""
-#: alpine/colorconf.c:710
+#: alpine/colorconf.c:735
msgid " (more in exceptions)"
msgstr ""
-#: alpine/colorconf.c:716
+#: alpine/colorconf.c:741
msgid " (more in main config)"
msgstr ""
-#: alpine/colorconf.c:799
+#: alpine/colorconf.c:829
msgid "HELP FOR SETTING UP COLOR"
msgstr ""
-#: alpine/colorconf.c:1797
+#: alpine/colorconf.c:1855
msgid "Really restore all colors to default values"
msgstr ""
-#: alpine/colorconf.c:2017
+#: alpine/colorconf.c:2005
+msgid "Enter the name of the index token to be added: "
+msgstr ""
+
+#: alpine/colorconf.c:2011
+#, c-format
+msgid "token \"%s\" not recognized"
+msgstr ""
+
+#: alpine/colorconf.c:2015
+#, c-format
+msgid "Color rule for token \"%s\" already exists"
+msgstr ""
+
+#: alpine/colorconf.c:2130
msgid "Can't delete this color setting"
msgstr ""
-#: alpine/colorconf.c:2021
+#: alpine/colorconf.c:2135
msgid "Really delete header color from config"
msgstr ""
-#: alpine/colorconf.c:2117
+#: alpine/colorconf.c:2136
+msgid "Really delete index token color from config"
+msgstr ""
+
+#: alpine/colorconf.c:2236
msgid "header color deleted"
msgstr ""
-#: alpine/colorconf.c:2123
+#: alpine/colorconf.c:2242
msgid "Can't shuffle this color setting"
msgstr ""
-#: alpine/colorconf.c:2139
+#: alpine/colorconf.c:2258
msgid ""
"Shuffle only makes sense when there is more than one Header Color defined"
msgstr ""
-#: alpine/colorconf.c:2165
+#: alpine/colorconf.c:2284
#, c-format
msgid "Shuffle %s%s%s ? "
msgstr ""
-#: alpine/colorconf.c:2262
+#: alpine/colorconf.c:2381
msgid "Header Colors shuffled"
msgstr ""
-#: alpine/colorconf.c:2689
+#: alpine/colorconf.c:2828
msgid "Pattern to match ="
msgstr ""
-#: alpine/context.c:202
+#: alpine/context.c:203
msgid ""
"No exceptions to edit. First collection exception must be set by editing file"
msgstr ""
-#: alpine/context.c:294
+#: alpine/context.c:295
msgid "Really delete last exceptional collection"
msgstr ""
-#: alpine/context.c:313 alpine/context.c:337
+#: alpine/context.c:314 alpine/context.c:338
msgid "Trouble saving change, cancelled"
msgstr ""
-#: alpine/context.c:318
+#: alpine/context.c:319
msgid "Deleted last Folder-Collection, reverting to default"
msgstr ""
-#: alpine/context.c:324
+#: alpine/context.c:325
msgid "Deleted default Folder-Collection, reverting back to default"
msgstr ""
-#: alpine/context.c:344
+#: alpine/context.c:345
msgid "Deleted last News-Collection, reverting to default"
msgstr ""
-#: alpine/context.c:352
+#: alpine/context.c:353
msgid "Deleted default News-Collection, reverting back to default"
msgstr ""
-#: alpine/context.c:557
+#: alpine/context.c:558
msgid "Error adding new collection"
msgstr ""
-#: alpine/context.c:566
+#: alpine/context.c:567
msgid "New collection added. Use \"$\" to adjust order."
msgstr ""
-#: alpine/context.c:629
+#: alpine/context.c:630
#, c-format
msgid "Shuffle selected context %s%s%s? "
msgstr ""
-#: alpine/context.c:694
+#: alpine/context.c:695
msgid "Error deleting shuffled context"
msgstr ""
-#: alpine/context.c:700
+#: alpine/context.c:701
msgid "Trouble shuffling, cancelled"
msgstr ""
-#: alpine/context.c:708
+#: alpine/context.c:709
msgid "Collections shuffled"
msgstr ""
#. TRANSLATORS: Sorry, can't move news group collections above email collections
-#: alpine/context.c:714
+#: alpine/context.c:715
msgid "Sorry, cannot Shuffle news to top"
msgstr ""
-#: alpine/context.c:716
+#: alpine/context.c:717
msgid "Sorry, nothing to Shuffle"
msgstr ""
-#: alpine/context.c:762
+#: alpine/context.c:763
msgid "Collection list entry updated"
msgstr ""
-#: alpine/context.c:801
+#: alpine/context.c:802
msgid "Sorry, cannot Delete causing news to move to top"
msgstr ""
-#: alpine/context.c:805
+#: alpine/context.c:806
#, c-format
msgid "Delete the collection definition for \"%s\""
msgstr ""
-#: alpine/context.c:838
+#: alpine/context.c:839
msgid "Error deleting renamed context"
msgstr ""
-#: alpine/context.c:842
+#: alpine/context.c:843
msgid "Collection deleted"
msgstr ""
-#: alpine/context.c:847
+#: alpine/context.c:848
msgid "No collections deleted"
msgstr ""
-#: alpine/imap.c:188
+#: alpine/imap.c:194
#, c-format
msgid "Alert received while accessing \"%s\": %s"
msgstr ""
@@ -8832,142 +8921,142 @@ msgstr ""
#. that the password will be sent unencrypted over the network. This is
#. just a warning message that gets added parenthetically when the user
#. is asked for a password.
-#: alpine/imap.c:340
+#: alpine/imap.c:346
msgid " (INSECURE)"
msgstr ""
#. TRANSLATORS: Retrying is shown when the user is being asked for a password
#. after having already failed at least once.
-#: alpine/imap.c:343
+#: alpine/imap.c:349
msgid "Retrying - "
msgstr ""
#. TRANSLATORS: A label for the hostname that the user is logging in on
-#: alpine/imap.c:345
+#: alpine/imap.c:351
msgid "HOST"
msgstr ""
#. TRANSLATORS: user is logging in as a particular user (a particular
#. login name), this is just labelling that user name.
-#: alpine/imap.c:348
+#: alpine/imap.c:354
msgid "USER"
msgstr ""
#. TRANSLATORS: user is being asked to type in their login name
-#: alpine/imap.c:596
+#: alpine/imap.c:611
msgid "ENTER LOGIN NAME"
msgstr ""
#. TRANSLATORS: An abbreviated form of ENTER LOGIN NAME because
#. longer version doesn't fit on screen
-#: alpine/imap.c:630
+#: alpine/imap.c:645
msgid "LOGIN"
msgstr ""
#. TRANSLATORS: user is being asked to type in their password
-#: alpine/imap.c:847
+#: alpine/imap.c:867
msgid "ENTER PASSWORD"
msgstr ""
#. TRANSLATORS: An abbreviated form of ENTER PASSWORD
-#: alpine/imap.c:898
+#: alpine/imap.c:918
msgid "PASSWORD"
msgstr ""
-#: alpine/imap.c:1195
+#: alpine/imap.c:1217
#, c-format
-msgid "Waited %s seconds for server reply. Break connection to server"
+msgid "No reply in %s seconds from server %s. Break connection"
msgstr ""
-#: alpine/imap.c:1257
+#: alpine/imap.c:1281
#, c-format
-msgid "Waited %s seconds for server reply. Break connection to server? "
+msgid "No reply in %s seconds from server %s. Break connection?"
msgstr ""
-#: alpine/imap.c:1276
+#: alpine/imap.c:1301
#, c-format
-msgid "Waited %s seconds for server reply. Still Waiting..."
+msgid "No reply in %s seconds from server %s. Still Waiting..."
msgstr ""
-#: alpine/imap.c:1344
+#: alpine/imap.c:1394
msgid "There was a failure validating the SSL/TLS certificate for the server"
msgstr ""
-#: alpine/imap.c:1351 alpine/imap.c:1612
+#: alpine/imap.c:1401 alpine/imap.c:1662
msgid "The reason for the failure was"
msgstr ""
-#: alpine/imap.c:1374
+#: alpine/imap.c:1424
msgid ""
"We have not verified the identity of your server. If you ignore this "
"certificate validation problem and continue, you could end up connecting to "
"an imposter server."
msgstr ""
-#: alpine/imap.c:1377
+#: alpine/imap.c:1427
msgid ""
"If the certificate validation failure was expected and permanent you may "
"avoid seeing this warning message in the future by adding the option"
msgstr ""
-#: alpine/imap.c:1384
+#: alpine/imap.c:1434
msgid ""
"to the name of the folder you attempted to access. In other words, wherever "
"you see the characters"
msgstr ""
-#: alpine/imap.c:1391 alpine/imap.c:1682
+#: alpine/imap.c:1441 alpine/imap.c:1732
msgid "in your configuration, replace those characters with"
msgstr ""
-#: alpine/imap.c:1399
+#: alpine/imap.c:1449
msgid ""
"Answer \"Yes\" to ignore the warning and continue, \"No\" to cancel the open "
"of this folder."
msgstr ""
-#: alpine/imap.c:1418 alpine/imap.c:1718 alpine/help.c:199
+#: alpine/imap.c:1468 alpine/imap.c:1768 alpine/help.c:200
msgid "help text"
msgstr ""
-#: alpine/imap.c:1419
+#: alpine/imap.c:1469
msgid "SSL/TLS CERTIFICATE VALIDATION FAILURE"
msgstr ""
-#: alpine/imap.c:1427
+#: alpine/imap.c:1477
msgid "HELP FOR CERT VALIDATION FAILURE"
msgstr ""
-#: alpine/imap.c:1454
+#: alpine/imap.c:1504
msgid "SSL/TLS certificate validation failure"
msgstr ""
-#: alpine/imap.c:1457
+#: alpine/imap.c:1507
msgid ": Continue anyway "
msgstr ""
-#: alpine/imap.c:1464
+#: alpine/imap.c:1514
#, c-format
msgid "Open of %s cancelled"
msgstr ""
-#: alpine/imap.c:1486
+#: alpine/imap.c:1536
#, c-format
msgid "Rename newsrc \"%s%s\" for use as new host-specific newsrc"
msgstr ""
-#: alpine/imap.c:1506
+#: alpine/imap.c:1556
msgid "Error allocating space for details."
msgstr ""
-#: alpine/imap.c:1510
+#: alpine/imap.c:1560
msgid ""
"Host given by user:\n"
"\n"
" "
msgstr ""
-#: alpine/imap.c:1512
+#: alpine/imap.c:1562
msgid ""
"\n"
"\n"
@@ -8976,7 +9065,7 @@ msgid ""
" "
msgstr ""
-#: alpine/imap.c:1514
+#: alpine/imap.c:1564
msgid ""
"\n"
"\n"
@@ -8984,24 +9073,24 @@ msgid ""
"\n"
msgstr ""
-#: alpine/imap.c:1524
+#: alpine/imap.c:1574
msgid "CERT VALIDATION DETAILS"
msgstr ""
-#: alpine/imap.c:1529
+#: alpine/imap.c:1579
msgid "HELP FOR CERT VALIDATION DETAILS"
msgstr ""
-#: alpine/imap.c:1576
+#: alpine/imap.c:1626
#, c-format
msgid "SSL/TLS failure for %s: %s"
msgstr ""
-#: alpine/imap.c:1589
+#: alpine/imap.c:1639
msgid "There was an SSL/TLS failure for the server"
msgstr ""
-#: alpine/imap.c:1635
+#: alpine/imap.c:1685
msgid ""
"This is just an informational message. With the current setup, SSL/TLS will "
"not work. If this error re-occurs every time you run Alpine, your current "
@@ -9009,338 +9098,334 @@ msgid ""
"want to add the option"
msgstr ""
-#: alpine/imap.c:1658
+#: alpine/imap.c:1708
msgid ""
"to the name of the mail server you are attempting to access. In other words, "
"wherever you see the characters"
msgstr ""
-#: alpine/imap.c:1709
+#: alpine/imap.c:1759
msgid "Type RETURN to continue."
msgstr ""
-#: alpine/imap.c:1719
+#: alpine/imap.c:1769
msgid "SSL/TLS FAILURE"
msgstr ""
-#: alpine/imap.c:1727
+#: alpine/imap.c:1777
msgid "HELP FOR TLS/SSL FAILURE"
msgstr ""
-#: alpine/imap.c:2496
+#: alpine/imap.c:2678
msgid "Erase previously preserved passwords"
msgstr ""
-#: alpine/imap.c:2561 alpine/imap.c:2575
+#: alpine/imap.c:2743 alpine/imap.c:2757
msgid "Preserve password for next login"
msgstr ""
-#: alpine/imap.c:2581
+#: alpine/imap.c:2763
msgid "Stop \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
msgstr ""
-#: alpine/imap.c:2588
+#: alpine/imap.c:2770
msgid ""
"Restart \"Preserve passwords?\" prompts by deleting Alpine Keychain entry"
msgstr ""
-#: alpine/imap.c:2594
+#: alpine/imap.c:2776
msgid "Preserve password on DISK for next login"
msgstr ""
-#: alpine/help.c:224 pico/display.c:1790
+#: alpine/help.c:225 pico/display.c:1791
msgid "HELP"
msgstr ""
-#: alpine/help.c:235
+#: alpine/help.c:236
msgid "HELP TEXT"
msgstr ""
-#: alpine/help.c:243
+#: alpine/help.c:244
msgid "HELP FOR HELP TEXT"
msgstr ""
-#: alpine/help.c:252 alpine/help.c:263
+#: alpine/help.c:253 alpine/help.c:264
msgid "Prev Help"
msgstr ""
-#: alpine/help.c:257 alpine/help.c:272 pico/bind.c:178
+#: alpine/help.c:258 alpine/help.c:273 pico/bind.c:179
msgid "Exit Help"
msgstr ""
#. TRANSLATORS: this is the label of a command where
#. the user is asking for Help about the Help command
-#: alpine/help.c:279
+#: alpine/help.c:280
msgid "Help Help"
msgstr ""
-#: alpine/help.c:438
+#: alpine/help.c:457
msgid "View Link"
msgstr ""
-#: alpine/help.c:490
+#: alpine/help.c:509
#, c-format
msgid "Printing Error: %s"
msgstr ""
-#: alpine/help.c:503
+#: alpine/help.c:522
msgid "all 150+ pages of help text"
msgstr ""
-#: alpine/help.c:508
+#: alpine/help.c:527
msgid "Print of all help cancelled"
msgstr ""
-#: alpine/help.c:598
+#: alpine/help.c:618
msgid "HELP SUB-SECTION"
msgstr ""
-#: alpine/help.c:606 alpine/help.c:631
+#: alpine/help.c:626 alpine/help.c:651
#, c-format
msgid "Unrecognized Internal help: \"%s\""
msgstr ""
#. TRANSLATORS: Help for configuration
-#: alpine/help.c:621
+#: alpine/help.c:641
msgid "HELP CONFIG"
msgstr ""
#. TRANSLATORS: command label asking pine to include time stamps in output
-#: alpine/help.c:650
+#: alpine/help.c:670
msgid "Timestamps"
msgstr ""
#. TRANSLATORS: do not include time stamps in output
-#: alpine/help.c:652
+#: alpine/help.c:672
msgid "NoTimestamps"
msgstr ""
-#: alpine/help.c:671
+#: alpine/help.c:691
msgid "Failed allocating memory"
msgstr ""
-#: alpine/help.c:675
+#: alpine/help.c:695
msgid "Turning off new messages while reviewing"
msgstr ""
-#: alpine/help.c:724
+#: alpine/help.c:744
msgid "**** Journal entries prior to this point have been trimmed. ****\n"
msgstr ""
-#: alpine/help.c:732
+#: alpine/help.c:752
msgid "**** Debug 0-4 entries prior to this point have been trimmed. ****\n"
msgstr ""
-#: alpine/help.c:740
+#: alpine/help.c:760
msgid "**** Debug 5-9 entries prior to this point have been trimmed. ****\n"
msgstr ""
-#: alpine/help.c:814
+#: alpine/help.c:834
msgid "journal"
msgstr ""
#. TRANSLATORS: these are some screen titles
-#: alpine/help.c:826
+#: alpine/help.c:846
msgid "HELP FOR DEBUG JOURNAL"
msgstr ""
-#: alpine/help.c:828
+#: alpine/help.c:848
msgid "REVIEW DEBUGGING"
msgstr ""
-#: alpine/help.c:831 alpine/help.c:838
+#: alpine/help.c:851 alpine/help.c:858
msgid "HELP FOR JOURNAL"
msgstr ""
-#: alpine/help.c:833 alpine/help.c:840
+#: alpine/help.c:853 alpine/help.c:860
msgid "REVIEW RECENT MESSAGES"
msgstr ""
#. TRANSLATORS: shows what numeric level Debug output is displayed at
-#: alpine/help.c:850
+#: alpine/help.c:870
#, c-format
msgid "Debug (%d)"
msgstr ""
#. TRANSLATORS: include debug output in journal
-#: alpine/help.c:853
+#: alpine/help.c:873
msgid "DebugView"
msgstr ""
-#: alpine/help.c:920
+#: alpine/help.c:940
msgid "COMPOSE TO LOCAL SUPPORT"
msgstr ""
-#: alpine/help.c:927
+#: alpine/help.c:947
msgid "REQUEST FOR ASSISTANCE"
msgstr ""
-#: alpine/print.c:67
+#: alpine/print.c:68
msgid "Exception Setup not implemented for printer"
msgstr ""
-#: alpine/print.c:112
+#: alpine/print.c:113
msgid "You may \"Select\" a print command as your default printer."
msgstr ""
-#: alpine/print.c:125
+#: alpine/print.c:126
msgid "You may also add custom print commands to the list in the"
msgstr ""
-#: alpine/print.c:138
+#: alpine/print.c:139
msgid "\"Personally selected print command\" section below."
msgstr ""
-#: alpine/print.c:171
+#: alpine/print.c:172
msgid " Printer attached to IBM PC or compatible, Macintosh"
msgstr ""
-#: alpine/print.c:183
+#: alpine/print.c:184
msgid "This may not work with all attached printers, and will depend on the"
msgstr ""
-#: alpine/print.c:193
+#: alpine/print.c:194
msgid "terminal emulation/communications software in use. It is known to work"
msgstr ""
-#: alpine/print.c:288
+#: alpine/print.c:289
msgid " Standard UNIX print command"
msgstr ""
-#: alpine/print.c:305
+#: alpine/print.c:306
msgid "Using this option may require setting your \"PRINTER\" or \"LPDEST\""
msgstr ""
-#: alpine/print.c:320
+#: alpine/print.c:321
msgid "environment variable using the standard UNIX utilities."
msgstr ""
-#: alpine/print.c:335 alpine/print.c:462 alpine/print.c:482
+#: alpine/print.c:336 alpine/print.c:463 alpine/print.c:483
msgid "Printer List:"
msgstr ""
-#: alpine/print.c:368
+#: alpine/print.c:369
msgid " Personally selected print command"
msgstr ""
-#: alpine/print.c:386
+#: alpine/print.c:387
msgid "The text to be printed will be piped into the command given here. The"
msgstr ""
-#: alpine/print.c:401
+#: alpine/print.c:402
msgid ""
"command is in the 2nd column, the printer name is in the first column. Some"
msgstr ""
-#: alpine/print.c:416
+#: alpine/print.c:417
msgid ""
"examples are: \"prt\", \"lpr\", \"lp\", or \"enscript\". The command may be "
"given"
msgstr ""
-#: alpine/print.c:431
+#: alpine/print.c:432
msgid "with options, for example \"enscript -2 -r\" or \"lpr -Plpacc170\". The"
msgstr ""
-#: alpine/print.c:446
+#: alpine/print.c:447
msgid ""
"commands and options on your system may be different from these examples."
msgstr ""
-#: alpine/print.c:497
+#: alpine/print.c:498
msgid "SETUP PRINTER EXCEPTIONS"
msgstr ""
-#: alpine/print.c:498
+#: alpine/print.c:499
msgid "SETUP PRINTER"
msgstr ""
-#: alpine/print.c:499
+#: alpine/print.c:500
msgid "printer config"
msgstr ""
-#: alpine/print.c:603 alpine/print.c:616 alpine/print.c:629 alpine/print.c:642
-#: alpine/print.c:655
+#: alpine/print.c:604 alpine/print.c:617 alpine/print.c:630 alpine/print.c:643
+#: alpine/print.c:656
msgid "Trouble setting default printer"
msgstr ""
-#: alpine/print.c:738
+#: alpine/print.c:739
msgid "Enter printer name : "
msgstr ""
-#: alpine/print.c:770 alpine/print.c:789
+#: alpine/print.c:771 alpine/print.c:790
msgid "Enter name of printer to be added : "
msgstr ""
-#: alpine/print.c:776
+#: alpine/print.c:777
msgid "Enter the name for replacement printer : "
msgstr ""
-#: alpine/print.c:837
+#: alpine/print.c:838
msgid "Enter command for printer : "
msgstr ""
-#: alpine/print.c:877 alpine/print.c:1046
+#: alpine/print.c:878 alpine/print.c:1047
msgid "No commas allowed in command"
msgstr ""
-#: alpine/print.c:940
+#: alpine/print.c:941
#, c-format
msgid "Delete (unused) printer %s "
msgstr ""
-#: alpine/print.c:946
+#: alpine/print.c:947
#, c-format
msgid "Really delete item %s from printer list "
msgstr ""
-#: alpine/print.c:958
+#: alpine/print.c:959
msgid "Printer not deleted"
msgstr ""
-#: alpine/print.c:981 pith/ldap.c:1737
-msgid "Name"
-msgstr ""
-
-#: alpine/print.c:985 pith/mailcmd.c:129
+#: alpine/print.c:986 pith/mailcmd.c:130
msgid "Command"
msgstr ""
-#: alpine/print.c:989
+#: alpine/print.c:990
msgid "Options"
msgstr ""
#. TRANSLATORS: this is a question with three choices
-#: alpine/print.c:992
+#: alpine/print.c:993
msgid "Change Name or Command or Options ? "
msgstr ""
-#: alpine/print.c:1007
+#: alpine/print.c:1008
msgid "Change command : "
msgstr ""
-#: alpine/print.c:1070
+#: alpine/print.c:1071
msgid "Change name : "
msgstr ""
-#: alpine/print.c:1124
+#: alpine/print.c:1125
msgid "Init"
msgstr ""
-#: alpine/print.c:1128
+#: alpine/print.c:1129
msgid "Trailer"
msgstr ""
-#: alpine/print.c:1130
+#: alpine/print.c:1131
msgid "Change Init string or Trailer string ? "
msgstr ""
-#: alpine/print.c:1146
+#: alpine/print.c:1147
#, c-format
msgid "Change INIT string : "
msgstr ""
-#: alpine/print.c:1148
+#: alpine/print.c:1149
#, c-format
msgid "Change TRAILER string : "
msgstr ""
@@ -9350,135 +9435,135 @@ msgstr ""
msgid "Enter passphrase for <%s>: "
msgstr ""
-#: alpine/smime.c:110
+#: alpine/smime.c:111
msgid "Can only view one message's information at a time."
msgstr ""
-#: alpine/smime.c:120
+#: alpine/smime.c:121
msgid "Can't fetch body of message."
msgstr ""
-#: alpine/smime.c:200 pith/smime.c:1642 pith/smime.c:1768
+#: alpine/smime.c:201 pith/smime.c:1713 pith/smime.c:1933
msgid "This message was cryptographically signed."
msgstr ""
-#: alpine/smime.c:209
+#: alpine/smime.c:210
#, c-format
msgid "Certificate%s used for signing"
msgstr ""
-#: alpine/smime.c:234 pith/smime.c:1781
+#: alpine/smime.c:235 pith/smime.c:1946
msgid "This message was encrypted."
msgstr ""
-#: alpine/smime.c:244
+#: alpine/smime.c:245
msgid "The algorithm used to encrypt was "
msgstr ""
-#: alpine/smime.c:257
+#: alpine/smime.c:258
#, c-format
msgid "Certificate%s for decrypting"
msgstr ""
-#: alpine/smime.c:288
+#: alpine/smime.c:289
msgid "No certificate capable of decrypting could be found."
msgstr ""
-#: alpine/smime.c:389
+#: alpine/smime.c:390
msgid "Couldn't find certificate info."
msgstr ""
-#: alpine/smime.c:608
+#: alpine/smime.c:609
msgid "SETUP S/MIME EXCEPTIONS"
msgstr ""
-#: alpine/smime.c:609
+#: alpine/smime.c:610
msgid "SETUP S/MIME"
msgstr ""
-#: alpine/smime.c:626
+#: alpine/smime.c:627
msgid "conf_scroll_screen bad ret in smime_config"
msgstr ""
-#: alpine/smime.c:768
+#: alpine/smime.c:765
msgid "Mac OS X specific features"
msgstr ""
-#: alpine/smime.c:791
+#: alpine/smime.c:788
msgid ""
"Be careful with the following commands, they REPLACE contents in the target"
msgstr ""
-#: alpine/smime.c:805
+#: alpine/smime.c:802
msgid "Transfer public certs FROM directory TO container"
msgstr ""
-#: alpine/smime.c:813
+#: alpine/smime.c:810
msgid "Transfer private keys FROM directory TO container"
msgstr ""
-#: alpine/smime.c:821
+#: alpine/smime.c:818
msgid "Transfer CA certs FROM directory TO container"
msgstr ""
-#: alpine/smime.c:832
+#: alpine/smime.c:829
msgid "Transfer public certs FROM container TO directory"
msgstr ""
-#: alpine/smime.c:840
+#: alpine/smime.c:837
msgid "Transfer private keys FROM container TO directory"
msgstr ""
-#: alpine/smime.c:848
+#: alpine/smime.c:845
msgid "Transfer CA certs FROM container TO directory"
msgstr ""
-#: alpine/smime.c:861
+#: alpine/smime.c:858
msgid "Transfer public certs FROM container TO keychain"
msgstr ""
-#: alpine/smime.c:869
+#: alpine/smime.c:866
msgid "Transfer public certs FROM keychain TO container"
msgstr ""
-#: alpine/smime.c:887 alpine/smime.c:965
+#: alpine/smime.c:884 alpine/smime.c:962
msgid "Public certs transferred to container"
msgstr ""
-#: alpine/smime.c:889 alpine/smime.c:900 alpine/smime.c:911 alpine/smime.c:922
-#: alpine/smime.c:933 alpine/smime.c:944
+#: alpine/smime.c:886 alpine/smime.c:897 alpine/smime.c:908 alpine/smime.c:919
+#: alpine/smime.c:930 alpine/smime.c:941
msgid "Problem transferring certs"
msgstr ""
-#: alpine/smime.c:898
+#: alpine/smime.c:895
msgid "Public certs transferred to directory, delete Container config to use"
msgstr ""
-#: alpine/smime.c:909
+#: alpine/smime.c:906
msgid "Private keys transferred to container"
msgstr ""
-#: alpine/smime.c:920
+#: alpine/smime.c:917
msgid "Private keys transferred to directory, delete Container config to use"
msgstr ""
-#: alpine/smime.c:931
+#: alpine/smime.c:928
msgid "CA certs transferred to container"
msgstr ""
-#: alpine/smime.c:942
+#: alpine/smime.c:939
msgid "CA certs transferred to directory, delete Container config to use"
msgstr ""
-#: alpine/smime.c:954
+#: alpine/smime.c:951
msgid "Public certs transferred to keychain"
msgstr ""
-#: alpine/smime.c:956 alpine/smime.c:967
+#: alpine/smime.c:953 alpine/smime.c:964
msgid "Command not implemented yet"
msgstr ""
-#: pico/osdep/mswin_spell.c:57 pico/osdep/spell.c:98
+#: pico/osdep/mswin_spell.c:57 pico/osdep/spell.c:99
msgid "Checking spelling..."
msgstr ""
@@ -9486,7 +9571,7 @@ msgstr ""
msgid "Spelling: initializing Aspell failed"
msgstr ""
-#: pico/osdep/mswin_spell.c:109 pico/osdep/spell.c:257
+#: pico/osdep/mswin_spell.c:109 pico/osdep/spell.c:258
msgid "Done checking spelling"
msgstr ""
@@ -9500,324 +9585,324 @@ msgstr ""
#. TRANSLATORS: Some help text. The ~ characters cause
#. the characters they are in front of to be bold.
-#: pico/osdep/spell.c:49 pico/osdep/spell.c:67
+#: pico/osdep/spell.c:50 pico/osdep/spell.c:68
msgid "Spell Check Help"
msgstr ""
-#: pico/osdep/spell.c:51
+#: pico/osdep/spell.c:52
msgid " The spell checker examines all words in the text. It then"
msgstr ""
-#: pico/osdep/spell.c:52
+#: pico/osdep/spell.c:53
msgid " offers each misspelled word for correction while simultaneously"
msgstr ""
-#: pico/osdep/spell.c:53
+#: pico/osdep/spell.c:54
msgid " highlighting it in the text. To leave a word unchanged simply"
msgstr ""
-#: pico/osdep/spell.c:54
+#: pico/osdep/spell.c:55
msgid ""
"~ hit ~R~e~t~u~r~n at the edit prompt. If a word has been corrected,"
msgstr ""
-#: pico/osdep/spell.c:55
+#: pico/osdep/spell.c:56
msgid ""
" each occurrence of the incorrect word is offered for replacement."
msgstr ""
-#: pico/osdep/spell.c:57
+#: pico/osdep/spell.c:58
msgid ""
"~ Spell checking can be cancelled at any time by typing ~^~C (~F~3)"
msgstr ""
-#: pico/osdep/spell.c:58
+#: pico/osdep/spell.c:59
msgid " after exiting help."
msgstr ""
-#: pico/osdep/spell.c:60 pico/osdep/spell.c:78
+#: pico/osdep/spell.c:61 pico/osdep/spell.c:79
msgid "End of Spell Check Help"
msgstr ""
-#: pico/osdep/spell.c:69
+#: pico/osdep/spell.c:70
msgid "\tThe spell checker examines all words in the text. It then"
msgstr ""
-#: pico/osdep/spell.c:70
+#: pico/osdep/spell.c:71
msgid "\toffers each misspelled word for correction while simultaneously"
msgstr ""
-#: pico/osdep/spell.c:71
+#: pico/osdep/spell.c:72
msgid "\thighlighting it in the text. To leave a word unchanged simply"
msgstr ""
-#: pico/osdep/spell.c:72
+#: pico/osdep/spell.c:73
msgid "\thit Return at the edit prompt. If a word has been corrected,"
msgstr ""
-#: pico/osdep/spell.c:73
+#: pico/osdep/spell.c:74
msgid "\teach occurrence of the incorrect word is offered for replacement."
msgstr ""
-#: pico/osdep/spell.c:75
+#: pico/osdep/spell.c:76
msgid "\tSpell checking can be cancelled at any time by typing ^C (F3)"
msgstr ""
-#: pico/osdep/spell.c:76
+#: pico/osdep/spell.c:77
msgid "\tafter exiting help."
msgstr ""
-#: pico/osdep/spell.c:104
+#: pico/osdep/spell.c:105
msgid "Can't write temp file for spell checker"
msgstr ""
-#: pico/osdep/spell.c:144
+#: pico/osdep/spell.c:145
#, c-format
-msgid "Spell-checking file \"%s\" not found"
+msgid "\aSpell-checking file \"%s\" not found"
msgstr ""
-#: pico/osdep/spell.c:151
+#: pico/osdep/spell.c:152
msgid "Can't fork spell checker"
msgstr ""
-#: pico/osdep/spell.c:185
+#: pico/osdep/spell.c:186
#, c-format
msgid "Replace \"%s\" with \"%s\""
msgstr ""
-#: pico/osdep/spell.c:195
+#: pico/osdep/spell.c:196
msgid "Edit a replacement: "
msgstr ""
-#: pico/osdep/spell.c:214
+#: pico/osdep/spell.c:215
msgid "Spell Checking Cancelled"
msgstr ""
-#: pico/osdep/spell.c:224 pico/osdep/spell.c:231
+#: pico/osdep/spell.c:225 pico/osdep/spell.c:232
msgid "Help with Spelling Checker"
msgstr ""
#. TRANSLATORS: Read File is a prompt for the name of
#. a file to be read into the composer.
-#: pico/attach.c:91 pico/display.c:67 pico/display.c:83
+#: pico/attach.c:92 pico/display.c:68 pico/display.c:84
msgid "Read File"
msgstr ""
-#: pico/attach.c:91
+#: pico/attach.c:92
msgid "RcvUpload"
msgstr ""
-#: pico/attach.c:97
+#: pico/attach.c:98
msgid "Name to give uploaded attachment: "
msgstr ""
#. TRANSLATORS: User is being asked for the name
#. of the file they want to attach to a message.
-#: pico/attach.c:100
+#: pico/attach.c:101
msgid "File to attach: "
msgstr ""
#. TRANSLATORS: This is a prompt for a comment about the file
#. they have attached.
-#: pico/attach.c:106
+#: pico/attach.c:107
msgid "Attachment comment: "
msgstr ""
-#: pico/attach.c:114
+#: pico/attach.c:115
msgid "Attach Help"
msgstr ""
-#: pico/attach.c:319 pico/attach.c:329 pico/attach.c:884 pico/attach.c:902
+#: pico/attach.c:320 pico/attach.c:330 pico/attach.c:885 pico/attach.c:903
msgid "home directory"
msgstr ""
#. TRANSLATORS: the %s is replaced with the name of a directory
-#: pico/attach.c:322
+#: pico/attach.c:323
#, c-format
msgid "Restricted mode allows attachments from %s only: too many ..'s"
msgstr ""
-#: pico/attach.c:331
+#: pico/attach.c:332
#, c-format
-msgid "Restricted mode allows attachments from %s only"
+msgid "\aRestricted mode allows attachments from %s only"
msgstr ""
-#: pico/attach.c:404
+#: pico/attach.c:405
msgid "Attach cancelled"
msgstr ""
-#: pico/attach.c:849 pico/attach.c:1051
+#: pico/attach.c:850 pico/attach.c:1052
#, c-format
-msgid "Attchmnt: '%s' not allowed in file name"
+msgid "\aAttchmnt: '%s' not allowed in file name"
msgstr ""
-#: pico/attach.c:886
+#: pico/attach.c:887
#, c-format
msgid "Attachments allowed only from %s: too many ..'s"
msgstr ""
-#: pico/attach.c:903
+#: pico/attach.c:904
#, c-format
-msgid "Attachments allowed only from %s"
+msgid "\aAttachments allowed only from %s"
msgstr ""
-#: pico/attach.c:973
+#: pico/attach.c:974
#, c-format
-msgid "Attchmnt: Expected ']' after \"%s\""
+msgid "\aAttchmnt: Expected ']' after \"%s\""
msgstr ""
-#: pico/attach.c:1094
+#: pico/attach.c:1095
#, c-format
-msgid "Attchmnt: Expected '(' or '\"' after %s"
+msgid "\aAttchmnt: Expected '(' or '\"' after %s"
msgstr ""
-#: pico/attach.c:1153
+#: pico/attach.c:1154
#, c-format
-msgid "Attchmnt: Size field missing ')': \"%s\""
+msgid "\aAttchmnt: Size field missing ')': \"%s\""
msgstr ""
-#: pico/attach.c:1172
-msgid "Attchmnt: Malformed comment, quotes required"
+#: pico/attach.c:1173
+msgid "\aAttchmnt: Malformed comment, quotes required"
msgstr ""
-#: pico/attach.c:1194
-msgid "Attchmnt: Closing quote required at end of comment"
+#: pico/attach.c:1195
+msgid "\aAttchmnt: Closing quote required at end of comment"
msgstr ""
-#: pico/attach.c:1238
-msgid "Attchmnt: Comma must separate attachments"
+#: pico/attach.c:1239
+msgid "\aAttchmnt: Comma must separate attachments"
msgstr ""
#. TRANSLATORS: command key labels, Send means send the message
#. we are currently working on.
-#: pico/display.c:66 pico/display.c:82 pico/display.c:1622 pico/browse.c:112
-#: pico/composer.c:126
+#: pico/display.c:67 pico/display.c:83 pico/display.c:1623 pico/browse.c:113
+#: pico/composer.c:132
msgid "Get Help"
msgstr ""
-#: pico/display.c:66
+#: pico/display.c:67
msgid "WriteOut"
msgstr ""
#. TRANSLATORS: Previous Page
-#: pico/display.c:67 pico/display.c:83 pico/browse.c:113 pico/bind.c:245
+#: pico/display.c:68 pico/display.c:84 pico/browse.c:114 pico/bind.c:246
msgid "Prev Pg"
msgstr ""
-#: pico/display.c:68 pico/display.c:84
+#: pico/display.c:69 pico/display.c:85
msgid "Cut Text"
msgstr ""
-#: pico/display.c:68
+#: pico/display.c:69
msgid "Cur Pos"
msgstr ""
-#: pico/display.c:69 pico/display.c:86
+#: pico/display.c:70 pico/display.c:87
msgid "Justify"
msgstr ""
-#: pico/display.c:70 pico/display.c:1123 pico/browse.c:116
+#: pico/display.c:71 pico/display.c:1124 pico/browse.c:117
msgid "Where is"
msgstr ""
#. TRANSLATORS: Next Page, a command key label
-#: pico/display.c:70 pico/display.c:87 pico/browse.c:116 pico/bind.c:237
+#: pico/display.c:71 pico/display.c:88 pico/browse.c:117 pico/bind.c:238
msgid "Next Pg"
msgstr ""
-#: pico/display.c:73 pico/display.c:90
+#: pico/display.c:74 pico/display.c:91
msgid "To Spell"
msgstr ""
-#: pico/display.c:75 pico/display.c:92 pico/composer.c:134
+#: pico/display.c:76 pico/display.c:93 pico/composer.c:140
msgid "Del Char"
msgstr ""
-#: pico/display.c:84 pico/display.c:1120 pico/composer.c:132
-#: pico/composer.c:4401
+#: pico/display.c:85 pico/display.c:1121 pico/composer.c:138
+#: pico/composer.c:4426
msgid "Postpone"
msgstr ""
#. TRANSLATORS: UnJustify means undo the previous
#. Justify command.
-#: pico/display.c:792 pico/display.c:1126
+#: pico/display.c:793 pico/display.c:1127
msgid "UnJustify"
msgstr ""
-#: pico/display.c:794 pico/display.c:807
+#: pico/display.c:795 pico/display.c:808
msgid "Can now UnJustify!"
msgstr ""
-#: pico/display.c:799 pico/display.c:1127
+#: pico/display.c:800 pico/display.c:1128
msgid "UnCut Text"
msgstr ""
-#: pico/display.c:1116 pico/composer.c:126 pico/composer.c:4364
+#: pico/display.c:1117 pico/composer.c:132 pico/composer.c:4389
msgid "Send"
msgstr ""
-#: pico/display.c:1122
+#: pico/display.c:1123
msgid "Alt Edit"
msgstr ""
-#: pico/display.c:1396 pico/display.c:1743 pico/word.c:599
+#: pico/display.c:1397 pico/display.c:1744 pico/word.c:683
msgid "ABORT"
msgstr ""
-#: pico/basic.c:946
+#: pico/basic.c:942
msgid "Xterm mouse tracking on!"
msgstr ""
-#: pico/basic.c:947
+#: pico/basic.c:943
msgid "Xterm mouse tracking off!"
msgstr ""
-#: pico/basic.c:950
+#: pico/basic.c:946
msgid "Xterm mouse tracking still off ($DISPLAY variable set?)"
msgstr ""
-#: pico/pico.c:341
+#: pico/pico.c:342
msgid "Please make the screen bigger."
msgstr ""
#. TRANSLATORS: The user typed the Cancel command and was
#. asked to confirm that. Instead they canceled the cancel
#. command.
-#: pico/pico.c:652
+#: pico/pico.c:653
msgid "Cancel Cancelled"
msgstr ""
-#: pico/pico.c:661
+#: pico/pico.c:662
msgid "Cancel message (answering \"Yes\" will abandon your mail message)"
msgstr ""
-#: pico/pico.c:663
+#: pico/pico.c:664
msgid "Cancel Edit (and abandon changes)"
msgstr ""
-#: pico/pico.c:664
+#: pico/pico.c:665
msgid "Cancel Edit"
msgstr ""
-#: pico/pico.c:671
-msgid "Cancel Cancelled"
+#: pico/pico.c:672
+msgid "\aCancel Cancelled"
msgstr ""
-#: pico/pico.c:712
-msgid "Problem with attachments! Fix errors or delete attachments."
+#: pico/pico.c:713
+msgid "\aProblem with attachments! Fix errors or delete attachments."
msgstr ""
#. TRANSLATORS: buffer is the in-memory copy of a file
-#: pico/pico.c:761
+#: pico/pico.c:762
msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES)"
msgstr ""
-#: pico/pico.c:1915
+#: pico/pico.c:1916
#, c-format
msgid "Attached dropped file \"%s\""
msgstr ""
-#: pico/pico.c:1917
+#: pico/pico.c:1918
#, c-format
msgid "Inserted dropped file \"%s\""
msgstr ""
@@ -9828,660 +9913,660 @@ msgstr ""
msgid "can't create '%s'\n"
msgstr ""
-#: pico/browse.c:114
+#: pico/browse.c:115
msgid "Copy"
msgstr ""
#. TRANSLATORS: The next several lines go together. The ~ characters
#. should be left in front of the characters they cause to be bold.
-#: pico/browse.c:172
+#: pico/browse.c:173
msgid "Help for Browse Command"
msgstr ""
-#: pico/browse.c:174
+#: pico/browse.c:175
msgid " Pico's file browser is used to select a file from the"
msgstr ""
-#: pico/browse.c:175
+#: pico/browse.c:176
msgid " file system for inclusion in the edited text."
msgstr ""
-#: pico/browse.c:177
+#: pico/browse.c:178
msgid "~ Both directories and files are displayed. Press ~S"
msgstr ""
-#: pico/browse.c:178
+#: pico/browse.c:179
msgid "~ or ~R~e~t~u~r~n to select a file or directory. When a file"
msgstr ""
-#: pico/browse.c:179
+#: pico/browse.c:180
msgid " is selected during the \"Read File\" command, it is"
msgstr ""
-#: pico/browse.c:180
+#: pico/browse.c:181
msgid " inserted into edited text. Answering \"yes\" to the"
msgstr ""
-#: pico/browse.c:181
+#: pico/browse.c:182
msgid " verification question after a directory is selected causes"
msgstr ""
-#: pico/browse.c:182
+#: pico/browse.c:183
msgid " the contents of that directory to be displayed for selection."
msgstr ""
-#: pico/browse.c:184
+#: pico/browse.c:185
msgid " The file named \"..\" is special, and means the \"parent\""
msgstr ""
-#: pico/browse.c:185
+#: pico/browse.c:186
msgid " of the directory being displayed. Select this directory"
msgstr ""
-#: pico/browse.c:186
+#: pico/browse.c:187
msgid " to move upward in the directory tree."
msgstr ""
-#: pico/browse.c:188
+#: pico/browse.c:189
msgid "End of Browser Help."
msgstr ""
#. TRANSLATORS: Some more help text
-#: pico/browse.c:198
+#: pico/browse.c:199
msgid "Help for Pilot (PIne's Looker-upper Of Things"
msgstr ""
-#: pico/browse.c:200
+#: pico/browse.c:201
msgid ""
" Pilot is a simple, display-oriented file system browser based on the"
msgstr ""
-#: pico/browse.c:201
+#: pico/browse.c:202
msgid ""
"~ Alpine message system composer. As with Alpine, commands are "
"displayed at"
msgstr ""
-#: pico/browse.c:202
+#: pico/browse.c:203
msgid ""
"~ the bottom of the screen, and context-sensitive help is provided."
msgstr ""
-#: pico/browse.c:204
+#: pico/browse.c:205
msgid ""
"~ Pilot displays the current working directory at the top of the "
"screen."
msgstr ""
-#: pico/browse.c:205
+#: pico/browse.c:206
msgid ""
"~ The directory's contents are displayed in columns of file name, file"
msgstr ""
-#: pico/browse.c:206
+#: pico/browse.c:207
msgid ""
"~ size pairs. Names that are directories are indicated by the name"
msgstr ""
-#: pico/browse.c:207
+#: pico/browse.c:208
msgid ""
"~ ~(~d~i~r~) in place of the file size. The parent of the current "
"working"
msgstr ""
-#: pico/browse.c:208
+#: pico/browse.c:209
msgid ""
"~ directory is indicated by the file name ~.~. and size of ~"
"(~p~a~r~e~n~t~ ~d~i~r~)."
msgstr ""
-#: pico/browse.c:209
+#: pico/browse.c:210
msgid ""
"~ File names that are symbolic links to other files are displayed "
"with a"
msgstr ""
-#: pico/browse.c:210
+#: pico/browse.c:211
msgid "~ file size of ~-~-."
msgstr ""
-#: pico/browse.c:212
+#: pico/browse.c:213
msgid " The following function keys are available in Pilot:"
msgstr ""
-#: pico/browse.c:214
+#: pico/browse.c:215
msgid "~ ~? Display this help text."
msgstr ""
-#: pico/browse.c:215
+#: pico/browse.c:216
msgid "~ ~Q Quit Pilot."
msgstr ""
-#: pico/browse.c:217
+#: pico/browse.c:218
msgid ""
"~ ~V View the currently selected file or open the selected "
"directory."
msgstr ""
-#: pico/browse.c:218
+#: pico/browse.c:219
msgid ""
"~ Note: Pilot invokes ~p~i~n~e ~-~F, or the program defined "
"by the ~P~A~G~E~R"
msgstr ""
-#: pico/browse.c:219
+#: pico/browse.c:220
msgid "~ environment variable, to view the file."
msgstr ""
-#: pico/browse.c:220
+#: pico/browse.c:221
msgid "~ ~L Launch an external application program."
msgstr ""
-#: pico/browse.c:222
+#: pico/browse.c:223
msgid "~ ~W Search for a file by name."
msgstr ""
-#: pico/browse.c:223
+#: pico/browse.c:224
msgid "~ ~- Scroll up one page."
msgstr ""
-#: pico/browse.c:224
+#: pico/browse.c:225
msgid "~ ~S~p~a~c~e Scroll down one page."
msgstr ""
-#: pico/browse.c:225
+#: pico/browse.c:226
msgid "~ ~N,~^~F Move forward (right) one column."
msgstr ""
-#: pico/browse.c:226
+#: pico/browse.c:227
msgid "~ ~P,~^~B Move back (left) one column."
msgstr ""
-#: pico/browse.c:227
+#: pico/browse.c:228
msgid "~ ~^~N Move down one row."
msgstr ""
-#: pico/browse.c:228
+#: pico/browse.c:229
msgid "~ ~^~P Move up one row."
msgstr ""
-#: pico/browse.c:230
+#: pico/browse.c:231
msgid "~ ~D Delete the selected file."
msgstr ""
-#: pico/browse.c:231
+#: pico/browse.c:232
msgid "~ ~R Rename the selected file or directory."
msgstr ""
-#: pico/browse.c:232
+#: pico/browse.c:233
msgid "~ ~C Copy the selected file."
msgstr ""
-#: pico/browse.c:233
+#: pico/browse.c:234
msgid "~ ~E Edit the selected file."
msgstr ""
-#: pico/browse.c:234
+#: pico/browse.c:235
msgid ""
"~ Note: Pilot invokes ~p~i~c~o, or the program defined by the "
"~E~D~I~T~O~R"
msgstr ""
-#: pico/browse.c:235
+#: pico/browse.c:236
msgid "~ environment variable, to edit the file."
msgstr ""
-#: pico/browse.c:237
+#: pico/browse.c:238
msgid "End of Pilot Help."
msgstr ""
-#: pico/browse.c:330
+#: pico/browse.c:331
#, c-format
-msgid "Can't read outside of %s in restricted mode"
+msgid "\aCan't read outside of %s in restricted mode"
msgstr ""
-#: pico/browse.c:434 pico/main.c:415
+#: pico/browse.c:435 pico/main.c:416
msgid "You may possibly have new mail."
msgstr ""
-#: pico/browse.c:710
+#: pico/browse.c:711
msgid "Can't edit non-text file. Try Launch."
msgstr ""
-#: pico/browse.c:747
-msgid "Type L command to use ListMode"
+#: pico/browse.c:748
+msgid "\aType L command to use ListMode"
msgstr ""
-#: pico/browse.c:755
-msgid "Can't Set directories"
+#: pico/browse.c:756
+msgid "\aCan't Set directories"
msgstr ""
-#: pico/browse.c:776
-msgid "Already in ListMode"
+#: pico/browse.c:777
+msgid "\aAlready in ListMode"
msgstr ""
-#: pico/browse.c:801
+#: pico/browse.c:802
msgid "Add Name"
msgstr ""
-#: pico/browse.c:805
+#: pico/browse.c:806
msgid "Command to execute: "
msgstr ""
-#: pico/browse.c:809 pico/browse.c:972 pico/browse.c:1054 pico/browse.c:1179
-#: pico/browse.c:1307 pico/browse.c:1600
-msgid "No help yet!"
+#: pico/browse.c:810 pico/browse.c:973 pico/browse.c:1055 pico/browse.c:1180
+#: pico/browse.c:1308 pico/browse.c:1601
+msgid "\aNo help yet!"
msgstr ""
-#: pico/browse.c:821
+#: pico/browse.c:822
msgid "Command cancelled"
msgstr ""
-#: pico/browse.c:829
+#: pico/browse.c:830
msgid "No command specified"
msgstr ""
-#: pico/browse.c:848
-msgid "Can't delete a directory"
+#: pico/browse.c:849
+msgid "\aCan't delete a directory"
msgstr ""
-#: pico/browse.c:853
+#: pico/browse.c:854
msgid "Delete not allowed in restricted mode"
msgstr ""
-#: pico/browse.c:864
+#: pico/browse.c:865
msgid "File is write protected! OVERRIDE"
msgstr ""
#. TRANSLATORS: This is a question, Delete file <filename>
-#: pico/browse.c:869
+#: pico/browse.c:870
#, c-format
msgid "Delete file \"%.*s\""
msgstr ""
-#: pico/browse.c:872
+#: pico/browse.c:873
msgid "File CANNOT be UNdeleted! Really delete"
msgstr ""
-#: pico/browse.c:878
+#: pico/browse.c:879
msgid "Delete Cancelled"
msgstr ""
-#: pico/browse.c:879
+#: pico/browse.c:880
msgid "File Not Deleted"
msgstr ""
-#: pico/browse.c:888
+#: pico/browse.c:889
#, c-format
msgid "Delete Failed: %s"
msgstr ""
-#: pico/browse.c:938 pico/browse.c:947
+#: pico/browse.c:939 pico/browse.c:948
msgid "Help for Browsing"
msgstr ""
-#: pico/browse.c:945
+#: pico/browse.c:946
msgid "Browser Help"
msgstr ""
#. TRANSLATORS: A prompt asking for a directory to
#. move into
-#: pico/browse.c:967
+#: pico/browse.c:968
msgid "Directory to go to: "
msgstr ""
-#: pico/browse.c:980
+#: pico/browse.c:981
msgid "Goto cancelled"
msgstr ""
-#: pico/browse.c:994
+#: pico/browse.c:995
#, c-format
msgid "Invalid Directory: %s"
msgstr ""
-#: pico/browse.c:999
+#: pico/browse.c:1000
msgid "Restricted mode browsing limited to home directory"
msgstr ""
-#: pico/browse.c:1005
+#: pico/browse.c:1006
#, c-format
-msgid " Can't go outside of %s in restricted mode"
+msgid "\a Can't go outside of %s in restricted mode"
msgstr ""
-#: pico/browse.c:1023
+#: pico/browse.c:1024
#, c-format
-msgid "Not a directory: \"%s\""
+msgid "\aNot a directory: \"%s\""
msgstr ""
-#: pico/browse.c:1037
+#: pico/browse.c:1038
msgid "Add not allowed in restricted mode"
msgstr ""
-#: pico/browse.c:1051
+#: pico/browse.c:1052
msgid "Name of file to add: "
msgstr ""
-#: pico/browse.c:1062
+#: pico/browse.c:1063
msgid "Add File Cancelled"
msgstr ""
-#: pico/browse.c:1077
+#: pico/browse.c:1078
msgid "No file named. Add Cancelled."
msgstr ""
-#: pico/browse.c:1082 pico/browse.c:1208 pico/browse.c:1328
+#: pico/browse.c:1083 pico/browse.c:1209 pico/browse.c:1329
msgid "Too many ..'s in name"
msgstr ""
-#: pico/browse.c:1088
+#: pico/browse.c:1089
#, c-format
-msgid "Restricted mode allows Add in %s only"
+msgid "\aRestricted mode allows Add in %s only"
msgstr ""
-#: pico/browse.c:1094
+#: pico/browse.c:1095
#, c-format
msgid "File \"%.*s\" already exists!"
msgstr ""
-#: pico/browse.c:1111
+#: pico/browse.c:1112
#, c-format
msgid "Added File \"%s\""
msgstr ""
-#: pico/browse.c:1114 pico/browse.c:1248 pico/browse.c:1363
+#: pico/browse.c:1115 pico/browse.c:1249 pico/browse.c:1364
msgid "Problems refiguring browser"
msgstr ""
-#: pico/browse.c:1162
-msgid "Can't copy a directory"
+#: pico/browse.c:1163
+msgid "\aCan't copy a directory"
msgstr ""
-#: pico/browse.c:1167
+#: pico/browse.c:1168
msgid "Copy not allowed in restricted mode"
msgstr ""
-#: pico/browse.c:1176
+#: pico/browse.c:1177
msgid "Name of new copy: "
msgstr ""
-#: pico/browse.c:1187
+#: pico/browse.c:1188
msgid "Make Copy Cancelled"
msgstr ""
-#: pico/browse.c:1198
+#: pico/browse.c:1199
msgid "No destination, file not copied"
msgstr ""
-#: pico/browse.c:1203
-msgid "Can't copy file on to itself!"
+#: pico/browse.c:1204
+msgid "\aCan't copy file on to itself!"
msgstr ""
-#: pico/browse.c:1214
+#: pico/browse.c:1215
#, c-format
-msgid "Restricted mode allows Copy in %s only"
+msgid "\aRestricted mode allows Copy in %s only"
msgstr ""
#. TRANSLATORS: A question: File <filename> exists! Replace?
-#: pico/browse.c:1221 pico/browse.c:1342
+#: pico/browse.c:1222 pico/browse.c:1343
#, c-format
msgid "File \"%.*s\" exists! OVERWRITE"
msgstr ""
-#: pico/browse.c:1225
+#: pico/browse.c:1226
msgid "Make copy cancelled"
msgstr ""
-#: pico/browse.c:1226
+#: pico/browse.c:1227
msgid "File Not Renamed"
msgstr ""
-#: pico/browse.c:1245
+#: pico/browse.c:1246
#, c-format
msgid "File copied to %s"
msgstr ""
-#: pico/browse.c:1290
-msgid "Can't rename \"..\""
+#: pico/browse.c:1291
+msgid "\aCan't rename \"..\""
msgstr ""
-#: pico/browse.c:1295
+#: pico/browse.c:1296
msgid "Rename not allowed in restricted mode"
msgstr ""
-#: pico/browse.c:1304
+#: pico/browse.c:1305
msgid "Rename file to: "
msgstr ""
-#: pico/browse.c:1315 pico/browse.c:1347
+#: pico/browse.c:1316 pico/browse.c:1348
msgid "Rename cancelled"
msgstr ""
-#: pico/browse.c:1334
+#: pico/browse.c:1335
#, c-format
-msgid "Restricted mode allows Rename in %s only"
+msgid "\aRestricted mode allows Rename in %s only"
msgstr ""
-#: pico/browse.c:1348
+#: pico/browse.c:1349
msgid "Not Renamed"
msgstr ""
-#: pico/browse.c:1359
+#: pico/browse.c:1360
#, c-format
msgid "Rename Failed: %s"
msgstr ""
-#: pico/browse.c:1421
+#: pico/browse.c:1422
#, c-format
-msgid "Can't visit %s in restricted mode"
+msgid "\aCan't visit %s in restricted mode"
msgstr ""
-#: pico/browse.c:1448
-msgid "Can't move up a directory"
+#: pico/browse.c:1449
+msgid "\aCan't move up a directory"
msgstr ""
-#: pico/browse.c:1496
+#: pico/browse.c:1497
#, c-format
-msgid "Problem finding dir \"%s\""
+msgid "\aProblem finding dir \"%s\""
msgstr ""
-#: pico/browse.c:1537
+#: pico/browse.c:1538
msgid "No files are selected, use \"X\" to mark files for selection"
msgstr ""
-#: pico/browse.c:1598
+#: pico/browse.c:1599
msgid "File name to find"
msgstr ""
-#: pico/browse.c:1631
+#: pico/browse.c:1632
msgid "Searched to end of directory"
msgstr ""
-#: pico/browse.c:1634
+#: pico/browse.c:1635
msgid "Searched to start of directory"
msgstr ""
-#: pico/browse.c:1653
+#: pico/browse.c:1654
msgid "Whereis cancelled"
msgstr ""
-#: pico/browse.c:1684 pico/search.c:298
+#: pico/browse.c:1685 pico/search.c:299
#, c-format
msgid "\"%s\" not found"
msgstr ""
#. TRANSLATORS: Brwsr is an abbreviation for Browser, which is
#. a command used to look through something
-#: pico/browse.c:2190
+#: pico/browse.c:2191
msgid "Quit"
msgstr ""
-#: pico/browse.c:2190
+#: pico/browse.c:2191
msgid "Exit Brwsr"
msgstr ""
-#: pico/browse.c:2192
+#: pico/browse.c:2193
msgid "Goto"
msgstr ""
-#: pico/browse.c:2195
+#: pico/browse.c:2196
msgid "Launch"
msgstr ""
-#: pico/browse.c:2853
+#: pico/browse.c:2854
msgid "Can't display non-text file. Try \"Launch\"."
msgstr ""
-#: pico/browse.c:2860
+#: pico/browse.c:2861
#, c-format
msgid "Can't read file: %s"
msgstr ""
-#: pico/browse.c:2867
+#: pico/browse.c:2868
#, c-format
msgid "Can't open file: %s"
msgstr ""
#. TRANSLATORS: Some help text that goes together in a group.
-#: pico/search.c:64
+#: pico/search.c:65
msgid "Help for Search Command"
msgstr ""
-#: pico/search.c:66
+#: pico/search.c:67
msgid " Enter the words or characters you would like to search"
msgstr ""
-#: pico/search.c:67
+#: pico/search.c:68
msgid "~ for, then press ~R~e~t~u~r~n. The search then takes place."
msgstr ""
-#: pico/search.c:68
+#: pico/search.c:69
msgid " When the characters or words that you entered "
msgstr ""
-#: pico/search.c:69
+#: pico/search.c:70
msgid " are found, the buffer will be redisplayed with the cursor "
msgstr ""
-#: pico/search.c:70
+#: pico/search.c:71
msgid " at the beginning of the selected text."
msgstr ""
-#: pico/search.c:72
+#: pico/search.c:73
msgid " The most recent string for which a search was made is"
msgstr ""
-#: pico/search.c:73
+#: pico/search.c:74
msgid " displayed in the \"Search\" prompt between the square"
msgstr ""
-#: pico/search.c:74
+#: pico/search.c:75
msgid " brackets. This string is the default search prompt."
msgstr ""
-#: pico/search.c:75
+#: pico/search.c:76
msgid "~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"
msgstr ""
-#: pico/search.c:76
+#: pico/search.c:77
msgid " search to be made with the default value."
msgstr ""
-#: pico/search.c:78
+#: pico/search.c:79
msgid " The text search is not case sensitive, and will examine the"
msgstr ""
-#: pico/search.c:79
+#: pico/search.c:80
msgid " entire message."
msgstr ""
-#: pico/search.c:81
+#: pico/search.c:82
msgid " Should the search fail, a message will be displayed."
msgstr ""
-#: pico/search.c:83
+#: pico/search.c:84
msgid "End of Search Help."
msgstr ""
-#: pico/search.c:146 pico/search.c:153 pico/search.c:437 pico/search.c:444
+#: pico/search.c:147 pico/search.c:154 pico/search.c:438 pico/search.c:445
msgid "Help for Searching"
msgstr ""
-#: pico/search.c:171
+#: pico/search.c:172
msgid "Search to Line Number : "
msgstr ""
-#: pico/search.c:173
+#: pico/search.c:174
msgid "Search to Line Number Cancelled"
msgstr ""
-#: pico/search.c:177
+#: pico/search.c:178
msgid "Line number must be greater than zero"
msgstr ""
-#: pico/search.c:181
+#: pico/search.c:182
msgid "Line number must contain only digits"
msgstr ""
-#: pico/search.c:240
+#: pico/search.c:241
msgid "Search Cancelled"
msgstr ""
#. TRANSLATORS: abbreviation for Replace All occurences
-#: pico/search.c:340 pico/search.c:455
+#: pico/search.c:341 pico/search.c:456
msgid "Repl All"
msgstr ""
#. TRANSLATORS: Replace just one occurence
-#: pico/search.c:460
+#: pico/search.c:461
msgid "Repl One"
msgstr ""
-#: pico/search.c:467
+#: pico/search.c:468
msgid "Replacement Cancelled"
msgstr ""
-#: pico/search.c:580
+#: pico/search.c:583
#, c-format
msgid "No more matches for \"%s\""
msgstr ""
-#: pico/search.c:584
+#: pico/search.c:587
msgid "No more matches"
msgstr ""
-#: pico/search.c:603 pico/search.c:772
+#: pico/search.c:606 pico/search.c:775
msgid "FirstLine"
msgstr ""
-#: pico/search.c:608 pico/search.c:777
+#: pico/search.c:611 pico/search.c:780
msgid "LastLine"
msgstr ""
-#: pico/search.c:613
+#: pico/search.c:616
msgid "No Replace"
msgstr ""
-#: pico/search.c:619 pico/search.c:783
+#: pico/search.c:622 pico/search.c:786
msgid "LineNumber"
msgstr ""
#. TRANSLATORS: Start of paragraph
-#: pico/search.c:625 pico/search.c:788
+#: pico/search.c:628 pico/search.c:791
msgid "Start of Para"
msgstr ""
-#: pico/search.c:630 pico/search.c:793
+#: pico/search.c:633 pico/search.c:796
msgid "End of Para"
msgstr ""
#. TRANSLATORS: Instead of justifying (formatting) just a
#. single paragraph, Full Justify justifies the entire
#. message.
-#: pico/search.c:638 pico/search.c:798
+#: pico/search.c:641 pico/search.c:801
msgid "FullJustify"
msgstr ""
-#: pico/search.c:726
+#: pico/search.c:729
msgid "No Line Number"
msgstr ""
@@ -10491,15 +10576,15 @@ msgstr ""
msgid "Discard changes"
msgstr ""
-#: pico/word.c:576 pico/word.c:608
+#: pico/word.c:660 pico/word.c:692
msgid "Region"
msgstr ""
-#: pico/word.c:580 pico/word.c:615
+#: pico/word.c:664 pico/word.c:699
msgid "Paragraph"
msgstr ""
-#: pico/word.c:582 pico/word.c:624
+#: pico/word.c:666 pico/word.c:708
msgid "Quotelevel"
msgstr ""
@@ -10507,273 +10592,273 @@ msgstr ""
#. Leave the ~ characters where they are, they cause the following
#. character to be printed in boldface as long as the first character
#. of the line is also a ~.
-#: pico/bind.c:43
+#: pico/bind.c:44
msgid " Pico Help Text"
msgstr ""
-#: pico/bind.c:45
+#: pico/bind.c:46
msgid " Pico is designed to be a simple, easy-to-use text editor with a"
msgstr ""
-#: pico/bind.c:46
+#: pico/bind.c:47
msgid ""
" layout very similar to the Alpine mailer. The status line at the"
msgstr ""
-#: pico/bind.c:47
+#: pico/bind.c:48
msgid " top of the display shows pico's version, the current file being"
msgstr ""
-#: pico/bind.c:48
+#: pico/bind.c:49
msgid " edited and whether or not there are outstanding modifications"
msgstr ""
-#: pico/bind.c:49
+#: pico/bind.c:50
msgid ""
" that have not been saved. The third line from the bottom is used"
msgstr ""
-#: pico/bind.c:50
+#: pico/bind.c:51
msgid ""
" to report informational messages and for additional command input."
msgstr ""
-#: pico/bind.c:51
+#: pico/bind.c:52
msgid " The bottom two lines list the available editing commands."
msgstr ""
-#: pico/bind.c:53
+#: pico/bind.c:54
msgid " Each character typed is automatically inserted into the buffer"
msgstr ""
-#: pico/bind.c:54
+#: pico/bind.c:55
msgid " at the current cursor position. Editing commands and cursor"
msgstr ""
-#: pico/bind.c:55
+#: pico/bind.c:56
msgid " movement (besides arrow keys) are given to pico by typing"
msgstr ""
-#: pico/bind.c:56
+#: pico/bind.c:57
msgid " special control-key sequences. A caret, '^', is used to denote"
msgstr ""
-#: pico/bind.c:57
+#: pico/bind.c:58
msgid ""
"~ the control key, sometimes marked \"CTRL\", so the ~C~T~R~L~-~q key"
msgstr ""
-#: pico/bind.c:58
+#: pico/bind.c:59
msgid "~ combination is written as ~^~Q."
msgstr ""
-#: pico/bind.c:60
+#: pico/bind.c:61
msgid ""
" The following functions are available in pico (where applicable,"
msgstr ""
-#: pico/bind.c:61
+#: pico/bind.c:62
msgid " corresponding function key commands are in parentheses)."
msgstr ""
-#: pico/bind.c:63
+#: pico/bind.c:64
msgid "~ ~^~G (~F~1) Display this help text."
msgstr ""
-#: pico/bind.c:65
+#: pico/bind.c:66
msgid "~ ~^~F move Forward a character."
msgstr ""
-#: pico/bind.c:66
+#: pico/bind.c:67
msgid "~ ~^~B move Backward a character."
msgstr ""
-#: pico/bind.c:67
+#: pico/bind.c:68
msgid "~ ~^~P move to the Previous line."
msgstr ""
-#: pico/bind.c:68
+#: pico/bind.c:69
msgid "~ ~^~N move to the Next line."
msgstr ""
-#: pico/bind.c:69
+#: pico/bind.c:70
msgid "~ ~^~A move to the beginning of the current line."
msgstr ""
-#: pico/bind.c:70
+#: pico/bind.c:71
msgid "~ ~^~E move to the End of the current line."
msgstr ""
-#: pico/bind.c:71
+#: pico/bind.c:72
msgid "~ ~^~V (~F~8) move forward a page of text."
msgstr ""
-#: pico/bind.c:72
+#: pico/bind.c:73
msgid "~ ~^~Y (~F~7) move backward a page of text."
msgstr ""
-#: pico/bind.c:74
+#: pico/bind.c:75
msgid "~ ~^~W (~F~6) Search for (where is) text, neglecting case."
msgstr ""
-#: pico/bind.c:75
+#: pico/bind.c:76
msgid "~ ~^~L Refresh the display."
msgstr ""
-#: pico/bind.c:77
+#: pico/bind.c:78
msgid "~ ~^~D Delete the character at the cursor position."
msgstr ""
-#: pico/bind.c:78
+#: pico/bind.c:79
msgid ""
"~ ~^~^ Mark cursor position as beginning of selected text."
msgstr ""
-#: pico/bind.c:79
+#: pico/bind.c:80
msgid " Note: Setting mark when already set unselects text."
msgstr ""
-#: pico/bind.c:80
+#: pico/bind.c:81
msgid ""
"~ ~^~K (~F~9) Cut selected text (displayed in inverse characters)."
msgstr ""
-#: pico/bind.c:81
+#: pico/bind.c:82
msgid " Note: The selected text's boundary on the cursor side"
msgstr ""
-#: pico/bind.c:82
+#: pico/bind.c:83
msgid " ends at the left edge of the cursor. So, with "
msgstr ""
-#: pico/bind.c:83
+#: pico/bind.c:84
msgid " selected text to the left of the cursor, the "
msgstr ""
-#: pico/bind.c:84
+#: pico/bind.c:85
msgid " character under the cursor is not selected."
msgstr ""
-#: pico/bind.c:85
+#: pico/bind.c:86
msgid "~ ~^~U (~F~1~0) Uncut (paste) last cut text inserting it at the"
msgstr ""
-#: pico/bind.c:86
+#: pico/bind.c:87
msgid " current cursor position."
msgstr ""
-#: pico/bind.c:87
+#: pico/bind.c:88
msgid "~ ~^~I Insert a tab at the current cursor position."
msgstr ""
-#: pico/bind.c:89
+#: pico/bind.c:90
msgid "~ ~^~J (~F~4) Format (justify) the current paragraph."
msgstr ""
-#: pico/bind.c:90
+#: pico/bind.c:91
msgid ""
" Note: paragraphs delimited by blank lines or indentation."
msgstr ""
-#: pico/bind.c:91
+#: pico/bind.c:92
msgid "~ ~^~T (~F~1~2) To invoke the spelling checker"
msgstr ""
-#: pico/bind.c:92
+#: pico/bind.c:93
msgid "~ ~^~C (~F~1~1) Report current cursor position"
msgstr ""
-#: pico/bind.c:94
+#: pico/bind.c:95
msgid ""
"~ ~^~R (~F~5) Insert an external file at the current cursor "
"position."
msgstr ""
-#: pico/bind.c:95
+#: pico/bind.c:96
msgid "~ ~^~O (~F~3) Output the current buffer to a file, saving it."
msgstr ""
-#: pico/bind.c:96
+#: pico/bind.c:97
msgid "~ ~^~X (~F~2) Exit pico, saving buffer."
msgstr ""
-#: pico/bind.c:98
+#: pico/bind.c:99
msgid " End of Help."
msgstr ""
-#: pico/bind.c:140
+#: pico/bind.c:141
msgid "Help for the Alpine Composer"
msgstr ""
-#: pico/bind.c:141
+#: pico/bind.c:142
msgid "Help for Signature Editor"
msgstr ""
#. TRANSLATORS: Pico is the name of a program
-#: pico/bind.c:164
+#: pico/bind.c:165
msgid "Help for Pico"
msgstr ""
-#: pico/file.c:50
+#: pico/file.c:51
msgid "Read file: "
msgstr ""
-#: pico/file.c:54
+#: pico/file.c:55
msgid "File reading disabled in secure mode"
msgstr ""
-#: pico/file.c:59
+#: pico/file.c:60
msgid "No file name entered"
msgstr ""
-#: pico/file.c:65 pico/main.c:326
+#: pico/file.c:66 pico/main.c:327
#, c-format
msgid "Can't read file from outside of %s"
msgstr ""
#. TRANSLATORS: several lines of help text
-#: pico/file.c:76
+#: pico/file.c:77
msgid "Insert File Help Text"
msgstr ""
-#: pico/file.c:78
+#: pico/file.c:79
msgid " Type in a file name to have it inserted into your editing"
msgstr ""
-#: pico/file.c:79
+#: pico/file.c:80
msgid " buffer between the line that the cursor is currently on"
msgstr ""
-#: pico/file.c:80
+#: pico/file.c:81
msgid " and the line directly below it. You may abort this by "
msgstr ""
-#: pico/file.c:81
+#: pico/file.c:82
msgid "~ typing the ~F~2 (~^~C) key after exiting help."
msgstr ""
-#: pico/file.c:83
+#: pico/file.c:84
msgid "End of Insert File Help"
msgstr ""
#. TRANSLATORS: several lines of help text
-#: pico/file.c:90
+#: pico/file.c:91
msgid "Write File Help Text"
msgstr ""
-#: pico/file.c:92
+#: pico/file.c:93
msgid " Type in a file name to have it written out, thus saving"
msgstr ""
-#: pico/file.c:93
+#: pico/file.c:94
msgid " your buffer, to a file. You can abort this by typing "
msgstr ""
-#: pico/file.c:94
+#: pico/file.c:95
msgid "~ the ~F~2 (~^~C) key after exiting help."
msgstr ""
-#: pico/file.c:96
+#: pico/file.c:97
msgid "End of Write File Help"
msgstr ""
@@ -10781,385 +10866,385 @@ msgstr ""
#. that inserts a file into a message being composed.
#. InsertMsg means Insert Message and it inserts a different
#. message into the message being composed.
-#: pico/file.c:141
+#: pico/file.c:142
msgid "InsertFile"
msgstr ""
-#: pico/file.c:141
+#: pico/file.c:142
msgid "InsertMsg"
msgstr ""
-#: pico/file.c:178
+#: pico/file.c:179
#, c-format
msgid "Message %s included"
msgstr ""
-#: pico/file.c:184
+#: pico/file.c:185
msgid "Can't insert file in restricted mode"
msgstr ""
-#: pico/file.c:191
+#: pico/file.c:192
#, c-format
msgid "Can't insert file from outside of %s: too many ..'s"
msgstr ""
-#: pico/file.c:198
+#: pico/file.c:199
#, c-format
msgid "Can't insert file from outside of %s"
msgstr ""
-#: pico/file.c:225
+#: pico/file.c:226
msgid "Can't select messages yet!"
msgstr ""
-#: pico/file.c:261
+#: pico/file.c:262
msgid "Can't insert in restricted mode"
msgstr ""
-#: pico/file.c:306
-msgid "Restricted mode disallows uploaded command"
+#: pico/file.c:307
+msgid "\aRestricted mode disallows uploaded command"
msgstr ""
-#: pico/file.c:339 pico/file.c:346
+#: pico/file.c:340 pico/file.c:347
msgid "Help for Insert File"
msgstr ""
-#: pico/file.c:494
+#: pico/file.c:495
msgid "New file"
msgstr ""
-#: pico/file.c:501
+#: pico/file.c:502
msgid "Reading file"
msgstr ""
-#: pico/file.c:511
+#: pico/file.c:512
#, c-format
msgid "Read %ld lines"
msgstr ""
-#: pico/file.c:513
+#: pico/file.c:514
#, c-format
msgid "Read 1 line"
msgstr ""
#. TRANSLATORS: Asking for name of file to write data into
-#: pico/file.c:584
+#: pico/file.c:585
msgid "File Name to write : "
msgstr ""
-#: pico/file.c:596
+#: pico/file.c:597
#, c-format
msgid "Can't write outside of %s: too many ..'s"
msgstr ""
-#: pico/file.c:604
+#: pico/file.c:605
#, c-format
msgid "Can't write outside of %s"
msgstr ""
-#: pico/file.c:748
+#: pico/file.c:749
#, c-format
msgid "File \"%s\" exists, OVERWRITE"
msgstr ""
-#: pico/file.c:780 pico/file.c:827
+#: pico/file.c:781 pico/file.c:828
#, c-format
msgid "Wrote %s lines"
msgstr ""
-#: pico/file.c:783 pico/file.c:830
+#: pico/file.c:784 pico/file.c:831
msgid "Wrote 1 line"
msgstr ""
-#: pico/file.c:810
+#: pico/file.c:811
msgid "No file name"
msgstr ""
-#: pico/file.c:955
+#: pico/file.c:956
#, c-format
msgid "Inserting %s."
msgstr ""
-#: pico/file.c:968
+#: pico/file.c:969
#, c-format
msgid "Inserted %ld lines"
msgstr ""
-#: pico/file.c:970
+#: pico/file.c:971
#, c-format
msgid "Inserted 1 line"
msgstr ""
#. TRANSLATORS: error message about command line
-#: pico/main.c:86 pico/pilot.c:52
+#: pico/main.c:87 pico/pilot.c:53
#, c-format
msgid "missing or empty argument to \"%c\" flag"
msgstr ""
-#: pico/main.c:87 pico/pilot.c:53
+#: pico/main.c:88 pico/pilot.c:54
#, c-format
msgid "non numeric argument for \"%c\" flag"
msgstr ""
-#: pico/main.c:88 pico/pilot.c:54
+#: pico/main.c:89 pico/pilot.c:55
#, c-format
msgid "missing color for \"%s\" flag"
msgstr ""
-#: pico/main.c:89 pico/pilot.c:55
+#: pico/main.c:90 pico/pilot.c:56
#, c-format
msgid "missing character set for \"%s\" flag"
msgstr ""
-#: pico/main.c:90 pico/pilot.c:56
+#: pico/main.c:91 pico/pilot.c:57
#, c-format
msgid "input character set \"%s\" is unsupported"
msgstr ""
-#: pico/main.c:91 pico/pilot.c:57
+#: pico/main.c:92 pico/pilot.c:58
#, c-format
msgid "output character set \"%s\" is unsupported"
msgstr ""
#. TRANSLATORS: little help printed out when incorrect arguments
#. are given to pico program.
-#: pico/main.c:96
+#: pico/main.c:97
msgid "Possible Starting Arguments for Pico editor:"
msgstr ""
-#: pico/main.c:98 pico/pilot.c:64
+#: pico/main.c:99 pico/pilot.c:65
msgid "\tArgument\t\tMeaning"
msgstr ""
-#: pico/main.c:99
+#: pico/main.c:100
msgid "\t -e \t\tComplete - allow file name completion"
msgstr ""
-#: pico/main.c:100
+#: pico/main.c:101
msgid "\t -k \t\tCut - let ^K cut from cursor position to end of line"
msgstr ""
-#: pico/main.c:101 pico/pilot.c:65
+#: pico/main.c:102 pico/pilot.c:66
msgid "\t -a \t\tShowDot - show dot files in file browser"
msgstr ""
-#: pico/main.c:102 pico/pilot.c:66
+#: pico/main.c:103 pico/pilot.c:67
msgid "\t -j \t\tGoto - allow 'Goto' command in file browser"
msgstr ""
-#: pico/main.c:103 pico/pilot.c:67
+#: pico/main.c:104 pico/pilot.c:68
msgid "\t -g \t\tShow - show cursor in file browser"
msgstr ""
-#: pico/main.c:104 pico/pilot.c:68
+#: pico/main.c:105 pico/pilot.c:69
msgid "\t -m \t\tMouse - turn on mouse support"
msgstr ""
-#: pico/main.c:105 pico/pilot.c:70
+#: pico/main.c:106 pico/pilot.c:71
msgid "\t -x \t\tNoKeyhelp - suppress keyhelp"
msgstr ""
-#: pico/main.c:106
+#: pico/main.c:107
msgid ""
"\t -p \t\tPreserveStartStop - preserve \"start\"(^Q) and \"stop\"(^S) "
"characters"
msgstr ""
-#: pico/main.c:107 pico/pilot.c:71
+#: pico/main.c:108 pico/pilot.c:72
msgid ""
"\t -q \t\tTermdefWins - termcap or terminfo takes precedence over defaults"
msgstr ""
-#: pico/main.c:108
+#: pico/main.c:109
msgid ""
"\t -Q <quotestr> \tSet quote string (eg. \"> \") esp. for composing email"
msgstr ""
-#: pico/main.c:109
+#: pico/main.c:110
msgid "\t -d \t\tRebind - let delete key delete current character"
msgstr ""
-#: pico/main.c:110 pico/pilot.c:72
+#: pico/main.c:111 pico/pilot.c:73
msgid "\t -f \t\tKeys - force use of function keys"
msgstr ""
-#: pico/main.c:111
+#: pico/main.c:112
msgid "\t -b \t\tReplace - allow search and replace"
msgstr ""
-#: pico/main.c:112 pico/pilot.c:73
+#: pico/main.c:113 pico/pilot.c:74
msgid "\t -h \t\tHelp - give this list of options"
msgstr ""
-#: pico/main.c:113
+#: pico/main.c:114
msgid "\t -r[#cols] \tFill - set fill column to #cols columns, default=72"
msgstr ""
-#: pico/main.c:114 pico/pilot.c:79
+#: pico/main.c:115 pico/pilot.c:80
msgid "\t -n[#s] \tMail - notify about new mail every #s seconds, default=180"
msgstr ""
-#: pico/main.c:115
+#: pico/main.c:116
msgid "\t -s <speller> \tSpeller - specify alternative speller"
msgstr ""
-#: pico/main.c:116 pico/pilot.c:80
+#: pico/main.c:117 pico/pilot.c:81
msgid "\t -t \t\tShutdown - enable special shutdown mode"
msgstr ""
-#: pico/main.c:117 pico/pilot.c:81
+#: pico/main.c:118 pico/pilot.c:82
msgid "\t -o <dir>\tOperation - specify the operating directory"
msgstr ""
-#: pico/main.c:118 pico/pilot.c:82
+#: pico/main.c:119 pico/pilot.c:83
msgid "\t -z \t\tSuspend - allow use of ^Z suspension"
msgstr ""
-#: pico/main.c:119
+#: pico/main.c:120
msgid "\t -w \t\tNoWrap - turn off word wrap"
msgstr ""
-#: pico/main.c:120
+#: pico/main.c:121
msgid "\t -W <wordseps> \tSet word separators other than whitespace"
msgstr ""
-#: pico/main.c:122 pico/pilot.c:75
+#: pico/main.c:123 pico/pilot.c:76
msgid ""
"\t -dcs <display_character_set> \tdefault uses LANG or LC_CTYPE from "
"environment"
msgstr ""
-#: pico/main.c:123 pico/pilot.c:76
+#: pico/main.c:124 pico/pilot.c:77
msgid "\t -kcs <keyboard_character_set> \tdefaults to display_character_set"
msgstr ""
-#: pico/main.c:124 pico/pilot.c:77
+#: pico/main.c:125 pico/pilot.c:78
msgid "\t -syscs\t\tuse system-supplied translation routines"
msgstr ""
-#: pico/main.c:127 pico/pilot.c:84
+#: pico/main.c:128 pico/pilot.c:85
msgid "\t -cnf color \tforeground color"
msgstr ""
-#: pico/main.c:128 pico/pilot.c:85
+#: pico/main.c:129 pico/pilot.c:86
msgid "\t -cnb color \tbackground color"
msgstr ""
-#: pico/main.c:129 pico/pilot.c:86
+#: pico/main.c:130 pico/pilot.c:87
msgid "\t -crf color \treverse foreground color"
msgstr ""
-#: pico/main.c:130 pico/pilot.c:87
+#: pico/main.c:131 pico/pilot.c:88
msgid "\t -crb color \treverse background color"
msgstr ""
-#: pico/main.c:132
+#: pico/main.c:133
msgid "\t +[line#] \tLine - start on line# line, default=1"
msgstr ""
-#: pico/main.c:133
+#: pico/main.c:134
msgid "\t -v \t\tView - view file"
msgstr ""
-#: pico/main.c:134 pico/pilot.c:89
+#: pico/main.c:135 pico/pilot.c:90
msgid "\t -no_setlocale_collate\tdo not do setlocale(LC_COLLATE)"
msgstr ""
-#: pico/main.c:135
+#: pico/main.c:136
msgid "\t -version\tPico version number"
msgstr ""
-#: pico/main.c:137
+#: pico/main.c:138
msgid "\t All arguments may be followed by a file name to display."
msgstr ""
-#: pico/main.c:357 pico/pilot.c:215
+#: pico/main.c:358 pico/pilot.c:216
#, c-format
msgid "Checking for new mail every %s seconds"
msgstr ""
-#: pico/main.c:843 pico/pilot.c:462
+#: pico/main.c:844 pico/pilot.c:463
#, c-format
msgid "Argument Error: %.200s"
msgstr ""
#. TRANSLATORS: little help printed out when incorrect arguments are
#. given for pilot program.
-#: pico/pilot.c:62
+#: pico/pilot.c:63
msgid "Possible Starting Arguments for Pilot file browser:"
msgstr ""
-#: pico/pilot.c:69
+#: pico/pilot.c:70
msgid "\t -v \t\tOneColumn - use single column display"
msgstr ""
-#: pico/pilot.c:91
+#: pico/pilot.c:92
msgid "\t All arguments may be followed by a directory name to start in."
msgstr ""
#. TRANSLATORS: Rich Headers is a command to display more headers. It
#. is triggered with the ^R key. PrvPg stands for Previous Page.
-#: pico/composer.c:129 pico/composer.c:4385
+#: pico/composer.c:135 pico/composer.c:4410
msgid "Rich Hdr"
msgstr ""
-#: pico/composer.c:129
+#: pico/composer.c:135
msgid "PrvPg/Top"
msgstr ""
#. TRANSLATORS: Cut Line means remove a line. Postpone means to save
#. a message being composed so that it can be worked on later.
-#: pico/composer.c:132
+#: pico/composer.c:138
msgid "Cut Line"
msgstr ""
#. TRANSLATORS: Next Page
-#: pico/composer.c:136
+#: pico/composer.c:142
msgid "Attach"
msgstr ""
-#: pico/composer.c:136
+#: pico/composer.c:142
msgid "NxtPg/End"
msgstr ""
#. TRANSLATORS: Undelete a line that was just deleted
-#: pico/composer.c:138
+#: pico/composer.c:144
msgid "UnDel Line"
msgstr ""
-#: pico/composer.c:743
+#: pico/composer.c:754
msgid "Problem with attachments. Postpone anyway?"
msgstr ""
-#: pico/composer.c:1706
+#: pico/composer.c:1726
#, c-format
msgid "Can't move beyond top of %s"
msgstr ""
-#: pico/composer.c:1927
+#: pico/composer.c:1952
msgid "Please make the screen larger."
msgstr ""
-#: pico/composer.c:2001 pico/composer.c:2223 pico/composer.c:2237
-msgid "Can't edit attachment number!"
+#: pico/composer.c:2026 pico/composer.c:2248 pico/composer.c:2262
+msgid "\aCan't edit attachment number!"
msgstr ""
#. TRANSLATORS: Killing text is deleting it and
#. Unkilling text is undeleting killed text.
-#: pico/composer.c:2174
+#: pico/composer.c:2199
msgid "Problem Unkilling text"
msgstr ""
-#: pico/composer.c:4392
+#: pico/composer.c:4417
msgid "Edit File"
msgstr ""
-#: pith/charconv/utf8.c:1934
+#: pith/charconv/utf8.c:1935
#, c-format
msgid "Display character set \"%s\" is ignored when using system translation"
msgstr ""
-#: pith/charconv/utf8.c:1946
+#: pith/charconv/utf8.c:1947
#, c-format
msgid "Keyboard character set \"%s\" is ignored when using system translation"
msgstr ""
@@ -11168,772 +11253,772 @@ msgstr ""
#. set the user is trying to use (which is unsupported by alpine).
#. The second argument is " (except for posting)" if they are
#. trying to use ISO-2022-JP for something other than posting.
-#: pith/charconv/utf8.c:1994 pith/charconv/utf8.c:2032
+#: pith/charconv/utf8.c:1995 pith/charconv/utf8.c:2033
#, c-format
msgid "Character set \"%s\" is unsupported%s, using US-ASCII"
msgstr ""
-#: pith/charconv/utf8.c:1996 pith/charconv/utf8.c:2034
+#: pith/charconv/utf8.c:1997 pith/charconv/utf8.c:2035
msgid " (except for posting)"
msgstr ""
-#: pith/charconv/utf8.c:2048
+#: pith/charconv/utf8.c:2049
msgid "Help, can't figure out display character set or even use US-ASCII."
msgstr ""
#. TRANSLATORS: User is viewing a message and all the quoted text is
#. being shown.
-#: pith/mailview.c:169
+#: pith/mailview.c:170
msgid "All quoted text being included"
msgstr ""
-#: pith/mailview.c:206
+#: pith/mailview.c:207
#, c-format
msgid "Error writing message: %s"
msgstr ""
#. TRANSLATORS: There was an error putting together a message for
#. viewing. The arg is the description of the error.
-#: pith/mailview.c:314 pith/mailview.c:2151
+#: pith/mailview.c:315 pith/mailview.c:2153
#, c-format
msgid "Formatting error: %s"
msgstr ""
-#: pith/mailview.c:327 pith/reply.c:2570
+#: pith/mailview.c:328 pith/reply.c:2588
msgid " [ERROR fetching text of message]"
msgstr ""
#. TRANSLATORS: A label
-#: pith/mailview.c:583 pith/mailview.c:596
+#: pith/mailview.c:585 pith/mailview.c:598
msgid "Parts/Attachments:"
msgstr ""
-#: pith/init.c:138
+#: pith/init.c:139
#, c-format
msgid "Folders directory name is longer than %d\n"
msgstr ""
-#: pith/init.c:139
+#: pith/init.c:140
#, c-format
msgid "Directory name: \"%s/%s\"\n"
msgstr ""
-#: pith/init.c:264
+#: pith/init.c:265
#, c-format
msgid "Incomplete maildomain \"%s\"."
msgstr ""
-#: pith/init.c:268
+#: pith/init.c:269
msgid "Return address in mail you send may be incorrect."
msgstr ""
-#: pith/init.c:288
+#: pith/init.c:289
#, c-format
msgid "No host name or domain name set\n"
msgstr ""
#. TRANSLATORS: arg is a filename
-#: pith/init.c:526
+#: pith/init.c:527
#, c-format
msgid "Renaming \"%s\" at start of month"
msgstr ""
#. TRANSLATORS: 1st arg is filename, 2nd is error message
-#: pith/init.c:532
+#: pith/init.c:533
#, c-format
msgid "Error renaming \"%s\": %s"
msgstr ""
#. TRANSLATORS: This is a heading describing some addresses the
#. user will have the chance to choose from.
-#: pith/takeaddr.c:562
+#: pith/takeaddr.c:563
msgid " These entries are taken from the attachments "
msgstr ""
-#: pith/takeaddr.c:573 pith/takeaddr.c:625
+#: pith/takeaddr.c:574 pith/takeaddr.c:626
msgid "Can't take address into address book. Error accessing folder"
msgstr ""
#. TRANSLATORS: msg is message
-#: pith/takeaddr.c:598
+#: pith/takeaddr.c:599
msgid " These entries are taken from the msg headers "
msgstr ""
-#: pith/takeaddr.c:682
+#: pith/takeaddr.c:683
msgid " Below this line are some possibilities taken from the text of the msg "
msgstr ""
#. TRANSLATORS: -bail is a literal option name, don't change it.
-#: pith/conf.c:1724
+#: pith/conf.c:1774
msgid "Exiting because -bail option is set and config file doesn't exist."
msgstr ""
-#: pith/conf.c:2484
+#: pith/conf.c:2545
msgid "Only using first character of threading-indicator-character option"
msgstr ""
-#: pith/conf.c:2491
+#: pith/conf.c:2552
msgid "Only using first character of threading-expanded-character option"
msgstr ""
-#: pith/conf.c:2501
+#: pith/conf.c:2562
msgid "Only using first character of threading-lastreply-character option"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2628
+#: pith/conf.c:2689
msgid "Advanced User Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2631
+#: pith/conf.c:2692
msgid "Folder Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2634
+#: pith/conf.c:2695
msgid "Address Book Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2637
+#: pith/conf.c:2698
msgid "Composer Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2640
+#: pith/conf.c:2701
msgid "News Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2643
+#: pith/conf.c:2704
msgid "Viewer Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2646
+#: pith/conf.c:2707
msgid "Advanced Command Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2649
+#: pith/conf.c:2710
msgid "Printer Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2652
+#: pith/conf.c:2713
msgid "Reply Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2655
+#: pith/conf.c:2716
msgid "Sending Preferences"
msgstr ""
#. TRANSLATORS: section heading in configuration screen
-#: pith/conf.c:2658
+#: pith/conf.c:2719
msgid "Message Index Preferences"
msgstr ""
-#: pith/conf.c:4956
+#: pith/conf.c:5028
msgid "Unable to read or write remote configuration"
msgstr ""
-#: pith/conf.c:5478
+#: pith/conf.c:5554
msgid "Can't access remote config, changes NOT saved!"
msgstr ""
-#: pith/conf.c:5504
+#: pith/conf.c:5580
#, c-format
msgid "No write permission for remote config %.200s, changes NOT saved!"
msgstr ""
-#: pith/conf.c:5510
+#: pith/conf.c:5586
msgid "Remote config changed, aborting our change to avoid damage..."
msgstr ""
-#: pith/conf.c:5562
+#: pith/conf.c:5638
#, c-format
msgid "Can't modify configuration file \"%.200s\": ReadOnly"
msgstr ""
#. TRANSLATORS: first argument is a filename, second
#. arg is the text of the error message
-#: pith/conf.c:5592
+#: pith/conf.c:5668
#, c-format
msgid "Error creating \"%.200s\" : %.200s"
msgstr ""
-#: pith/conf.c:5809
+#: pith/conf.c:5923
msgid "Copying to remote config"
msgstr ""
-#: pith/conf.c:5817 pith/adrbklib.c:3396
+#: pith/conf.c:5931 pith/adrbklib.c:3413
#, c-format
msgid "Error copying to %.200s: %.200s"
msgstr ""
-#: pith/conf.c:5821
+#: pith/conf.c:5935
msgid "Copy of config to remote folder failed, changes NOT saved remotely"
msgstr ""
-#: pith/conf.c:5856
+#: pith/conf.c:5970
#, c-format
msgid "Error saving configuration in \"%.200s\": %.200s"
msgstr ""
#. TRANSLATORS: The %s is either "Postload " or nothing. A Postload config file
#. is a type of config file.
-#: pith/conf.c:5970
+#: pith/conf.c:6084
#, c-format
msgid "Must quit Alpine to change %sconfig file."
msgstr ""
-#: pith/conf.c:6720
+#: pith/conf.c:6843
#, c-format
msgid "Posting-Character set \"%s\" is unsupported, using UTF-8"
msgstr ""
-#: pith/conf.c:6735
+#: pith/conf.c:6858
msgid "(fixed)"
msgstr ""
-#: pith/conf.c:6736
+#: pith/conf.c:6859
msgid "(default)"
msgstr ""
-#: pith/conf.c:6737
+#: pith/conf.c:6860
msgid "(overridden)"
msgstr ""
-#: pith/conf.c:6950
+#: pith/conf.c:7073
msgid "This option has no effect without Enable-Incoming-Folders"
msgstr ""
-#: pith/conf.c:7129
+#: pith/conf.c:7252
#, c-format
msgid "Posting-Character-Set \"%s\" is unsupported, using UTF-8"
msgstr ""
-#: pith/conf.c:7142
+#: pith/conf.c:7265
msgid "Posting-Character-Set is ignored with Use-System-Translation turned on"
msgstr ""
-#: pith/conf.c:7300
+#: pith/conf.c:7423
#, c-format
msgid "No local file specified"
msgstr ""
-#: pith/conf.c:7305
+#: pith/conf.c:7428
#, c-format
msgid "No remote folder specified"
msgstr ""
-#: pith/conf.c:7310
+#: pith/conf.c:7433
#, c-format
msgid "Remote folder name \"%s\" %s"
msgstr ""
-#: pith/conf.c:7311
+#: pith/conf.c:7434
msgid "must begin with \"{\""
msgstr ""
-#: pith/conf.c:7311
+#: pith/conf.c:7434
msgid "not valid"
msgstr ""
-#: pith/conf.c:7316
+#: pith/conf.c:7439
#, c-format
msgid "First argument \"%s\" must be a local filename"
msgstr ""
-#: pith/conf.c:7322
+#: pith/conf.c:7445
#, c-format
msgid "Local file \"%s\" does not exist"
msgstr ""
-#: pith/conf.c:7327
+#: pith/conf.c:7450
#, c-format
msgid "Can't read local file \"%s\": %s"
msgstr ""
-#: pith/conf.c:7337 pith/remote.c:97 pith/reply.c:3389
+#: pith/conf.c:7460 pith/remote.c:98 pith/reply.c:3407
msgid "Error: "
msgstr ""
-#: pith/conf.c:7337
+#: pith/conf.c:7460
msgid "Can't copy to remote folder."
msgstr ""
-#: pith/conf.c:7340
+#: pith/conf.c:7463
#, c-format
msgid "Can't create \"%s\""
msgstr ""
-#: pith/conf.c:7355
+#: pith/conf.c:7478
#, c-format
msgid "Can't open remote folder \"%s\""
msgstr ""
-#: pith/conf.c:7361
+#: pith/conf.c:7484
#, c-format
msgid "Remote folder \"%s\" is readonly"
msgstr ""
-#: pith/conf.c:7374
+#: pith/conf.c:7497
#, c-format
msgid "Failed initializing remote folder \"%s\", check debug file"
msgstr ""
-#: pith/conf.c:7395
+#: pith/conf.c:7518
#, c-format
msgid "Error copying to remote folder \"%s\""
msgstr ""
-#: pith/conf.c:7894
+#: pith/conf.c:8037
msgid "Supported features in this Alpine"
msgstr ""
#. TRANSLATORS: headings
-#: pith/conf.c:7932
+#: pith/conf.c:8075
msgid "Encryption:"
msgstr ""
-#: pith/conf.c:7935
+#: pith/conf.c:8078
msgid " TLS and SSL"
msgstr ""
-#: pith/conf.c:7937
+#: pith/conf.c:8080
msgid " None (no TLS or SSL)"
msgstr ""
-#: pith/conf.c:7947
+#: pith/conf.c:8090
msgid "Authenticators:"
msgstr ""
-#: pith/conf.c:7961
+#: pith/conf.c:8104
msgid "Mailbox drivers:"
msgstr ""
-#: pith/conf.c:7976
+#: pith/conf.c:8119
msgid "Directories:"
msgstr ""
-#: pith/conf.c:7992
+#: pith/conf.c:8135
msgid ""
"Authenticators may be disabled because of the \"disable-these-authenticators"
"\" hidden config option. Mailbox drivers may be disabled because of the "
"\"disable-these-drivers\" hidden config option."
msgstr ""
-#: pith/conf.c:7996
+#: pith/conf.c:8139
msgid ""
"Authenticators may be disabled because of the \"disable-these-authenticators"
"\""
msgstr ""
-#: pith/conf.c:7998
+#: pith/conf.c:8141
msgid "hidden config option. Mailbox drivers may be disabled because of the"
msgstr ""
-#: pith/conf.c:8000
+#: pith/conf.c:8143
msgid "\"disable-these-drivers\" hidden config option."
msgstr ""
-#: pith/detach.c:165
+#: pith/detach.c:166
msgid "Can't find body for requested message"
msgstr ""
-#: pith/detach.c:276
+#: pith/detach.c:277
msgid "Formatting error: no space to make copy, no display filters used"
msgstr ""
-#: pith/detach.c:633 pith/detach.c:785
+#: pith/detach.c:634 pith/detach.c:786
msgid "Message size does not match expected size, continuing..."
msgstr ""
#. TRANSLATORS: data transfer was interrupted by something
-#: pith/detach.c:699
+#: pith/detach.c:700
msgid "Transfer interrupted!"
msgstr ""
-#: pith/detach.c:789
+#: pith/detach.c:790
msgid "Server returns zero bytes, Quell-Partial-Fetch feature may help"
msgstr ""
#. TRANSLATORS: a label
-#: pith/folder.c:557
+#: pith/folder.c:568
msgid "Incoming Message Folders"
msgstr ""
-#: pith/folder.c:584
+#: pith/folder.c:595
msgid "No folder collections defined"
msgstr ""
-#: pith/folder.c:2319 pith/mailcmd.c:1937
+#: pith/folder.c:2340 pith/mailcmd.c:1958
msgid "new"
msgstr ""
-#: pith/folder.c:2323 pith/mailcmd.c:1934
+#: pith/folder.c:2344 pith/mailcmd.c:1955
msgid "unseen"
msgstr ""
#. TRANSLATORS: This is the description of an attachment that isn't being
#. shown but that can be viewed or saved.
-#: pith/mimedesc.c:820
+#: pith/mimedesc.c:821
msgid "Not Shown. Use the \"V\" command to view or save to address book."
msgstr ""
#. TRANSLATORS: This is the description of an attachment that isn't being
#. shown but that can be viewed or saved.
-#: pith/mimedesc.c:825
+#: pith/mimedesc.c:826
msgid "Not Shown. Use the \"V\" command to view or save this part."
msgstr ""
-#: pith/mimedesc.c:839
+#: pith/mimedesc.c:840
msgid "Unable to print this part."
msgstr ""
#. TRANSLATORS: tell user they are waiting for Sorting of %s, the foldername
-#: pith/sort.c:186 pith/sort.c:244
+#: pith/sort.c:188 pith/sort.c:246
#, c-format
msgid "Sorting \"%s\""
msgstr ""
-#: pith/bldaddr.c:337
+#: pith/bldaddr.c:338
msgid "Loop or Duplicate detected in addressbook!"
msgstr ""
#. TRANSLATORS: The first %s is a mailbox, the second is either
#. directory or addressbook
-#: pith/bldaddr.c:655
+#: pith/bldaddr.c:656
#, c-format
msgid "Address for \"%s\" not in %s"
msgstr ""
-#: pith/bldaddr.c:658
+#: pith/bldaddr.c:659
msgid "addressbook"
msgstr ""
-#: pith/mailindx.c:631
+#: pith/mailindx.c:661
#, c-format
msgid "Unrecognized word in index-format: %s"
msgstr ""
-#: pith/mailindx.c:878
+#: pith/mailindx.c:908
msgid "Configured \"index-format\" unrecognizable. Using default."
msgstr ""
-#: pith/mailindx.c:2024 pith/mailindx.c:3213
+#: pith/mailindx.c:2056 pith/mailindx.c:3253
msgid "[ No Message Text Available ]"
msgstr ""
-#: pith/mailindx.c:4133
+#: pith/mailindx.c:4173
msgid "Today"
msgstr ""
-#: pith/mailindx.c:4635
+#: pith/mailindx.c:4676
msgid "Yesterday"
msgstr ""
-#: pith/mailindx.c:4639
+#: pith/mailindx.c:4680
msgid "Tomorrow"
msgstr ""
-#: pith/mailindx.c:4641
+#: pith/mailindx.c:4682
#, c-format
msgid "Next %.3s!"
msgstr ""
-#: pith/thread.c:869
+#: pith/thread.c:870
msgid "No thread to collapse or expand on this line"
msgstr ""
-#: pith/thread.c:927
+#: pith/thread.c:928
#, c-format
msgid "Unselected %s messages in thread"
msgstr ""
-#: pith/thread.c:930
+#: pith/thread.c:931
#, c-format
msgid "Selected %s messages in thread"
msgstr ""
-#: pith/thread.c:934
+#: pith/thread.c:935
#, c-format
msgid "Selected %s more messages in thread"
msgstr ""
-#: pith/pattern.c:1863
+#: pith/pattern.c:1864
#, c-format
msgid "Error: Interval \"%s\", min > max"
msgstr ""
-#: pith/pattern.c:1866
+#: pith/pattern.c:1867
#, c-format
msgid "Error: Interval \"%s\": syntax is (min,max)"
msgstr ""
-#: pith/pattern.c:3448
+#: pith/pattern.c:3449
#, c-format
msgid "Error renaming \"%s\" to \"%s\": %s"
msgstr ""
-#: pith/pattern.c:3499
+#: pith/pattern.c:3500
msgid "Unknown error saving pattern variable"
msgstr ""
-#: pith/pattern.c:7132
+#: pith/pattern.c:7133
#, c-format
msgid "Processing filter \"%s\""
msgstr ""
-#: pith/pattern.c:7751
+#: pith/pattern.c:7760
msgid "filtering done"
msgstr ""
-#: pith/pattern.c:7908
+#: pith/pattern.c:7917
#, c-format
msgid "Can't delete messages in readonly folder \"%s\""
msgstr ""
-#: pith/pattern.c:7986
+#: pith/pattern.c:7995
#, c-format
msgid "Filtered all %s message to \"%s\""
msgstr ""
-#: pith/pattern.c:8024
+#: pith/pattern.c:8033
#, c-format
msgid "Can't set flags in readonly folder \"%s\""
msgstr ""
-#: pith/abdlc.c:42
+#: pith/abdlc.c:43
msgid "[ Permission Denied ]"
msgstr ""
#. TRANSLATORS: This is a heading referring to something that is readable
#. but not writeable.
-#: pith/abdlc.c:45
+#: pith/abdlc.c:46
msgid " (ReadOnly)"
msgstr ""
#. TRANSLATORS: Not readable
-#: pith/abdlc.c:47
+#: pith/abdlc.c:48
msgid " (Un-readable)"
msgstr ""
#. TRANSLATORS: Directories, as in LDAP Directories. A heading.
-#: pith/abdlc.c:49
+#: pith/abdlc.c:50
msgid "Directories"
msgstr ""
-#: pith/abdlc.c:449
+#: pith/abdlc.c:450
msgid "Addrbook changed unexpectedly, re-syncing..."
msgstr ""
-#: pith/abdlc.c:451
+#: pith/abdlc.c:452
msgid "addrbook changed while we had it open?, re-sync\n"
msgstr ""
-#: pith/abdlc.c:809 pith/abdlc.c:1180 pith/abdlc.c:1938 pith/abdlc.c:2041
+#: pith/abdlc.c:810 pith/abdlc.c:1181 pith/abdlc.c:1939 pith/abdlc.c:2042
msgid "Bug in addrbook, not supposed to happen, re-syncing..."
msgstr ""
-#: pith/send.c:296
+#: pith/send.c:297
#, c-format
msgid "Can't open %s mailbox: %s"
msgstr ""
-#: pith/send.c:308
+#: pith/send.c:309
#, c-format
msgid "%s message folder doesn't exist!"
msgstr ""
-#: pith/send.c:887 pith/reply.c:1071 pith/reply.c:1126
+#: pith/send.c:888 pith/reply.c:1089 pith/reply.c:1144
msgid "Error including all message parts"
msgstr ""
#. TRANSLATORS: Arg is a mailbox name
-#: pith/send.c:1003
+#: pith/send.c:1004
#, c-format
msgid "Can't delete %s"
msgstr ""
#. TRANSLATORS: First arg is the address we can't
#. send to, second arg is "not in addressbook".
-#: pith/send.c:1499
+#: pith/send.c:1503
#, c-format
msgid "Can't send to address %s: %s"
msgstr ""
-#: pith/send.c:1503
+#: pith/send.c:1507
msgid "not in addressbook"
msgstr ""
#. TRANSLATORS: program is busy updating the Answered flags so warns user
-#: pith/send.c:1616
+#: pith/send.c:1620
msgid "Updating \"Answered\" Flags"
msgstr ""
-#: pith/send.c:1753
+#: pith/send.c:1757
msgid "Can't send message. No recipients specified!"
msgstr ""
-#: pith/send.c:1785
+#: pith/send.c:1789
msgid "Sending mail"
msgstr ""
-#: pith/send.c:2004
+#: pith/send.c:2008
msgid "Delivery Status Notification not available from this server."
msgstr ""
-#: pith/send.c:2011
+#: pith/send.c:2015
#, c-format
msgid "Mail not sent. Sending error%s%s"
msgstr ""
-#: pith/send.c:2034 pith/send.c:2053
+#: pith/send.c:2038 pith/send.c:2057
#, c-format
msgid "Mail not sent: %.80s"
msgstr ""
-#: pith/send.c:2079
+#: pith/send.c:2083
#, c-format
msgid "Error sending%.2s%.80s"
msgstr ""
-#: pith/send.c:2418
+#: pith/send.c:2423
msgid "Fcc creation error. Message NOT sent or copied."
msgstr ""
-#: pith/send.c:2421
+#: pith/send.c:2426
msgid "Fcc creation rejected. Message NOT sent or copied."
msgstr ""
-#: pith/send.c:4364
+#: pith/send.c:4369
#, c-format
msgid "Encoding Error \"%s\""
msgstr ""
-#: pith/send.c:4381
+#: pith/send.c:4386
msgid "The following attachment was sent,\r\n"
msgstr ""
-#: pith/send.c:4382
+#: pith/send.c:4387
msgid "but NOT saved in the Fcc copy:\r\n"
msgstr ""
-#: pith/send.c:4977
+#: pith/send.c:4999
#, c-format
msgid "Space not allowed in header name (%s)"
msgstr ""
-#: pith/send.c:4988
+#: pith/send.c:5010
#, c-format
msgid "Not allowed to change header \"%s\""
msgstr ""
-#: pith/send.c:5356
+#: pith/send.c:5378
#, c-format
msgid "Error posting message: %s"
msgstr ""
-#: pith/send.c:5376
+#: pith/send.c:5398
#, c-format
msgid "Error connecting to news server: %s"
msgstr ""
-#: pith/send.c:5389 pith/send.c:5576
+#: pith/send.c:5411 pith/send.c:5598
#, c-format
msgid "Can't post, NNTP-server must be defined!"
msgstr ""
-#: pith/send.c:5426
+#: pith/send.c:5448
msgid "SMTP-server must be defined!"
msgstr ""
-#: pith/send.c:5437
+#: pith/send.c:5459
msgid "No default posting command."
msgstr ""
-#: pith/send.c:5568
+#: pith/send.c:5590
#, c-format
msgid "News not posted: \"%s\": %s"
msgstr ""
-#: pith/send.c:5608
+#: pith/send.c:5630
msgid "Error posting."
msgstr ""
-#: pith/send.c:5613
+#: pith/send.c:5635
#, c-format
msgid "Posting program %s returned error"
msgstr ""
-#: pith/send.c:5619
+#: pith/send.c:5641
#, c-format
msgid "Error running \"%s\""
msgstr ""
-#: pith/send.c:5691
+#: pith/send.c:5713
#, c-format
msgid "Unexpected hostname for piped SMTP: %.*s"
msgstr ""
#. TRANSLATORS: Arg is replaced with the command name or the word Command
-#: pith/mailcmd.c:129
+#: pith/mailcmd.c:130
#, c-format
msgid "%s cancelled"
msgstr ""
-#: pith/mailcmd.c:264
+#: pith/mailcmd.c:265
msgid "Deletion mark removed, message won't be deleted"
msgstr ""
-#: pith/mailcmd.c:265
+#: pith/mailcmd.c:266
msgid "Message not marked for deletion; no action taken"
msgstr ""
-#: pith/mailcmd.c:269
+#: pith/mailcmd.c:270
#, c-format
msgid "Deletion mark removed from %s message%s"
msgstr ""
-#: pith/mailcmd.c:669
+#: pith/mailcmd.c:675
#, c-format
msgid "Opened folder \"%s\" with %s messages%s"
msgstr ""
-#: pith/mailcmd.c:670
+#: pith/mailcmd.c:676
#, c-format
msgid "Opened folder \"%s\" with %s message%s"
msgstr ""
-#: pith/mailcmd.c:1930
+#: pith/mailcmd.c:1951
msgid "recent"
msgstr ""
#. TRANSLATORS: warning to user that we're busy selecting messages
-#: pith/mailcmd.c:2416
+#: pith/mailcmd.c:2441
msgid "Busy Selecting"
msgstr ""
-#: pith/adrbklib.c:274
+#: pith/adrbklib.c:275
msgid "Can't contact remote address book server, using cached copy"
msgstr ""
#. TRANSLATORS: A temporary file for the address book can't
#. be opened.
-#: pith/adrbklib.c:488
+#: pith/adrbklib.c:489
#, c-format
msgid "Temp addrbook file can't be opened: %s"
msgstr ""
-#: pith/adrbklib.c:493
+#: pith/adrbklib.c:494
msgid "Address book doesn't exist"
msgstr ""
-#: pith/adrbklib.c:502
+#: pith/adrbklib.c:503
#, c-format
msgid "Address book %.200s doesn't exist, creating"
msgstr ""
@@ -11941,246 +12026,246 @@ msgstr ""
#. TRANSLATORS: The address book was changed by something else so alpine
#. is not making the change the user wanted to make to avoid damaging
#. the address book.
-#: pith/adrbklib.c:2924
+#: pith/adrbklib.c:2941
msgid ""
"Addrbook changed by another process, aborting our change to avoid damage..."
msgstr ""
-#: pith/adrbklib.c:2953
+#: pith/adrbklib.c:2970
msgid "Can't access remote addrbook, aborting change..."
msgstr ""
-#: pith/adrbklib.c:2981
+#: pith/adrbklib.c:2998
msgid "No write permission for remote addrbook, aborting change..."
msgstr ""
-#: pith/adrbklib.c:2985
+#: pith/adrbklib.c:3002
msgid "Remote addrbook changed, aborting our change to avoid damage..."
msgstr ""
-#: pith/adrbklib.c:3042
+#: pith/adrbklib.c:3059
msgid "Saving address book"
msgstr ""
-#: pith/adrbklib.c:3245
+#: pith/adrbklib.c:3262
#, c-format
msgid "Can't replace address book %.200sfile \"%.200s\""
msgstr ""
-#: pith/adrbklib.c:3249
+#: pith/adrbklib.c:3266
msgid ""
"If another Alpine is running, quit that Alpine before updating address book."
msgstr ""
-#: pith/adrbklib.c:3324
+#: pith/adrbklib.c:3341
#, c-format
msgid "Replace of \"%.200s\" failed, trying %.200s"
msgstr ""
-#: pith/adrbklib.c:3339
+#: pith/adrbklib.c:3356
#, c-format
msgid "Copy of addrbook to \"%.200s\" failed, changes NOT saved!"
msgstr ""
-#: pith/adrbklib.c:3377
+#: pith/adrbklib.c:3394
msgid "Copying to remote addressbook"
msgstr ""
-#: pith/adrbklib.c:3388
+#: pith/adrbklib.c:3405
#, c-format
msgid "Error opening temporary addrbook file %.200s: %.200s"
msgstr ""
-#: pith/adrbklib.c:3405
+#: pith/adrbklib.c:3422
msgid "Copy of addrbook to remote folder failed, changes NOT saved remotely"
msgstr ""
-#: pith/adrbklib.c:3443
+#: pith/adrbklib.c:3460
msgid "Interrupt! Reverting to previous version"
msgstr ""
-#: pith/adrbklib.c:4745
+#: pith/adrbklib.c:4762
msgid "Sorting address book"
msgstr ""
-#: pith/adrbklib.c:4767
+#: pith/adrbklib.c:4784
msgid "Address book sort cancelled, using old order for now"
msgstr ""
-#: pith/adrbklib.c:5441
+#: pith/adrbklib.c:5458
#, c-format
msgid "Error opening/creating address book %.200s"
msgstr ""
#. TRANSLATORS: groups refers to news groups
-#: pith/news.c:242
+#: pith/news.c:243
msgid "Can't validate groups. No servers defined"
msgstr ""
#. TRANSLATORS: groups refers to news groups
-#: pith/news.c:244 pith/news.c:251
+#: pith/news.c:245 pith/news.c:252
msgid "Can't validate groups. No servers responding"
msgstr ""
-#: pith/news.c:249
+#: pith/news.c:250
msgid "No servers defined for posting to newsgroups"
msgstr ""
-#: pith/filter.c:1134 pith/filter.c:1142
+#: pith/filter.c:1136 pith/filter.c:1144
msgid "Pipe command returned error."
msgstr ""
-#: pith/filter.c:1147
+#: pith/filter.c:1149
msgid "Error setting up pipe command."
msgstr ""
-#: pith/filter.c:1541 pith/filter.c:1566
+#: pith/filter.c:1543 pith/filter.c:1568
msgid "Warning: Non-hexadecimal character in QP encoding!"
msgstr ""
#. TRANSLATORS: error while translating from one
#. character set to another, for example from UTF-8
#. to ISO-2022-JP or something like that.
-#: pith/filter.c:1851 pith/filter.c:10524
+#: pith/filter.c:1853 pith/filter.c:10974
msgid "translation error"
msgstr ""
-#: pith/remote.c:98
+#: pith/remote.c:99
msgid " Can't fetch remote configuration."
msgstr ""
-#: pith/remote.c:857
+#: pith/remote.c:858
#, c-format
msgid "can't open metadata file %s, continuing (%s)"
msgstr ""
-#: pith/remote.c:897
+#: pith/remote.c:898
#, c-format
msgid "can't create metadata file %s, continuing (%s)"
msgstr ""
-#: pith/remote.c:1287
+#: pith/remote.c:1288
#, c-format
msgid "Can't initialize folder \"%s\" (write permission)"
msgstr ""
-#: pith/remote.c:1290
+#: pith/remote.c:1291
msgid "Choose a new, unused folder for the remote data"
msgstr ""
-#: pith/remote.c:1306
+#: pith/remote.c:1307
msgid "Initializing remote data"
msgstr ""
-#: pith/remote.c:1331
+#: pith/remote.c:1332
#, c-format
msgid "\"%s\" has invalid format, can't initialize"
msgstr ""
-#: pith/remote.c:1360 pith/remote.c:1946
+#: pith/remote.c:1361 pith/remote.c:1947
#, c-format
msgid "Error opening temporary file: %s"
msgstr ""
-#: pith/remote.c:1397
+#: pith/remote.c:1398
#, c-format
msgid "Error copying to remote folder: %s"
msgstr ""
-#: pith/remote.c:1517
+#: pith/remote.c:1518
#, c-format
msgid "Can't open remote address book \"%s\""
msgstr ""
-#: pith/remote.c:1523
+#: pith/remote.c:1524
#, c-format
msgid "Error: no messages in remote address book \"%s\"!"
msgstr ""
-#: pith/remote.c:1537
+#: pith/remote.c:1538
#, c-format
msgid "Suspicious Received headers in first msg in \"%s\""
msgstr ""
-#: pith/remote.c:1923
+#: pith/remote.c:1924
#, c-format
msgid "Can't initialize \"%s\" (invalid format)"
msgstr ""
-#: pith/remote.c:1937
+#: pith/remote.c:1938
msgid "Copying remote data"
msgstr ""
-#: pith/remote.c:1958
+#: pith/remote.c:1959
#, c-format
msgid "Error opening temporary file %s: %s"
msgstr ""
-#: pith/remote.c:1976
+#: pith/remote.c:1977
msgid "Can't access remote IMAP data"
msgstr ""
-#: pith/remote.c:1997
+#: pith/remote.c:1998
msgid "Remote IMAP folder has wrong contents"
msgstr ""
-#: pith/remote.c:2017
+#: pith/remote.c:2018
msgid "Can't access check date in remote data"
msgstr ""
-#: pith/remote.c:2087
+#: pith/remote.c:2088
#, c-format
msgid "Error writing temp file: %s"
msgstr ""
-#: pith/remote.c:2095
+#: pith/remote.c:2096
#, c-format
msgid "%s: Error copying remote IMAP data"
msgstr ""
-#: pith/remote.c:2110
+#: pith/remote.c:2111
#, c-format
msgid "Error updating local file: %s: %s"
msgstr ""
-#: pith/remote.c:2113
+#: pith/remote.c:2114
msgid "Perhaps another process has the file open?"
msgstr ""
-#: pith/remote.c:2124
+#: pith/remote.c:2125
#, c-format
msgid "Error updating cache file %s: %s"
msgstr ""
-#: pith/remote.c:2154
+#: pith/remote.c:2155
#, c-format
msgid "Can't open remote IMAP folder \"%s\""
msgstr ""
-#: pith/remote.c:2222
+#: pith/remote.c:2223
#, c-format
msgid "Can't open \"%s\" for copying"
msgstr ""
-#: pith/remote.c:2233
+#: pith/remote.c:2234
#, c-format
msgid "\"%s\" has invalid format"
msgstr ""
-#: pith/ldap.c:115
+#: pith/ldap.c:116
msgid "Directory lookup failed, using backup email address"
msgstr ""
-#: pith/ldap.c:127
+#: pith/ldap.c:128
msgid "Directory lookup failed, no backup email address available"
msgstr ""
-#: pith/ldap.c:167
+#: pith/ldap.c:168
#, c-format
msgid "Warning: current address different from saved address (%s)"
msgstr ""
-#: pith/ldap.c:210
+#: pith/ldap.c:211
msgid "Missing username in LDAP address"
msgstr ""
@@ -12311,239 +12396,239 @@ msgid "User ID"
msgstr ""
#. TRANSLATORS: an informative error message
-#: pith/addrbook.c:159
+#: pith/addrbook.c:160
#, c-format
msgid "Ignoring unrecognized word \"%s\" in Address-Book-Formats"
msgstr ""
-#: pith/addrbook.c:231
+#: pith/addrbook.c:232
msgid "Address-Book-Formats has no recognizable words, using default format"
msgstr ""
#. TRANSLATORS: When a message is forwarded by the user this is the
#. text that shows where the forwarded part of the message begins.
-#: pith/reply.c:2034
+#: pith/reply.c:2052
msgid "---------- Forwarded message ----------"
msgstr ""
-#: pith/reply.c:2466
+#: pith/reply.c:2484
msgid "Error fetching message contents. Can't Bounce message"
msgstr ""
-#: pith/reply.c:2948 pith/reply.c:2969
+#: pith/reply.c:2966 pith/reply.c:2987
#, c-format
msgid "Error fetching part %s"
msgstr ""
-#: pith/reply.c:3389
+#: pith/reply.c:3407
msgid "Can't fetch remote configuration."
msgstr ""
-#: pith/stream.c:3277
+#: pith/stream.c:3278
#, c-format
msgid "MAIL FOLDER \"%s\" CLOSED DUE TO ACCESS ERROR"
msgstr ""
-#: pith/stream.c:3283
+#: pith/stream.c:3284
#, c-format
msgid "Folder \"%s\" is Closed"
msgstr ""
#. TRANSLATORS: The argument is the number of new messages
-#: pith/newmail.c:829
+#: pith/newmail.c:678
#, c-format
msgid "%ld new messages!"
msgstr ""
#. TRANSLATORS: The argument is either " to you" or nothing
-#: pith/newmail.c:832
+#: pith/newmail.c:681
#, c-format
msgid "New mail%s!"
msgstr ""
-#: pith/newmail.c:833
+#: pith/newmail.c:682
msgid " to you"
msgstr ""
-#: pith/newmail.c:839
+#: pith/newmail.c:689
#, c-format
msgid "%ld messages saved to folder \"%.80s\""
msgstr ""
-#: pith/newmail.c:842
+#: pith/newmail.c:692
#, c-format
msgid "Mail saved to folder \"%.80s\""
msgstr ""
-#: pith/newmail.c:849
+#: pith/newmail.c:701
#, c-format
msgid "%ld messages saved to folder \"...%.80s\""
msgstr ""
-#: pith/newmail.c:852
+#: pith/newmail.c:703
#, c-format
msgid "Mail saved to folder \"...%.80s\""
msgstr ""
-#: pith/save.c:762 pith/save.c:892 pith/save.c:1351
+#: pith/save.c:763 pith/save.c:894 pith/save.c:1372
msgid "Can only save to existing folders in Incoming Collection"
msgstr ""
#. TRANSLATORS: A warning to user that the message parts
#. they deleted will not be included in the copy they
#. are now saving to.
-#: pith/save.c:1104 pith/save.c:1251
+#: pith/save.c:1125 pith/save.c:1272
msgid "NOTE: Deleted message parts NOT included in saved copy!"
msgstr ""
-#: pith/save.c:1124 pith/save.c:1311
+#: pith/save.c:1145 pith/save.c:1332
#, c-format
msgid "Cannot save because current folder is Closed"
msgstr ""
-#: pith/save.c:1570
+#: pith/save.c:1591
msgid "The following attachment was DELETED when this message was saved:"
msgstr ""
#. TRANSLATORS: User is restricted to operating within a certain directory
-#: pith/context.c:334
+#: pith/context.c:337
#, c-format
msgid "Not allowed outside of %.150s"
msgstr ""
-#: pith/smime.c:312 pith/smime.c:376 pith/smime.c:473 pith/smime.c:831
-#: pith/smime.c:861 pith/smime.c:891
+#: pith/smime.c:321 pith/smime.c:385 pith/smime.c:482 pith/smime.c:840
+#: pith/smime.c:870 pith/smime.c:900
#, c-format
msgid "Can't create directory %s"
msgstr ""
-#: pith/smime.c:568 pith/smime.c:901
+#: pith/smime.c:577 pith/smime.c:910
msgid "Directory not defined"
msgstr ""
-#: pith/smime.c:575 pith/smime.c:812
+#: pith/smime.c:584 pith/smime.c:821
msgid "Turn off the Keychain feature above first"
msgstr ""
-#: pith/smime.c:579 pith/smime.c:816 pith/smime.c:846 pith/smime.c:876
-#: pith/smime.c:906
+#: pith/smime.c:588 pith/smime.c:825 pith/smime.c:855 pith/smime.c:885
+#: pith/smime.c:915
msgid "Container path is not defined"
msgstr ""
-#: pith/smime.c:597 pith/smkeys.c:345
+#: pith/smime.c:606 pith/smkeys.c:365
msgid "Can't access remote smime configuration."
msgstr ""
-#: pith/smime.c:731 pith/smime.c:960 pith/smkeys.c:411
+#: pith/smime.c:740 pith/smime.c:969 pith/smkeys.c:431
#, c-format
msgid "Can't rename %s to %s"
msgstr ""
-#: pith/smime.c:745 pith/smkeys.c:426
+#: pith/smime.c:754 pith/smkeys.c:446
#, c-format
msgid "Error opening temporary smime file %s: %s"
msgstr ""
-#: pith/smime.c:761
+#: pith/smime.c:770
msgid "Copy of smime key to remote folder failed, NOT saved remotely"
msgstr ""
-#: pith/smime.c:825 pith/smime.c:855 pith/smime.c:885
+#: pith/smime.c:834 pith/smime.c:864 pith/smime.c:894
msgid "Directory is not defined"
msgstr ""
-#: pith/smime.c:1145
-msgid "Wrong password"
+#: pith/smime.c:1156
+msgid "Incorrect passphrase"
msgstr ""
-#: pith/smime.c:1147
+#: pith/smime.c:1158
#, c-format
msgid "Couldn't read key: %s"
msgstr ""
-#: pith/smime.c:1340
+#: pith/smime.c:1411
#, c-format
msgid "Unable to find certificate for <%s@%s>"
msgstr ""
-#: pith/smime.c:1532
+#: pith/smime.c:1603
msgid "Couldn't verify S/MIME signature: No CA Certs were loaded"
msgstr ""
-#: pith/smime.c:1540
+#: pith/smime.c:1611
msgid "S/MIME signature verified ok"
msgstr ""
-#: pith/smime.c:1554
+#: pith/smime.c:1625
#, c-format
msgid "Couldn't verify S/MIME signature: %s"
msgstr ""
-#: pith/smime.c:1643 pith/smime.c:1769
+#: pith/smime.c:1714 pith/smime.c:1934
msgid ""
"This message was cryptographically signed but the signature could not be "
"verified."
msgstr ""
-#: pith/smime.c:1787
-msgid "Couldn't find the certificate needed to decrypt."
-msgstr ""
-
-#: pith/smime.c:1809
+#: pith/smime.c:1864 pith/smime.c:1984
#, c-format
msgid "Error decrypting: %s"
msgstr ""
-#: pith/smime.c:1838
+#: pith/smime.c:1952
+msgid "Couldn't find the certificate needed to decrypt."
+msgstr ""
+
+#: pith/smime.c:2013
msgid "Encrypted data couldn't be parsed."
msgstr ""
-#: pith/smime.c:2041
+#: pith/smime.c:2219
msgid "Couldn't find the certificate needed to sign."
msgstr ""
-#: pith/smime.c:2068
+#: pith/smime.c:2246
msgid "Error creating signed object."
msgstr ""
-#: pith/smkeys.c:107
+#: pith/smkeys.c:106
#, c-format
msgid "Error loading file %s"
msgstr ""
-#: pith/smkeys.c:422
+#: pith/smkeys.c:442
msgid "Copying to remote smime container"
msgstr ""
-#: pith/smkeys.c:442
+#: pith/smkeys.c:462
msgid "Copy of smime cert to remote folder failed, changes NOT saved remotely"
msgstr ""
-#: pith/smkeys.c:471
+#: pith/smkeys.c:491
#, c-format
msgid "Saved certificate for <%s>"
msgstr ""
-#: pith/smkeys.c:474
+#: pith/smkeys.c:494
#, c-format
msgid "Couldn't save certificate for <%s>"
msgstr ""
-#: pith/smkeys.c:637
+#: pith/smkeys.c:657
msgid "Error in privatekey container, missing END"
msgstr ""
-#: pith/smkeys.c:708
+#: pith/smkeys.c:728
#, c-format
msgid "Error in publiccert container, missing BEGIN, certtext=%s"
msgstr ""
-#: pith/smkeys.c:798
+#: pith/smkeys.c:818
#, c-format
msgid "Error in cacert container, missing BEGIN, certtext=%s"
msgstr ""
-#: pith/smkeys.c:803
+#: pith/smkeys.c:823
#, c-format
msgid "Error in cacert container, missing separator, line=%s"
msgstr ""
diff --git a/regex/Makefile.in b/regex/Makefile.in
index 0ee7efea..8a39b382 100644
--- a/regex/Makefile.in
+++ b/regex/Makefile.in
@@ -65,7 +65,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
diff --git a/web/src/cgi.tcl-1.10/cgi.tcl b/web/src/cgi.tcl-1.10/cgi.tcl
new file mode 100644
index 00000000..81667179
--- /dev/null
+++ b/web/src/cgi.tcl-1.10/cgi.tcl
@@ -0,0 +1,2659 @@
+##################################################
+#
+# cgi.tcl - routines for writing CGI scripts in Tcl
+# Author: Don Libes <libes@nist.gov>, January '95
+#
+# These routines implement the code described in the paper
+# "Writing CGI scripts in Tcl" which appeared in the Tcl '96 conference.
+# Please read the paper before using this code. The paper is:
+# http://expect.nist.gov/doc/cgi.pdf
+#
+##################################################
+
+##################################################
+# http header support
+##################################################
+
+proc cgi_http_head {args} {
+ global _cgi env errorInfo
+
+ if {[info exists _cgi(http_head_done)]} return
+
+ set _cgi(http_head_in_progress) 1
+
+ if {0 == [llength $args]} {
+ cgi_content_type
+ } else {
+ if {[catch {uplevel 1 [lindex $args 0]} errMsg]} {
+ set savedInfo $errorInfo
+ cgi_content_type
+ }
+ }
+ cgi_puts ""
+
+ unset _cgi(http_head_in_progress)
+ set _cgi(http_head_done) 1
+
+ if {[info exists savedInfo]} {
+ error $errMsg $savedInfo
+ }
+}
+
+# avoid generating http head if not in CGI environment
+# to allow generation of pure HTML files
+proc _cgi_http_head_implicit {} {
+ global env
+
+ if {[info exists env(REQUEST_METHOD)]} cgi_http_head
+}
+
+proc cgi_status {num str} {
+ global _cgi
+
+ if {[info exists _cgi(http_status_done)]} return
+ set _cgi(http_status_done) 1
+ cgi_puts "Status: $num $str"
+}
+
+# If these are called manually, they automatically generate the extra newline
+
+proc cgi_content_type {args} {
+ global _cgi
+
+ if {0==[llength $args]} {
+ set t text/html
+ } else {
+ set t [lindex $args 0]
+ if {[regexp ^multipart/ $t]} {
+ set _cgi(multipart) 1
+ }
+ }
+
+ if {[info exists _cgi(http_head_in_progress)]} {
+ cgi_puts "Content-type: $t"
+ } else {
+ cgi_http_head [list cgi_content_type $t]
+ }
+}
+
+proc cgi_redirect {t} {
+ global _cgi
+
+ if {[info exists _cgi(http_head_in_progress)]} {
+ cgi_status 302 Redirected
+ cgi_puts "Uri: $t"
+ cgi_puts "Location: $t"
+ } else {
+ cgi_http_head {
+ cgi_redirect $t
+ }
+ }
+}
+
+# deprecated, use cgi_redirect
+proc cgi_location {t} {
+ global _cgi
+
+ if {[info exists _cgi(http_head_in_progress)]} {
+ cgi_puts "Location: $t"
+ } else {
+ cgi_http_head "cgi_location $t"
+ }
+}
+
+proc cgi_target {t} {
+ global _cgi
+
+ if {![info exists _cgi(http_head_in_progress)]} {
+ error "cgi_target must be set from within cgi_http_head."
+ }
+ cgi_puts "Window-target: $t"
+}
+
+# Make client retrieve url in this many seconds ("client pull").
+# With no 2nd arg, current url is retrieved.
+proc cgi_refresh {seconds {url ""}} {
+ global _cgi
+
+ if {![info exists _cgi(http_head_in_progress)]} {
+ error "cgi_refresh must be set from within cgi_http_head. Try using cgi_http_equiv instead."
+ }
+ cgi_put "Refresh: $seconds"
+
+ if {0!=[string compare $url ""]} {
+ cgi_put "; $url"
+ }
+ cgi_puts ""
+}
+
+# Example: cgi_pragma no-cache
+proc cgi_pragma {arg} {
+ global _cgi
+
+ if {![info exists _cgi(http_head_in_progress)]} {
+ error "cgi_pragma must be set from within cgi_http_head."
+ }
+ cgi_puts "Pragma: $arg"
+}
+
+##################################################
+# support for debugging or other crucial things we need immediately
+##################################################
+
+proc cgi_comment {args} {} ;# need this asap
+
+proc cgi_html_comment {args} {
+ regsub -all {>} $args {\&gt;} args
+ cgi_put "<!--[_cgi_list_to_string $args] -->"
+}
+
+set _cgi(debug) -off
+proc cgi_debug {args} {
+ global _cgi
+
+ set old $_cgi(debug)
+ set arg [lindex $args 0]
+ if {$arg == "-on"} {
+ set _cgi(debug) -on
+ set args [lrange $args 1 end]
+ } elseif {$arg == "-off"} {
+ set _cgi(debug) -off
+ set args [lrange $args 1 end]
+ } elseif {[regexp "^-t" $arg]} {
+ set temp 1
+ set _cgi(debug) -on
+ set args [lrange $args 1 end]
+ } elseif {[regexp "^-noprint$" $arg]} {
+ set noprint 1
+ set args [lrange $args 1 end]
+ }
+
+ set arg [lindex $args 0]
+ if {$arg == "--"} {
+ set args [lrange $args 1 end]
+ }
+
+ if {[llength $args]} {
+ if {$_cgi(debug) == "-on"} {
+
+ _cgi_close_tag
+ # force http head and open html, head, body
+ catch {
+ if {[info exists noprint]} {
+ uplevel 1 [lindex $args 0]
+ } else {
+ cgi_html {
+ cgi_head {
+ cgi_title "debugging before complete HTML head"
+ }
+ # force body open and leave open
+ _cgi_body_start
+ uplevel 1 [lindex $args 0]
+ # bop back out to catch, so we don't close body
+ error "ignore"
+ }
+ }
+ }
+ }
+ }
+
+ if {[info exists temp]} {
+ set _cgi(debug) $old
+ }
+ return $old
+}
+
+proc cgi_uid_check {user} {
+ global env
+
+ # leave in so old scripts don't blow up
+ if {[regexp "^-off$" $user]} return
+
+ if {[info exists env(USER)]} {
+ set whoami $env(USER)
+ } elseif {0==[catch {exec whoami} whoami]} {
+ # "who am i" on some Linux hosts returns "" so try whoami first
+ } elseif {0==[catch {exec who am i} whoami]} {
+ # skip over "host!"
+ regexp "(.*!)?(\[^ \t]*)" $whoami dummy dummy whoami
+ } elseif {0==[catch {package require registry}]} {
+ set whoami [registry get HKEY_LOCAL_MACHINE\\Network\\Logon username]
+ } else {
+ set whoami $user ;# give up and let go
+ }
+ if {$whoami != "$user"} {
+ error "Warning: This CGI script expects to run with uid \"$user\". However, this script is running as \"$whoami\"."
+ }
+}
+
+# print out elements of an array
+# like Tcl's parray, but formatted for browser
+proc cgi_parray {a {pattern *}} {
+ upvar 1 $a array
+ if {![array exists array]} {
+ error "\"$a\" isn't an array"
+ }
+
+ set maxl 0
+ foreach name [lsort [array names array $pattern]] {
+ if {[string length $name] > $maxl} {
+ set maxl [string length $name]
+ }
+ }
+ cgi_preformatted {
+ set maxl [expr {$maxl + [string length $a] + 2}]
+ foreach name [lsort [array names array $pattern]] {
+ set nameString [format %s(%s) $a $name]
+ cgi_puts [cgi_quote_html [format "%-*s = %s" $maxl $nameString $array($name)]]
+ }
+ }
+}
+
+proc cgi_eval {cmd} {
+ global env _cgi
+
+ # put cmd somewhere that uplevel can find it
+ set _cgi(body) $cmd
+
+ uplevel 1 {
+ global env _cgi errorInfo
+
+ if {1==[catch $_cgi(body) errMsg]} {
+ # error occurred, handle it
+ set _cgi(errorInfo) $errorInfo
+
+ if {![info exists env(REQUEST_METHOD)]} {
+ puts stderr $_cgi(errorInfo)
+ return
+ }
+ # the following code is all to force browsers into a state
+ # such that diagnostics can be reliably shown
+
+ # close irrelevant things
+ _cgi_close_procs
+ # force http head and open html, head, body
+ cgi_html {
+ cgi_body {
+ if {[info exists _cgi(client_error)]} {
+ cgi_h3 "Client Error"
+ cgi_p "$errMsg Report this to your system administrator or browser vendor."
+ } else {
+ cgi_put [cgi_anchor_name cgierror]
+ cgi_h3 "An internal error was detected in the service\
+ software. The diagnostics are being emailed to\
+ the service system administrator ($_cgi(admin_email))."
+
+ if {$_cgi(debug) == "-on"} {
+ cgi_puts "Heck, since you're debugging, I'll show you the\
+ errors right here:"
+ # suppress formatting
+ cgi_preformatted {
+ cgi_puts [cgi_quote_html $_cgi(errorInfo)]
+ }
+ } else {
+ cgi_mail_start $_cgi(admin_email)
+ cgi_mail_add "Subject: [cgi_name] CGI problem"
+ cgi_mail_add
+ cgi_mail_add "CGI environment:"
+ cgi_mail_add "REQUEST_METHOD: $env(REQUEST_METHOD)"
+ cgi_mail_add "SCRIPT_NAME: $env(SCRIPT_NAME)"
+ # this next few things probably don't need
+ # a catch but I'm not positive
+ catch {cgi_mail_add "HTTP_USER_AGENT: $env(HTTP_USER_AGENT)"}
+ catch {cgi_mail_add "HTTP_REFERER: $env(HTTP_REFERER)"}
+ catch {cgi_mail_add "HTTP_HOST: $env(HTTP_HOST)"}
+ catch {cgi_mail_add "REMOTE_HOST: $env(REMOTE_HOST)"}
+ catch {cgi_mail_add "REMOTE_ADDR: $env(REMOTE_ADDR)"}
+ cgi_mail_add "cgi.tcl version: 1.10.0"
+ cgi_mail_add "input:"
+ catch {cgi_mail_add $_cgi(input)}
+ cgi_mail_add "cookie:"
+ catch {cgi_mail_add $env(HTTP_COOKIE)}
+ cgi_mail_add "errorInfo:"
+ cgi_mail_add "$_cgi(errorInfo)"
+ cgi_mail_end
+ }
+ }
+ } ;# end cgi_body
+ } ;# end cgi_html
+ } ;# end catch
+ } ;# end uplevel
+}
+
+# return true if cgi_eval caught an error
+proc cgi_error_occurred {} {
+ global _cgi
+
+ return [info exists _cgi(errorInfo)]
+}
+
+##################################################
+# CGI URL creation
+##################################################
+
+# declare location of root of CGI files
+# this allows all CGI references to be relative in the source
+# making it easy to move everything in the future
+# If you have multiple roots, just don't call this.
+proc cgi_root {args} {
+ global _cgi
+
+ if {[llength $args]} {
+ set _cgi(root) [lindex $args 0]
+ } else {
+ set _cgi(root)
+ }
+}
+
+# make a URL for a CGI script
+proc cgi_cgi {args} {
+ global _cgi
+
+ set root $_cgi(root)
+ if {0!=[string compare $root ""]} {
+ if {![regexp "/$" $root]} {
+ append root "/"
+ }
+ }
+
+ set suffix [cgi_suffix]
+
+ set arg [lindex $args 0]
+ if {0==[string compare $arg "-suffix"]} {
+ set suffix [lindex $args 1]
+ set args [lrange $args 2 end]
+ }
+
+ if {[llength $args]==1} {
+ return $root[lindex $args 0]$suffix
+ } else {
+ return $root[lindex $args 0]$suffix?[join [lrange $args 1 end] &]
+ }
+}
+
+proc cgi_suffix {args} {
+ global _cgi
+ if {[llength $args] > 0} {
+ set _cgi(suffix) [lindex $args 0]
+ }
+ if {![info exists _cgi(suffix)]} {
+ return .cgi
+ } else {
+ return $_cgi(suffix)
+ }
+}
+
+proc cgi_cgi_set {variable value} {
+ regsub -all {%} $value "%25" value
+ regsub -all {&} $value "%26" value
+ regsub -all {\+} $value "%2b" value
+ regsub -all { } $value "+" value
+ regsub -all {=} $value "%3d" value
+ regsub -all {#} $value "%23" value
+ regsub -all {/} $value "%2f" value ;# Added...
+ return $variable=$value
+}
+
+##################################################
+# URL dictionary support
+##################################################
+
+proc cgi_link {args} {
+ global _cgi_link
+
+ set tag [lindex $args 0]
+ switch -- [llength $args] {
+ 1 {
+ set label $_cgi_link($tag,label)
+ } 2 {
+ set label [lindex $args end]
+ } default {
+ set _cgi_link($tag,label) [set label [lindex $args 1]]
+ set _cgi_link($tag,url) [lrange $args 2 end]
+ }
+ }
+
+ return [eval cgi_url [list $label] $_cgi_link($tag,url)]
+}
+
+# same as above but for images
+# note: uses different namespace
+proc cgi_imglink {args} {
+ global _cgi_imglink
+
+ set tag [lindex $args 0]
+ if {[llength $args] >= 2} {
+ set _cgi_imglink($tag) [eval cgi_img [lrange $args 1 end]]
+ }
+ return $_cgi_imglink($tag)
+}
+
+proc cgi_link_label {tag} {
+ global _cgi_link
+ return $_cgi_link($tag,label)
+}
+
+proc cgi_link_url {tag} {
+ global _cgi_link
+ return $_cgi_link($tag,url)
+}
+
+##################################################
+# hyperlink support
+##################################################
+
+# construct a hyperlink labeled "display"
+# last arg is the link destination
+# any other args are passed through into <a> display
+proc cgi_url {display args} {
+ global _cgi
+
+ set buf "<a href=\"[lindex $args 0]\""
+ foreach a [lrange $args 1 end] {
+ if {[regexp $_cgi(attr,regexp) $a dummy attr str]} {
+ append buf " $attr=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ return "$buf>$display</a>"
+}
+
+# generate an image reference (<img ...>)
+# first arg is image url
+# other args are passed through into <img> tag
+proc cgi_img {args} {
+ global _cgi
+
+ set buf "<img src=\"[lindex $args 0]\""
+ foreach a [lrange $args 1 end] {
+ if {[regexp "^(alt|lowsrc|usemap)=(.*)" $a dummy attr str]} {
+ append buf " $attr=[cgi_dquote_html $str]"
+ } elseif {[regexp $_cgi(attr,regexp) $a dummy attr str]} {
+ append buf " $attr=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ return "$buf />"
+}
+
+# names an anchor so that it can be linked to
+proc cgi_anchor_name {name} {
+ return "<a name=\"$name\"/>"
+}
+
+proc cgi_base {args} {
+ global _cgi
+
+ cgi_put "<base"
+ foreach a $args {
+ if {[regexp "^href=(.*)" $a dummy str]} {
+ cgi_put " href=[cgi_dquote_html $str]"
+ } elseif {[regexp $_cgi(attr,regexp) $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts " />"
+}
+
+##################################################
+# quoting support
+##################################################
+
+if {[info tclversion] >= 8.2} {
+ proc cgi_unquote_input buf {
+ # rewrite "+" back to space
+ # protect \ from quoting another \ and throwing off other things
+ # replace line delimiters with newlines
+ set buf [string map -nocase [list + { } "\\" "\\\\" %0d%0a \n] $buf]
+
+ # prepare to process all %-escapes
+ regsub -all -nocase {%([a-f0-9][a-f0-9])} $buf {\\u00\1} buf
+
+ # process \u unicode mapped chars
+ encoding convertfrom $::_cgi(queryencoding) \
+ [subst -novar -nocommand $buf]
+ }
+} elseif {[info tclversion] >= 8.1} {
+ proc cgi_unquote_input buf {
+ # rewrite "+" back to space
+ regsub -all {\+} $buf { } buf
+ # protect \ from quoting another \ and throwing off other things
+ regsub -all {\\} $buf {\\\\} buf
+
+ # replace line delimiters with newlines
+ regsub -all -nocase "%0d%0a" $buf "\n" buf
+
+ # prepare to process all %-escapes
+ regsub -all -nocase {%([a-f0-9][a-f0-9])} $buf {\\u00\1} buf
+ # process \u unicode mapped chars
+ return [subst -novar -nocommand $buf]
+ }
+} else {
+ proc cgi_unquote_input {buf} {
+ # rewrite "+" back to space
+ regsub -all {\+} $buf { } buf
+ # protect \ from quoting another \ and throwing off other things first
+ # protect $ from doing variable expansion
+ # protect [ from doing evaluation
+ # protect " from terminating string
+ regsub -all {([\\["$])} $buf {\\\1} buf
+
+ # replace line delimiters with newlines
+ regsub -all -nocase "%0d%0a" $buf "\n" buf
+ # Mosaic sends just %0A. This is handled in the next command.
+
+ # prepare to process all %-escapes
+ regsub -all -nocase {%([a-f0-9][a-f0-9])} $buf {[format %c 0x\1]} buf
+ # process %-escapes and undo all protection
+ eval return \"$buf\"
+ }
+}
+
+# return string but with html-special characters escaped,
+# necessary if you want to send unknown text to an html-formatted page.
+proc cgi_quote_html {s} {
+ regsub -all {&} $s {\&amp;} s ;# must be first!
+ regsub -all {"} $s {\&quot;} s
+ regsub -all {<} $s {\&lt;} s
+ regsub -all {>} $s {\&gt;} s
+ return $s
+}
+
+proc cgi_dquote_html {s} {
+ return \"[cgi_quote_html $s]\"
+}
+
+# return string quoted appropriately to appear in a url
+proc cgi_quote_url {in} {
+ regsub -all {%} $in "%25" in
+ regsub -all {\+} $in "%2b" in
+ regsub -all { } $in "%20" in
+ regsub -all {"} $in "%22" in
+ regsub -all {\?} $in "%3f" in
+ return $in
+}
+
+##################################################
+# short or single paragraph support
+##################################################
+
+proc cgi_br {args} {
+ cgi_put "<br"
+ if {[llength $args]} {
+ cgi_put "[_cgi_list_to_string $args]"
+ }
+ cgi_put " />"
+}
+
+# generate cgi_h1 and others
+for {set _cgi(tmp) 1} {$_cgi(tmp)<8} {incr _cgi(tmp)} {
+ proc cgi_h$_cgi(tmp) {{args}} "eval cgi_h $_cgi(tmp) \$args"
+}
+proc cgi_h {num args} {
+ cgi_put "<h$num"
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ set args [lrange $args end end]
+ }
+ cgi_put ">[lindex $args 0]</h$num>"
+}
+
+proc cgi_p {args} {
+ cgi_put "<p"
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ set args [lrange $args end end]
+ }
+ cgi_put ">[lindex $args 0]</p>"
+}
+
+proc cgi_address {s} {cgi_put <address>$s</address>}
+proc cgi_blockquote {s} {cgi_puts <blockquote>$s</blockquote>}
+
+##################################################
+# long or multiple paragraph support
+##################################################
+
+# Shorthand for <div align=center>. We used to use <center> tags but that
+# is now officially unsupported.
+proc cgi_center {cmd} {
+ uplevel 1 "cgi_division align=center [list $cmd]"
+}
+
+proc cgi_division {args} {
+ cgi_put "<div"
+ _cgi_close_proc_push "cgi_put </div>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr {[llength $args]-2}]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_preformatted {args} {
+ cgi_put "<pre"
+ _cgi_close_proc_push "cgi_put </pre>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+##################################################
+# list support
+##################################################
+
+proc cgi_li {args} {
+ cgi_put <li
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">[lindex $args end]</li>"
+}
+
+proc cgi_number_list {args} {
+ cgi_put "<ol"
+ _cgi_close_proc_push "cgi_put </ol>"
+
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+
+ _cgi_close_proc
+}
+
+proc cgi_bullet_list {args} {
+ cgi_put "<ul"
+ _cgi_close_proc_push "cgi_put </ul>"
+
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+
+ _cgi_close_proc
+}
+
+# Following two are normally used from within definition lists
+# but are actually paragraph types on their own.
+proc cgi_term {s} {cgi_put <dt>$s</dt>}
+proc cgi_term_definition {s} {cgi_put <dd>$s</dd>}
+
+proc cgi_definition_list {cmd} {
+ cgi_put "<dl>"
+ _cgi_close_proc_push "cgi_put </dl>"
+
+ uplevel 1 $cmd
+ _cgi_close_proc
+}
+
+proc cgi_menu_list {cmd} {
+ cgi_put "<menu>"
+ _cgi_close_proc_push "cgi_put </menu>"
+
+ uplevel 1 $cmd
+ _cgi_close_proc
+}
+proc cgi_directory_list {cmd} {
+ cgi_put "<dir>"
+ _cgi_close_proc_push "cgi_put </dir>"
+
+ uplevel 1 $cmd
+ _cgi_close_proc
+}
+
+##################################################
+# text support
+##################################################
+
+proc cgi_put {s} {cgi_puts -nonewline $s}
+
+# some common special characters
+proc cgi_lt {} {return "&lt;"}
+proc cgi_gt {} {return "&gt;"}
+proc cgi_amp {} {return "&amp;"}
+proc cgi_quote {} {return "&quot;"}
+proc cgi_enspace {} {return "&ensp;"}
+proc cgi_emspace {} {return "&emsp;"}
+proc cgi_nbspace {} {return "&#160;"} ;# nonbreaking space
+proc cgi_tm {} {return "&#174;"} ;# registered trademark
+proc cgi_copyright {} {return "&#169;"}
+proc cgi_isochar {n} {return "&#$n;"}
+proc cgi_breakable {} {return "<wbr />"}
+
+proc cgi_unbreakable_string {s} {return "<nobr>$s</nobr>"}
+proc cgi_unbreakable {cmd} {
+ cgi_put "<nobr>"
+ _cgi_close_proc_push "cgi_put </nobr>"
+ uplevel 1 $cmd
+ _cgi_close_proc
+}
+
+proc cgi_nl {args} {
+ set buf "<br"
+ if {[llength $args]} {
+ append buf "[_cgi_list_to_string $args]"
+ }
+ return "$buf />"
+}
+
+proc cgi_bold {s} {return "<b>$s</b>"}
+proc cgi_italic {s} {return "<i>$s</i>"}
+proc cgi_underline {s} {return "<u>$s</u>"}
+proc cgi_strikeout {s} {return "<s>$s</s>"}
+proc cgi_subscript {s} {return "<sub>$s</sub>"}
+proc cgi_superscript {s} {return "<sup>$s</sup>"}
+proc cgi_typewriter {s} {return "<tt>$s</tt>"}
+proc cgi_blink {s} {return "<blink>$s</blink>"}
+proc cgi_emphasis {s} {return "<em>$s</em>"}
+proc cgi_strong {s} {return "<strong>$s</strong>"}
+proc cgi_cite {s} {return "<cite>$s</cite>"}
+proc cgi_sample {s} {return "<samp>$s</samp>"}
+proc cgi_keyboard {s} {return "<kbd>$s</kbd>"}
+proc cgi_variable {s} {return "<var>$s</var>"}
+proc cgi_definition {s} {return "<dfn>$s</dfn>"}
+proc cgi_big {s} {return "<big>$s</big>"}
+proc cgi_small {s} {return "<small>$s</small>"}
+
+proc cgi_basefont {size} {cgi_put "<basefont size=$size />"}
+
+proc cgi_font {args} {
+ global _cgi
+
+ set buf "<font"
+ foreach a [lrange $args 0 [expr [llength $args]-2]] {
+ if {[regexp $_cgi(attr,regexp) $a dummy attr str]} {
+ append buf " $attr=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ return "$buf>[lindex $args end]</font>"
+}
+
+# take a cgi func and have it return what would normally print
+# This command is reentrant (that's why it's so complex).
+proc cgi_buffer {cmd} {
+ global _cgi
+
+ if {0==[info exists _cgi(returnIndex)]} {
+ set _cgi(returnIndex) 0
+ }
+
+ rename cgi_puts cgi_puts$_cgi(returnIndex)
+ incr _cgi(returnIndex)
+ set _cgi(return[set _cgi(returnIndex)]) ""
+
+ proc cgi_puts args {
+ global _cgi
+ upvar #0 _cgi(return[set _cgi(returnIndex)]) buffer
+
+ append buffer [lindex $args end]
+ if {[llength $args] == 1} {
+ append buffer $_cgi(buffer_nl)
+ }
+ }
+
+ # must restore things before allowing the eval to fail
+ # so catch here and rethrow later
+ if {[catch {uplevel 1 $cmd} errMsg]} {
+ global errorInfo
+ set savedInfo $errorInfo
+ }
+
+ # not necessary to put remainder of code in close_proc_push since it's
+ # all buffered anyway and hasn't yet put browser into a funky state.
+
+ set buffer $_cgi(return[set _cgi(returnIndex)])
+
+ incr _cgi(returnIndex) -1
+ rename cgi_puts ""
+ rename cgi_puts$_cgi(returnIndex) cgi_puts
+
+ if {[info exists savedInfo]} {
+ error $errMsg $savedInfo
+ }
+ return $buffer
+}
+
+set _cgi(buffer_nl) "\n"
+proc cgi_buffer_nl {nl} {
+ global _cgi
+
+ set old $_cgi(buffer_nl)
+ set _cgi(buffer_nl) $nl
+ return $old
+}
+
+##################################################
+# html and tags that can appear in html top-level
+##################################################
+
+proc cgi_html {args} {
+ set html [lindex $args end]
+ set argc [llength $args]
+ if {$argc > 1} {
+ eval _cgi_html_start [lrange $args 0 [expr {$argc-2}]]
+ } else {
+ _cgi_html_start
+ }
+ uplevel 1 $html
+ _cgi_html_end
+}
+
+proc _cgi_html_start {args} {
+ global _cgi
+
+ if {[info exists _cgi(html_in_progress)]} return
+ _cgi_http_head_implicit
+
+ set _cgi(html_in_progress) 1
+ cgi_doctype
+
+ append buf "<html"
+ foreach a $args {
+ if {[regexp $_cgi(attr,regexp) $a dummy attr str]} {
+ append buf " $attr=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ cgi_puts "$buf>"
+}
+
+proc _cgi_html_end {} {
+ global _cgi
+ unset _cgi(html_in_progress)
+ set _cgi(html_done) 1
+ cgi_puts "</html>"
+}
+
+# force closure of all tags and exit without going through normal returns.
+# Very useful if you want to call exit from a deeply stacked CGI script
+# and still have the HTML be correct.
+proc cgi_exit {} {
+ _cgi_close_procs
+ cgi_html {cgi_body {}}
+ exit
+}
+
+##################################################
+# head support
+##################################################
+
+proc cgi_head {{head {}}} {
+ global _cgi
+
+ if {[info exists _cgi(head_done)]} {
+ return
+ }
+
+ # allow us to be recalled so that we can display errors
+ if {0 == [info exists _cgi(head_in_progress)]} {
+ _cgi_http_head_implicit
+ set _cgi(head_in_progress) 1
+ cgi_puts "<head>"
+ }
+
+ # prevent cgi_html (during error handling) from generating html tags
+ set _cgi(html_in_progress) 1
+ # don't actually generate html tags since there's nothing to clean
+ # them up
+
+ if {0 == [string length $head]} {
+ if {[catch {cgi_title}]} {
+ set head "cgi_title untitled"
+ }
+ }
+ uplevel 1 $head
+ if {![info exists _cgi(head_suppress_tag)]} {
+ cgi_puts "</head>"
+ } else {
+ unset _cgi(head_suppress_tag)
+ }
+
+ set _cgi(head_done) 1
+
+ # debugging can unset this in the uplevel above
+ catch {unset _cgi(head_in_progress)}
+}
+
+# with one arg: set, print, and return title
+# with no args: return title
+proc cgi_title {args} {
+ global _cgi
+
+ set title [lindex $args 0]
+
+ if {[llength $args]} {
+ _cgi_http_head_implicit
+
+ # we could just generate <head></head> tags, but head-level commands
+ # might follow so just suppress the head tags entirely
+ if {![info exists _cgi(head_in_progress)]} {
+ set _cgi(head_in_progress) 1
+ set _cgi(head_suppress_tag) 1
+ }
+
+ set _cgi(title) $title
+ cgi_puts "<title>$title</title>"
+ }
+ return $_cgi(title)
+}
+
+# This tag can only be called from with cgi_head.
+# example: cgi_http_equiv Refresh 1
+# There's really no reason to call this since it can be done directly
+# from cgi_http_head.
+proc cgi_http_equiv {type contents} {
+ _cgi_http_head_implicit
+ cgi_puts "<meta http-equiv=\"$type\" content=[cgi_dquote_html $contents]/>"
+}
+
+# Do whatever you want with meta tags.
+# Example: <meta name="author" content="Don Libes">
+proc cgi_meta {args} {
+ cgi_put "<meta"
+ foreach a $args {
+ if {[regexp "^(name|content|http-equiv)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=[cgi_dquote_html $str]"
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts " />"
+}
+
+proc cgi_relationship {rel href args} {
+ cgi_puts "<link rel=$rel href=\"$href\""
+ foreach a $args {
+ if {[regexp "^title=(.*)" $a dummy str]} {
+ cgi_put " title=[cgi_dquote_html $str]"
+ } elseif {[regexp "^type=(.*)" $a dummy str]} {
+ cgi_put " type=[cgi_dquote_html $str]"
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts "/>"
+}
+
+proc cgi_name {args} {
+ global _cgi
+
+ if {[llength $args]} {
+ set _cgi(name) [lindex $args 0]
+ }
+ return $_cgi(name)
+}
+
+##################################################
+# body and other top-level support
+##################################################
+
+proc cgi_body {args} {
+ global errorInfo errorCode _cgi
+
+ # allow user to "return" from the body without missing _cgi_body_end
+ if {1==[catch {
+ eval _cgi_body_start [lrange $args 0 [expr [llength $args]-2]]
+ uplevel 1 [lindex $args end]
+ } errMsg]} {
+ set savedInfo $errorInfo
+ set savedCode $errorCode
+ error $errMsg $savedInfo $savedCode
+ }
+ _cgi_body_end
+}
+
+proc _cgi_body_start {args} {
+ global _cgi
+ if {[info exists _cgi(body_in_progress)]} return
+
+ cgi_head
+
+ set _cgi(body_in_progress) 1
+
+ cgi_put "<body"
+ foreach a "$args $_cgi(body_args)" {
+ if {[regexp "^(background|bgcolor|text|link|vlink|alink|onLoad|onUnload)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts ">"
+
+ cgi_debug {
+ global env
+ catch {cgi_puts "Input: <pre>$_cgi(input)</pre>"}
+ catch {cgi_puts "Cookie: <pre>$env(HTTP_COOKIE)</pre>"}
+ }
+
+ if {![info exists _cgi(errorInfo)]} {
+ uplevel 2 app_body_start
+ }
+}
+
+proc _cgi_body_end {} {
+ global _cgi
+ if {![info exists _cgi(errorInfo)]} {
+ uplevel 2 app_body_end
+ }
+ unset _cgi(body_in_progress)
+ cgi_puts "</body>"
+
+ if {[info exists _cgi(multipart)]} {
+ unset _cgi(http_head_done)
+ catch {unset _cgi(http_status_done)}
+ unset _cgi(head_done)
+ catch {unset _cgi(head_suppress_tag)}
+ }
+}
+
+proc cgi_body_args {args} {
+ global _cgi
+
+ set _cgi(body_args) $args
+}
+
+proc cgi_script {args} {
+ cgi_puts "<script[_cgi_lrange $args 0 [expr [llength $args]-2]]>"
+ _cgi_close_proc_push "cgi_puts </script>"
+
+ uplevel 1 [lindex $args end]
+
+ _cgi_close_proc
+}
+
+proc cgi_javascript {args} {
+ cgi_puts "<script[_cgi_lrange $args 0 [expr [llength $args]-2]]>"
+ cgi_puts "<!--- Hide script from browsers that don't understand JavaScript"
+ _cgi_close_proc_push {cgi_puts "// End hiding -->\n</script>"}
+
+ uplevel 1 [lindex $args end]
+
+ _cgi_close_proc
+}
+
+proc cgi_noscript {args} {
+ cgi_puts "<noscript[_cgi_lrange $args 0 [expr [llength $args]-2]]>"
+ _cgi_close_proc_push {cgi_puts "</noscript>"}
+
+ uplevel 1 [lindex $args end]
+
+ _cgi_close_proc
+}
+
+proc cgi_applet {args} {
+ cgi_puts "<applet[_cgi_lrange $args 0 [expr [llength $args]-2]]>"
+ _cgi_close_proc_push "cgi_puts </applet>"
+
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_param {nameval} {
+ regexp "(\[^=]*)(=?)(.*)" $nameval dummy name q value
+
+ if {$q != "="} {
+ set value ""
+ }
+ cgi_puts "<param name=\"$name\" value=[cgi_dquote_html $value]/>"
+}
+
+# record any proc's that must be called prior to displaying an error
+proc _cgi_close_proc_push {p} {
+ global _cgi
+ if {![info exists _cgi(close_proc)]} {
+ set _cgi(close_proc) ""
+ }
+ set _cgi(close_proc) "$p; $_cgi(close_proc)"
+}
+
+proc _cgi_close_proc_pop {} {
+ global _cgi
+ regexp "^(\[^;]*);(.*)" $_cgi(close_proc) dummy lastproc _cgi(close_proc)
+ return $lastproc
+}
+
+# generic proc to close whatever is on the top of the stack
+proc _cgi_close_proc {} {
+ eval [_cgi_close_proc_pop]
+}
+
+proc _cgi_close_procs {} {
+ global _cgi
+
+ _cgi_close_tag
+ if {[info exists _cgi(close_proc)]} {
+ uplevel #0 $_cgi(close_proc)
+ }
+}
+
+proc _cgi_close_tag {} {
+ global _cgi
+
+ if {[info exists _cgi(tag_in_progress)]} {
+ cgi_put ">"
+ unset _cgi(tag_in_progress)
+ }
+}
+
+##################################################
+# hr support
+##################################################
+
+proc cgi_hr {args} {
+ set buf "<hr"
+ foreach a $args {
+ if {[regexp "^width=(.*)" $a dummy str]} {
+ append buf " width=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ cgi_put "$buf />"
+}
+
+##################################################
+# form & isindex
+##################################################
+
+proc cgi_form {action args} {
+ global _cgi
+
+ _cgi_form_multiple_check
+ set _cgi(form_in_progress) 1
+
+ _cgi_close_proc_push _cgi_form_end
+ cgi_put "<form action="
+ if {[regexp {^[a-z]*:} $action]} {
+ cgi_put "\"$action\""
+ } else {
+ cgi_put "\"[cgi_cgi $action]\""
+ }
+ set method "method=post"
+ foreach a [lrange $args 0 [expr [llength $args]-2]] {
+ if {[regexp "^method=" $a]} {
+ set method $a
+ } elseif {[regexp "^(target|onReset|onSubmit)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } elseif {[regexp "^enctype=(.*)" $a dummy str]} {
+ cgi_put " enctype=\"$str\""
+ set _cgi(form,enctype) $str
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put " $method>"
+ uplevel 1 [lindex $args end]
+ catch {unset _cgi(form,enctype)}
+ _cgi_close_proc
+}
+
+proc _cgi_form_end {} {
+ global _cgi
+ unset _cgi(form_in_progress)
+ cgi_put "</form>"
+}
+
+proc _cgi_form_multiple_check {} {
+ global _cgi
+ if {[info exists _cgi(form_in_progress)]} {
+ error "Cannot create form (or isindex) with form already in progress."
+ }
+}
+
+proc cgi_isindex {args} {
+ _cgi_form_multiple_check
+
+ cgi_put "<isindex"
+ foreach a $args {
+ if {[regexp "^href=(.*)" $a dummy str]} {
+ cgi_put " href=\"$str\""
+ } elseif {[regexp "^prompt=(.*)" $a dummy str]} {
+ cgi_put " prompt=[cgi_dquote_html $str]"
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+##################################################
+# argument handling
+##################################################
+
+proc cgi_input {{fakeinput {}} {fakecookie {}}} {
+ global env _cgi _cgi_uservar _cgi_cookie _cgi_cookie_shadowed
+
+ set _cgi(uservars) {}
+ set _cgi(uservars,autolist) {}
+
+ if {[info exists env(CONTENT_TYPE)] && [regexp ^multipart/form-data $env(CONTENT_TYPE)]} {
+ if {![info exists env(REQUEST_METHOD)]} {
+ # running by hand
+ set fid [open $fakeinput]
+ } else {
+ set fid stdin
+ }
+ if {([info tclversion] >= 8.1) || [catch exp_version] || [info exists _cgi(no_binary_upload)]} {
+ _cgi_input_multipart $fid
+ } else {
+ _cgi_input_multipart_binary $fid
+ }
+ } else {
+ if {![info exists env(REQUEST_METHOD)]} {
+ set input $fakeinput
+ set env(HTTP_COOKIE) $fakecookie
+ } elseif { $env(REQUEST_METHOD) == "GET" } {
+ set input ""
+ catch {set input $env(QUERY_STRING)} ;# doesn't have to be set
+ } elseif { $env(REQUEST_METHOD) == "HEAD" } {
+ set input ""
+ } elseif {![info exists env(CONTENT_LENGTH)]} {
+ set _cgi(client_error) 1
+ error "Your browser failed to generate the content-length during a POST method."
+ } else {
+ set length $env(CONTENT_LENGTH)
+ if {0!=[string compare $length "-1"]} {
+ set input [read stdin $env(CONTENT_LENGTH)]
+ } else {
+ set _cgi(client_error) 1
+ error "Your browser generated a content-length of -1 during a POST method."
+ }
+ if {[info tclversion] >= 8.1} {
+ # guess query encoding from Content-Type header
+ if {[info exists env(CONTENT_TYPE)] \
+ && [regexp -nocase -- {charset=([^[:space:]]+)} $env(CONTENT_TYPE) m cs]} {
+ if {[regexp -nocase -- {iso-?8859-([[:digit:]]+)} $cs m d]} {
+ set _cgi(queryencoding) "iso8859-$d"
+ } elseif {[regexp -nocase -- {windows-([[:digit:]]+)} $cs m d]} {
+ set _cgi(queryencoding) "cp$d"
+ } elseif {0==[string compare -nocase $cs "utf-8"]} {
+ set _cgi(queryencoding) "utf-8"
+ } elseif {0==[string compare -nocase $cs "utf-16"]} {
+ set _cgi(queryencoding) "unicode"
+ }
+ } else {
+ set _cgi(queryencoding) [encoding system]
+ }
+ }
+ }
+ # save input for possible diagnostics later
+ set _cgi(input) $input
+
+ set pairs [split $input &]
+ foreach pair $pairs {
+ if {0 == [regexp "^(\[^=]*)=(.*)$" $pair dummy varname val]} {
+ # if no match, unquote and leave it at that
+ # this is typical of <isindex>-style queries
+ set varname anonymous
+ set val $pair
+ }
+
+ set varname [cgi_unquote_input $varname]
+ set val [cgi_unquote_input $val]
+ _cgi_set_uservar $varname $val
+ }
+ }
+
+ # O'Reilly's web server incorrectly uses COOKIE
+ catch {set env(HTTP_COOKIE) $env(COOKIE)}
+ if {![info exists env(HTTP_COOKIE)]} return
+ foreach pair [split $env(HTTP_COOKIE) ";"] {
+ # pairs are actually split by "; ", sigh
+ set pair [string trimleft $pair " "]
+ # spec is not clear but seems to allow = unencoded
+ # only sensible interpretation is to assume no = in var names
+ # appears MS IE can omit "=val"
+ set val ""
+ regexp (\[^=]*)=?(.*) $pair dummy varname val
+
+ set varname [cgi_unquote_input $varname]
+ set val [cgi_unquote_input $val]
+
+ if {[info exists _cgi_cookie($varname)]} {
+ lappend _cgi_cookie_shadowed($varname) $val
+ } else {
+ set _cgi_cookie($varname) $val
+ }
+ }
+}
+
+proc _cgi_input_multipart {fin} {
+ global env _cgi _cgi_uservar _cgi_userfile
+
+ cgi_debug -noprint {
+ # save file for debugging purposes
+ set dbg_filename [file join $_cgi(tmpdir) CGIdbg.[pid]]
+ # explicitly flush all writes to fout, because sometimes the writer
+ # can hang and we won't get to the termination code
+ set dbg_fout [open $dbg_filename w $_cgi(tmpperms)]
+ set _cgi(input) $dbg_filename
+ catch {fconfigure $dbg_fout -translation binary}
+ }
+
+ # figure out boundary
+ if {0==[regexp boundary=(.*) $env(CONTENT_TYPE) dummy boundary]} {
+ set _cgi(client_error) 1
+ error "Your browser failed to generate a \"boundary=\" line in a multipart response (CONTENT_TYPE: $env(CONTENT_TYPE)). Please upgrade (or fix) your browser."
+ }
+
+ # make boundary into a legal regsub pattern by protecting #
+ # legal boundary characters include ()+.? (among others)
+ regsub -all "\\(" $boundary "\\(" boundary
+ regsub -all "\\)" $boundary "\\)" boundary
+ regsub -all "\\+" $boundary "\\+" boundary
+ regsub -all "\\." $boundary "\\." boundary
+ regsub -all "\\?" $boundary "\\?" boundary
+
+ set boundary --$boundary
+
+ # don't corrupt or modify uploads yet allow Tcl 7.4 to work
+ catch {fconfigure $fin -translation binary}
+
+ # get first boundary line
+ gets $fin buf
+ if {[info exists dbg_fout]} {puts $dbg_fout $buf; flush $dbg_fout}
+
+ set _cgi(file,filecount) 0
+
+ while {1} {
+ # process Content-Disposition:
+ if {-1 == [gets $fin buf]} break
+ if {[info exists dbg_fout]} {puts $dbg_fout $buf; flush $dbg_fout}
+ catch {unset filename}
+ regexp {name="([^"]*)"} $buf dummy varname
+ if {0==[info exists varname]} {
+ # lynx violates spec and doesn't use quotes, so try again but
+ # assume space is delimiter
+ regexp {name=([^ ]*)} $buf dummy varname
+ if {0==[info exists varname]} {
+ set _cgi(client_error) 1
+ error "In response to a request for a multipart form, your browser generated a part header without a name field. Please upgrade (or fix) your browser."
+ }
+ }
+ # Lame-o encoding (on Netscape at least) doesn't escape field
+ # delimiters (like quotes)!! Since all we've ever seen is filename=
+ # at end of line, assuming nothing follows. Sigh.
+ regexp {filename="(.*)"} $buf dummy filename
+
+ # Skip remaining headers until blank line.
+ # Content-Type: can appear here.
+ set conttype ""
+ while {1} {
+ if {-1 == [gets $fin buf]} break
+ if {[info exists dbg_fout]} {puts $dbg_fout $buf; flush $dbg_fout}
+ if {0==[string compare $buf "\r"]} break
+ regexp -nocase "^Content-Type:\[ \t]+(.*)\r" $buf x conttype
+ }
+
+ if {[info exists filename]} {
+ if {$_cgi(file,filecount) > $_cgi(file,filelimit)} {
+ error "Too many files submitted. Max files allowed: $_cgi(file,filelimit)"
+ }
+
+ # read the part into a file
+ set foutname [file join $_cgi(tmpdir) CGI[pid].[incr _cgi(file,filecount)]]
+ set fout [open $foutname w $_cgi(tmpperms)]
+ # "catch" permits this to work with Tcl 7.4
+ catch {fconfigure $fout -translation binary}
+ _cgi_set_uservar $varname [list $foutname $filename $conttype]
+ set _cgi_userfile($varname) [list $foutname $filename $conttype]
+
+ #
+ # Look for a boundary line preceded by \r\n.
+ #
+ # To do this, we buffer line terminators that might
+ # be the start of the special \r\n$boundary sequence.
+ # The buffer is called "leftover" and is just inserted
+ # into the front of the next output (assuming it's
+ # not a boundary line).
+
+ set leftover ""
+ while {1} {
+ if {-1 == [gets $fin buf]} break
+ if {[info exists dbg_fout]} {puts $dbg_fout $buf; flush $dbg_fout}
+
+ if {0 == [string compare "\r\n" $leftover]} {
+ if {[regexp ^[set boundary](--)?\r?$ $buf dummy dashdash]} {
+ if {$dashdash == "--"} {set eof 1}
+ break
+ }
+ }
+ if {[regexp (.*)\r$ $buf x data]} {
+ puts -nonewline $fout $leftover$data
+ set leftover "\r\n"
+ } else {
+ puts -nonewline $fout $leftover$buf
+ set leftover "\n"
+ }
+ if {[file size $foutname] > $_cgi(file,charlimit)} {
+ error "File size exceeded. Max file size allowed: $_cgi(file,charlimit)"
+ }
+ }
+
+ close $fout
+ unset fout
+ } else {
+ # read the part into a variable
+ set val ""
+ set blanks 0
+ while {1} {
+ if {-1 == [gets $fin buf]} break
+ if {[info exists dbg_fout]} {puts $dbg_fout $buf; flush $dbg_fout}
+ if {[regexp ^[set boundary](--)?\r?$ $buf dummy dashdash]} {
+ if {$dashdash == "--"} {set eof 1}
+ break
+ }
+ if {0!=[string compare $val ""]} {
+ append val \n
+ }
+ regexp (.*)\r$ $buf dummy buf
+ if {[info exists blanks]} {
+ if {0!=[string compare $buf ""]} {
+ if {$blanks} {
+ append val [string repeat \n [incr blanks]]
+ }
+ unset blanks
+ } else {
+ incr blanks
+ }
+ }
+ append val $buf
+ }
+ _cgi_set_uservar $varname $val
+ }
+ if {[info exists eof]} break
+ }
+ if {[info exists dbg_fout]} {close $dbg_fout}
+}
+
+proc _cgi_input_multipart_binary {fin} {
+ global env _cgi _cgi_uservar _cgi_userfile
+
+ log_user 0
+ set timeout -1
+
+ cgi_debug -noprint {
+ # save file for debugging purposes
+ set dbg_filename [file join $_cgi(tmpdir) CGIdbg.[pid]]
+ set _cgi(input) $dbg_filename
+ spawn -open [open $dbg_filename w $_cgi(tmpperms)]
+ set dbg_sid $spawn_id
+ }
+ spawn -open $fin
+ set fin_sid $spawn_id
+ remove_nulls 0
+
+ if {0} {
+ # dump input to screen
+ cgi_debug {
+ puts "<xmp>"
+ expect {
+ -i $fin_sid
+ -re ^\r {puts -nonewline "CR"; exp_continue}
+ -re ^\n {puts "NL"; exp_continue}
+ -re . {puts -nonewline $expect_out(buffer); exp_continue}
+ }
+ puts "</xmp>"
+ exit
+ }
+ }
+
+ # figure out boundary
+ if {0==[regexp boundary=(.*) $env(CONTENT_TYPE) dummy boundary]} {
+ set _cgi(client_error) 1
+ error "Your browser failed to generate a \"boundary=\" definition in a multipart response (CONTENT_TYPE: $env(CONTENT_TYPE)). Please upgrade (or fix) your browser."
+ }
+
+ # make boundary into a legal regsub pattern by protecting #
+ # legal boundary characters include ()+.? (among others)
+ regsub -all "\\(" $boundary "\\(" boundary
+ regsub -all "\\)" $boundary "\\)" boundary
+ regsub -all "\\+" $boundary "\\+" boundary
+ regsub -all "\\." $boundary "\\." boundary
+ regsub -all "\\?" $boundary "\\?" boundary
+
+ set boundary --$boundary
+ set linepat "(\[^\r]*)\r\n"
+
+ # get first boundary line
+ expect {
+ -i $fin_sid
+ -re $linepat {
+ set buf $expect_out(1,string)
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $buf\n}
+ }
+ eof {
+ set _cgi(client_error) 1
+ error "Your browser failed to provide an initial boundary ($boundary) in a multipart response. Please upgrade (or fix) your browser."
+ }
+ }
+
+ set _cgi(file,filecount) 0
+
+ while {1} {
+ # process Content-Disposition:
+ expect {
+ -i $fin_sid
+ -re $linepat {
+ set buf $expect_out(1,string)
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $buf\n}
+ }
+ eof break
+ }
+ catch {unset filename}
+ regexp {name="([^"]*)"} $buf dummy varname
+ if {0==[info exists varname]} {
+ set _cgi(client_error) 1
+ error "In response to a request for a multipart form, your browser generated a part header without a name field. Please upgrade (or fix) your browser."
+ }
+
+ # Lame-o encoding (on Netscape at least) doesn't escape field
+ # delimiters (like quotes)!! Since all we've ever seen is filename=
+ # at end of line, assuming nothing follows. Sigh.
+ regexp {filename="(.*)"} $buf dummy filename
+
+ # Skip remaining headers until blank line.
+ # Content-Type: can appear here.
+ set conttype ""
+ expect {
+ -i $fin_sid
+ -re $linepat {
+ set buf $expect_out(1,string)
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $buf\n}
+ if {0!=[string compare $buf ""]} exp_continue
+ regexp -nocase "^Content-Type:\[ \t]+(.*)\r" $buf x conttype
+ }
+ eof break
+ }
+
+ if {[info exists filename]} {
+ if {$_cgi(file,filecount) > $_cgi(file,filelimit)} {
+ error "Too many files submitted. Max files allowed: $_cgi(file,filelimit)"
+ }
+
+ # read the part into a file
+ set foutname [file join $_cgi(tmpdir) CGI[pid].[incr _cgi(file,filecount)]]
+ spawn -open [open $foutname w $_cgi(tmpperms)]
+ set fout_sid $spawn_id
+
+ _cgi_set_uservar $varname [list $foutname $filename $conttype]
+ set _cgi_userfile($varname) [list $foutname $filename $conttype]
+
+ # This is tricky stuff - be very careful changing anything here!
+ # In theory, all we have to is record everything up to
+ # \r\n$boundary\r\n. Unfortunately, we can't simply wait on
+ # such a pattern because the input can overflow any possible
+ # buffer we might choose. We can't simply catch buffer_full
+ # because the boundary might straddle a buffer. I doubt that
+ # doing my own buffering would be any faster than taking the
+ # approach I've done here.
+ #
+ # The code below basically implements a simple scanner that
+ # keeps track of whether it's seen crlfs or pieces of them.
+ # The idea is that we look for crlf pairs, separated by
+ # things that aren't crlfs (or pieces of them). As we encounter
+ # things that aren't crlfs (or pieces of them), or when we decide
+ # they can't be, we mark them for output and resume scanning for
+ # new pairs.
+ #
+ # The scanner runs tolerably fast because the [...]+ pattern picks
+ # up most things. The \r and \n are ^-anchored so the pattern
+ # match is pretty fast and these don't happen that often so the
+ # huge \n action is executed rarely (once per line on text files).
+ # The null pattern is, of course, only used when everything
+ # else fails.
+
+ # crlf == "\r\n" if we've seen one, else == ""
+ # cr == "\r" if we JUST saw one, else == ""
+ # Yes, strange, but so much more efficient
+ # that I'm willing to sacrifice readability, sigh.
+ # buf accumulated data between crlf pairs
+
+ set buf ""
+ set cr ""
+ set crlf ""
+
+ expect {
+ -i $fin_sid
+ -re "^\r" {
+ if {$cr == "\r"} {
+ append buf "\r"
+ }
+ set cr \r
+ exp_continue
+ } -re "^\n" {
+ if {$cr == "\r"} {
+ if {$crlf == "\r\n"} {
+ # do boundary test
+ if {[regexp ^[set boundary](--)?$ $buf dummy dashdash]} {
+ if {$dashdash == "--"} {
+ set eof 1
+ }
+ } else {
+ # boundary test failed
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- \r\n$buf}
+ send -i $fout_sid \r\n$buf ; set buf ""
+ set cr ""
+ exp_continue
+ }
+ } else {
+ set crlf "\r\n"
+ set cr ""
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $buf}
+ send -i $fout_sid -- $buf ; set buf ""
+ exp_continue
+ }
+ } else {
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $crlf$buf\n}
+ send -i $fout_sid -- $crlf$buf\n ; set buf ""
+ set crlf ""
+ exp_continue
+ }
+ } -re "\[^\r\n]+" {
+ if {$cr == "\r"} {
+ set buf $crlf$buf\r$expect_out(buffer)
+ set crlf ""
+ set cr ""
+ } else {
+ append buf $expect_out(buffer)
+ }
+ exp_continue
+ } null {
+ if {[info exists dbg_sid]} {
+ send -i $dbg_sid -- $crlf$buf$cr
+ send -i $dbg_sid -null
+ }
+ send -i $fout_sid -- $crlf$buf$cr ; set buf ""
+ send -i $fout_sid -null
+ set cr ""
+ set crlf ""
+ exp_continue
+ } eof {
+ set _cgi(client_error) 1
+ error "Your browser failed to provide an ending boundary ($boundary) in a multipart response. Please upgrade (or fix) your browser."
+ }
+ }
+ exp_close -i $fout_sid ;# implicitly closes fout
+ exp_wait -i $fout_sid
+ unset fout_sid
+ } else {
+ # read the part into a variable
+ set val ""
+ expect {
+ -i $fin_sid
+ -re $linepat {
+ set buf $expect_out(1,string)
+ if {[info exists dbg_sid]} {send -i $dbg_sid -- $buf\n}
+ if {[regexp ^[set boundary](--)?$ $buf dummy dashdash]} {
+ if {$dashdash == "--"} {set eof 1}
+ } else {
+ regexp (.*)\r$ $buf dummy buf
+ if {0!=[string compare $val ""]} {
+ append val \n
+ }
+ append val $buf
+ exp_continue
+ }
+ }
+ }
+ _cgi_set_uservar $varname $val
+ }
+ if {[info exists eof]} break
+ }
+ if {[info exists fout]} {
+ exp_close -i $dbg_sid
+ exp_wait -i $dbg_sid
+ }
+
+ # no need to close fin, fin_sid, or dbg_sid
+}
+
+# internal routine for defining user variables
+proc _cgi_set_uservar {varname val} {
+ global _cgi _cgi_uservar
+
+ set exists [info exists _cgi_uservar($varname)]
+ set isList $exists
+ # anything we've seen before and is being set yet again necessarily
+ # has to be (or become a list)
+
+ if {!$exists} {
+ lappend _cgi(uservars) $varname
+ }
+
+ if {[regexp List$ $varname]} {
+ set isList 1
+ } elseif {$exists} {
+ # vars that we've seen before but aren't marked as lists
+ # need to be "listified" so we can do appends later
+ if {-1 == [lsearch $_cgi(uservars,autolist) $varname]} {
+ # remember that we've listified it
+ lappend _cgi(uservars,autolist) $varname
+ set _cgi_uservar($varname) [list $_cgi_uservar($varname)]
+ }
+ }
+ if {$isList} {
+ lappend _cgi_uservar($varname) $val
+ } else {
+ set _cgi_uservar($varname) $val
+ }
+}
+
+# export named variable
+proc cgi_export {nameval} {
+ regexp "(\[^=]*)(=?)(.*)" $nameval dummy name q value
+
+ if {$q != "="} {
+ set value [uplevel 1 set [list $name]]
+ }
+
+ cgi_put "<input type=hidden name=\"$name\" value=[cgi_dquote_html $value]/>"
+}
+
+proc cgi_export_cookie {name args} {
+ upvar 1 $name x
+ eval cgi_cookie_set [list $name=$x] $args
+}
+
+# return list of variables available for import
+# Explicit list is used to keep items in order originally found in form.
+proc cgi_import_list {} {
+ global _cgi
+
+ return $_cgi(uservars)
+}
+
+# import named variable
+proc cgi_import {name} {
+ global _cgi_uservar
+ upvar 1 $name var
+
+ set var $_cgi_uservar($name)
+}
+
+proc cgi_import_as {name tclvar} {
+ global _cgi_uservar
+ upvar 1 $tclvar var
+
+ set var $_cgi_uservar($name)
+}
+
+# like cgi_import but if not available, try cookie
+proc cgi_import_cookie {name} {
+ global _cgi_uservar
+ upvar 1 $name var
+
+ if {0==[catch {set var $_cgi_uservar($name)}]} return
+ set var [cgi_cookie_get $name]
+}
+
+# like cgi_import but if not available, try cookie
+proc cgi_import_cookie_as {name tclvar} {
+ global _cgi_uservar
+ upvar 1 $tclvar var
+
+ if {0==[catch {set var $_cgi_uservar($name)}]} return
+ set var [cgi_cookie_get $name]
+}
+
+proc cgi_import_file {type name} {
+ global _cgi_userfile
+ upvar 1 $name var
+
+ set var $_cgi_userfile($name)
+ switch -- $type {
+ "-server" {
+ lindex $var 0
+ } "-client" {
+ lindex $var 1
+ } "-type" {
+ lindex $var 2
+ }
+ }
+}
+
+# deprecated, use cgi_import_file
+proc cgi_import_filename {type name} {
+ global _cgi_userfile
+ upvar 1 $name var
+
+ set var $_cgi_userfile($name)
+ if {$type == "-server" || $type == "-local"} {
+ # -local is deprecated
+ lindex $var 0
+ } else {
+ lindex $var 1
+ }
+}
+
+# set the urlencoding
+proc cgi_urlencoding {{encoding ""}} {
+ global _cgi
+
+ set result [expr {[info exists _cgi(queryencoding)]
+ ? $_cgi(queryencoding)
+ : ""}]
+
+ # check if the encoding is available
+ if {[info tclversion] >= 8.1
+ && [lsearch -exact [encoding names] $encoding] != -1 } {
+ set _cgi(queryencoding) $encoding
+ }
+
+ return $result
+}
+
+##################################################
+# button support
+##################################################
+
+# not sure about arg handling, do we need to support "name="?
+proc cgi_button {value args} {
+ cgi_put "<input type=button value=[cgi_dquote_html $value]"
+ foreach a $args {
+ if {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+# Derive a button from a link predefined by cgi_link
+proc cgi_button_link {args} {
+ global _cgi_link
+
+ set tag [lindex $args 0]
+ if {[llength $args] == 2} {
+ set label [lindex $args end]
+ } else {
+ set label $_cgi_link($tag,label)
+ }
+
+ cgi_button $label onClick=$_cgi_link($tag,url)
+}
+
+proc cgi_submit_button {{nameval {=Submit Query}} args} {
+ regexp "(\[^=]*)=(.*)" $nameval dummy name value
+ cgi_put "<input type=submit"
+ if {0!=[string compare "" $name]} {
+ cgi_put " name=\"$name\""
+ }
+ cgi_put " value=[cgi_dquote_html $value]"
+ foreach a $args {
+ if {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+
+proc cgi_reset_button {{value Reset} args} {
+ cgi_put "<input type=reset value=[cgi_dquote_html $value]"
+
+ foreach a $args {
+ if {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+proc cgi_radio_button {nameval args} {
+ regexp "(\[^=]*)=(.*)" $nameval dummy name value
+
+ cgi_put "<input type=radio name=\"$name\" value=[cgi_dquote_html $value]"
+
+ foreach a $args {
+ if {[regexp "^checked_if_equal=(.*)" $a dummy default]} {
+ if {0==[string compare $default $value]} {
+ cgi_put " checked"
+ }
+ } elseif {[regexp "^checked=(.*)" $a dummy checked]} {
+ # test explicitly to avoid forcing user eval
+ if {$checked} {
+ cgi_put " checked"
+ }
+ } elseif {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+proc cgi_image_button {nameval args} {
+ regexp "(\[^=]*)=(.*)" $nameval dummy name value
+ cgi_put "<input type=image"
+ if {0!=[string compare "" $name]} {
+ cgi_put " name=\"$name\""
+ }
+ cgi_put " src=\"$value\""
+ foreach a $args {
+ if {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+# map/area implement client-side image maps
+proc cgi_map {name cmd} {
+ cgi_put "<map name=\"$name\">"
+ _cgi_close_proc_push "cgi_put </map>"
+
+ uplevel 1 $cmd
+ _cgi_close_proc
+}
+
+proc cgi_area {args} {
+ cgi_put "<area"
+ foreach a $args {
+ if {[regexp "^(coords|shape|href|target|onMouseOut|alt)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+##################################################
+# checkbox support
+##################################################
+
+proc cgi_checkbox {nameval args} {
+ regexp "(\[^=]*)(=?)(.*)" $nameval dummy name q value
+ cgi_put "<input type=checkbox name=\"$name\""
+
+ if {0!=[string compare "" $value]} {
+ cgi_put " value=[cgi_dquote_html $value]"
+ }
+
+ foreach a $args {
+ if {[regexp "^checked_if_equal=(.*)" $a dummy default]} {
+ if {0==[string compare $default $value]} {
+ cgi_put " checked"
+ }
+ } elseif {[regexp "^checked=(.*)" $a dummy checked]} {
+ # test explicitly to avoid forcing user eval
+ if {$checked} {
+ cgi_put " checked"
+ }
+ } elseif {[regexp "^onClick=(.*)" $a dummy str]} {
+ cgi_put " onClick=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+##################################################
+# textentry support
+##################################################
+
+proc cgi_text {nameval args} {
+ regexp "(\[^=]*)(=?)(.*)" $nameval dummy name q value
+
+ cgi_put "<input name=\"$name\""
+
+ if {$q != "="} {
+ set value [uplevel 1 set [list $name]]
+ }
+ cgi_put " value=[cgi_dquote_html $value]"
+
+ foreach a $args {
+ if {[regexp "^on(Select|Focus|Blur|Change)=(.*)" $a dummy event str]} {
+ cgi_put " on$event=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put "/>"
+}
+
+##################################################
+# textarea support
+##################################################
+
+proc cgi_textarea {nameval args} {
+ regexp "(\[^=]*)(=?)(.*)" $nameval dummy name q value
+
+ cgi_put "<textarea name=\"$name\""
+ foreach a $args {
+ if {[regexp "^on(Select|Focus|Blur|Change)=(.*)" $a dummy event str]} {
+ cgi_put " on$event=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_put ">"
+
+ if {$q != "="} {
+ set value [uplevel 1 set [list $name]]
+ }
+ cgi_put "[cgi_quote_html $value]</textarea>"
+}
+
+##################################################
+# file upload support
+##################################################
+
+# for this to work, pass enctype=multipart/form-data to cgi_form
+proc cgi_file_button {name args} {
+ global _cgi
+ if {[info exists _cgi(formtype)] && ("multipart/form-data" != $_cgi(form,enctype))} {
+ error "cgi_file_button requires that cgi_form have the argument enctype=multipart/form-data"
+ }
+ cgi_put "<input type=file name=\"$name\"[_cgi_list_to_string $args]/>"
+}
+
+# establish a per-file limit for uploads
+
+proc cgi_file_limit {files chars} {
+ global _cgi
+
+ set _cgi(file,filelimit) $files
+ set _cgi(file,charlimit) $chars
+}
+
+##################################################
+# select support
+##################################################
+
+proc cgi_select {name args} {
+ cgi_put "<select name=\"$name\""
+ _cgi_close_proc_push "cgi_put </select>"
+ foreach a [lrange $args 0 [expr [llength $args]-2]] {
+ if {[regexp "^on(Focus|Blur|Change)=(.*)" $a dummy event str]} {
+ cgi_put " on$event=\"$str\""
+ } else {
+ if {0==[string compare multiple $a]} {
+ ;# sanity check
+ if {![regexp "List$" $name]} {
+ cgi_puts ">" ;# prevent error from being absorbed
+ error "When selecting multiple options, select variable \
+ must end in \"List\" to allow the value to be \
+ recognized as a list when it is processed later."
+ }
+ }
+ cgi_put " $a"
+ }
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_option {o args} {
+ cgi_put "<option"
+ set value $o
+ set selected 0
+ foreach a $args {
+ if {[regexp "^selected_if_equal=(.*)" $a dummy selected_if_equal]} {
+ } elseif {[regexp "^value=(.*)" $a dummy value]} {
+ cgi_put " value=[cgi_dquote_html $value]"
+ } else {
+ cgi_put " $a"
+ }
+ }
+ if {[info exists selected_if_equal]} {
+ if {0 == [string compare $selected_if_equal $value]} {
+ cgi_put " selected"
+ }
+ }
+ cgi_puts ">[cgi_quote_html $o]</option>"
+}
+
+##################################################
+# plug-in support
+##################################################
+
+proc cgi_embed {src wh args} {
+ regexp (.*)x(.*) $wh dummy width height
+ cgi_put "<embed src=[cgi_dquote_html $src] width=\"$width\" height=\"$height\""
+ foreach a $args {
+ if {[regexp "^palette=(.*)" $a dummy str]} {
+ cgi_put " palette=\"$str\""
+ } elseif {[regexp -- "-quote" $a]} {
+ set quote 1
+ } else {
+ if {[info exists quote]} {
+ regexp "(\[^=]*)=(.*)" $a dummy var val
+ cgi_put " var=[cgi_dquote_html $var]"
+ } else {
+ cgi_put " $a"
+ }
+ }
+ }
+ cgi_put "/>"
+}
+
+##################################################
+# mail support
+##################################################
+
+# mail to/from the service itself
+proc cgi_mail_addr {args} {
+ global _cgi
+
+ if {[llength $args]} {
+ set _cgi(email) [lindex $args 0]
+ }
+ return $_cgi(email)
+}
+
+proc cgi_mail_start {to} {
+ global _cgi
+
+ set _cgi(mailfile) [file join $_cgi(tmpdir) cgimail.[pid]]
+ set _cgi(mailfid) [open $_cgi(mailfile) w+]
+ set _cgi(mailto) $to
+
+ # mail is actually sent by "nobody". To force bounce messages
+ # back to us, override the default return-path.
+ cgi_mail_add "Return-Path: <$_cgi(email)>"
+ cgi_mail_add "From: [cgi_name] <$_cgi(email)>"
+ cgi_mail_add "To: $to"
+}
+
+# add another line to outgoing mail
+# if no arg, add a blank line
+proc cgi_mail_add {{arg {}}} {
+ global _cgi
+
+ puts $_cgi(mailfid) $arg
+}
+
+# end the outgoing mail and send it
+proc cgi_mail_end {} {
+ global _cgi
+
+ flush $_cgi(mailfid)
+
+ foreach sendmail in $_cgi(sendmail) {
+ if {[file executable $sendmail]} {
+ exec $sendmail -t -odb < $_cgi(mailfile)
+ # Explanation:
+ # -t means: pick up recipient from body
+ # -odb means: deliver in background
+ # note: bogus local address cause sendmail to fail immediately
+ set sent 1
+ }
+ }
+
+ if {0==[info exists sent]} {
+ # fallback for sites without sendmail
+
+ if {0==[info exists _cgi(mail_relay)]} {
+ regexp "@(.*)" $_cgi(mailto) dummy _cgi(mail_relay)
+ }
+
+ set s [socket $_cgi(mail_relay) 25]
+ gets $s answer
+ if {[lindex $answer 0] != 220} {error $answer}
+
+ puts $s "HELO [info host]";flush $s
+ gets $s answer
+ if {[lindex $answer 0] != 250} {error $answer}
+
+ puts $s "MAIL FROM:<$_cgi(email)>";flush $s
+ gets $s answer
+ if {[lindex $answer 0] != 250} {error $answer}
+
+ puts $s "RCPT TO:<$_cgi(mailto)>";flush $s
+ gets $s answer
+ if {[lindex $answer 0] != 250} {error $answer}
+
+ puts $s DATA;flush $s
+ gets $s answer
+ if {[lindex $answer 0] != 354} {error $answer}
+
+ seek $_cgi(mailfid) 0 start
+ puts $s [read $_cgi(mailfid)];flush $s
+ puts $s .;flush $s
+ gets $s answer
+ if {[lindex $answer 0] != 250} {error $answer}
+
+ close $s
+ }
+ close $_cgi(mailfid)
+ file delete -force $_cgi(mailfile)
+}
+
+proc cgi_mail_relay {host} {
+ global _cgi
+
+ set _cgi(mail_relay) $host
+}
+
+proc cgi_sendmail {path} {
+ global _cgi
+
+ set _cgi(sendmail) $path
+}
+
+##################################################
+# cookie support
+##################################################
+
+# calls to cookie_set look like this:
+# cgi_cookie_set user=don domain=nist.gov expires=never
+# cgi_cookie_set user=don domain=nist.gov expires=now
+# cgi_cookie_set user=don domain=nist.gov expires=...actual date...
+
+proc cgi_cookie_set {nameval args} {
+ global _cgi
+
+ if {![info exists _cgi(http_head_in_progress)]} {
+ error "Cookies must be set from within cgi_http_head."
+ }
+ cgi_puts -nonewline "Set-Cookie: [cgi_cookie_encode $nameval];"
+
+ foreach a $args {
+ if {[regexp "^expires=(.*)" $a dummy expiration]} {
+ if {0==[string compare $expiration "never"]} {
+ set expiration "Friday, 11-Jan-2038 23:59:59 GMT"
+ } elseif {0==[string compare $expiration "now"]} {
+ set expiration "Friday, 31-Dec-1990 23:59:59 GMT"
+ }
+ cgi_puts -nonewline " expires=$expiration;"
+ } elseif {[regexp "^(domain|path)=(.*)" $a dummy attr str]} {
+ cgi_puts -nonewline " $attr=[cgi_cookie_encode $str];"
+ } elseif {[regexp "^secure$" $a]} {
+ cgi_puts -nonewline " secure;"
+ }
+ }
+ cgi_puts ""
+}
+
+# return list of cookies available for import
+proc cgi_cookie_list {} {
+ global _cgi_cookie
+
+ array names _cgi_cookie
+}
+
+proc cgi_cookie_get {args} {
+ global _cgi_cookie
+
+ set all 0
+
+ set flag [lindex $args 0]
+ if {$flag == "-all"} {
+ set args [lrange $args 1 end]
+ set all 1
+ }
+ set name [lindex $args 0]
+
+ if {$all} {
+ global _cgi_cookie_shadowed
+
+ if {[info exists _cgi_cookie_shadowed($name)]} {
+ return [concat $_cgi_cookie($name) $_cgi_cookie_shadowed($name)]
+ } else {
+ return [concat $_cgi_cookie($name)]
+ }
+ }
+ return $_cgi_cookie($name)
+}
+
+proc cgi_cookie_encode {in} {
+ regsub -all " " $in "+" in
+ regsub -all "%" $in "%25" in ;# must preceed other subs that produce %
+ regsub -all ";" $in "%3B" in
+ regsub -all "," $in "%2C" in
+ regsub -all "\n" $in "%0D%0A" in
+ return $in
+}
+
+##################################################
+# table support
+##################################################
+
+proc cgi_table {args} {
+ cgi_put "<table"
+ _cgi_close_proc_push "cgi_put </table>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_caption {args} {
+ cgi_put "<caption"
+ _cgi_close_proc_push "cgi_put </caption>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_table_row {args} {
+ cgi_put "<tr"
+ _cgi_close_proc_push "cgi_put </tr>"
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+# like table_row but without eval
+proc cgi_tr {args} {
+ cgi_put <tr
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ foreach i [lindex $args end] {
+ cgi_td $i
+ }
+ cgi_put </tr>
+}
+
+proc cgi_table_head {args} {
+ cgi_put "<th"
+ _cgi_close_proc_push "cgi_put </th>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+# like table_head but without eval
+proc cgi_th {args} {
+ cgi_put "<th"
+
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">[lindex $args end]</th>"
+}
+
+proc cgi_table_data {args} {
+ cgi_put "<td"
+ _cgi_close_proc_push "cgi_put </td>"
+
+ if {[llength $args]} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+# like table_data but without eval
+proc cgi_td {args} {
+ cgi_put "<td"
+
+ if {[llength $args] > 1} {
+ cgi_put "[_cgi_lrange $args 0 [expr [llength $args]-2]]"
+ }
+ cgi_put ">[lindex $args end]</td>"
+}
+
+##################################################
+# stylesheets - not yet documented
+##################################################
+
+proc cgi_stylesheet {href} {
+ cgi_puts "<link rel=stylesheet href=\"$href\" type=\"text/css\"/>"
+}
+
+proc cgi_span {args} {
+ set buf "<span"
+ foreach a [lrange $args 0 [expr [llength $args]-2]] {
+ if {[regexp "style=(.*)" $a dummy str]} {
+ append buf " style=\"$str\""
+ } elseif {[regexp "class=(.*)" $a dummy str]} {
+ append buf " class=\"$str\""
+ } else {
+ append buf " $a"
+ }
+ }
+ return "$buf>[lindex $args end]</span>"
+}
+
+##################################################
+# frames
+##################################################
+
+proc cgi_frameset {args} {
+ cgi_head ;# force it out, just in case none
+
+ cgi_put "<frameset"
+ _cgi_close_proc_push "cgi_puts </frameset>"
+
+ foreach a [lrange $args 0 [expr [llength $args]-2]] {
+ if {[regexp "^(rows|cols|onUnload|onLoad|onBlur)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts ">"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+proc cgi_frame {namesrc args} {
+ cgi_put "<frame"
+
+ regexp "(\[^=]*)(=?)(.*)" $namesrc dummy name q src
+
+ if {$name != ""} {
+ cgi_put " name=\"$name\""
+ }
+
+ if {$src != ""} {
+ cgi_put " src=\"$src\""
+ }
+
+ foreach a $args {
+ if {[regexp "^(marginwidth|marginheight|scrolling|onFocus)=(.*)" $a dummy attr str]} {
+ cgi_put " $attr=\"$str\""
+ } else {
+ cgi_put " $a"
+ }
+ }
+ cgi_puts "/>"
+}
+
+proc cgi_noframes {args} {
+ cgi_puts "<noframes>"
+ _cgi_close_proc_push "cgi_puts </noframes>"
+ uplevel 1 [lindex $args end]
+ _cgi_close_proc
+}
+
+##################################################
+# admin support
+##################################################
+
+# mail address of the administrator
+proc cgi_admin_mail_addr {args} {
+ global _cgi
+
+ if {[llength $args]} {
+ set _cgi(admin_email) [lindex $args 0]
+ }
+ return $_cgi(admin_email)
+}
+
+##################################################
+# if possible, make each cmd available without cgi_ prefix
+##################################################
+
+if {[info tclversion] >= 7.5} {
+ foreach _cgi(old) [info procs cgi_*] {
+ regexp "^cgi_(.*)" $_cgi(old) _cgi(dummy) _cgi(new)
+ if {[llength [info commands $_cgi(new)]]} continue
+ interp alias {} $_cgi(new) {} $_cgi(old)
+ }
+} else {
+ foreach _cgi(old) [info procs cgi_*] {
+ regexp "^cgi_(.*)" $_cgi(old) _cgi(dummy) _cgi(new)
+ if {[llength [info commands $_cgi(new)]]} continue
+ proc $_cgi(new) {args} "uplevel 1 $_cgi(old) \$args"
+ }
+}
+
+##################################################
+# internal utilities
+##################################################
+
+# undo Tcl's quoting due to list protection
+# This leaves a space at the beginning if the string is non-null
+# but this is always desirable in the HTML context in which it is called
+# and the resulting HTML looks more readable.
+# (It makes the Tcl callers a little less readable - however, there aren't
+# more than a handful and they're all right here, so we'll live with it.)
+proc _cgi_list_to_string {list} {
+ set string ""
+ foreach l $list {
+ append string " $l"
+ }
+ # remove first space if possible
+ # regexp "^ ?(.*)" $string dummy string
+ return $string
+}
+
+# do lrange but return as string
+# needed for stuff like: cgi_puts "[_cgi_lrange $args ...]
+# Like _cgi_list_to_string, also returns string with initial blank if non-null
+proc _cgi_lrange {list i1 i2} {
+ _cgi_list_to_string [lrange $list $i1 $i2]
+}
+
+##################################################
+# temporary file procedures
+##################################################
+
+# set appropriate temporary file modes
+proc cgi_tmpfile_permissions {{mode ""}} {
+ global _cgi
+
+ if {[string length $mode]} {
+ set _cgi(tmpperms) $mode
+ }
+
+ return $_cgi(tmpperms)
+}
+
+##################################################
+# user-defined procedures
+##################################################
+
+# User-defined procedure called immediately after <body>
+# Good mechanism for controlling things such as if all of your pages
+# start with the same graphic or other boilerplate.
+proc app_body_start {} {}
+
+# User-defined procedure called just before </body>
+# Good place to generate signature lines, last-updated-by, etc.
+proc app_body_end {} {}
+
+proc cgi_puts {args} {
+ eval puts $args
+}
+
+# User-defined procedure to generate DOCTYPE declaration
+proc cgi_doctype {} {}
+
+##################################################
+# do some initialization
+##################################################
+
+# cgi_init initializes to a known state.
+
+proc cgi_init {} {
+ global _cgi
+ unset _cgi
+
+ # set explicitly for speed
+ set _cgi(debug) -off
+ set _cgi(buffer_nl) "\n"
+
+ cgi_name ""
+ cgi_root ""
+ cgi_body_args ""
+ cgi_file_limit 10 100000000
+
+ if {[info tclversion] >= 8.1} {
+ # set initial urlencoding
+ if { [lsearch -exact [encoding names] "utf-8"] != -1} {
+ cgi_urlencoding "utf-8"
+ } else {
+ cgi_urlencoding [encoding system]
+ }
+ }
+
+ # email addr of person responsible for this service
+ cgi_admin_mail_addr "root" ;# you should override this!
+
+ # most services won't have an actual email addr
+ cgi_mail_addr "CGI script - do not reply"
+}
+cgi_init
+
+# deduce tmp directory
+switch $tcl_platform(platform) {
+ unix {
+ set _cgi(tmpdir) /tmp
+ set _cgi(tmpperms) 0644
+ set _cgi(sendmail) [list /usr/lib/sendmail /usr/sbin/sendmail]
+ } macintosh {
+ set _cgi(tmpdir) [pwd]
+ set _cgi(tmpperms) {}
+ set _cgi(sendmail) {}
+ } default {
+ set _cgi(tmpdir) [pwd]
+ catch {set _cgi(tmpdir) $env(TMP)}
+ catch {set _cgi(tmpdir) $env(TEMP)}
+ set _cgi(tmpperms) {}
+ set _cgi(sendmail) {}
+ }
+}
+
+# regexp for matching attr=val
+set _cgi(attr,regexp) "^(\[^=]*)=(\[^\"].*)"
+
+package provide cgi 1.10.0
diff --git a/web/src/cgi.tcl-1.10/version b/web/src/cgi.tcl-1.10/version
new file mode 100644
index 00000000..14151a9d
--- /dev/null
+++ b/web/src/cgi.tcl-1.10/version
@@ -0,0 +1,2 @@
+set versionFull 1.10.0
+set version 1.10
diff --git a/web/src/pubcookie/wp_gssapi_proxy b/web/src/pubcookie/wp_gssapi_proxy
new file mode 100755
index 00000000..c0c2f33f
--- /dev/null
+++ b/web/src/pubcookie/wp_gssapi_proxy
Binary files differ
diff --git a/web/src/pubcookie/wp_tclsh b/web/src/pubcookie/wp_tclsh
new file mode 100755
index 00000000..99528161
--- /dev/null
+++ b/web/src/pubcookie/wp_tclsh
Binary files differ
diff --git a/web/src/pubcookie/wp_uidmapper b/web/src/pubcookie/wp_uidmapper
new file mode 100755
index 00000000..8f806e5b
--- /dev/null
+++ b/web/src/pubcookie/wp_uidmapper
Binary files differ
diff --git a/web/src/pubcookie/wp_uidmapper.c b/web/src/pubcookie/wp_uidmapper.c
index 662e9b3a..3126507e 100644
--- a/web/src/pubcookie/wp_uidmapper.c
+++ b/web/src/pubcookie/wp_uidmapper.c
@@ -10,8 +10,11 @@
* ========================================================================
*/
+#define _GNU_SOURCE
#include <system.h>
#include <general.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
#include "id_table.h"
#include "wp_uidmapper_lib.h"
@@ -137,7 +140,7 @@ int main(int argc, char *argv[]) {
exit(1);
}
atexit(socketname_cleanup);
- chmod(ssock,sockmode);
+ fchmod(ssock,sockmode);
#ifndef DGRAM_MODE
if(listen(ssock,8)) {
diff --git a/web/src/pubcookie/wp_umc b/web/src/pubcookie/wp_umc
new file mode 100755
index 00000000..6fe5cd36
--- /dev/null
+++ b/web/src/pubcookie/wp_umc
Binary files differ