* New version 2.21.99

   * The online repo does not mimic the root local directory
     from which it is created. This is an attempt to fix this.
     This caused the problem that kerberos was not working
     with the bytes on the repo, but it would work on the root
     which created it. Reported by Holger Trapp.

4 files changed, 874 insertions, 4 deletions

diff --git a/po/Makefile b/po/Makefile
new file mode 100644
index 00000000..8aa236f1
--- /dev/null
+++ b/po/Makefile
@@ -0,0 +1,680 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.16
+
+PACKAGE = alpine
+VERSION = 2.21.9
+PACKAGE_BUGREPORT = chappa@washington.edu
+
+SHELL = /bin/sh
+
+
+srcdir = .
+top_srcdir = ..
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+datadir = ${datarootdir}
+localedir = ${datadir}/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it.
+# In automake >= 1.10, $(MKDIR_P) is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh -d
+install_sh = $(SHELL) ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh
+MKDIR_P = /usr/bin/mkdir -p
+mkdir_p = $(MKDIR_P)
+
+GMSGFMT_ = /usr/bin/msgfmt
+GMSGFMT_no = /usr/bin/msgfmt
+GMSGFMT_yes = /usr/bin/msgfmt
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = 
+GMOFILES = 
+UPDATEPOFILES = 
+DUMMYPOFILES = 
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+     ../alpine/osdep/termout.wnt.c \
+     ../alpine/osdep/termin.wnt.c \
+     ../alpine/osdep/termin.gen.c \
+     ../alpine/osdep/termout.gen.c \
+     ../alpine/osdep/termin.unx.c \
+     ../alpine/osdep/termout.unx.c \
+     ../alpine/osdep/fltrname.c \
+     ../alpine/osdep/diskquot.non.c \
+     ../alpine/osdep/execview.c \
+     ../alpine/osdep/chnge_pw.c \
+     ../alpine/osdep/mswinver.c \
+     ../alpine/osdep/jobcntrl.c \
+     ../alpine/osdep/debuging.c \
+     ../alpine/osdep/print.c \
+     ../alpine/init.c \
+     ../alpine/rpdump.c \
+     ../alpine/arg.c \
+     ../alpine/mailview.c \
+     ../alpine/keymenu.c \
+     ../alpine/dispfilt.c \
+     ../alpine/takeaddr.c \
+     ../alpine/ldapconf.c \
+     ../alpine/send.c \
+     ../alpine/radio.c \
+     ../alpine/mailcmd.c \
+     ../alpine/titlebar.c \
+     ../alpine/adrbkcmd.c \
+     ../alpine/alpine.c \
+     ../alpine/folder.c \
+     ../alpine/busy.c \
+     ../alpine/remote.c \
+     ../alpine/pipe.c \
+     ../alpine/setup.c \
+     ../alpine/after.c \
+     ../alpine/flagmaint.c \
+     ../alpine/confscroll.c \
+     ../alpine/mailindx.c \
+     ../alpine/kblock.c \
+     ../alpine/roleconf.c \
+     ../alpine/listsel.c \
+     ../alpine/status.c \
+     ../alpine/addrbook.c \
+     ../alpine/reply.c \
+     ../alpine/mailpart.c \
+     ../alpine/pattern.c \
+     ../alpine/signal.c \
+     ../alpine/rpload.c \
+     ../alpine/colorconf.c \
+     ../alpine/context.c \
+     ../alpine/pine-use.c \
+     ../alpine/imap.c \
+     ../alpine/newuser.c \
+     ../alpine/help.c \
+     ../alpine/print.c \
+     ../alpine/smime.c \
+     ../pico/osdep/mswin_tw.c \
+     ../pico/osdep/msdlg.c \
+     ../pico/osdep/read.c \
+     ../pico/osdep/chkpoint.c \
+     ../pico/osdep/fsync.c \
+     ../pico/osdep/newmail.c \
+     ../pico/osdep/getkey.c \
+     ../pico/osdep/mswin_spell.c \
+     ../pico/osdep/signals.c \
+     ../pico/osdep/shell.c \
+     ../pico/osdep/terminal.c \
+     ../pico/osdep/color.c \
+     ../pico/osdep/filesys.c \
+     ../pico/osdep/spell.c \
+     ../pico/osdep/tty.c \
+     ../pico/osdep/popen.c \
+     ../pico/osdep/truncate.c \
+     ../pico/osdep/altedit.c \
+     ../pico/osdep/mouse.c \
+     ../pico/osdep/raw.c \
+     ../pico/osdep/mswin_aspell.c \
+     ../pico/osdep/mswin.c \
+     ../pico/attach.c \
+     ../pico/display.c \
+     ../pico/basic.c \
+     ../pico/region.c \
+     ../pico/pico.c \
+     ../pico/blddate.c \
+     ../pico/browse.c \
+     ../pico/search.c \
+     ../pico/fileio.c \
+     ../pico/window.c \
+     ../pico/buffer.c \
+     ../pico/mswinver.c \
+     ../pico/word.c \
+     ../pico/bind.c \
+     ../pico/file.c \
+     ../pico/random.c \
+     ../pico/main.c \
+     ../pico/utf8stub.c \
+     ../pico/pilot.c \
+     ../pico/line.c \
+     ../pico/composer.c \
+     ../pith/charconv/filesys.c \
+     ../pith/charconv/utf8.c \
+     ../pith/osdep/temp_nam.c \
+     ../pith/osdep/fnexpand.c \
+     ../pith/osdep/domnames.c \
+     ../pith/osdep/tempfile.c \
+     ../pith/osdep/fgetpos.c \
+     ../pith/osdep/mimedisp.c \
+     ../pith/osdep/filesize.c \
+     ../pith/osdep/collate.c \
+     ../pith/osdep/err_desc.c \
+     ../pith/osdep/canonicl.c \
+     ../pith/osdep/pw_stuff.c \
+     ../pith/osdep/lstcmpnt.c \
+     ../pith/osdep/debugtime.c \
+     ../pith/osdep/rename.c \
+     ../pith/osdep/hostname.c \
+     ../pith/osdep/bldpath.c \
+     ../pith/osdep/color.c \
+     ../pith/osdep/coredump.c \
+     ../pith/osdep/canaccess.c \
+     ../pith/osdep/writ_dir.c \
+     ../pith/osdep/creatdir.c \
+     ../pith/osdep/pipe.c \
+     ../pith/mailview.c \
+     ../pith/init.c \
+     ../pith/takeaddr.c \
+     ../pith/keyword.c \
+     ../pith/text.c \
+     ../pith/conf.c \
+     ../pith/detach.c \
+     ../pith/mailcap.c \
+     ../pith/sequence.c \
+     ../pith/list.c \
+     ../pith/folder.c \
+     ../pith/icache.c \
+     ../pith/color.c \
+     ../pith/mimedesc.c \
+     ../pith/sort.c \
+     ../pith/bldaddr.c \
+     ../pith/mailindx.c \
+     ../pith/string.c \
+     ../pith/helpindx.c \
+     ../pith/ablookup.c \
+     ../pith/adjtime.c \
+     ../pith/maillist.c \
+     ../pith/escapes.c \
+     ../pith/copyaddr.c \
+     ../pith/thread.c \
+     ../pith/pattern.c \
+     ../pith/state.c \
+     ../pith/rfc2231.c \
+     ../pith/imap.c \
+     ../pith/help_h_gen.c \
+     ../pith/abdlc.c \
+     ../pith/tempfile.c \
+     ../pith/margin.c \
+     ../pith/util.c \
+     ../pith/msgno.c \
+     ../pith/send.c \
+     ../pith/charset.c \
+     ../pith/mailcmd.c \
+     ../pith/hist.c \
+     ../pith/adrbklib.c \
+     ../pith/readfile.c \
+     ../pith/news.c \
+     ../pith/editorial.c \
+     ../pith/help_c_gen.c \
+     ../pith/filter.c \
+     ../pith/mimetype.c \
+     ../pith/remote.c \
+     ../pith/store.c \
+     ../pith/pipe.c \
+     ../pith/addrstring.c \
+     ../pith/flag.c \
+     ../pith/ldap.c \
+     ../pith/status.c \
+     ../pith/addrbook.c \
+     ../pith/detoken.c \
+     ../pith/reply.c \
+     ../pith/stream.c \
+     ../pith/newmail.c \
+     ../pith/save.c \
+     ../pith/url.c \
+     ../pith/search.c \
+     ../pith/context.c \
+     ../pith/help.c \
+     ../pith/handle.c \
+     ../pith/strlst.c \
+     ../pith/smime.c \
+     ../pith/smkeys.c
+
+CATALOGS = 
+
+# Makevars gets inserted here. (Don't remove this line!)
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# 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 = Eduardo Chappa
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = chappa@gmx.com
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-yes
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+	  --files-from=$(srcdir)/POTFILES.in \
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-yes
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	$(mkdir_p) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-yes
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	$(mkdir_p) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-yes
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff --git a/po/Makefile.in b/po/Makefile.in
index 6e602213..ab48d37d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -11,7 +11,7 @@
 # Origin: gettext-0.16
 
 PACKAGE = alpine
-VERSION = 2.21
+VERSION = 2.21.9
 PACKAGE_BUGREPORT = chappa@washington.edu
 
 SHELL = /bin/sh
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /run/media/echappa/Work/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, $(MKDIR_P) is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /run/media/echappa/Work/alpine/alpinegit/install-sh -d
-install_sh = $(SHELL) ${SHELL} /run/media/echappa/Work/alpine/alpinegit/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh -d
+install_sh = $(SHELL) ${SHELL} /run/media/chappa/Work/alpine/alpinegit/install-sh
 MKDIR_P = /usr/bin/mkdir -p
 mkdir_p = $(MKDIR_P)
 
diff --git a/po/POTFILES b/po/POTFILES
new file mode 100644
index 00000000..d1e60faf
--- /dev/null
+++ b/po/POTFILES
@@ -0,0 +1,189 @@
+     ../alpine/osdep/termout.wnt.c \
+     ../alpine/osdep/termin.wnt.c \
+     ../alpine/osdep/termin.gen.c \
+     ../alpine/osdep/termout.gen.c \
+     ../alpine/osdep/termin.unx.c \
+     ../alpine/osdep/termout.unx.c \
+     ../alpine/osdep/fltrname.c \
+     ../alpine/osdep/diskquot.non.c \
+     ../alpine/osdep/execview.c \
+     ../alpine/osdep/chnge_pw.c \
+     ../alpine/osdep/mswinver.c \
+     ../alpine/osdep/jobcntrl.c \
+     ../alpine/osdep/debuging.c \
+     ../alpine/osdep/print.c \
+     ../alpine/init.c \
+     ../alpine/rpdump.c \
+     ../alpine/arg.c \
+     ../alpine/mailview.c \
+     ../alpine/keymenu.c \
+     ../alpine/dispfilt.c \
+     ../alpine/takeaddr.c \
+     ../alpine/ldapconf.c \
+     ../alpine/send.c \
+     ../alpine/radio.c \
+     ../alpine/mailcmd.c \
+     ../alpine/titlebar.c \
+     ../alpine/adrbkcmd.c \
+     ../alpine/alpine.c \
+     ../alpine/folder.c \
+     ../alpine/busy.c \
+     ../alpine/remote.c \
+     ../alpine/pipe.c \
+     ../alpine/setup.c \
+     ../alpine/after.c \
+     ../alpine/flagmaint.c \
+     ../alpine/confscroll.c \
+     ../alpine/mailindx.c \
+     ../alpine/kblock.c \
+     ../alpine/roleconf.c \
+     ../alpine/listsel.c \
+     ../alpine/status.c \
+     ../alpine/addrbook.c \
+     ../alpine/reply.c \
+     ../alpine/mailpart.c \
+     ../alpine/pattern.c \
+     ../alpine/signal.c \
+     ../alpine/rpload.c \
+     ../alpine/colorconf.c \
+     ../alpine/context.c \
+     ../alpine/pine-use.c \
+     ../alpine/imap.c \
+     ../alpine/newuser.c \
+     ../alpine/help.c \
+     ../alpine/print.c \
+     ../alpine/smime.c \
+     ../pico/osdep/mswin_tw.c \
+     ../pico/osdep/msdlg.c \
+     ../pico/osdep/read.c \
+     ../pico/osdep/chkpoint.c \
+     ../pico/osdep/fsync.c \
+     ../pico/osdep/newmail.c \
+     ../pico/osdep/getkey.c \
+     ../pico/osdep/mswin_spell.c \
+     ../pico/osdep/signals.c \
+     ../pico/osdep/shell.c \
+     ../pico/osdep/terminal.c \
+     ../pico/osdep/color.c \
+     ../pico/osdep/filesys.c \
+     ../pico/osdep/spell.c \
+     ../pico/osdep/tty.c \
+     ../pico/osdep/popen.c \
+     ../pico/osdep/truncate.c \
+     ../pico/osdep/altedit.c \
+     ../pico/osdep/mouse.c \
+     ../pico/osdep/raw.c \
+     ../pico/osdep/mswin_aspell.c \
+     ../pico/osdep/mswin.c \
+     ../pico/attach.c \
+     ../pico/display.c \
+     ../pico/basic.c \
+     ../pico/region.c \
+     ../pico/pico.c \
+     ../pico/blddate.c \
+     ../pico/browse.c \
+     ../pico/search.c \
+     ../pico/fileio.c \
+     ../pico/window.c \
+     ../pico/buffer.c \
+     ../pico/mswinver.c \
+     ../pico/word.c \
+     ../pico/bind.c \
+     ../pico/file.c \
+     ../pico/random.c \
+     ../pico/main.c \
+     ../pico/utf8stub.c \
+     ../pico/pilot.c \
+     ../pico/line.c \
+     ../pico/composer.c \
+     ../pith/charconv/filesys.c \
+     ../pith/charconv/utf8.c \
+     ../pith/osdep/temp_nam.c \
+     ../pith/osdep/fnexpand.c \
+     ../pith/osdep/domnames.c \
+     ../pith/osdep/tempfile.c \
+     ../pith/osdep/fgetpos.c \
+     ../pith/osdep/mimedisp.c \
+     ../pith/osdep/filesize.c \
+     ../pith/osdep/collate.c \
+     ../pith/osdep/err_desc.c \
+     ../pith/osdep/canonicl.c \
+     ../pith/osdep/pw_stuff.c \
+     ../pith/osdep/lstcmpnt.c \
+     ../pith/osdep/debugtime.c \
+     ../pith/osdep/rename.c \
+     ../pith/osdep/hostname.c \
+     ../pith/osdep/bldpath.c \
+     ../pith/osdep/color.c \
+     ../pith/osdep/coredump.c \
+     ../pith/osdep/canaccess.c \
+     ../pith/osdep/writ_dir.c \
+     ../pith/osdep/creatdir.c \
+     ../pith/osdep/pipe.c \
+     ../pith/mailview.c \
+     ../pith/init.c \
+     ../pith/takeaddr.c \
+     ../pith/keyword.c \
+     ../pith/text.c \
+     ../pith/conf.c \
+     ../pith/detach.c \
+     ../pith/mailcap.c \
+     ../pith/sequence.c \
+     ../pith/list.c \
+     ../pith/folder.c \
+     ../pith/icache.c \
+     ../pith/color.c \
+     ../pith/mimedesc.c \
+     ../pith/sort.c \
+     ../pith/bldaddr.c \
+     ../pith/mailindx.c \
+     ../pith/string.c \
+     ../pith/helpindx.c \
+     ../pith/ablookup.c \
+     ../pith/adjtime.c \
+     ../pith/maillist.c \
+     ../pith/escapes.c \
+     ../pith/copyaddr.c \
+     ../pith/thread.c \
+     ../pith/pattern.c \
+     ../pith/state.c \
+     ../pith/rfc2231.c \
+     ../pith/imap.c \
+     ../pith/help_h_gen.c \
+     ../pith/abdlc.c \
+     ../pith/tempfile.c \
+     ../pith/margin.c \
+     ../pith/util.c \
+     ../pith/msgno.c \
+     ../pith/send.c \
+     ../pith/charset.c \
+     ../pith/mailcmd.c \
+     ../pith/hist.c \
+     ../pith/adrbklib.c \
+     ../pith/readfile.c \
+     ../pith/news.c \
+     ../pith/editorial.c \
+     ../pith/help_c_gen.c \
+     ../pith/filter.c \
+     ../pith/mimetype.c \
+     ../pith/remote.c \
+     ../pith/store.c \
+     ../pith/pipe.c \
+     ../pith/addrstring.c \
+     ../pith/flag.c \
+     ../pith/ldap.c \
+     ../pith/status.c \
+     ../pith/addrbook.c \
+     ../pith/detoken.c \
+     ../pith/reply.c \
+     ../pith/stream.c \
+     ../pith/newmail.c \
+     ../pith/save.c \
+     ../pith/url.c \
+     ../pith/search.c \
+     ../pith/context.c \
+     ../pith/help.c \
+     ../pith/handle.c \
+     ../pith/strlst.c \
+     ../pith/smime.c \
+     ../pith/smkeys.c
diff --git a/po/stamp-po b/po/stamp-po
new file mode 100644
index 00000000..9788f702
--- /dev/null
+++ b/po/stamp-po
@@ -0,0 +1 @@
+timestamp