From: Adeodato Simó Date: Sun, 3 Apr 2005 18:08:39 +0000 (+0200) Subject: Import mutt_1.5.9-1 X-Git-Tag: 1.5.9-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/6132f1fe27fba7f86ce8c2f5ee806e8e1f1fc3de?ds=sidebyside Import mutt_1.5.9-1 --- diff --git a/debian/changelog b/debian/changelog index 9ad4057..f4c5be1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +mutt (1.5.9-1) unstable; urgency=medium + + * New upstream release, though the previous upload already included most of + it because of the CVS pull. Do another one now (2005-04-03), including the + following bits from 1.5.10: + + several translation updates (de, id, nl, pl, ru). + + a patch by Daniel Jacobowitz to synchronise message flags before moving + messages. (Closes: #163616) + + * Also, the header cache patch is now fully integrated upstream, so drop it. + + * Don't set pipe_default in debian/patches/080_Md.Muttrc, and stick to + upstream's default (unset). (Closes: #300830) + + * Updated the compressed folders patch to version 1.5.9. + + * Updated patch 080_Md.Muttrc to restore the old behaviour of the index. + + -- Adeodato Simó Sun, 03 Apr 2005 20:08:39 +0200 + mutt (1.5.8-1) unstable; urgency=low * New upstream release, with a CVS pull to get all the translation updates @@ -10,6 +30,8 @@ mutt (1.5.8-1) unstable; urgency=low in a message being composed. This permits, for example, to match against recipients added manually after writing the mail, which wasn't possible with 'send-hook' alone. + + Christoph Berg's menu_context patch is also included. Check the + $menu_context and $menu_move_off variables. * This version also includes the following fixes: + message flags are not lost after editing a message. (Closes: #275060) @@ -24,9 +46,10 @@ mutt (1.5.8-1) unstable; urgency=low * Updated the compressed folders patch to version 1.5.8. - * Dropped the adjust_line patch from extra-patches/mutt-ja-compat, - incorporated upstream. Renamed mutt-ja-compat to assumed-charset, since - that's the only patch that remains. + * Dropped the adjust_line and adjust_edited_file patches from + extra-patches/mutt-ja-compat, incorporated upstream. Renamed + mutt-ja-compat to assumed-charset, since that's the only patch that + remains. * Lots of patches in the Debian package have been applied upstream, drop them (16 in total). Worth mentioning is the gnutls patch. The @@ -41,10 +64,7 @@ mutt (1.5.8-1) unstable; urgency=low been drastically reduced, since the generic code and the IMAP support has been incorporated upstream. - * Updated the compressed folders patch to version 1.5.7. - - * Dropped the adjust_edited_file patch from extra-patches/mutt-ja-compat, - incorporated upstream. + * Updated the compressed folders patch to version 1.5.8. * Use mixmaster-filter by default. (Closes: #299060) diff --git a/debian/patches/080_Md.Muttrc b/debian/patches/080_Md.Muttrc index 1fae231..d6a4f80 100644 --- a/debian/patches/080_Md.Muttrc +++ b/debian/patches/080_Md.Muttrc @@ -1,14 +1,14 @@ -diff -urN mutt-1.5.3.orig/Muttrc.head.in mutt-1.5.3/Muttrc.head.in ---- mutt-1.5.3.orig/Muttrc.head.in 2000-03-20 11:25:49.000000000 +0100 -+++ mutt-1.5.3/Muttrc.head.in 2003-01-12 17:16:41.000000000 +0100 -@@ -6,6 +6,38 @@ +diff -ruN mutt-1.5.9.orig/Muttrc.head.in mutt-1.5.9/Muttrc.head.in +--- mutt-1.5.9.orig/Muttrc.head.in 2002-01-24 13:10:47.000000000 +0100 ++++ mutt-1.5.9/Muttrc.head.in 2005-04-10 13:54:02.000000000 +0200 +@@ -6,6 +6,41 @@ # ignore "from " received content- mime-version status x-status message-id ignore sender references return-path lines +ignore date delivered-to precedence errors-to in-reply-to user-agent -+ignore x-loop x-sender x-mailer x-msmail-priority x-mimeole x-priority -+ignore x-accept-language x-authentication-warning thread- priority -+ignore domainkey-signature ++ignore x-loop x-sender x-mailer x-msmail-priority x-mimeole x-ms- x-priority ++ignore x-accept-language x-authentication-warning thread- priority importance ++ignore x-original-to domainkey-signature + +# emacs-like bindings +bind editor "\e" kill-word @@ -22,6 +22,9 @@ diff -urN mutt-1.5.3.orig/Muttrc.head.in mutt-1.5.3/Muttrc.head.in +#bind pager previous-line +#bind pager next-line + ++# restore the behaviour of mutt versions up to 1.5.7 ++set menu_move_off ++ +# don't add the hostname to the From header +unset use_domain +# don't generate a From header @@ -40,11 +43,8 @@ diff -urN mutt-1.5.3.orig/Muttrc.head.in mutt-1.5.3/Muttrc.head.in # imitate the old search-body function macro index \eb '/~b ' 'search in message bodies' -@@ -13,11 +44,20 @@ - # simulate the old url menu - macro index \cb |urlview\n 'call urlview to extract URLs out of a message' +@@ -15,9 +50,17 @@ macro pager \cb |urlview\n 'call urlview to extract URLs out of a message' -+set pipe_decode # Show documentation when pressing F1 -macro generic "!less @docdir@/manual.txt\n" "Show Mutt documentation" @@ -64,7 +64,7 @@ diff -urN mutt-1.5.3.orig/Muttrc.head.in mutt-1.5.3/Muttrc.head.in # If Mutt is unable to determine your site's domain name correctly, you can # set the default here. -@@ -28,7 +68,22 @@ +@@ -28,7 +71,22 @@ # # set use_8bitmime diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index eeccd6c..3e29601 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,6 +1,6 @@ -diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in ---- mutt-1.5.8.orig/Makefile.in 2005-02-12 21:58:25.000000000 +0100 -+++ mutt-1.5.8/Makefile.in 2005-03-10 07:55:36.122707840 +0100 +diff -ru mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in +--- mutt-1.5.9.orig/Makefile.in 2005-03-13 17:37:46.000000000 +0100 ++++ mutt-1.5.9/Makefile.in 2005-04-03 19:58:55.328383264 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -12,6 +12,24 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +@@ -15,7 +15,7 @@ + @SET_MAKE@ + + +-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) ++SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -40,7 +40,7 @@ + build_triplet = @build@ + host_triplet = @host@ + EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \ +- makedoc$(EXEEXT) ++ pgpewrap$(EXEEXT) makedoc$(EXEEXT) + bin_PROGRAMS = mutt$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Muttrc.head.in \ @@ -76,10 +76,10 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ @@ -27,16 +45,30 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \ headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \ -@@ -286,7 +286,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap - @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) -@@ -294,7 +294,7 @@ +@@ -99,6 +99,10 @@ + am__DEPENDENCIES_1 = + am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT) + mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS) ++pgpewrap_SOURCES = pgpewrap.c ++pgpewrap_OBJECTS = pgpewrap.$(OBJEXT) ++pgpewrap_LDADD = $(LDADD) ++pgpewrap_DEPENDENCIES = @LIBOBJS@ + am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ + lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \ + pgppacket.$(OBJEXT) ascii.$(OBJEXT) +@@ -113,9 +117,9 @@ + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) \ +- $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) ++ $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) + DIST_SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) \ +- $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) \ ++ $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c \ + $(pgpring_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +@@ -294,7 +298,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.c mutt_SOURCES = $(BUILT_SOURCES) \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ @@ -45,7 +77,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ edit.c enter.c flags.c init.c filter.c from.c getdomain.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -@@ -325,7 +325,7 @@ +@@ -325,7 +329,7 @@ crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ @@ -54,16 +86,17 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -@@ -337,7 +337,7 @@ - makedoc.c stamp-doc-rc README.SSL smime.h\ - muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ - ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ -- snprintf.c regex.c -+ snprintf.c regex.c crypt-gpgme.h - - EXTRA_SCRIPTS = smime_keys - mutt_dotlock_SOURCES = mutt_dotlock.c -@@ -487,6 +487,7 @@ +@@ -441,6 +445,9 @@ + mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) + @rm -f mutt_dotlock$(EXEEXT) + $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS) ++pgpewrap$(EXEEXT): $(pgpewrap_OBJECTS) $(pgpewrap_DEPENDENCIES) ++ @rm -f pgpewrap$(EXEEXT) ++ $(LINK) $(pgpewrap_LDFLAGS) $(pgpewrap_OBJECTS) $(pgpewrap_LDADD) $(LIBS) + pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) + @rm -f pgpring$(EXEEXT) + $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS) +@@ -487,6 +494,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ @@ -71,7 +104,15 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -@@ -597,7 +598,13 @@ +@@ -542,6 +550,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patchlist.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgp.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpewrap.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpinvoke.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgpkey.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgplib.Po@am__quote@ +@@ -597,7 +606,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -86,7 +127,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -609,7 +616,7 @@ +@@ -609,7 +624,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -95,7 +136,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -@@ -617,7 +624,13 @@ +@@ -617,7 +632,13 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @@ -110,7 +151,7 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -638,7 +651,7 @@ +@@ -638,7 +659,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -119,10 +160,44 @@ diff -ru mutt-1.5.8.orig/Makefile.in mutt-1.5.8/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -Only in mutt-1.5.8: autom4te.cache -diff -ru mutt-1.5.8.orig/config.h.in mutt-1.5.8/config.h.in ---- mutt-1.5.8.orig/config.h.in 2005-02-12 21:57:46.000000000 +0100 -+++ mutt-1.5.8/config.h.in 2005-03-10 07:55:30.238718258 +0100 +@@ -914,8 +935,9 @@ + + install-data-am: install-data-local + +-install-exec-am: install-binPROGRAMS install-binSCRIPTS \ +- install-exec-local ++install-exec-am: install-binPROGRAMS install-binSCRIPTS ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + + install-info: install-info-recursive + +@@ -956,9 +978,9 @@ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-binSCRIPTS \ + install-data install-data-am install-data-local install-exec \ +- install-exec-am install-exec-local install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ install-exec-am install-exec-hook install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +@@ -993,7 +1015,7 @@ + patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh + $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c + +-install-exec-local: ++install-exec-hook: + if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \ + rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ + ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ +Only in mutt-1.5.9: autom4te.cache +diff -ru mutt-1.5.9.orig/config.h.in mutt-1.5.9/config.h.in +--- mutt-1.5.9.orig/config.h.in 2005-03-13 17:37:09.000000000 +0100 ++++ mutt-1.5.9/config.h.in 2005-04-03 19:58:50.546379495 +0200 @@ -498,6 +498,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -133,108 +208,19 @@ diff -ru mutt-1.5.8.orig/config.h.in mutt-1.5.8/config.h.in /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -Only in mutt-1.5.8: config.h.in~ -diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure ---- mutt-1.5.8.orig/configure 2005-02-12 21:57:29.000000000 +0100 -+++ mutt-1.5.8/configure 2005-03-10 07:55:37.063546277 +0100 -@@ -852,51 +852,55 @@ - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --disable-largefile omit support for large files -- --enable-gpgme Enable GPGME support -- --disable-pgp Disable PGP support -- --disable-smime Disable SMIME support -- --enable-external-dotlock Force use of an external dotlock program -- --enable-pop Enable POP3 support -- --enable-imap Enable IMAP support -- --enable-debug Enable debugging support -- --enable-flock Use flock() to lock files -- --disable-fcntl Do NOT use fcntl() to lock files -- --enable-inodesort Read files in maildir folders sorted by inode. -- --disable-warnings Turn off compiler warnings (not recommended) -- --enable-nfs-fix Work around an NFS with broken attributes caching -- --enable-buffy-size Use file size attribute instead of access time -- --enable-mailtool Enable Sun mailtool attachments support -- --enable-locales-fix The result of isprint() is unreliable -- --enable-exact-address Enable regeneration of email addresses -- --enable-hcache Enable header caching -- --disable-iconv Disable iconv support -- --disable-nls Do not use Native Language Support -+ --enable-gpgme Enable GPGME support -+ --disable-pgp Disable PGP support -+ --disable-smime Disable SMIME support -+ --enable-external-dotlock -+ Force use of an external dotlock program -+ --enable-pop Enable POP3 support -+ --enable-imap Enable IMAP support -+ --enable-debug Enable debugging support -+ --enable-flock Use flock() to lock files -+ --disable-fcntl Do NOT use fcntl() to lock files -+ --enable-inodesort Read files in maildir folders sorted by inode -+ --disable-warnings Turn off compiler warnings (not recommended) -+ --enable-nfs-fix Work around an NFS with broken attributes caching -+ --enable-buffy-size Use file size attribute instead of access time -+ --enable-mailtool Enable Sun mailtool attachments support -+ --enable-locales-fix The result of isprint() is unreliable +Only in mutt-1.5.9: config.h.in~ +diff -ru mutt-1.5.9.orig/configure mutt-1.5.9/configure +--- mutt-1.5.9.orig/configure 2005-03-13 17:36:32.000000000 +0100 ++++ mutt-1.5.9/configure 2005-04-03 19:58:56.255190487 +0200 +@@ -868,6 +868,7 @@ + --enable-buffy-size Use file size attribute instead of access time + --enable-mailtool Enable Sun mailtool attachments support + --enable-locales-fix The result of isprint() is unreliable + --enable-compressed Enable compressed folders support -+ --enable-exact-address Enable regeneration of email addresses -+ --enable-hcache Enable header caching -+ --disable-iconv Disable iconv support -+ --disable-nls Do not use Native Language Support - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) -- --with-mixmaster=PATH Include Mixmaster support -- --with-slang=DIR Use S-Lang instead of ncurses -- --with-curses=DIR Where ncurses is installed -- --with-regex Use the GNU regex library -- --with-homespool=FILE File in user's directory where new mail is spooled -- --with-mailpath=DIR Directory where spool mailboxes are located -- --with-docdir=PATH Specify where to put the documentation -- --with-domain=DOMAIN Specify your DNS domain name -- --with-gss=PFX Compile in GSSAPI authentication for IMAP -- --with-ssl=PFX Compile in SSL support for POP/IMAP -- --with-nss=PFX Compile in SSL support for POP/IMAP via NSS -- --with-gnutls=PFX Enable SSL support using gnutls -- --with-sasl=PFX Use Cyrus SASL library for POP/IMAP authentication -- --with-sasl2=PFX Use Cyrus SASL library version 2 for POP/IMAP authentication -- --with-idn=PFX Use GNU libidn for domain names -- --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) -- --without-gdbm Get rid of gdbm even if it is available -- --with-bdb=DIR Use BerkeleyDB4 if gdbm is not available -- --with-libiconv-prefix=DIR Search for libiconv in DIR/include and DIR/lib -- --with-included-gettext Use the GNU gettext library included here -- --without-wc-funcs Do not use the system's wchar_t functions -+ --with-gpgme-prefix=PFX prefix where GPGME is installed (optional) -+ --with-mixmaster=PATH Include Mixmaster support -+ --with-slang=DIR Use S-Lang instead of ncurses -+ --with-curses=DIR Where ncurses is installed -+ --with-regex Use the GNU regex library -+ --with-homespool=FILE File in user's directory where new mail is spooled -+ --with-mailpath=DIR Directory where spool mailboxes are located -+ --with-docdir=PATH Specify where to put the documentation -+ --with-domain=DOMAIN Specify your DNS domain name -+ --with-gss=PFX Compile in GSSAPI authentication for IMAP -+ --with-ssl=PFX Compile in SSL support for POP/IMAP -+ --with-nss=PFX Compile in SSL support for POP/IMAP via NSS -+ --with-gnutls=PFX Enable SSL support using gnutls -+ --with-sasl=PFX Use Cyrus SASL library for POP/IMAP authentication -+ --with-sasl2=PFX Use Cyrus SASL library version 2 for POP/IMAP -+ authentication -+ --with-idn=PFX Use GNU libidn for domain names -+ --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) -+ --without-gdbm Don't use gdbm even if it is available -+ --with-bdb=DIR Use BerkeleyDB4 if gdbm is not available -+ --with-libiconv-prefix=DIR -+ Search for libiconv in DIR/include and DIR/lib -+ --with-included-gettext Use the GNU gettext library included here -+ --without-wc-funcs Do not use the system's wchar_t functions - - Some influential environment variables: - CC C compiler command -@@ -998,7 +1002,7 @@ + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching + --disable-iconv Disable iconv support +@@ -1001,7 +1002,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi @@ -243,7 +229,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure done fi -@@ -2429,8 +2433,7 @@ +@@ -2432,8 +2433,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -253,7 +239,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2488,8 +2491,7 @@ +@@ -2491,8 +2491,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -263,7 +249,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2605,8 +2607,7 @@ +@@ -2608,8 +2607,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -273,7 +259,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2660,8 +2661,7 @@ +@@ -2663,8 +2661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -283,7 +269,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2706,8 +2706,7 @@ +@@ -2709,8 +2706,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -293,7 +279,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -2751,8 +2750,7 @@ +@@ -2754,8 +2750,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -303,7 +289,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3004,8 +3002,7 @@ +@@ -3007,8 +3002,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -313,7 +299,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3059,8 +3056,7 @@ +@@ -3062,8 +3056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -323,7 +309,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3395,8 +3391,7 @@ +@@ -3398,8 +3391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -333,7 +319,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3566,8 +3561,7 @@ +@@ -3569,8 +3561,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -343,7 +329,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -3642,8 +3636,7 @@ +@@ -3645,8 +3636,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -353,7 +339,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4296,8 +4289,7 @@ +@@ -4299,8 +4289,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -363,7 +349,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4413,8 +4405,7 @@ +@@ -4416,8 +4405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -373,7 +359,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4496,8 +4487,7 @@ +@@ -4499,8 +4487,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -383,7 +369,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4526,8 +4516,7 @@ +@@ -4529,8 +4516,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -393,7 +379,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4597,8 +4586,7 @@ +@@ -4600,8 +4586,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -403,7 +389,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4650,8 +4638,7 @@ +@@ -4653,8 +4638,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -413,7 +399,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4722,8 +4709,7 @@ +@@ -4725,8 +4709,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -423,7 +409,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4775,8 +4761,7 @@ +@@ -4778,8 +4761,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -433,7 +419,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4999,8 +4984,7 @@ +@@ -5002,8 +4984,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -443,7 +429,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5147,8 +5131,7 @@ +@@ -5150,8 +5131,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -453,7 +439,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5210,8 +5193,7 @@ +@@ -5213,8 +5193,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -463,7 +449,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5273,8 +5255,7 @@ +@@ -5276,8 +5255,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -473,7 +459,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5314,8 +5295,7 @@ +@@ -5317,8 +5295,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -483,7 +469,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5371,8 +5351,7 @@ +@@ -5374,8 +5351,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -493,7 +479,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5412,8 +5391,7 @@ +@@ -5415,8 +5391,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -503,7 +489,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5477,8 +5455,7 @@ +@@ -5480,8 +5455,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -513,7 +499,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5509,10 +5486,8 @@ +@@ -5512,10 +5486,8 @@ esac else if test "$cross_compiling" = yes; then @@ -526,7 +512,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -5624,8 +5599,7 @@ +@@ -5627,8 +5599,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -536,7 +522,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5687,8 +5661,7 @@ +@@ -5690,8 +5661,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -546,7 +532,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5728,8 +5701,7 @@ +@@ -5731,8 +5701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -556,7 +542,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5785,8 +5757,7 @@ +@@ -5788,8 +5757,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -566,7 +552,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5826,8 +5797,7 @@ +@@ -5829,8 +5797,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -576,7 +562,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5891,8 +5861,7 @@ +@@ -5894,8 +5861,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -586,7 +572,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5923,10 +5892,8 @@ +@@ -5926,10 +5892,8 @@ esac else if test "$cross_compiling" = yes; then @@ -599,7 +585,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6038,8 +6005,7 @@ +@@ -6041,8 +6005,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -609,7 +595,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6101,8 +6067,7 @@ +@@ -6104,8 +6067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -619,7 +605,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6142,8 +6107,7 @@ +@@ -6145,8 +6107,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -629,7 +615,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6199,8 +6163,7 @@ +@@ -6202,8 +6163,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -639,7 +625,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6240,8 +6203,7 @@ +@@ -6243,8 +6203,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -649,7 +635,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6305,8 +6267,7 @@ +@@ -6308,8 +6267,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -659,7 +645,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6337,10 +6298,8 @@ +@@ -6340,10 +6298,8 @@ esac else if test "$cross_compiling" = yes; then @@ -672,7 +658,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6452,8 +6411,7 @@ +@@ -6455,8 +6411,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -682,7 +668,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6515,8 +6473,7 @@ +@@ -6518,8 +6473,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -692,7 +678,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6556,8 +6513,7 @@ +@@ -6559,8 +6513,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -702,7 +688,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6613,8 +6569,7 @@ +@@ -6616,8 +6569,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -712,7 +698,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6654,8 +6609,7 @@ +@@ -6657,8 +6609,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -722,7 +708,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6719,8 +6673,7 @@ +@@ -6722,8 +6673,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -732,7 +718,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6751,10 +6704,8 @@ +@@ -6754,10 +6704,8 @@ esac else if test "$cross_compiling" = yes; then @@ -745,7 +731,16 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -7216,8 +7167,7 @@ +@@ -6992,7 +6940,7 @@ + #define CRYPT_BACKEND_CLASSIC_PGP 1 + _ACEOF + +- PGPAUX_TARGET="pgpring pgpewrap" ++ PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" + fi + +@@ -7219,8 +7167,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -755,7 +750,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7303,8 +7253,7 @@ +@@ -7306,8 +7253,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -765,7 +760,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7419,8 +7368,7 @@ +@@ -7422,8 +7368,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -775,7 +770,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7490,8 +7438,7 @@ +@@ -7493,8 +7438,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -785,7 +780,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7560,8 +7507,7 @@ +@@ -7563,8 +7507,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -795,7 +790,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7627,8 +7573,7 @@ +@@ -7630,8 +7573,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -805,7 +800,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7778,8 +7723,7 @@ +@@ -7781,8 +7723,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -815,7 +810,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7962,8 +7906,7 @@ +@@ -7965,8 +7906,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -825,7 +820,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8031,8 +7974,7 @@ +@@ -8034,8 +7974,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -835,7 +830,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8101,8 +8043,7 @@ +@@ -8104,8 +8043,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -845,7 +840,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8173,8 +8114,7 @@ +@@ -8176,8 +8114,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -855,7 +850,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8296,8 +8236,7 @@ +@@ -8299,8 +8236,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -865,7 +860,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8366,8 +8305,7 @@ +@@ -8369,8 +8305,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -875,7 +870,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8444,8 +8382,7 @@ +@@ -8447,8 +8382,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -885,7 +880,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8507,8 +8444,7 @@ +@@ -8510,8 +8444,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -895,7 +890,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8561,8 +8497,7 @@ +@@ -8564,8 +8497,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -905,7 +900,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8605,8 +8540,7 @@ +@@ -8608,8 +8540,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -915,7 +910,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8681,8 +8615,7 @@ +@@ -8684,8 +8615,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -925,7 +920,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8721,8 +8654,7 @@ +@@ -8724,8 +8654,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -935,7 +930,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8818,8 +8750,7 @@ +@@ -8821,8 +8750,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -945,7 +940,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8989,8 +8920,7 @@ +@@ -8992,8 +8920,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -955,7 +950,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9140,8 +9070,7 @@ +@@ -9143,8 +9070,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -965,7 +960,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9290,8 +9219,7 @@ +@@ -9293,8 +9219,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -975,7 +970,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9477,8 +9405,7 @@ +@@ -9480,8 +9405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -985,7 +980,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9550,8 +9477,7 @@ +@@ -9553,8 +9477,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -995,7 +990,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9658,8 +9584,7 @@ +@@ -9661,8 +9584,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1005,7 +1000,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9748,8 +9673,7 @@ +@@ -9751,8 +9673,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1015,7 +1010,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9822,8 +9746,7 @@ +@@ -9825,8 +9746,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1025,7 +1020,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9888,8 +9811,7 @@ +@@ -9891,8 +9811,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1035,7 +1030,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9996,8 +9918,7 @@ +@@ -9999,8 +9918,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1045,7 +1040,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10100,8 +10021,7 @@ +@@ -10103,8 +10021,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1055,7 +1050,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10209,8 +10129,7 @@ +@@ -10212,8 +10129,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1065,7 +1060,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10270,8 +10189,7 @@ +@@ -10273,8 +10189,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1075,7 +1070,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10459,8 +10377,7 @@ +@@ -10462,8 +10377,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1085,7 +1080,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10563,8 +10480,7 @@ +@@ -10566,8 +10480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1095,7 +1090,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10678,8 +10594,7 @@ +@@ -10681,8 +10594,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1105,7 +1100,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10748,8 +10663,7 @@ +@@ -10751,8 +10663,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1115,7 +1110,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10856,8 +10770,7 @@ +@@ -10859,8 +10770,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1125,7 +1120,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10926,8 +10839,7 @@ +@@ -10929,8 +10839,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1135,7 +1130,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11034,8 +10946,7 @@ +@@ -11037,8 +10946,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1145,7 +1140,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11145,8 +11056,7 @@ +@@ -11148,8 +11056,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1155,7 +1150,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11645,8 +11555,7 @@ +@@ -11648,8 +11555,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1165,7 +1160,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11712,8 +11621,7 @@ +@@ -11715,8 +11621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1175,7 +1170,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11814,8 +11722,7 @@ +@@ -11817,8 +11722,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1185,7 +1180,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11881,8 +11788,7 @@ +@@ -11884,8 +11788,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1195,7 +1190,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11987,8 +11893,7 @@ +@@ -11990,8 +11893,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1205,7 +1200,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12149,8 +12054,7 @@ +@@ -12152,8 +12054,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1215,7 +1210,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12223,8 +12127,7 @@ +@@ -12226,8 +12127,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1225,7 +1220,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12299,8 +12202,7 @@ +@@ -12302,8 +12202,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1235,7 +1230,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12493,8 +12395,7 @@ +@@ -12496,8 +12395,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1245,7 +1240,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12571,8 +12472,7 @@ +@@ -12574,8 +12472,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1255,7 +1250,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12681,8 +12581,7 @@ +@@ -12684,8 +12581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1265,7 +1260,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12982,8 +12881,7 @@ +@@ -12985,8 +12881,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1275,7 +1270,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13156,8 +13054,7 @@ +@@ -13159,8 +13054,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1285,7 +1280,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13268,8 +13165,7 @@ +@@ -13271,8 +13165,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1295,7 +1290,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13392,8 +13288,7 @@ +@@ -13395,8 +13288,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1305,7 +1300,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13515,8 +13410,7 @@ +@@ -13518,8 +13410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1315,7 +1310,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13620,8 +13514,7 @@ +@@ -13623,8 +13514,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1325,7 +1320,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13723,8 +13616,7 @@ +@@ -13726,8 +13616,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1335,7 +1330,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13826,8 +13718,7 @@ +@@ -13829,8 +13718,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1345,7 +1340,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13978,6 +13869,18 @@ +@@ -13981,6 +13869,18 @@ fi fi; @@ -1364,7 +1359,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure # Check whether --with-exec-shell or --without-exec-shell was given. if test "${with_exec_shell+set}" = set; then -@@ -14070,8 +13973,7 @@ +@@ -14073,8 +13973,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1374,7 +1369,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14156,8 +14058,7 @@ +@@ -14159,8 +14058,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1384,7 +1379,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14273,8 +14174,7 @@ +@@ -14276,8 +14174,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1394,7 +1389,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14339,8 +14239,7 @@ +@@ -14342,8 +14239,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1404,7 +1399,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14404,8 +14303,7 @@ +@@ -14407,8 +14303,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1414,7 +1409,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14486,8 +14384,7 @@ +@@ -14489,8 +14384,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1424,7 +1419,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14628,8 +14525,7 @@ +@@ -14631,8 +14525,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1434,7 +1429,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14767,8 +14663,7 @@ +@@ -14770,8 +14663,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1444,7 +1439,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14952,8 +14847,7 @@ +@@ -14955,8 +14847,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1454,7 +1449,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15243,8 +15137,7 @@ +@@ -15246,8 +15137,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1464,7 +1459,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15450,8 +15343,7 @@ +@@ -15453,8 +15343,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1474,7 +1469,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15533,8 +15425,7 @@ +@@ -15536,8 +15425,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1484,7 +1479,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15584,8 +15475,7 @@ +@@ -15587,8 +15475,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1494,7 +1489,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15660,8 +15550,7 @@ +@@ -15663,8 +15550,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1504,7 +1499,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15731,8 +15620,7 @@ +@@ -15734,8 +15620,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1514,7 +1509,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15795,8 +15683,7 @@ +@@ -15798,8 +15683,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1524,7 +1519,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15901,8 +15788,7 @@ +@@ -15904,8 +15788,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1534,7 +1529,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16040,8 +15926,7 @@ +@@ -16043,8 +15926,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1544,7 +1539,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16100,8 +15985,7 @@ +@@ -16103,8 +15985,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1554,7 +1549,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16212,8 +16096,7 @@ +@@ -16215,8 +16096,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1564,7 +1559,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16698,8 +16581,7 @@ +@@ -16701,8 +16581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1574,7 +1569,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17053,8 +16935,7 @@ +@@ -17056,8 +16935,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1584,7 +1579,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17125,8 +17006,7 @@ +@@ -17128,8 +17006,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1594,7 +1589,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17277,8 +17157,7 @@ +@@ -17280,8 +17157,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1604,7 +1599,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17345,8 +17224,7 @@ +@@ -17348,8 +17224,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1614,7 +1609,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17412,8 +17290,7 @@ +@@ -17415,8 +17290,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1624,7 +1619,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17600,8 +17477,7 @@ +@@ -17603,8 +17477,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1634,7 +1629,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17707,8 +17583,7 @@ +@@ -17710,8 +17583,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1644,7 +1639,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17811,8 +17686,7 @@ +@@ -17814,8 +17686,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1654,7 +1649,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17880,8 +17754,7 @@ +@@ -17883,8 +17754,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1664,7 +1659,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17962,8 +17835,7 @@ +@@ -17965,8 +17835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1674,7 +1669,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18026,8 +17898,7 @@ +@@ -18029,8 +17898,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1684,7 +1679,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18088,8 +17959,7 @@ +@@ -18091,8 +17959,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1694,7 +1689,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19082,11 +18952,6 @@ +@@ -19085,11 +18952,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1706,7 +1701,7 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ -@@ -19125,6 +18990,12 @@ +@@ -19128,6 +18990,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1719,9 +1714,9 @@ diff -ru mutt-1.5.8.orig/configure mutt-1.5.8/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -diff -ru mutt-1.5.8.orig/imap/Makefile.in mutt-1.5.8/imap/Makefile.in ---- mutt-1.5.8.orig/imap/Makefile.in 2005-02-12 21:58:24.000000000 +0100 -+++ mutt-1.5.8/imap/Makefile.in 2005-03-10 07:55:35.624793344 +0100 +diff -ru mutt-1.5.9.orig/imap/Makefile.in mutt-1.5.9/imap/Makefile.in +--- mutt-1.5.9.orig/imap/Makefile.in 2005-03-13 17:37:45.000000000 +0100 ++++ mutt-1.5.9/imap/Makefile.in 2005-04-03 19:58:54.831486654 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -1733,18 +1728,9 @@ diff -ru mutt-1.5.8.orig/imap/Makefile.in mutt-1.5.8/imap/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -223,7 +223,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - @USE_GSS_TRUE@GSSSOURCES = auth_gss.c - @USE_SASL_FALSE@AUTHENTICATORS = auth_anon.c auth_cram.c - @USE_SASL_TRUE@AUTHENTICATORS = auth_sasl.c -diff -ru mutt-1.5.8.orig/m4/Makefile.in mutt-1.5.8/m4/Makefile.in ---- mutt-1.5.8.orig/m4/Makefile.in 2005-02-12 21:58:24.000000000 +0100 -+++ mutt-1.5.8/m4/Makefile.in 2005-03-10 07:55:35.786765529 +0100 +diff -ru mutt-1.5.9.orig/m4/Makefile.in mutt-1.5.9/m4/Makefile.in +--- mutt-1.5.9.orig/m4/Makefile.in 2005-03-13 17:37:45.000000000 +0100 ++++ mutt-1.5.9/m4/Makefile.in 2005-04-03 19:58:54.969457936 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. diff --git a/debian/scripts/vars b/debian/scripts/vars index 19e3da4..059d9da 100644 --- a/debian/scripts/vars +++ b/debian/scripts/vars @@ -8,7 +8,7 @@ SOURCE_DIR=build-tree # For a single pkg, this is the directory that is embedded in the tarball. # For multiple pkgs, this is null. -TAR_DIR=mutt-1.5.8 +TAR_DIR=mutt-1.5.9 # Where to place all the stamp files. This directory can be removed, and # all the targets will then be rerun. STAMP_DIR=debian/stampdir diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index f12621e..5ad6cd0 100644 --- a/upstream/extra-patches/compressed-folders +++ b/upstream/extra-patches/compressed-folders @@ -7,19 +7,19 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2005-03-10 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.8.rr.compressed.1.gz + - Date: 2005-04-03 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.9.rr.compressed.1.gz * Changes made: - filterdiff -p1 \ - $(for f in Makefile.in config.h.in configure Muttrc doc/manual.txt \ + $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \ doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) - 2005-03-10: fix configure.in to match latest CVS. == END PATCH -diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c ---- mutt-1.5.8/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.8-ro/compress.c 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c +--- mutt-1.5.9/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.9-ro/compress.c 2005-03-20 14:06:20.000000000 +0100 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -508,9 +508,9 @@ diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h ---- mutt-1.5.8/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.8-ro/compress.h 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h +--- mutt-1.5.9/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.9-ro/compress.h 2005-03-20 14:06:20.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -539,12 +539,12 @@ diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -diff -urN mutt-1.5.8/config.h.in mutt-1.5.8-ro/config.h.in -diff -urN mutt-1.5.8/configure mutt-1.5.8-ro/configure -diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/configure.in ---- mutt-1.5.8/configure.in 2005-02-12 21:57:16.000000000 +0100 -+++ mutt-1.5.8-ro/configure.in 2005-02-13 18:54:39.000000000 +0100 -@@ -776,6 +776,11 @@ +diff -urN mutt-1.5.9/config.h.in mutt-1.5.9-ro/config.h.in +diff -urN mutt-1.5.9/configure mutt-1.5.9-ro/configure +diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in +--- mutt-1.5.9/configure.in 2005-03-13 17:36:01.000000000 +0100 ++++ mutt-1.5.9-ro/configure.in 2005-03-20 14:11:05.000000000 +0100 +@@ -777,6 +777,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -556,9 +556,9 @@ diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/configure.in AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", -diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c ---- mutt-1.5.8/curs_main.c 2005-02-12 20:22:15.000000000 +0100 -+++ mutt-1.5.8-ro/curs_main.c 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/curs_main.c mutt-1.5.9-ro/curs_main.c +--- mutt-1.5.9/curs_main.c 2005-02-28 19:36:35.000000000 +0100 ++++ mutt-1.5.9-ro/curs_main.c 2005-03-20 14:06:20.000000000 +0100 @@ -1076,6 +1076,11 @@ { int check; @@ -571,14 +571,14 @@ diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.8/doc/manual-4.html mutt-1.5.8-ro/doc/manual-4.html -diff -urN mutt-1.5.8/doc/manual-6.html mutt-1.5.8-ro/doc/manual-6.html -diff -urN mutt-1.5.8/doc/manual.html mutt-1.5.8-ro/doc/manual.html -diff -urN mutt-1.5.8/doc/manual.sgml mutt-1.5.8-ro/doc/manual.sgml -diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head ---- mutt-1.5.8/doc/manual.sgml.head 2005-02-12 20:41:36.000000000 +0100 -+++ mutt-1.5.8-ro/doc/manual.sgml.head 2005-02-13 18:54:39.000000000 +0100 -@@ -2537,6 +2537,176 @@ +diff -urN mutt-1.5.9/doc/manual-4.html mutt-1.5.9-ro/doc/manual-4.html +diff -urN mutt-1.5.9/doc/manual-6.html mutt-1.5.9-ro/doc/manual-6.html +diff -urN mutt-1.5.9/doc/manual.html mutt-1.5.9-ro/doc/manual.html +diff -urN mutt-1.5.9/doc/manual.sgml mutt-1.5.9-ro/doc/manual.sgml +diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head +--- mutt-1.5.9/doc/manual.sgml.head 2005-02-19 14:49:49.000000000 +0100 ++++ mutt-1.5.9-ro/doc/manual.sgml.head 2005-03-20 14:06:20.000000000 +0100 +@@ -2539,6 +2539,176 @@ macro pager \cb |urlview\n @@ -755,7 +755,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head Mutt's MIME Support

Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -3116,6 +3286,8 @@ +@@ -3118,6 +3288,8 @@ @@ -764,7 +764,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head @@ -773,7 +773,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head @@ -782,11 +782,11 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - -+# Use folders which match on \\.gz$ as gzipped folders: -+# open-hook \\.gz$ "gzip -cd %f > %t" -+# close-hook \\.gz$ "gzip -c %t > %f" -+# append-hook \\.gz$ "gzip -c %t >> %f" -+ - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. - # -diff -urN mutt-1.5.8/Muttrc.head.in mutt-1.5.8-ro/Muttrc.head.in ---- mutt-1.5.8/Muttrc.head.in 2002-01-24 13:10:47.000000000 +0100 -+++ mutt-1.5.8-ro/Muttrc.head.in 2005-02-13 18:54:40.000000000 +0100 -@@ -19,6 +19,11 @@ - macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" - -+# Use folders which match on \\.gz$ as gzipped folders: -+# open-hook \\.gz$ "gzip -cd %f > %t" -+# close-hook \\.gz$ "gzip -c %t > %f" -+# append-hook \\.gz$ "gzip -c %t >> %f" -+ - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. - # -diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c ---- mutt-1.5.8/mx.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.8-ro/mx.c 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/Muttrc mutt-1.5.9-ro/Muttrc +diff -urN mutt-1.5.9/Muttrc.head mutt-1.5.9-ro/Muttrc.head +diff -urN mutt-1.5.9/Muttrc.head.in mutt-1.5.9-ro/Muttrc.head.in +diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c +--- mutt-1.5.9/mx.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.9-ro/mx.c 2005-03-20 14:06:20.000000000 +0100 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1082,9 +1054,9 @@ diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h ---- mutt-1.5.8/mx.h 2003-08-05 15:58:16.000000000 +0200 -+++ mutt-1.5.8-ro/mx.h 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h +--- mutt-1.5.9/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.9-ro/mx.h 2005-03-20 14:06:20.000000000 +0100 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -1095,15 +1067,15 @@ diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.8/PATCHES mutt-1.5.8-ro/PATCHES ---- mutt-1.5.8/PATCHES 2005-02-12 21:55:51.000000000 +0100 -+++ mutt-1.5.8-ro/PATCHES 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/PATCHES mutt-1.5.9-ro/PATCHES +--- mutt-1.5.9/PATCHES 2005-03-13 17:33:06.000000000 +0100 ++++ mutt-1.5.9-ro/PATCHES 2005-03-20 17:59:28.000000000 +0100 @@ -0,0 +1 @@ -+patch-1.5.8.rr.compressed.1 -diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po ---- mutt-1.5.8/po/de.po 2005-02-12 21:58:50.000000000 +0100 -+++ mutt-1.5.8-ro/po/de.po 2005-02-13 18:56:06.000000000 +0100 -@@ -710,6 +710,48 @@ ++patch-1.5.9.rr.compressed.1 +diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po +--- mutt-1.5.9/po/de.po 2005-03-13 17:38:22.000000000 +0100 ++++ mutt-1.5.9-ro/po/de.po 2005-03-20 14:06:20.000000000 +0100 +@@ -715,6 +715,48 @@ msgid "PGP already selected. Clear & continue ? " msgstr "PGP bereits ausgewählt. Löschen und weiter?" @@ -1152,7 +1124,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1300,6 +1342,10 @@ +@@ -1305,6 +1347,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1163,7 +1135,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -2713,18 +2759,10 @@ +@@ -2737,18 +2783,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1182,9 +1154,9 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po #. this means ctx->changed or ctx->deleted was set, but no #. * messages were found to be changed or deleted. This should #. * never happen, is we presume it is a bug in mutt. -diff -urN mutt-1.5.8/po/POTFILES.in mutt-1.5.8-ro/po/POTFILES.in ---- mutt-1.5.8/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 -+++ mutt-1.5.8-ro/po/POTFILES.in 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/po/POTFILES.in mutt-1.5.9-ro/po/POTFILES.in +--- mutt-1.5.9/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 ++++ mutt-1.5.9-ro/po/POTFILES.in 2005-03-20 14:06:20.000000000 +0100 @@ -8,6 +8,7 @@ color.c commands.c @@ -1193,9 +1165,9 @@ diff -urN mutt-1.5.8/po/POTFILES.in mutt-1.5.8-ro/po/POTFILES.in crypt.c curs_lib.c curs_main.c -diff -urN mutt-1.5.8/status.c mutt-1.5.8-ro/status.c ---- mutt-1.5.8/status.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.8-ro/status.c 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/status.c mutt-1.5.9-ro/status.c +--- mutt-1.5.9/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.9-ro/status.c 2005-03-20 14:06:20.000000000 +0100 @@ -97,6 +97,14 @@ case 'f': diff --git a/upstream/extra-patches/header-cache b/upstream/extra-patches/header-cache deleted file mode 100644 index 69ee997..0000000 --- a/upstream/extra-patches/header-cache +++ /dev/null @@ -1,222 +0,0 @@ -# vi: ft=diff -This is the header cache patch by Thomas Glanzmann -. - -The home page for this patch is: - - http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/ - -* Patch last synced with upstream: - - Date: 2005-02-10 - - File: http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/mutt-cvs-header-cache.28 - -* Changes made: NONE. - -== END PATCH -diff -Nru a/PATCHES b/PATCHES ---- a/PATCHES -+++ b/PATCHES -@@ -0,0 +1 @@ -+mutt-cvs-header-cache.28 -diff -Nru a/init.h b/init.h ---- a/init.h 2005-01-27 20:54:24 +01:00 -+++ b/init.h 2005-01-28 15:12:41 +01:00 -@@ -1032,6 +1032,13 @@ - ** global header cache for all folders is used. Per default it is unset and so - ** no header caching will be used. - */ -+ { "maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 }, -+ /* -+ ** .pp -+ ** Check for Maildir unaware programs other than mutt having modified maildir -+ ** files when the header cache is in use. This incurs one stat(2) per -+ ** message every time the folder is opened. -+ */ - { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" }, - /* - ** .pp -diff -Nru a/mh.c b/mh.c ---- a/mh.c 2005-01-27 20:45:37 +01:00 -+++ b/mh.c 2005-02-03 09:09:50 +01:00 -@@ -787,6 +787,14 @@ - return r; - } - -+#if USE_HCACHE -+static size_t maildir_hcache_keylen (const char *fn) -+{ -+ const char * p = strrchr (fn, ':'); -+ return p ? (size_t) (p - fn) : mutt_strlen(fn); -+} -+#endif -+ - #ifdef USE_INODESORT - /* - * Merge two maildir lists according to the inode numbers. -@@ -882,27 +890,67 @@ - * This function does the second parsing pass for a maildir-style - * folder. - */ -- - void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md) - { - struct maildir *p; - char fn[_POSIX_PATH_MAX]; - int count; - -+#if USE_HCACHE -+ void *hc = NULL; -+ void *data; -+ struct timeval *when = NULL; -+ struct stat lastchanged; -+ int ret; -+ -+ hc = mutt_hcache_open (HeaderCache, ctx->path); -+#endif -+ - for (p = md, count = 0; p; p = p->next, count++) -- if (p && p->h && !p->header_parsed) -- { -- if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) -- mutt_message (_("Reading %s... %d"), ctx->path, count); -- snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); -- if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) -- p->header_parsed = 1; -- else -- mutt_free_header (&p->h); -- } --} -+ { -+ if (! (p && p->h && !p->header_parsed)) -+ continue; - -+ if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) -+ mutt_message (_("Reading %s... %d"), ctx->path, count); - -+#if USE_HCACHE -+ data = mutt_hcache_fetch (hc, p->h->path + 3, &maildir_hcache_keylen); -+ when = (struct timeval *) data; -+#endif -+ -+ snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); -+ -+#if USE_HCACHE -+ if (option(OPTHCACHEVERIFY)) -+ ret = stat(fn, &lastchanged); -+ else { -+ lastchanged.st_mtime = 0; -+ ret = 0; -+ } -+ -+ if (data != NULL && !ret && lastchanged.st_mtime <= when->tv_sec) -+ { -+ p->h = mutt_hcache_restore ((unsigned char *)data, &p->h); -+ maildir_parse_flags (p->h, fn); -+ } else -+#endif -+ if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) -+ { -+ p->header_parsed = 1; -+#if USE_HCACHE -+ mutt_hcache_store (hc, p->h->path + 3, p->h, 0, &maildir_hcache_keylen); -+#endif -+ } else -+ mutt_free_header (&p->h); -+#if USE_HCACHE -+ FREE(&data); -+#endif -+ } -+#if USE_HCACHE -+ mutt_hcache_close (hc); -+#endif -+} - - /* Read a MH/maildir style mailbox. - * -@@ -1399,6 +1447,9 @@ - { - char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX]; - int i, j; -+#if USE_HCACHE -+ void *hc = NULL; -+#endif /* USE_HCACHE */ - - if (ctx->magic == M_MH) - i = mh_check_mailbox (ctx, index_hint); -@@ -1408,6 +1459,11 @@ - if (i != 0) - return i; - -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ hc = mutt_hcache_open(HeaderCache, ctx->path); -+#endif /* USE_HCACHE */ -+ - for (i = 0; i < ctx->msgcount; i++) - { - if (ctx->hdrs[i]->deleted -@@ -1416,7 +1472,13 @@ - snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path); - if (ctx->magic == M_MAILDIR - || (option (OPTMHPURGE) && ctx->magic == M_MH)) -+ { -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_delete (hc, ctx->hdrs[i]->path + 3, &maildir_hcache_keylen); -+#endif /* USE_HCACHE */ - unlink (path); -+ } - else if (ctx->magic == M_MH) - { - /* MH just moves files out of the way when you delete them */ -@@ -1438,16 +1500,21 @@ - if (ctx->magic == M_MAILDIR) - { - if (maildir_sync_message (ctx, i) == -1) -- return -1; -+ goto err; - } - else - { - if (mh_sync_message (ctx, i) == -1) -- return -1; -+ goto err; - } - } - } - -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_close (hc); -+#endif /* USE_HCACHE */ -+ - if (ctx->magic == M_MH) - mh_update_sequences (ctx); - -@@ -1468,6 +1535,13 @@ - } - - return 0; -+ -+err: -+#if USE_HCACHE -+ if (ctx->magic == M_MAILDIR) -+ mutt_hcache_close (hc); -+#endif /* USE_HCACHE */ -+ return -1; - } - - static char *maildir_canon_filename (char *dest, const char *src, size_t l) -diff -Nru a/mutt.h b/mutt.h ---- a/mutt.h 2005-01-27 20:54:24 +01:00 -+++ b/mutt.h 2005-01-28 15:12:54 +01:00 -@@ -353,6 +353,9 @@ - OPTFORCENAME, - OPTFORWDECODE, - OPTFORWQUOTE, -+#if USE_HCACHE -+ OPTHCACHEVERIFY, -+#endif - OPTHDRS, - OPTHEADER, - OPTHELP, diff --git a/upstream/patches/cvs_2005-03-09 b/upstream/patches/cvs_2005-03-09 deleted file mode 100644 index c023d47..0000000 --- a/upstream/patches/cvs_2005-03-09 +++ /dev/null @@ -1,10526 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.384 -retrieving revision 3.405 -diff -u -p -r3.384 -r3.405 ---- a/ChangeLog 12 Feb 2005 20:47:13 -0000 3.384 -+++ b/ChangeLog 5 Mar 2005 18:16:11 -0000 3.405 -@@ -1,3 +1,122 @@ -+2005-03-05 18:15:20 Christoph Ludwig (roessler) -+ -+ * crypt.c: The attached patch fixes a segfault I observed -+ today: mutt failed to check for a possible null pointer in -+ mutt_is_application_smime(Body*). -+ -+2005-03-05 07:10:57 brendan (brendan) -+ -+ * mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h, -+ mutt_ssl.c, mutt_ssl_gnutls.c, mutt_ssl_nss.c, mutt_tunnel.c: -+ Rename open/close/read/write function pointers to avoid problems -+ with systems where standard open/close/read/write functions are -+ implemented with macros. Thanks to Aaron Crane and others for -+ their input about the problem. -+ -+2005-03-01 15:53:25 Vsevolod Volkov (roessler) -+ -+ * po/ru.po: update -+ -+2005-03-01 15:52:33 Thomas Glanzmann (roessler) -+ -+ * init.h: This is a spelling fix supplied by Cameron Simpson. -+ -+2005-02-28 18:33:45 Mads Martin Joergensen (roessler) -+ -+ * curs_main.c: Fix a crash. -+ -+2005-02-28 15:15:23 Christoph Berg (roessler) -+ -+ * init.h, menu.c, mutt.h: I've updated the menu_context patch to -+ reintroduce the menu_move_off variable that hasn't made it into -+ 1.5.8. The patch fixes menu_prev_line and menu_next_line which -+ didn't work with menu_context > 0 and also makes -+ work even if there are less messages than screen lines (thanks -+ to René Clerc and Vincent Lefevre for spotting these issues). -+ -+2005-02-28 14:37:09 Udo Schweigert (roessler) -+ -+ * smime.c: As pointed out in a separate thread, here is a patch -+ which fixes the problem of a failing openssl after interactively -+ selecting a recipient's key. -+ -+2005-02-27 03:18:23 Brendan Cully (brendan) -+ -+ * imap/message.c: Turn brain back on before committing patches -+ (that modification I made to APPEND was bogus). -+ -+2005-02-27 02:44:45 Dan Hopper (brendan) -+ -+ * imap/message.c: Don't lose N flag when uploading a message to an -+ IMAP mailbox. (Slightly modified from the original patch to -+ prevent spurious space characters). -+ -+2005-02-21 04:42:34 Alain Bench (roessler) -+ -+ * parse.c, pgp.c, sendlib.c: Bcc should be RFC2047-encoded, too. -+ -+2005-02-19 16:00:24 Thomas Roessler (roessler) -+ -+ * sendlib.c: Fix Debian 295528. -+ -+2005-02-17 03:33:00 Brendan Cully (brendan) -+ -+ * OPS, browser.c, doc/manual.sgml.head, functions.h, -+ imap/browse.c, imap/imap.c, imap/imap.h, imap/imap_private.h: New -+ function: rename-mailbox (bound to 'r' by default). -+ -+ The lack of a rename-mailbox command for IMAP finally got too annoying. -+ It's a bit of a cut-and-paste job, but I've put my dreams of cleaning -+ up the IMAP codebase on hold. Gotta grow up some time. -+ -+2005-02-16 09:34:06 ta_panta_rei <7vvtch802@sneakemail.com> (roessler) -+ -+ * po/el.po: update -+ -+2005-02-16 08:48:41 Ronny Haryanto (roessler) -+ -+ * po/id.po: update -+ -+2005-02-15 19:28:24 Thomas Roessler (roessler) -+ -+ * doc/Makefile.in: Fix linuxdoc invocation. Thanks to -+ Tamotsu Takahashi for tracking this down to an idiotic -+ non-backwards-compatible change to the way groff works. -+ -+2005-02-15 19:03:51 Ivan Vilata i Balaguer (roessler) -+ -+ * po/ca.po: update -+ -+2005-02-14 08:48:43 Vincent Lefevre (roessler) -+ -+ * po/fr.po: update -+ -+2005-02-13 17:37:31 Roland Rosenfeld (roessler) -+ -+ * po/de.po: update -+ -+2005-02-13 09:53:07 Thomas Roessler (roessler) -+ -+ * Makefile.am: Include crypt-gpgme.h with the distribution. -+ -+2005-02-13 00:25:37 Brendan Cully (brendan) -+ -+ * configure.in, m4/gettext.m4, m4/iconv.m4: Use AC_HELP_STRING to -+ pretty print configure --help screen, with mixed results. -+ -+2005-02-12 21:04:22 Brendan Cully (brendan) -+ -+ * Makefile.am, imap/Makefile.am: Require at least automake 1.6 -+ -+2005-02-12 20:56:36 Thomas Roessler (roessler) -+ -+ * po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, -+ po/zh_CN.po, po/pt_BR.po, po/ru.po, po/lt.po, po/nl.po, po/pl.po, -+ po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/da.po, po/de.po, po/el.po, po/eo.po, -+ po/es.po, Makefile.am, VERSION, po/bg.po, po/ca.po, po/cs.po, -+ reldate.h: automatic post-release commit for mutt-1.5.8 -+ - 2005-02-12 20:46:48 Vincent Lefevre (roessler) - - * po/fr.po: update -@@ -207,7 +326,7 @@ - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - - * hcache.c: - make hcache.c conform to mutt codingstyle -- - use $Id: ChangeLog,v 3.384 2005/02/12 20:47:13 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword -+ - use $Id: ChangeLog,v 3.405 2005/03/05 18:16:11 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword - - 2005-01-29 19:15:07 Thomas Glanzmann (roessler) - -Index: Makefile.am -=================================================================== -RCS file: /home/roessler/cvs/mutt/Makefile.am,v -retrieving revision 3.30 -retrieving revision 3.32 -diff -u -p -r3.30 -r3.32 ---- a/Makefile.am 12 Feb 2005 20:56:30 -0000 3.30 -+++ b/Makefile.am 13 Feb 2005 09:53:07 -0000 3.32 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in - ## Use aclocal -I m4; automake --foreign - --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc - - if BUILD_IMAP -@@ -79,7 +79,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O - makedoc.c stamp-doc-rc README.SSL smime.h\ - muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ - ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ -- snprintf.c regex.c -+ snprintf.c regex.c crypt-gpgme.h - - EXTRA_SCRIPTS = smime_keys - -Index: OPS -=================================================================== -RCS file: /home/roessler/cvs/mutt/OPS,v -retrieving revision 3.5 -retrieving revision 3.6 -diff -u -p -r3.5 -r3.6 ---- a/OPS 4 Jul 2003 17:07:22 -0000 3.5 -+++ b/OPS 17 Feb 2005 03:33:00 -0000 3.6 -@@ -144,6 +144,7 @@ OP_QUIT "save changes to mailbox and qui - OP_RECALL_MESSAGE "recall a postponed message" - OP_REDRAW "clear and redraw the screen" - OP_REFORMAT_WINCH "{internal}" -+OP_RENAME_MAILBOX "rename the current mailbox (IMAP only)" - OP_REPLY "reply to a message" - OP_RESEND "use the current message as a template for a new one" - OP_SAVE "save message/attachment to a file" -Index: browser.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/browser.c,v -retrieving revision 3.13 -retrieving revision 3.14 -diff -u -p -r3.13 -r3.14 ---- a/browser.c 3 Feb 2005 17:01:42 -0000 3.13 -+++ b/browser.c 17 Feb 2005 03:33:00 -0000 3.14 -@@ -875,7 +875,28 @@ void _mutt_select_file (char *f, size_t - } - break; - -- case OP_DELETE_MAILBOX: -+ case OP_RENAME_MAILBOX: -+ if (!state.entry[menu->current].imap) -+ mutt_error (_("Rename is only supported for IMAP mailboxes")); -+ else -+ { -+ int nentry = menu->current; -+ -+ if (imap_mailbox_rename (state.entry[nentry].name) >= 0) { -+ destroy_state (&state); -+ init_state (&state, NULL); -+ state.imap_browse = 1; -+ imap_browse (LastDir, &state); -+ menu->data = state.entry; -+ menu->current = 0; -+ menu->top = 0; -+ init_menu (&state, menu, title, sizeof (title), buffy); -+ MAYBE_REDRAW (menu->redraw); -+ } -+ } -+ break; -+ -+ case OP_DELETE_MAILBOX: - if (!state.entry[menu->current].imap) - mutt_error (_("Delete is only supported for IMAP mailboxes")); - else -Index: configure.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/configure.in,v -retrieving revision 3.23 -retrieving revision 3.24 -diff -u -p -r3.23 -r3.24 ---- a/configure.in 12 Feb 2005 20:20:42 -0000 3.23 -+++ b/configure.in 13 Feb 2005 00:25:37 -0000 3.24 -@@ -93,12 +93,12 @@ if test -f $srcdir/EXPORTABLE ; then - else - SUBVERSION="i" - -- AC_ARG_ENABLE(gpgme, [ --enable-gpgme Enable GPGME support], -+ AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]), - [ if test x$enableval = xyes; then - have_gpgme=yes - fi - ]) -- AC_ARG_WITH(gpgme-prefix, [ --with-gpgme-prefix=PFX prefix where GPGME is installed (optional)], -+ AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]), - gpgme_config_prefix="$withval", gpgme_config_prefix="") - - if test x$have_gpgme = xyes; then -@@ -120,7 +120,7 @@ else - AC_SUBST(LIBGPGME_CFLAGS) - AC_SUBST(LIBGPGME_LIBS) - -- AC_ARG_ENABLE(pgp, [ --disable-pgp Disable PGP support], -+ AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]), - [ if test x$enableval = xno ; then - have_pgp=no - fi -@@ -133,7 +133,7 @@ else - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" - fi - -- AC_ARG_ENABLE(smime, [ --disable-smime Disable SMIME support], -+ AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]), - [ if test x$enableval = xno ; then - have_smime=no - fi -@@ -146,7 +146,7 @@ else - SMIMEAUX_TARGET="smime_keys" - fi - -- AC_ARG_WITH(mixmaster, [ --with-mixmaster[=PATH] Include Mixmaster support], -+ AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), - [if test -x "$withval" ; then - MIXMASTER="$withval" - else -@@ -175,7 +175,7 @@ if test $ISPELL != no; then - AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) - fi - --AC_ARG_WITH(slang, [ --with-slang[=DIR] Use S-Lang instead of ncurses], -+AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]), - [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish, - [AC_TRY_RUN([#include - -@@ -240,7 +240,7 @@ main () - ], - - [mutt_cv_curses=/usr -- AC_ARG_WITH(curses, [ --with-curses=DIR Where ncurses is installed ], -+ AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]), - [if test $withval != yes; then - mutt_cv_curses=$withval - fi -@@ -351,7 +351,7 @@ AC_CHECK_FUNCS(strftime, , [AC_CHECK_LIB - dnl AIX may not have fchdir() - AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no]) - --AC_ARG_WITH(regex, [ --with-regex Use the GNU regex library ], -+AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]), - [mutt_cv_regex=yes], - [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)]) - -@@ -375,7 +375,8 @@ if test $mutt_cv_regex = yes; then - fi - - --AC_ARG_WITH(homespool, [ --with-homespool[=FILE] File in user's directory where new mail is spooled], with_homespool=${withval}) -+AC_ARG_WITH(homespool, -+ AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval}) - if test x$with_homespool != x; then - if test $with_homespool = yes; then - with_homespool=mailbox -@@ -389,7 +390,7 @@ if test x$with_homespool != x; then - AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ]) - mutt_cv_setgid=no - else -- AC_ARG_WITH(mailpath, [ --with-mailpath=DIR Directory where spool mailboxes are located], -+ AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]), - [mutt_cv_mailpath=$withval], - [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath, - [mutt_cv_mailpath=no -@@ -445,7 +446,7 @@ int main (int argc, char **argv) - fi - fi - --AC_ARG_ENABLE(external_dotlock, [ --enable-external-dotlock Force use of an external dotlock program], -+AC_ARG_ENABLE(external_dotlock, AC_HELP_STRING([--enable-external-dotlock], [Force use of an external dotlock program]), - [mutt_cv_external_dotlock="$enableval"]) - - if test "x$mutt_cv_setgid" = "xyes" || test "x$mutt_cv_fchdir" = "xno" \ -@@ -461,7 +462,7 @@ AC_SUBST(DOTLOCK_TARGET) - - - AC_MSG_CHECKING(where to put the documentation) --AC_ARG_WITH(docdir, [ --with-docdir=PATH Specify where to put the documentation], -+AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]), - [mutt_cv_docdir=$withval], - [mutt_cv_docdir="$mutt_cv_prefix/doc/mutt"]) - AC_MSG_RESULT($mutt_cv_docdir) -@@ -479,7 +480,7 @@ fi - AC_SUBST(DOTLOCK_GROUP) - AC_SUBST(DOTLOCK_PERMISSION) - --AC_ARG_WITH(domain, [ --with-domain=DOMAIN Specify your DNS domain name], -+AC_ARG_WITH(domain, AC_HELP_STRING([--with-domain=DOMAIN], [Specify your DNS domain name]), - [if test $withval != yes; then - AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ]) - fi]) -@@ -488,7 +489,7 @@ need_socket="no" - - dnl -- socket dependencies -- - --AC_ARG_ENABLE(pop, [ --enable-pop Enable POP3 support], -+AC_ARG_ENABLE(pop, AC_HELP_STRING([--enable-pop], [Enable POP3 support]), - [ if test x$enableval = xyes ; then - AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o" -@@ -497,7 +498,7 @@ AC_ARG_ENABLE(pop, [ --enable-pop - fi - ]) - --AC_ARG_ENABLE(imap, [ --enable-imap Enable IMAP support], -+AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]), - [ if test x$enableval = xyes ; then - AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ]) - LIBIMAP="-Limap -limap" -@@ -528,7 +529,7 @@ fi - - dnl -- imap dependencies -- - --AC_ARG_WITH(gss, [ --with-gss[=PFX] Compile in GSSAPI authentication for IMAP], -+AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentication for IMAP]), - gss_prefix="$withval", gss_prefix="no") - if test "$gss_prefix" != "no" - then -@@ -558,7 +559,7 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss - - dnl -- end imap dependencies -- - --AC_ARG_WITH(ssl, [ --with-ssl[=PFX] Compile in SSL support for POP/IMAP], -+AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]), - [ if test "$with_ssl" != "no" - then - if test "$need_socket" != "yes"; then -@@ -588,7 +589,7 @@ AC_ARG_WITH(ssl, [ --with-ssl[=PFX] - AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) - - dnl SSL support via NSS --AC_ARG_WITH(nss, [ --with-nss[=PFX] Compile in SSL support for POP/IMAP via NSS], -+AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]), - [ if test "$with_nss" != no - then - if test "$need_socket" != "yes"; then -@@ -611,7 +612,7 @@ AC_ARG_WITH(nss, [ --with-nss[=PFX] - fi - ]) - --AC_ARG_WITH([gnutls], [ --with-gnutls[=PFX] Enable SSL support using gnutls], -+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]), - [gnutls_prefix="$withval"], [gnutls_prefix="no"]) - if test "$gnutls_prefix" != "no" - then -@@ -632,7 +633,7 @@ then - ]) - fi - --AC_ARG_WITH(sasl, [ --with-sasl[=PFX] Use Cyrus SASL library for POP/IMAP authentication], -+AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]), - [ - if test "$need_socket" != "yes" - then -@@ -662,7 +663,7 @@ AC_ARG_WITH(sasl, [ --with-sasl[=PFX] - ]) - AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) - --AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for POP/IMAP authentication], -+AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]), - [ - if test "$need_socket" != "yes" - then -@@ -694,7 +695,7 @@ AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] - ]) - AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) - --AC_ARG_WITH(idn, [ --with-idn=[PFX] Use GNU libidn for domain names], -+AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]), - [ - if test "$with_idn" != "no" ; then - if test "$with_idn" != "yes" ; then -@@ -714,19 +715,19 @@ fi - - dnl -- end socket -- - --AC_ARG_ENABLE(debug, [ --enable-debug Enable debugging support], -+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]), - [ if test x$enableval = xyes ; then - AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ]) - fi - ]) - --AC_ARG_ENABLE(flock, [ --enable-flock Use flock() to lock files], -+AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]), - [if test $enableval = yes; then - AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ]) - fi]) - - mutt_cv_fcntl=yes --AC_ARG_ENABLE(fcntl, [ --disable-fcntl Do NOT use fcntl() to lock files ], -+AC_ARG_ENABLE(fcntl, AC_HELP_STRING([--disable-fcntl], [Do NOT use fcntl() to lock files]), - [if test $enableval = no; then mutt_cv_fcntl=no; fi]) - - if test $mutt_cv_fcntl = yes; then -@@ -736,7 +737,7 @@ fi - dnl This may look cumbersome -- please keep it that way, so we can - dnl quickly change the default to "yes" again. - mutt_cv_inodesort=no --AC_ARG_ENABLE(inodesort, [ --enable-inodesort Read files in maildir folders sorted by inode. ], -+AC_ARG_ENABLE(inodesort, AC_HELP_STRING([--enable-inodesort], [Read files in maildir folders sorted by inode]), - [if test x$enableval = xyes ; then mutt_cv_inodesort=yes; fi]) - - if test $mutt_cv_inodesort = yes; then -@@ -744,7 +745,7 @@ if test $mutt_cv_inodesort = yes; then - fi - - mutt_cv_warnings=yes --AC_ARG_ENABLE(warnings, [ --disable-warnings Turn off compiler warnings (not recommended)], -+AC_ARG_ENABLE(warnings, AC_HELP_STRING([--disable-warnings], [Turn off compiler warnings (not recommended)]), - [if test $enableval = no; then - mutt_cv_warnings=no - fi]) -@@ -753,7 +754,7 @@ if test x$GCC = xyes -a $mutt_cv_warning - CFLAGS="-Wall -pedantic $CFLAGS" - fi - --AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], -+AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]), - [if test x$enableval = xyes; then - AC_DEFINE(NFS_ATTRIBUTE_HACK,1, - [Define if you have problems with mutt not detecting -@@ -761,22 +762,22 @@ AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-f - incorrectly cache the attributes of small files.]) - fi]) - --AC_ARG_ENABLE(buffy-size, [ --enable-buffy-size Use file size attribute instead of access time ], -+AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]), - [if test x$enableval = xyes; then - AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ]) - fi]) - --AC_ARG_ENABLE(mailtool, [ --enable-mailtool Enable Sun mailtool attachments support ], -+AC_ARG_ENABLE(mailtool, AC_HELP_STRING([--enable-mailtool], [Enable Sun mailtool attachments support]), - [if test x$enableval = xyes; then - AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) - fi]) - --AC_ARG_ENABLE(locales-fix, [ --enable-locales-fix The result of isprint() is unreliable ], -+AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]), - [if test x$enableval = xyes; then - AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) - fi]) - --AC_ARG_WITH(exec-shell, [ --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken)], -+AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), - [if test $withval != yes; then - AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", - [program to use for shell commands]) -@@ -785,7 +786,7 @@ AC_ARG_WITH(exec-shell, [ --with-exec-s - fi], - [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")]) - --AC_ARG_ENABLE(exact-address, [ --enable-exact-address Enable regeneration of email addresses], -+AC_ARG_ENABLE(exact-address, AC_HELP_STRING([--enable-exact-address], [Enable regeneration of email addresses]), - [if test $enableval = yes; then - AC_DEFINE(EXACT_ADDRESS,1, - [Enable exact regeneration of email addresses as parsed? -@@ -794,7 +795,7 @@ AC_ARG_ENABLE(exact-address, [ --enable - fi]) - - dnl -- start cache -- --AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], -+AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]), - [if test x$enableval = xyes; then - AC_DEFINE(USE_HCACHE, 1, [Enable header caching]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache.o" -@@ -804,7 +805,7 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache - - need_md5="yes" - ac_prefer_gdbm=yes -- AC_ARG_WITH(gdbm, [ --without-gdbm Get rid of gdbm even if it is available ], -+ AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]), - ac_prefer_gdbm=$withval) - if test x$ac_prefer_gdbm != xno; then - CPPFLAGS="$OLDCPPFLAGS" -@@ -816,7 +817,7 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache - fi - - ac_bdb_prefix=yes -- AC_ARG_WITH(bdb, [ --with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not available ], -+ AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available]), - ac_bdb_prefix=$withval) - if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" -@@ -890,7 +891,7 @@ AC_SUBST(LIBIMAPDEPS) - - dnl -- iconv/gettext -- - --AC_ARG_ENABLE(iconv, [ --disable-iconv Disable iconv support], -+AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [Disable iconv support]), - [if test x$enableval = xno ; then - am_cv_func_iconv=no - fi -@@ -1045,7 +1046,7 @@ if test "$mutt_cv_mbstate_t" = no; then - fi - - wc_funcs=maybe --AC_ARG_WITH(wc-funcs, [ --without-wc-funcs Do not use the system's wchar_t functions], -+AC_ARG_WITH(wc-funcs, AC_HELP_STRING([--without-wc-funcs], [Do not use the system's wchar_t functions]), - wc_funcs=$withval) - - if test "$wc_funcs" != yes -a "$wc_funcs" != no; then -Index: crypt.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt.c,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -p -r3.26 -r3.27 ---- a/crypt.c 3 Feb 2005 17:01:43 -0000 3.26 -+++ b/crypt.c 5 Mar 2005 18:15:20 -0000 3.27 -@@ -360,6 +360,9 @@ int mutt_is_application_smime (BODY *m) - char *t=NULL; - int len, complain=0; - -+ if(!m) -+ return 0; -+ - if ((m->type & TYPEAPPLICATION) && m->subtype) - { - /* S/MIME MIME types don't need x- anymore, see RFC2311 */ -Index: curs_main.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/curs_main.c,v -retrieving revision 3.20 -retrieving revision 3.21 -diff -u -p -r3.20 -r3.21 ---- a/curs_main.c 12 Feb 2005 19:19:24 -0000 3.20 -+++ b/curs_main.c 28 Feb 2005 18:33:45 -0000 3.21 -@@ -173,7 +173,7 @@ int index_color (int index_no) - { - HEADER *h = Context->hdrs[Context->v2r[index_no]]; - -- if (h->pair) -+ if (h && h->pair) - return h->pair; - - mutt_set_header_color (Context, h); -Index: functions.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/functions.h,v -retrieving revision 3.8 -retrieving revision 3.9 -diff -u -p -r3.8 -r3.9 ---- a/functions.h 28 Jan 2005 13:17:22 -0000 3.8 -+++ b/functions.h 17 Feb 2005 03:33:00 -0000 3.9 -@@ -350,6 +350,7 @@ struct binding_t OpBrowser[] = { - #ifdef USE_IMAP - { "create-mailbox", OP_CREATE_MAILBOX, "C" }, - { "delete-mailbox", OP_DELETE_MAILBOX, "d" }, -+ { "rename-mailbox", OP_RENAME_MAILBOX, "r" }, - { "subscribe", OP_BROWSER_SUBSCRIBE, "s" }, - { "unsubscribe", OP_BROWSER_UNSUBSCRIBE, "u" }, - { "toggle-subscribed", OP_BROWSER_TOGGLE_LSUB, "T" }, -Index: init.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.h,v -retrieving revision 3.66 -retrieving revision 3.68 -diff -u -p -r3.66 -r3.68 ---- a/init.h 12 Feb 2005 20:08:19 -0000 3.66 -+++ b/init.h 1 Mar 2005 15:52:33 -0000 3.68 -@@ -1026,11 +1026,11 @@ struct option_t MuttVars[] = { - { "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 }, - /* - ** .pp -- ** The header_cache variable points to the header cache database. If -- ** header_cache points to a directory there will be created one header cache -- ** database per folder within this directory. If it doesn't point to a directory a -- ** global header cache for all folders is used. Per default it is unset and so -- ** no header caching will be used. -+ ** The header_cache variable points to the header cache database. -+ ** If header_cache points to a directory it will contain a header cache -+ ** database per folder. If header_cache points to a file that file will -+ ** be a single global header cache. By default it is unset and so no -+ ** header caching will be used. - */ - { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" }, - /* -@@ -1096,6 +1096,13 @@ struct option_t MuttVars[] = { - ** This variable controls the number of lines of context that are given - ** when scrolling through menus. (Similar to ``$$pager_context''.) - */ -+ { "menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 0 }, -+ /* -+ ** .pp -+ ** When \fIunset\fP, the bottom entry of menus will never scroll up past -+ ** the bottom of the screen, unless there are less entries than lines. -+ ** When \fIset\fP, the bottom entry may move off the bottom. -+ */ - { "menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, 0 }, - /* - ** .pp -Index: menu.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/menu.c,v -retrieving revision 3.15 -retrieving revision 3.16 -diff -u -p -r3.15 -r3.16 ---- a/menu.c 12 Feb 2005 20:08:19 -0000 3.15 -+++ b/menu.c 28 Feb 2005 15:15:23 -0000 3.16 -@@ -374,7 +374,7 @@ void menu_check_recenter (MUTTMENU *menu - int c = MIN (MenuContext, menu->pagelen / 2); - int old_top = menu->top; - -- if (menu->max <= menu->pagelen) /* less entries than lines */ -+ if (!option (OPTMENUMOVEOFF) && menu->max <= menu->pagelen) /* less entries than lines */ - { - if (menu->top != 0) { - menu->top = 0; -@@ -396,8 +396,8 @@ void menu_check_recenter (MUTTMENU *menu - menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c; - } - -- /* make entries stick to bottom */ -- menu->top = MIN (menu->top, menu->max - menu->pagelen); -+ if (!option (OPTMENUMOVEOFF)) /* make entries stick to bottom */ -+ menu->top = MIN (menu->top, menu->max - menu->pagelen); - menu->top = MAX (menu->top, 0); - - if (menu->top != old_top) -@@ -433,10 +433,13 @@ void menu_next_line (MUTTMENU *menu) - { - if (menu->max) - { -- if (menu->top + 1 < menu->max) -+ int c = MIN (MenuContext, menu->pagelen / 2); -+ -+ if (menu->top + 1 < menu->max - c -+ && (option(OPTMENUMOVEOFF) || (menu->max > menu->pagelen && menu->top < menu->max - menu->pagelen))) - { - menu->top++; -- if (menu->current < menu->top) -+ if (menu->current < menu->top + c && menu->current < menu->max - 1) - menu->current++; - menu->redraw = REDRAW_INDEX; - } -@@ -451,8 +454,10 @@ void menu_prev_line (MUTTMENU *menu) - { - if (menu->top > 0) - { -+ int c = MIN (MenuContext, menu->pagelen / 2); -+ - menu->top--; -- if (menu->current >= menu->top + menu->pagelen) -+ if (menu->current >= menu->top + menu->pagelen - c && menu->current > 1) - menu->current--; - menu->redraw = REDRAW_INDEX; - } -Index: mutt.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt.h,v -retrieving revision 3.39 -retrieving revision 3.40 -diff -u -p -r3.39 -r3.40 ---- a/mutt.h 12 Feb 2005 19:19:25 -0000 3.39 -+++ b/mutt.h 28 Feb 2005 15:15:23 -0000 3.40 -@@ -388,6 +388,7 @@ enum - OPTMARKERS, - OPTMARKOLD, - OPTMENUSCROLL, /* scroll menu instead of implicit next-page */ -+ OPTMENUMOVEOFF, /* allow menu to scroll past last entry */ - OPTMETAKEY, /* interpret ALT-x as ESC-x */ - OPTMETOO, - OPTMHPURGE, -Index: mutt_sasl.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_sasl.c,v -retrieving revision 3.11 -retrieving revision 3.12 -diff -u -p -r3.11 -r3.12 ---- a/mutt_sasl.c 3 Feb 2005 17:01:43 -0000 3.11 -+++ b/mutt_sasl.c 5 Mar 2005 07:10:57 -0000 3.12 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2000-3 Brendan Cully -+ * Copyright (C) 2000-5 Brendan Cully - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -429,17 +429,17 @@ void mutt_sasl_setup_conn (CONNECTION* c - - /* preserve old functions */ - sasldata->sockdata = conn->sockdata; -- sasldata->open = conn->open; -- sasldata->close = conn->close; -- sasldata->read = conn->read; -- sasldata->write = conn->write; -+ sasldata->msasl_open = conn->conn_open; -+ sasldata->msasl_close = conn->conn_close; -+ sasldata->msasl_read = conn->conn_read; -+ sasldata->msasl_write = conn->conn_write; - - /* and set up new functions */ - conn->sockdata = sasldata; -- conn->open = mutt_sasl_conn_open; -- conn->close = mutt_sasl_conn_close; -- conn->read = mutt_sasl_conn_read; -- conn->write = mutt_sasl_conn_write; -+ conn->conn_open = mutt_sasl_conn_open; -+ conn->conn_close = mutt_sasl_conn_close; -+ conn->conn_read = mutt_sasl_conn_read; -+ conn->conn_write = mutt_sasl_conn_write; - } - - /* mutt_sasl_cb_log: callback to log SASL messages */ -@@ -515,7 +515,7 @@ static int mutt_sasl_conn_open (CONNECTI - - sasldata = (SASL_DATA*) conn->sockdata; - conn->sockdata = sasldata->sockdata; -- rc = (sasldata->open) (conn); -+ rc = (sasldata->msasl_open) (conn); - conn->sockdata = sasldata; - - return rc; -@@ -532,10 +532,10 @@ static int mutt_sasl_conn_close (CONNECT - - /* restore connection's underlying methods */ - conn->sockdata = sasldata->sockdata; -- conn->open = sasldata->open; -- conn->close = sasldata->close; -- conn->read = sasldata->read; -- conn->write = sasldata->write; -+ conn->conn_open = sasldata->msasl_open; -+ conn->conn_close = sasldata->msasl_close; -+ conn->conn_read = sasldata->msasl_read; -+ conn->conn_write = sasldata->msasl_write; - - /* release sasl resources */ - sasl_dispose (&sasldata->saslconn); -@@ -545,7 +545,7 @@ static int mutt_sasl_conn_close (CONNECT - FREE (&sasldata); - - /* call underlying close */ -- rc = (conn->close) (conn); -+ rc = (conn->conn_close) (conn); - - return rc; - } -@@ -585,7 +585,7 @@ static int mutt_sasl_conn_read (CONNECTI - do - { - /* call the underlying read function to fill the buffer */ -- rc = (sasldata->read) (conn, buf, len); -+ rc = (sasldata->msasl_read) (conn, buf, len); - if (rc <= 0) - goto out; - -@@ -609,7 +609,7 @@ static int mutt_sasl_conn_read (CONNECTI - rc = olen; - } - else -- rc = (sasldata->read) (conn, buf, len); -+ rc = (sasldata->msasl_read) (conn, buf, len); - - out: - conn->sockdata = sasldata; -@@ -649,7 +649,7 @@ static int mutt_sasl_conn_write (CONNECT - goto fail; - } - -- rc = (sasldata->write) (conn, pbuf, plen); -+ rc = (sasldata->msasl_write) (conn, pbuf, plen); - #ifndef USE_SASL2 - FREE (&pbuf); - #endif -@@ -663,7 +663,7 @@ static int mutt_sasl_conn_write (CONNECT - } - else - /* just write using the underlying socket function */ -- rc = (sasldata->write) (conn, buf, len); -+ rc = (sasldata->msasl_write) (conn, buf, len); - - conn->sockdata = sasldata; - -Index: mutt_sasl.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_sasl.h,v -retrieving revision 3.1 -retrieving revision 3.2 -diff -u -p -r3.1 -r3.2 ---- a/mutt_sasl.h 12 Nov 2002 08:20:08 -0000 3.1 -+++ b/mutt_sasl.h 5 Mar 2005 07:10:57 -0000 3.2 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2000-1 Brendan Cully -+ * Copyright (C) 2000-5 Brendan Cully - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -51,10 +51,10 @@ typedef struct - - /* underlying socket data */ - void* sockdata; -- int (*open) (CONNECTION* conn); -- int (*close) (CONNECTION* conn); -- int (*read) (CONNECTION* conn, char* buf, size_t len); -- int (*write) (CONNECTION* conn, const char* buf, size_t count); -+ int (*msasl_open) (CONNECTION* conn); -+ int (*msasl_close) (CONNECTION* conn); -+ int (*msasl_read) (CONNECTION* conn, char* buf, size_t len); -+ int (*msasl_write) (CONNECTION* conn, const char* buf, size_t count); - } - SASL_DATA; - -Index: mutt_socket.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_socket.c,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -p -r3.7 -r3.8 ---- a/mutt_socket.c 3 Feb 2005 17:01:43 -0000 3.7 -+++ b/mutt_socket.c 5 Mar 2005 07:10:57 -0000 3.8 -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 1998 Michael R. Elkins -- * Copyright (C) 1999-2001 Brendan Cully -+ * Copyright (C) 1999-2005 Brendan Cully - * Copyright (C) 1999-2000 Tommi Komulainen - * - * This program is free software; you can redistribute it and/or modify -@@ -56,7 +56,7 @@ int mutt_socket_open (CONNECTION* conn) - if (socket_preconnect ()) - return -1; - -- return conn->open (conn); -+ return conn->conn_open (conn); - } - - int mutt_socket_close (CONNECTION* conn) -@@ -66,7 +66,7 @@ int mutt_socket_close (CONNECTION* conn) - if (conn->fd < 0) - dprint (1, (debugfile, "mutt_socket_close: Attempt to close closed connection.\n")); - else -- rc = conn->close (conn); -+ rc = conn->conn_close (conn); - - conn->fd = -1; - conn->ssf = 0; -@@ -84,7 +84,7 @@ int mutt_socket_read (CONNECTION* conn, - return -1; - } - -- rc = conn->read (conn, buf, len); -+ rc = conn->conn_read (conn, buf, len); - /* EOF */ - if (rc == 0) - { -@@ -111,7 +111,7 @@ int mutt_socket_write_d (CONNECTION *con - } - - len = mutt_strlen (buf); -- if ((rc = conn->write (conn, buf, len)) < 0) -+ if ((rc = conn->conn_write (conn, buf, len)) < 0) - { - dprint (1, (debugfile, - "mutt_socket_write: error writing, closing socket\n")); -@@ -135,7 +135,7 @@ int mutt_socket_readchar (CONNECTION *co - if (conn->bufpos >= conn->available) - { - if (conn->fd >= 0) -- conn->available = conn->read (conn, conn->inbuf, sizeof (conn->inbuf)); -+ conn->available = conn->conn_read (conn, conn->inbuf, sizeof (conn->inbuf)); - else - { - dprint (1, (debugfile, "mutt_socket_readchar: attempt to read from closed connection.\n")); -@@ -277,10 +277,10 @@ CONNECTION* mutt_conn_find (const CONNEC - } - else - { -- conn->read = raw_socket_read; -- conn->write = raw_socket_write; -- conn->open = raw_socket_open; -- conn->close = raw_socket_close; -+ conn->conn_read = raw_socket_read; -+ conn->conn_write = raw_socket_write; -+ conn->conn_open = raw_socket_open; -+ conn->conn_close = raw_socket_close; - } - - return conn; -Index: mutt_socket.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_socket.h,v -retrieving revision 3.0 -retrieving revision 3.1 -diff -u -p -r3.0 -r3.1 ---- a/mutt_socket.h 24 Jan 2002 12:10:50 -0000 3.0 -+++ b/mutt_socket.h 5 Mar 2005 07:10:57 -0000 3.1 -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 1998 Brandon Long -- * Copyright (C) 1999-2001 Brendan Cully -+ * Copyright (C) 1999-2005 Brendan Cully - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -44,10 +44,10 @@ typedef struct _connection - struct _connection *next; - - void *sockdata; -- int (*read) (struct _connection* conn, char* buf, size_t len); -- int (*write) (struct _connection *conn, const char *buf, size_t count); -- int (*open) (struct _connection *conn); -- int (*close) (struct _connection *conn); -+ int (*conn_read) (struct _connection* conn, char* buf, size_t len); -+ int (*conn_write) (struct _connection *conn, const char *buf, size_t count); -+ int (*conn_open) (struct _connection *conn); -+ int (*conn_close) (struct _connection *conn); - } CONNECTION; - - int mutt_socket_open (CONNECTION* conn); -Index: mutt_ssl.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl.c,v -retrieving revision 3.6 -retrieving revision 3.7 -diff -u -p -r3.6 -r3.7 ---- a/mutt_ssl.c 3 Feb 2005 17:01:43 -0000 3.6 -+++ b/mutt_ssl.c 5 Mar 2005 07:10:57 -0000 3.7 -@@ -116,9 +116,9 @@ int mutt_ssl_starttls (CONNECTION* conn) - - /* hmm. watch out if we're starting TLS over any method other than raw. */ - conn->sockdata = ssldata; -- conn->read = ssl_socket_read; -- conn->write = ssl_socket_write; -- conn->close = tls_close; -+ conn->conn_read = ssl_socket_read; -+ conn->conn_write = ssl_socket_write; -+ conn->conn_close = tls_close; - - conn->ssf = SSL_CIPHER_get_bits (SSL_get_current_cipher (ssldata->ssl), - &maxbits); -@@ -233,14 +233,14 @@ int ssl_socket_setup (CONNECTION * conn) - { - if (ssl_init() < 0) - { -- conn->open = ssl_socket_open_err; -+ conn->conn_open = ssl_socket_open_err; - return -1; - } - -- conn->open = ssl_socket_open; -- conn->read = ssl_socket_read; -- conn->write = ssl_socket_write; -- conn->close = ssl_socket_close; -+ conn->conn_open = ssl_socket_open; -+ conn->conn_read = ssl_socket_read; -+ conn->conn_write = ssl_socket_write; -+ conn->conn_close = ssl_socket_close; - - return 0; - } -@@ -373,9 +373,9 @@ static int tls_close (CONNECTION* conn) - int rc; - - rc = ssl_socket_close (conn); -- conn->read = raw_socket_read; -- conn->write = raw_socket_write; -- conn->close = raw_socket_close; -+ conn->conn_read = raw_socket_read; -+ conn->conn_write = raw_socket_write; -+ conn->conn_close = raw_socket_close; - - return rc; - } -Index: mutt_ssl_gnutls.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl_gnutls.c,v -retrieving revision 3.4 -retrieving revision 3.5 -diff -u -p -r3.4 -r3.5 ---- a/mutt_ssl_gnutls.c 11 Feb 2005 04:12:03 -0000 3.4 -+++ b/mutt_ssl_gnutls.c 5 Mar 2005 07:10:57 -0000 3.5 -@@ -77,10 +77,10 @@ int mutt_gnutls_socket_setup (CONNECTION - if (tls_init() < 0) - return -1; - -- conn->open = tls_socket_open; -- conn->read = tls_socket_read; -- conn->write = tls_socket_write; -- conn->close = tls_socket_close; -+ conn->conn_open = tls_socket_open; -+ conn->conn_read = tls_socket_read; -+ conn->conn_write = tls_socket_write; -+ conn->conn_close = tls_socket_close; - - return 0; - } -@@ -151,9 +151,9 @@ int mutt_gnutls_starttls (CONNECTION* co - if (tls_negotiate (conn) < 0) - return -1; - -- conn->read = tls_socket_read; -- conn->write = tls_socket_write; -- conn->close = tls_starttls_close; -+ conn->conn_read = tls_socket_read; -+ conn->conn_write = tls_socket_write; -+ conn->conn_close = tls_starttls_close; - - return 0; - } -@@ -298,9 +298,9 @@ static int tls_starttls_close (CONNECTIO - int rc; - - rc = tls_socket_close (conn); -- conn->read = raw_socket_read; -- conn->write = raw_socket_write; -- conn->close = raw_socket_close; -+ conn->conn_read = raw_socket_read; -+ conn->conn_write = raw_socket_write; -+ conn->conn_close = raw_socket_close; - - return rc; - } -Index: mutt_ssl_nss.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl_nss.c,v -retrieving revision 3.2 -retrieving revision 3.3 -diff -u -p -r3.2 -r3.3 ---- a/mutt_ssl_nss.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ b/mutt_ssl_nss.c 5 Mar 2005 07:10:57 -0000 3.3 -@@ -374,9 +374,9 @@ mutt_nss_socket_setup (CONNECTION * con) - { - if (mutt_nss_init ()) - return -1; -- con->open = mutt_nss_socket_open; -- con->read = mutt_nss_socket_read; -- con->write = mutt_nss_socket_write; -- con->close = mutt_nss_socket_close; -+ con->conn_open = mutt_nss_socket_open; -+ con->conn_read = mutt_nss_socket_read; -+ con->conn_write = mutt_nss_socket_write; -+ con->conn_close = mutt_nss_socket_close; - return 0; - } -Index: mutt_tunnel.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_tunnel.c,v -retrieving revision 3.1 -retrieving revision 3.2 -diff -u -p -r3.1 -r3.2 ---- a/mutt_tunnel.c 3 Feb 2005 17:01:43 -0000 3.1 -+++ b/mutt_tunnel.c 5 Mar 2005 07:10:57 -0000 3.2 -@@ -49,10 +49,10 @@ static int tunnel_socket_write (CONNECTI - /* -- public functions -- */ - int mutt_tunnel_socket_setup (CONNECTION *conn) - { -- conn->open = tunnel_socket_open; -- conn->close = tunnel_socket_close; -- conn->read = tunnel_socket_read; -- conn->write = tunnel_socket_write; -+ conn->conn_open = tunnel_socket_open; -+ conn->conn_close = tunnel_socket_close; -+ conn->conn_read = tunnel_socket_read; -+ conn->conn_write = tunnel_socket_write; - - return 0; - } -Index: parse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/parse.c,v -retrieving revision 3.14 -retrieving revision 3.15 -diff -u -p -r3.14 -r3.15 ---- a/parse.c 3 Feb 2005 17:01:43 -0000 3.14 -+++ b/parse.c 21 Feb 2005 04:42:34 -0000 3.15 -@@ -1405,6 +1405,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE - rfc2047_decode_adrlist (e->from); - rfc2047_decode_adrlist (e->to); - rfc2047_decode_adrlist (e->cc); -+ rfc2047_decode_adrlist (e->bcc); - rfc2047_decode_adrlist (e->reply_to); - rfc2047_decode_adrlist (e->mail_followup_to); - rfc2047_decode_adrlist (e->return_path); -Index: pgp.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgp.c,v -retrieving revision 3.39 -retrieving revision 3.40 -diff -u -p -r3.39 -r3.40 ---- a/pgp.c 3 Feb 2005 18:44:27 -0000 3.39 -+++ b/pgp.c 21 Feb 2005 04:42:34 -0000 3.40 -@@ -1486,6 +1486,11 @@ int pgp_send_menu (HEADER *msg, int *red - - if (!(WithCrypto & APPLICATION_PGP)) - return msg->security; -+ -+ /* If autoinline and no crypto options set, then set inline. */ -+ if (option (OPTPGPAUTOINLINE) && -+ !((msg->security & APPLICATION_PGP) && (msg->security & (SIGN|ENCRYPT)))) -+ msg->security |= INLINE; - - snprintf (prompt, sizeof (prompt), - _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "), -Index: sendlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/sendlib.c,v -retrieving revision 3.28 -retrieving revision 3.30 -diff -u -p -r3.28 -r3.30 ---- a/sendlib.c 3 Feb 2005 17:01:44 -0000 3.28 -+++ b/sendlib.c 21 Feb 2005 04:42:34 -0000 3.30 -@@ -1168,6 +1168,9 @@ static void transform_to_7bit (BODY *a, - } - else - { -+ a->noconv = 1; -+ a->force_charset = 1; -+ - mutt_mktemp (buff); - if ((s.fpout = safe_fopen (buff, "w")) == NULL) - { -@@ -2167,6 +2170,7 @@ void mutt_prepare_envelope (ENVELOPE *en - /* Take care of 8-bit => 7-bit conversion. */ - rfc2047_encode_adrlist (env->to, "To"); - rfc2047_encode_adrlist (env->cc, "Cc"); -+ rfc2047_encode_adrlist (env->bcc, "Bcc"); - rfc2047_encode_adrlist (env->from, "From"); - rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To"); - rfc2047_encode_adrlist (env->reply_to, "Reply-To"); -@@ -2190,6 +2194,7 @@ void mutt_unprepare_envelope (ENVELOPE * - /* back conversions */ - rfc2047_decode_adrlist (env->to); - rfc2047_decode_adrlist (env->cc); -+ rfc2047_decode_adrlist (env->bcc); - rfc2047_decode_adrlist (env->from); - rfc2047_decode_adrlist (env->reply_to); - rfc2047_decode (&env->subject); -Index: smime.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/smime.c,v -retrieving revision 3.37 -retrieving revision 3.38 -diff -u -p -r3.37 -r3.38 ---- a/smime.c 3 Feb 2005 17:01:44 -0000 3.37 -+++ b/smime.c 28 Feb 2005 14:37:09 -0000 3.38 -@@ -464,8 +464,8 @@ char* smime_ask_for_key (char *prompt, c - } - } - if (hash) { -- fname = safe_malloc(14); /* Hash + '.' + Suffix + \n + \0 */ -- sprintf(fname, "%.8x.%i\n", Table[cur].hash, Table[cur].suffix); -+ fname = safe_malloc(13); /* Hash + '.' + Suffix + \0 */ -+ sprintf(fname, "%.8x.%i", Table[cur].hash, Table[cur].suffix); - } - else fname = NULL; - -Index: doc/Makefile.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/Makefile.in,v -retrieving revision 3.4 -retrieving revision 3.5 -diff -u -p -r3.4 -r3.5 ---- a/doc/Makefile.in 30 Apr 2004 06:49:37 -0000 3.4 -+++ b/doc/Makefile.in 15 Feb 2005 19:28:24 -0000 3.5 -@@ -1,4 +1,4 @@ --# $Id: Makefile.in,v 3.4 2004/04/30 06:49:37 roessler Exp $ -+# $Id: Makefile.in,v 3.5 2005/02/15 19:28:24 roessler Exp $ - - SHELL = /bin/sh - -@@ -103,7 +103,7 @@ uninstall: - - check: - manual.txt: manual.sgml -- if sgml2txt -c latin manual ; then \ -+ if linuxdoc -B txt --pass='-P -c' manual ; then \ - uniq < manual.txt | expand > _manual.txt ; \ - rm manual.txt ; \ - mv _manual.txt manual.txt ;\ -Index: doc/manual.sgml.head -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/manual.sgml.head,v -retrieving revision 3.37 -retrieving revision 3.38 -diff -u -p -r3.37 -r3.38 ---- a/doc/manual.sgml.head 12 Feb 2005 19:38:14 -0000 3.37 -+++ b/doc/manual.sgml.head 17 Feb 2005 03:33:00 -0000 3.38 -@@ -2461,8 +2461,10 @@ following differences: - will choose to descend into the subfolder view. If you wish to view - the messages in that folder, you must use view-file instead - (bound to space by default). --You can delete mailboxes with the delete-mailbox -- command (bound to d by default. You may also -+You can create, delete and rename mailboxes with the -+ create-mailbox, delete-mailbox, and -+ rename-mailbox commands (default bindings: C, -+ d and r, respectively). You may also - subscribe and unsubscribe to mailboxes (normally - these are bound to s and u, respectively). - -Index: imap/Makefile.am -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/Makefile.am,v -retrieving revision 3.0 -retrieving revision 3.1 -diff -u -p -r3.0 -r3.1 ---- a/imap/Makefile.am 24 Jan 2002 13:35:57 -0000 3.0 -+++ b/imap/Makefile.am 12 Feb 2005 21:04:22 -0000 3.1 -@@ -2,7 +2,7 @@ - - AR=@AR@ - --AUTOMAKE_OPTIONS = foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - if USE_GSS - GSSSOURCES = auth_gss.c -Index: imap/browse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/browse.c,v -retrieving revision 3.5 -retrieving revision 3.6 -diff -u -p -r3.5 -r3.6 ---- a/imap/browse.c 3 Feb 2005 17:01:44 -0000 3.5 -+++ b/imap/browse.c 17 Feb 2005 03:33:00 -0000 3.6 -@@ -302,6 +302,55 @@ int imap_mailbox_create (const char* fol - return -1; - } - -+int imap_mailbox_rename(const char* mailbox) -+{ -+ IMAP_DATA* idata; -+ IMAP_MBOX mx; -+ char buf[LONG_STRING]; -+ char newname[SHORT_STRING]; -+ -+ if (imap_parse_path (mailbox, &mx) < 0) -+ { -+ dprint (1, (debugfile, "imap_mailbox_rename: Bad source mailbox %s\n", -+ mailbox)); -+ return -1; -+ } -+ -+ if (!(idata = imap_conn_find (&mx.account, M_IMAP_CONN_NONEW))) -+ { -+ dprint (1, (debugfile, "imap_mailbox_rename: Couldn't find open connection to %s", mx.account.host)); -+ goto fail; -+ } -+ -+ snprintf(buf, sizeof (buf), _("Rename mailbox %s to: "), mx.mbox); -+ -+ if (mutt_get_field (buf, newname, sizeof (newname), M_FILE) < 0) -+ goto fail; -+ -+ if (!mutt_strlen (newname)) -+ { -+ mutt_error (_("Mailbox must have a name.")); -+ mutt_sleep (1); -+ goto fail; -+ } -+ -+ if (imap_rename_mailbox (idata, &mx, newname) < 0) { -+ mutt_error (_("Rename failed: %s"), imap_get_qualifier (idata->cmd.buf)); -+ mutt_sleep (1); -+ goto fail; -+ } -+ -+ mutt_message (_("Mailbox renamed.")); -+ mutt_sleep (0); -+ -+ FREE (&mx.mbox); -+ return 0; -+ -+ fail: -+ FREE (&mx.mbox); -+ return -1; -+} -+ - static int browse_add_list_result (IMAP_DATA* idata, const char* cmd, - struct browser_state* state, short isparent) - { -Index: imap/imap.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap.c,v -retrieving revision 3.20 -retrieving revision 3.21 -diff -u -p -r3.20 -r3.21 ---- a/imap/imap.c 3 Feb 2005 17:01:44 -0000 3.20 -+++ b/imap/imap.c 17 Feb 2005 03:33:00 -0000 3.21 -@@ -108,20 +108,37 @@ int imap_create_mailbox (IMAP_DATA* idat - return 0; - } - -+int imap_rename_mailbox (IMAP_DATA* idata, IMAP_MBOX* mx, const char* newname) -+{ -+ char oldmbox[LONG_STRING]; -+ char newmbox[LONG_STRING]; -+ char buf[LONG_STRING]; -+ -+ imap_munge_mbox_name (oldmbox, sizeof (oldmbox), mx->mbox); -+ imap_munge_mbox_name (newmbox, sizeof (newmbox), newname); -+ -+ snprintf (buf, sizeof (buf), "RENAME %s %s", oldmbox, newmbox); -+ -+ if (imap_exec (idata, buf, 0) != 0) -+ return -1; -+ -+ return 0; -+} -+ - int imap_delete_mailbox (CONTEXT* ctx, IMAP_MBOX mx) - { - char buf[LONG_STRING], mbox[LONG_STRING]; - IMAP_DATA *idata; - - if (!ctx || !ctx->data) { -- if (!(idata = imap_conn_find (&mx.account, -- option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW : 0))) -- { -- FREE (&mx.mbox); -- return -1; -- } -+ if (!(idata = imap_conn_find (&mx.account, -+ option (OPTIMAPPASSIVE) ? M_IMAP_CONN_NONEW : 0))) -+ { -+ FREE (&mx.mbox); -+ return -1; -+ } - } else { -- idata = ctx->data; -+ idata = ctx->data; - } - - imap_munge_mbox_name (mbox, sizeof (mbox), mx.mbox); -Index: imap/imap.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap.h,v -retrieving revision 3.3 -retrieving revision 3.4 -diff -u -p -r3.3 -r3.4 ---- a/imap/imap.h 11 Aug 2004 12:30:50 -0000 3.3 -+++ b/imap/imap.h 17 Feb 2005 03:33:00 -0000 3.4 -@@ -50,6 +50,7 @@ void imap_disallow_reopen (CONTEXT *ctx) - /* browse.c */ - int imap_browse (char* path, struct browser_state* state); - int imap_mailbox_create (const char* folder); -+int imap_mailbox_rename (const char* mailbox); - - /* message.c */ - int imap_append_message (CONTEXT* ctx, MESSAGE* msg); -Index: imap/imap_private.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap_private.h,v -retrieving revision 3.4 -retrieving revision 3.5 -diff -u -p -r3.4 -r3.5 ---- a/imap/imap_private.h 31 Jan 2005 02:40:14 -0000 3.4 -+++ b/imap/imap_private.h 17 Feb 2005 03:33:00 -0000 3.5 -@@ -194,6 +194,7 @@ typedef struct - /* -- private IMAP functions -- */ - /* imap.c */ - int imap_create_mailbox (IMAP_DATA* idata, char* mailbox); -+int imap_rename_mailbox (IMAP_DATA* idata, IMAP_MBOX* mx, const char* newname); - int imap_make_msg_set (IMAP_DATA* idata, BUFFER* buf, int flag, int changed); - int imap_open_connection (IMAP_DATA* idata); - IMAP_DATA* imap_conn_find (const ACCOUNT* account, int flags); -Index: imap/message.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/message.c,v -retrieving revision 3.17 -retrieving revision 3.19 -diff -u -p -r3.17 -r3.19 ---- a/imap/message.c 12 Feb 2005 19:54:51 -0000 3.17 -+++ b/imap/message.c 27 Feb 2005 03:18:23 -0000 3.19 -@@ -556,9 +556,12 @@ int imap_append_message (CONTEXT *ctx, M - rewind (fp); - - imap_munge_mbox_name (mbox, sizeof (mbox), mailbox); -- snprintf (buf, sizeof (buf), "APPEND %s (\\Seen%s%s) {%lu}", mbox, -- msg->flags.replied ? " \\Answered" : "", -- msg->flags.flagged ? " \\Flagged" : "", -+ snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox, -+ msg->flags.read ? "\\Seen" : "", -+ msg->flags.read && (msg->flags.replied || msg->flags.flagged) ? " " : "", -+ msg->flags.replied ? "\\Answered" : "", -+ msg->flags.replied && msg->flags.flagged ? " " : "", -+ msg->flags.flagged ? "\\Flagged" : "", - (unsigned long) len); - - imap_cmd_start (idata, buf); -Index: m4/gettext.m4 -=================================================================== -RCS file: /home/roessler/cvs/mutt/m4/gettext.m4,v -retrieving revision 3.1 -retrieving revision 3.2 -diff -u -p -r3.1 -r3.2 ---- a/m4/gettext.m4 6 Dec 2002 11:28:30 -0000 3.1 -+++ b/m4/gettext.m4 13 Feb 2005 00:25:37 -0000 3.2 -@@ -50,7 +50,7 @@ AC_DEFUN([MUTT_AM_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, -- [ --disable-nls Do not use Native Language Support], -+ AC_HELP_STRING([--disable-nls], [Do not use Native Language Support]), - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -@@ -66,7 +66,7 @@ AC_DEFUN([MUTT_AM_WITH_NLS], - is requested.]) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, -- [ --with-included-gettext Use the GNU gettext library included here], -+ AC_HELP_STRING([--with-included-gettext], [Use the GNU gettext library included here]), - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) -Index: m4/iconv.m4 -=================================================================== -RCS file: /home/roessler/cvs/mutt/m4/iconv.m4,v -retrieving revision 3.1 -retrieving revision 3.2 -diff -u -p -r3.1 -r3.2 ---- a/m4/iconv.m4 6 Dec 2002 11:28:30 -0000 3.1 -+++ b/m4/iconv.m4 13 Feb 2005 00:25:37 -0000 3.2 -@@ -8,7 +8,7 @@ AC_DEFUN([MUTT_AM_ICONV], - dnl those with the standalone portable GNU libiconv installed). - - AC_ARG_WITH([libiconv-prefix], --[ --with-libiconv-prefix=DIR Search for libiconv in DIR/include and DIR/lib], [ -+AC_HELP_STRING([--with-libiconv-prefix=DIR], [Search for libiconv in DIR/include and DIR/lib]), [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi - if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -Index: po/ca.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ca.po,v -retrieving revision 3.19 -retrieving revision 3.20 -diff -u -p -r3.19 -r3.20 ---- a/po/ca.po 12 Feb 2005 20:56:30 -0000 3.19 -+++ b/po/ca.po 15 Feb 2005 19:03:51 -0000 3.20 -@@ -3,27 +3,27 @@ - # Ivan Vilata i Balaguer , 2001, 2002, 2003, 2004. - # - # ivb (2001/12/08) --# ivb Ací cal ajustar-se a voltes a ~80 columnes. Les traduccions que --# ivb han hagut de ser «compactades» estan marcades amb «ABREUJAT!», --# ivb i s'hi indica la traducció completa. -+# ivb Ací cal ajustar-se a voltes a ~80 columnes. Les traduccions que -+# ivb han hagut de ser «compactades» estan marcades amb «ABREUJAT!», -+# ivb i s'hi indica la traducció completa. - # - # IDN = Internationalized Domain Name - msgid "" - msgstr "" --"Project-Id-Version: mutt 1.5.6\n" -+"Project-Id-Version: mutt 1.5.8\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2004-08-16 21:29+0200\n" -+"PO-Revision-Date: 2005-02-13 10:57+0100\n" - "Last-Translator: Ivan Vilata i Balaguer \n" - "Language-Team: Catalan \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=iso-8859-1\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - - #: account.c:148 - #, c-format - msgid "Username at %s: " --msgstr "Nom d'usuari en «%s»: " -+msgstr "Nom d'usuari en «%s»: " - - #: account.c:176 - #, c-format -@@ -36,7 +36,7 @@ msgid "Exit" - msgstr "Ix" - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44 - msgid "Del" - msgstr "Esbrr" -@@ -58,33 +58,33 @@ msgstr "Ajuda" - - #: addrbook.c:145 - msgid "You have no aliases!" --msgstr "No teniu cap àlies!" -+msgstr "No teniu cap àlies!" - - #: addrbook.c:156 - msgid "Aliases" --msgstr "Àlies" -+msgstr "Àlies" - - #. add a new alias - #: alias.c:246 - msgid "Alias as: " --msgstr "Nou àlies: " -+msgstr "Nou àlies: " - - #: alias.c:252 - msgid "You already have an alias defined with that name!" --msgstr "Ja heu definit un àlies amb aquest nom!" -+msgstr "Ja heu definit un àlies amb aquest nom!" - - #: alias.c:258 - msgid "Warning: This alias name may not work. Fix it?" --msgstr "Avís: Aquest àlies podria no funcionar. Voleu reparar-lo?" -+msgstr "Avís: Aquest àlies podria no funcionar. Voleu reparar-lo?" - - #: alias.c:283 - msgid "Address: " --msgstr "Adreça: " -+msgstr "Adreça: " - - #: alias.c:293 send.c:206 - #, c-format - msgid "Error: '%s' is a bad IDN." --msgstr "Error: «%s» no és un IDN vàlid." -+msgstr "Error: «%s» no és un IDN vàlid." - - #: alias.c:305 - msgid "Personal name: " -@@ -102,34 +102,34 @@ msgstr "Guarda en el fitxer: " - - #: alias.c:346 - msgid "Alias added." --msgstr "S'ha afegit l'àlies." -+msgstr "S'ha afegit l'àlies." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb El nom de fitxer no concorda amb cap «nametemplate»; voleu continuar? -+# ivb El nom de fitxer no concorda amb cap «nametemplate»; voleu continuar? - #: attach.c:112 attach.c:244 attach.c:472 attach.c:963 - msgid "Can't match nametemplate, continue?" --msgstr "El nom de fitxer no concorda amb cap «nametemplate»; continuar?" -+msgstr "El nom de fitxer no concorda amb cap «nametemplate»; continuar?" - - #. For now, editing requires a file, no piping - #: attach.c:125 - #, c-format - msgid "Mailcap compose entry requires %%s" --msgstr "Cal que l'entrada «compose» de «mailcap» continga «%%s»." -+msgstr "Cal que l'entrada «compose» de «mailcap» continga «%%s»." - - #: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181 - #: curs_lib.c:428 - #, c-format - msgid "Error running \"%s\"!" --msgstr "Error en executar «%s»!" -+msgstr "Error en executar «%s»!" - - #: attach.c:143 - msgid "Failure to open file to parse headers." --msgstr "No s'ha pogut obrir el fitxer per interpretar-ne les capçaleres." -+msgstr "No s'ha pogut obrir el fitxer per interpretar-ne les capçaleres." - - #: attach.c:174 - msgid "Failure to open file to strip headers." --msgstr "No s'ha pogut obrir el fitxer per eliminar-ne les capçaleres." -+msgstr "No s'ha pogut obrir el fitxer per eliminar-ne les capçaleres." - - # Es refereix a un fitxer temporal. ivb - #: attach.c:183 -@@ -138,26 +138,26 @@ msgstr "No s'ha pogut reanomenar un fitx - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb No hi ha cap entrada «compose» de «%s» en «mailcap»: es crea un fitxer buit. -+# ivb No hi ha cap entrada «compose» de «%s» en «mailcap»: es crea un fitxer buit. - #: attach.c:196 - #, c-format - msgid "No mailcap compose entry for %s, creating empty file." --msgstr "«%s» no té entrada «compose» en «mailcap»: cree fitxer buit." -+msgstr "«%s» no té entrada «compose» en «mailcap»: cree fitxer buit." - - #. For now, editing requires a file, no piping - #: attach.c:257 - #, c-format - msgid "Mailcap Edit entry requires %%s" --msgstr "Cal que l'entrada «edit» de «mailcap» continga «%%s»." -+msgstr "Cal que l'entrada «edit» de «mailcap» continga «%%s»." - - #: attach.c:275 - #, c-format - msgid "No mailcap edit entry for %s" --msgstr "No hi ha cap entrada «edit» de «%s» en «mailcap»." -+msgstr "No hi ha cap entrada «edit» de «%s» en «mailcap»." - - #: attach.c:438 - msgid "No matching mailcap entry found. Viewing as text." --msgstr "No hi ha cap entrada adequada en «mailcap». Es visualitza com a text." -+msgstr "No hi ha cap entrada adequada en «mailcap». Es visualitza com a text." - - #: attach.c:451 - msgid "MIME type not defined. Cannot view attachment." -@@ -178,7 +178,7 @@ msgstr "Error d'escriptura!" - - #: attach.c:1077 - msgid "I don't know how to print that!" --msgstr "No sé com imprimir això!" -+msgstr "No sé com imprimir això!" - - #: browser.c:45 - msgid "Chdir" -@@ -186,29 +186,29 @@ msgstr "Canvia directori" - - #: browser.c:46 - msgid "Mask" --msgstr "Màscara" -+msgstr "Màscara" - - #: browser.c:381 browser.c:968 - #, c-format - msgid "%s is not a directory." --msgstr "«%s» no és un directori." -+msgstr "«%s» no és un directori." - - # ivb (2001/12/07) --# ivb Es refereix a les definides en «mailboxes». -+# ivb Es refereix a les definides en «mailboxes». - #: browser.c:501 - #, c-format - msgid "Mailboxes [%d]" --msgstr "Bústies d'entrada [%d]" -+msgstr "Bústies d'entrada [%d]" - - #: browser.c:508 - #, c-format - msgid "Subscribed [%s], File mask: %s" --msgstr "Subscrites [%s], màscara de fitxers: %s" -+msgstr "Subscrites [%s], màscara de fitxers: %s" - - #: browser.c:512 - #, c-format - msgid "Directory [%s], File mask: %s" --msgstr "Directori [%s], màscara de fitxers: %s" -+msgstr "Directori [%s], màscara de fitxers: %s" - - #: browser.c:524 - msgid "Can't attach a directory!" -@@ -216,28 +216,28 @@ msgstr "No es pot adjuntar un directori! - - #: browser.c:655 browser.c:1035 browser.c:1132 - msgid "No files match the file mask" --msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers." -+msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers." - - #: browser.c:860 - msgid "Create is only supported for IMAP mailboxes" --msgstr "Només es poden crear bústies IMAP." -+msgstr "Només es poden crear bústies IMAP." - - #: browser.c:880 - msgid "Delete is only supported for IMAP mailboxes" --msgstr "Només es poden esborrar bústies IMAP." -+msgstr "Només es poden esborrar bústies IMAP." - - #: browser.c:888 - #, c-format - msgid "Really delete mailbox \"%s\"?" --msgstr "Voleu realment esborrar la bústia «%s»?" -+msgstr "Voleu realment esborrar la bústia «%s»?" - - #: browser.c:902 - msgid "Mailbox deleted." --msgstr "S'ha esborrat la bústia." -+msgstr "S'ha esborrat la bústia." - - #: browser.c:908 - msgid "Mailbox not deleted." --msgstr "No s'ha esborrat la bústia." -+msgstr "No s'ha esborrat la bústia." - - #: browser.c:927 - msgid "Chdir to: " -@@ -249,7 +249,7 @@ msgstr "Error en llegir el directori." - - #: browser.c:979 - msgid "File Mask: " --msgstr "Màscara de fitxers: " -+msgstr "Màscara de fitxers: " - - #: browser.c:1051 - msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " -@@ -298,11 +298,11 @@ msgid "%s: no such object" - msgstr "%s: L'objecte no existeix." - - # ivb (2001/11/18) --# ivb «index» és una paraula clau. -+# ivb «index» és una paraula clau. - #: color.c:385 - #, c-format - msgid "%s: command valid only for index object" --msgstr "%s: L'ordre només és vàlida per un objecte «index»." -+msgstr "%s: L'ordre només és vàlida per un objecte «index»." - - #: color.c:393 - #, c-format -@@ -327,19 +327,19 @@ msgid "%s: no such attribute" - msgstr "%s: L'atribut no existeix." - - # ivb (2001/12/08) --# ivb També apareix com a error aïllat. -+# ivb També apareix com a error aïllat. - #: color.c:700 hook.c:69 hook.c:77 keymap.c:748 - msgid "too few arguments" - msgstr "Manquen arguments." - - # ivb (2001/12/08) --# ivb També apareix com a error aïllat. -+# ivb També apareix com a error aïllat. - #: color.c:709 hook.c:83 - msgid "too many arguments" - msgstr "Sobren arguments." - - # ivb (2001/12/08) --# ivb També apareix com a error aïllat. -+# ivb També apareix com a error aïllat. - #: color.c:725 - msgid "default colors not supported" - msgstr "Els colors per defecte no estan suportats." -@@ -355,7 +355,7 @@ msgstr "No s'ha pogut crear un fitxer te - - #: commands.c:130 - msgid "Cannot create display filter" --msgstr "No s'ha pogut crear el filtre de visualització." -+msgstr "No s'ha pogut crear el filtre de visualització." - - #: commands.c:150 - msgid "Could not copy message" -@@ -363,7 +363,7 @@ msgstr "No s'ha pogut copiar el missatge - - #: commands.c:186 - msgid "S/MIME signature successfully verified." --msgstr "S'ha pogut verificar amb èxit la signatura S/MIME." -+msgstr "S'ha pogut verificar amb èxit la signatura S/MIME." - - #: commands.c:188 - msgid "S/MIME certificate owner does not match sender." -@@ -371,7 +371,7 @@ msgstr "El propietari del certificat S/M - - #: commands.c:191 commands.c:202 - msgid "Warning: Part of this message has not been signed." --msgstr "Avís: Part d'aquest missatge no ha estat signat." -+msgstr "Avís: Part d'aquest missatge no ha estat signat." - - #: commands.c:193 - msgid "S/MIME signature could NOT be verified." -@@ -379,7 +379,7 @@ msgstr "NO s'ha pogut verificar la signa - - #: commands.c:200 - msgid "PGP signature successfully verified." --msgstr "S'ha pogut verificar amb èxit la signatura PGP." -+msgstr "S'ha pogut verificar amb èxit la signatura PGP." - - #: commands.c:204 - msgid "PGP signature could NOT be verified." -@@ -399,12 +399,12 @@ msgstr "Redirigeix els missatges marcats - - #: commands.c:263 recvcmd.c:158 - msgid "Error parsing address!" --msgstr "Error en interpretar l'adreça!" -+msgstr "Error en interpretar l'adreça!" - - #: commands.c:271 recvcmd.c:166 - #, c-format - msgid "Bad IDN: '%s'" --msgstr "L'IDN no és vàlid: «%s»" -+msgstr "L'IDN no és vàlid: «%s»" - - # ivb (2001/12/02) - # ivb El programa posa l'interrogant. -@@ -438,7 +438,7 @@ msgstr "S'han redirigit els missatges." - - #: commands.c:385 commands.c:419 commands.c:436 - msgid "Can't create filter process" --msgstr "No s'ha pogut crear el procés filtre." -+msgstr "No s'ha pogut crear el procés filtre." - - #: commands.c:465 - msgid "Pipe to command: " -@@ -446,7 +446,7 @@ msgstr "Redirigeix a l'ordre: " - - #: commands.c:482 - msgid "No printing command has been defined." --msgstr "No s'ha definit cap ordre d'impressió." -+msgstr "No s'ha definit cap ordre d'impressió." - - #: commands.c:487 - msgid "Print message?" -@@ -458,11 +458,11 @@ msgstr "Voleu imprimir els misatges marc - - #: commands.c:496 - msgid "Message printed" --msgstr "S'ha imprés el missatge." -+msgstr "S'ha imprés el missatge." - - #: commands.c:496 - msgid "Messages printed" --msgstr "S'han imprés els missatges." -+msgstr "S'han imprés els missatges." - - #: commands.c:498 - msgid "Message could not be printed" -@@ -496,37 +496,37 @@ msgstr "dortsfcmpa" - - #: commands.c:567 - msgid "Shell command: " --msgstr "Ordre per l'intèrpret: " -+msgstr "Ordre per l'intèrpret: " - - #: commands.c:709 - #, c-format - msgid "Decode-save%s to mailbox" --msgstr "Descodifica i desa%s en la bústia" -+msgstr "Descodifica i desa%s en la bústia" - - #: commands.c:710 - #, c-format - msgid "Decode-copy%s to mailbox" --msgstr "Descodifica i còpia%s en la bústia" -+msgstr "Descodifica i còpia%s en la bústia" - - #: commands.c:711 - #, c-format - msgid "Decrypt-save%s to mailbox" --msgstr "Desxifra i desa%s en la bústia" -+msgstr "Desxifra i desa%s en la bústia" - - #: commands.c:712 - #, c-format - msgid "Decrypt-copy%s to mailbox" --msgstr "Desxifra i còpia%s en la bústia" -+msgstr "Desxifra i còpia%s en la bústia" - - #: commands.c:713 - #, c-format - msgid "Save%s to mailbox" --msgstr "Desa%s en la bústia" -+msgstr "Desa%s en la bústia" - - #: commands.c:713 - #, c-format - msgid "Copy%s to mailbox" --msgstr "Còpia%s en la bústia" -+msgstr "Còpia%s en la bústia" - - #: commands.c:714 - msgid " tagged" -@@ -535,30 +535,30 @@ msgstr " els marcats" - #: commands.c:787 - #, c-format - msgid "Copying to %s..." --msgstr "S'està copiant en «%s»..." -+msgstr "S'està copiant en «%s»..." - - #: commands.c:909 - #, c-format - msgid "Convert to %s upon sending?" --msgstr "Voleu convertir en «%s» en enviar?" -+msgstr "Voleu convertir en «%s» en enviar?" - - #: commands.c:919 - #, c-format - msgid "Content-Type changed to %s." --msgstr "S'ha canviat «Content-Type» a «%s»." -+msgstr "S'ha canviat «Content-Type» a «%s»." - - #: commands.c:924 - #, c-format - msgid "Character set changed to %s; %s." --msgstr "S'ha canviat el joc de caràcters a «%s»; %s." -+msgstr "S'ha canviat el joc de caràcters a «%s»; %s." - - #: commands.c:926 - msgid "not converting" --msgstr "es farà conversió" -+msgstr "es farà conversió" - - #: commands.c:926 - msgid "converting" --msgstr "no es farà conversió" -+msgstr "no es farà conversió" - - #: compose.c:47 - msgid "There are no attachments." -@@ -598,14 +598,14 @@ msgstr "En clar" - - #: compose.c:145 - msgid " (inline)" --msgstr " (en línia)" -+msgstr " (en línia)" - - #: compose.c:147 - msgid " (PGP/MIME)" - msgstr " (PGP/MIME)" - - # ivb (2001/11/19) --# ivb L'espai de principi és per alinear, però no hi ha res a fer... -+# ivb L'espai de principi és per alinear, però no hi ha res a fer... - #: compose.c:155 compose.c:159 - msgid " sign as: " - msgstr " signa com a: " -@@ -621,15 +621,15 @@ msgstr "Xifra amb: " - #: compose.c:221 - #, c-format - msgid "%s [#%d] no longer exists!" --msgstr "«%s» [#%d] ja no existeix!" -+msgstr "«%s» [#%d] ja no existeix!" - - # ivb (2001/11/19) - # ivb ABREUJAR! --# S'ha modificat «%s» [#%d]. Voleu actualitzar-ne la codificació? -+# S'ha modificat «%s» [#%d]. Voleu actualitzar-ne la codificació? - #: compose.c:229 - #, c-format - msgid "%s [#%d] modified. Update encoding?" --msgstr "Modificat «%s» [#%d]. Actualitzar codificació?" -+msgstr "Modificat «%s» [#%d]. Actualitzar codificació?" - - #: compose.c:272 - msgid "-- Attachments" -@@ -638,17 +638,17 @@ msgstr "-- Fitxers adjunts" - #: compose.c:302 - #, c-format - msgid "Warning: '%s' is a bad IDN." --msgstr "Avís: «%s» no és un IDN vàlid." -+msgstr "Avís: «%s» no és un IDN vàlid." - - #: compose.c:325 - msgid "You may not delete the only attachment." --msgstr "No es pot esborrar l'únic fitxer adjunt." -+msgstr "No es pot esborrar l'únic fitxer adjunt." - --# El primer camp és una capçalera de correu. ivb -+# El primer camp és una capçalera de correu. ivb - #: compose.c:601 send.c:1486 - #, c-format - msgid "Bad IDN in \"%s\": '%s'" --msgstr "L'IDN de «%s» no és vàlid: «%s»" -+msgstr "L'IDN de «%s» no és vàlid: «%s»" - - #: compose.c:684 - msgid "Attaching selected files..." -@@ -657,15 +657,15 @@ msgstr "S'estan adjuntant els fitxers se - #: compose.c:695 - #, c-format - msgid "Unable to attach %s!" --msgstr "No s'ha pogut adjuntar «%s»!" -+msgstr "No s'ha pogut adjuntar «%s»!" - - #: compose.c:714 - msgid "Open mailbox to attach message from" --msgstr "Bústia a obrir per adjuntar-ne missatges" -+msgstr "Bústia a obrir per adjuntar-ne missatges" - - #: compose.c:752 - msgid "No messages in that folder." --msgstr "La carpeta no conté missatges." -+msgstr "La carpeta no conté missatges." - - #: compose.c:761 - msgid "Tag the messages you want to attach!" -@@ -677,35 +677,35 @@ msgstr "No s'ha pogut adjuntar!" - - #: compose.c:842 - msgid "Recoding only affects text attachments." --msgstr "La recodificació només afecta els fitxers adjunts de tipus text." -+msgstr "La recodificació només afecta els fitxers adjunts de tipus text." - - #: compose.c:847 - msgid "The current attachment won't be converted." --msgstr "No es convertirà el fitxer adjunt actual." -+msgstr "No es convertirà el fitxer adjunt actual." - - #: compose.c:849 - msgid "The current attachment will be converted." --msgstr "Es convertirà el fitxer adjunt actual." -+msgstr "Es convertirà el fitxer adjunt actual." - - #: compose.c:924 - msgid "Invalid encoding." --msgstr "La codificació no és vàlida." -+msgstr "La codificació no és vàlida." - - #: compose.c:950 - msgid "Save a copy of this message?" --msgstr "Voleu guardar una còpia d'aquest missatge?" -+msgstr "Voleu guardar una còpia d'aquest missatge?" - - #: compose.c:1006 - msgid "Rename to: " - msgstr "Reanomena a: " - - # ivb (2001/11/19) --# ivb Cuidadín: en «compose» la cadena és el nom de fitxer i en --# ivb «editmsg» i «sendlib» és la cadena d'error. -+# ivb Cuidadín: en «compose» la cadena és el nom de fitxer i en -+# ivb «editmsg» i «sendlib» és la cadena d'error. - #: compose.c:1011 editmsg.c:116 sendlib.c:914 - #, c-format - msgid "Can't stat %s: %s" --msgstr "Ha fallat stat() sobre «%s»: %s" -+msgstr "Ha fallat stat() sobre «%s»: %s" - - #: compose.c:1038 - msgid "New file: " -@@ -713,23 +713,23 @@ msgstr "Nou fitxer: " - - #: compose.c:1051 - msgid "Content-Type is of the form base/sub" --msgstr "«Content-Type» ha de tenir la forma «base/sub»." -+msgstr "«Content-Type» ha de tenir la forma «base/sub»." - - #: compose.c:1057 - #, c-format - msgid "Unknown Content-Type %s" --msgstr "El valor de «Content-Type» «%s» no és conegut." -+msgstr "El valor de «Content-Type» «%s» no és conegut." - - #: compose.c:1070 - #, c-format - msgid "Can't create file %s" --msgstr "No s'ha pogut crear el fitxer «%s»." -+msgstr "No s'ha pogut crear el fitxer «%s»." - - # ivb (2001/11/20) - # ivb Curiosa forma d'emetre un error... - #: compose.c:1078 - msgid "What we have here is a failure to make an attachment" --msgstr "El que ocorre ací és que no s'ha pogut adjuntar un fitxer." -+msgstr "El que ocorre ací és que no s'ha pogut adjuntar un fitxer." - - #: compose.c:1139 - msgid "Postpone this message?" -@@ -737,12 +737,12 @@ msgstr "Voleu posposar aquest missatge?" - - #: compose.c:1196 - msgid "Write message to mailbox" --msgstr "Escriu el missatge en la bústia" -+msgstr "Escriu el missatge en la bústia" - - #: compose.c:1199 - #, c-format - msgid "Writing message to %s ..." --msgstr "S'està escrivint el missatge en «%s»..." -+msgstr "S'està escrivint el missatge en «%s»..." - - #: compose.c:1208 - msgid "Message written." -@@ -761,29 +761,29 @@ msgstr "El missatge ja usa PGP. Voleu po - msgid " (current time: %c)" - msgstr " (data actual: %c)" - --# La primera: «OpenSSL» o «PGP» (meec, apòstrof); la segona l'enterior. ivb -+# La primera: «OpenSSL» o «PGP» (meec, apòstrof); la segona l'enterior. ivb - #: crypt.c:75 - #, c-format - msgid "[-- %s output follows%s --]\n" --msgstr "[-- Aquesta és l'eixida de %s%s --]\n" -+msgstr "[-- Aquesta és l'eixida de %s%s --]\n" - - #: crypt.c:90 - msgid "Passphrase(s) forgotten." --msgstr "S'han esborrat de la memòria la o les frases clau." -+msgstr "S'han esborrat de la memòria la o les frases clau." - - #. they really want to send it inline... go for it - #: crypt.c:148 pgpkey.c:563 - msgid "Invoking PGP..." --msgstr "S'està invocant PGP..." -+msgstr "S'està invocant PGP..." - --# S'ha intentat però ha fallat. ivb -+# S'ha intentat però ha fallat. ivb - # ABREUJAT! ivb --# No s'ha pogut enviar el missatge en línia. Voleu recórrer a usar PGP/MIME? -+# No s'ha pogut enviar el missatge en línia. Voleu recórrer a usar PGP/MIME? - #. otherwise inline won't work...ask for revert - #: crypt.c:157 - msgid "Message can't be sent inline. Revert to using PGP/MIME?" - msgstr "" --"No s'ha pogut enviar el missatge en línia. Voleu recórrer a usar PGP/MIME?" -+"No s'ha pogut enviar el missatge en línia. Voleu recórrer a usar PGP/MIME?" - - #. abort - #: crypt.c:159 send.c:1438 -@@ -796,18 +796,18 @@ msgstr "No es suporten els misatges S/MI - - #: crypt.c:614 crypt.c:658 - msgid "Trying to extract PGP keys...\n" --msgstr "S'està provant a extreure les claus PGP...\n" -+msgstr "S'està provant a extreure les claus PGP...\n" - - #: crypt.c:638 crypt.c:678 - msgid "Trying to extract S/MIME certificates...\n" --msgstr "S'està provant a extreure els certificats S/MIME...\n" -+msgstr "S'està provant a extreure els certificats S/MIME...\n" - - #: crypt.c:799 - msgid "" - "[-- Error: Inconsistent multipart/signed structure! --]\n" - "\n" - msgstr "" --"[-- Error: L'estructura «multipart/signed» no és consistent! --]\n" -+"[-- Error: L'estructura «multipart/signed» no és consistent! --]\n" - "\n" - - #: crypt.c:821 -@@ -816,8 +816,8 @@ msgid "" - "[-- Error: Unknown multipart/signed protocol %s! --]\n" - "\n" - msgstr "" --"[-- Error: El protocol «%s» de «multipart/signed» --]\n" --"[-- no és conegut! --]\n" -+"[-- Error: El protocol «%s» de «multipart/signed» --]\n" -+"[-- no és conegut! --]\n" - "\n" - - #: crypt.c:861 -@@ -826,7 +826,7 @@ msgid "" - "[-- Warning: We can't verify %s/%s signatures. --]\n" - "\n" - msgstr "" --"[-- Avís: No es poden verificar les signatures «%s/%s». --]\n" -+"[-- Avís: No es poden verificar les signatures «%s/%s». --]\n" - "\n" - - #. Now display the signed body -@@ -835,7 +835,7 @@ msgid "" - "[-- The following data is signed --]\n" - "\n" - msgstr "" --"[-- Les dades següents es troben signades: --]\n" -+"[-- Les dades següents es troben signades: --]\n" - "\n" - - #: crypt.c:879 -@@ -843,7 +843,7 @@ msgid "" - "[-- Warning: Can't find any signatures. --]\n" - "\n" - msgstr "" --"[-- Avís: No s'ha trobat cap signatura. --]\n" -+"[-- Avís: No s'ha trobat cap signatura. --]\n" - "\n" - - #: crypt.c:885 -@@ -856,7 +856,7 @@ msgstr "" - - #: curs_lib.c:190 - msgid "yes" --msgstr "sí" -+msgstr "sí" - - #: curs_lib.c:191 - msgid "no" -@@ -868,7 +868,7 @@ msgid "Exit Mutt?" - msgstr "Voleu abandonar Mutt?" - - # ivb (2001/12/08) --# ivb Apareix amb més coses al darrere (curs_lib) o entre parèntesis -+# ivb Apareix amb més coses al darrere (curs_lib) o entre parèntesis - # ivb (mutt_socket) -> sense punt. - #: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328 - msgid "unknown error" -@@ -880,11 +880,11 @@ msgstr "Premeu qualsevol tecla per conti - - #: curs_lib.c:444 - msgid " ('?' for list): " --msgstr " («?» llista): " -+msgstr " («?» llista): " - - #: curs_main.c:51 curs_main.c:615 curs_main.c:645 - msgid "No mailbox is open." --msgstr "No hi ha cap bústia oberta." -+msgstr "No hi ha cap bústia oberta." - - #: curs_main.c:52 - msgid "There are no messages." -@@ -892,11 +892,11 @@ msgstr "No hi ha cap missatge." - - #: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44 - msgid "Mailbox is read-only." --msgstr "La bústia és de només lectura." -+msgstr "La bústia és de només lectura." - - #: curs_main.c:54 pager.c:59 recvattach.c:873 - msgid "Function not permitted in attach-message mode." --msgstr "No es permet aquesta funció en el mode d'adjuntar missatges." -+msgstr "No es permet aquesta funció en el mode d'adjuntar missatges." - - #: curs_main.c:55 - msgid "No visible messages." -@@ -904,7 +904,7 @@ msgstr "No hi ha cap missatge visible." - - #: curs_main.c:248 - msgid "Cannot toggle write on a readonly mailbox!" --msgstr "No es pot establir si una bústia de només lectura pot ser modificada." -+msgstr "No es pot establir si una bústia de només lectura pot ser modificada." - - #: curs_main.c:255 - msgid "Changes to folder will be written on folder exit." -@@ -927,7 +927,7 @@ msgid "Mail" - msgstr "Nou correu" - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: curs_main.c:406 pager.c:1457 - msgid "Reply" - msgstr "Respon" -@@ -939,15 +939,15 @@ msgstr "Grup" - #: curs_main.c:496 - msgid "Mailbox was externally modified. Flags may be wrong." - msgstr "" --"S'ha modificat la bústia des de fora. Els senyaladors poden ser incorrectes." -+"S'ha modificat la bústia des de fora. Els senyaladors poden ser incorrectes." - - #: curs_main.c:499 - msgid "New mail in this mailbox." --msgstr "Hi ha correu nou en aquesta bústia." -+msgstr "Hi ha correu nou en aquesta bústia." - - #: curs_main.c:503 - msgid "Mailbox was externally modified." --msgstr "S'ha modificat la bústia des de fora." -+msgstr "S'ha modificat la bústia des de fora." - - #: curs_main.c:621 - msgid "No tagged messages." -@@ -963,15 +963,15 @@ msgstr "Salta al missatge: " - - #: curs_main.c:749 - msgid "Argument must be a message number." --msgstr "L'argument ha de ser un número de missatge." -+msgstr "L'argument ha de ser un número de missatge." - - #: curs_main.c:782 - msgid "That message is not visible." --msgstr "Aqueix missatge no és visible." -+msgstr "Aqueix missatge no és visible." - - #: curs_main.c:785 - msgid "Invalid message number." --msgstr "El número de missatge no és vàlid." -+msgstr "El número de missatge no és vàlid." - - #: curs_main.c:804 - msgid "Delete messages matching: " -@@ -979,15 +979,15 @@ msgstr "Esborra els missatges que concor - - #: curs_main.c:826 - msgid "No limit pattern is in effect." --msgstr "No hi ha cap patró limitant en efecte." -+msgstr "No hi ha cap patró limitant en efecte." - - # ivb (2001/12/08) --# ivb Nooop! Només mostra el límit actual. -+# ivb Nooop! Només mostra el límit actual. - #. i18n: ask for a limit to apply - #: curs_main.c:831 - #, c-format - msgid "Limit: %s" --msgstr "Límit: %s" -+msgstr "Límit: %s" - - #: curs_main.c:841 - msgid "Limit to messages matching: " -@@ -1011,16 +1011,16 @@ msgstr "Desmarca els missatges que conco - - #: curs_main.c:1053 - msgid "Open mailbox in read-only mode" --msgstr "Obri en mode de només lectura la bústia" -+msgstr "Obri en mode de només lectura la bústia" - - #: curs_main.c:1055 - msgid "Open mailbox" --msgstr "Obri la bústia" -+msgstr "Obri la bústia" - - #: curs_main.c:1071 mx.c:512 mx.c:658 - #, c-format - msgid "%s is not a mailbox." --msgstr "«%s» no és una bústia." -+msgstr "«%s» no és una bústia." - - #: curs_main.c:1165 - msgid "Exit Mutt without saving?" -@@ -1028,7 +1028,7 @@ msgstr "Voleu abandonar Mutt sense desar - - #: curs_main.c:1199 curs_main.c:1224 - msgid "You are on the last message." --msgstr "Vos trobeu sobre l'últim missatge." -+msgstr "Vos trobeu sobre l'últim missatge." - - #: curs_main.c:1206 curs_main.c:1250 - msgid "No undeleted messages." -@@ -1047,13 +1047,13 @@ msgid "Search wrapped to bottom." - msgstr "La recerca ha tornat al final." - - # ivb (2001/12/08) --# ivb Ací no hi ha forma de posar el punt final de segur :( -+# ivb Ací no hi ha forma de posar el punt final de segur :( - #: curs_main.c:1392 - msgid "No new messages" - msgstr "No hi ha cap missatge nou" - - # ivb (2001/12/08) --# ivb Ací no hi ha forma de posar el punt final de segur :( -+# ivb Ací no hi ha forma de posar el punt final de segur :( - #: curs_main.c:1392 - msgid "No unread messages" - msgstr "No hi ha cap missatge no llegit" -@@ -1064,11 +1064,11 @@ msgstr " en aquesta vista limitada." - - #: curs_main.c:1414 pager.c:2354 - msgid "Can't change 'important' flag on POP server." --msgstr "No es pot canviar el senyalador «important» en un servidor POP." -+msgstr "No es pot canviar el senyalador «important» en un servidor POP." - - #: curs_main.c:1538 - msgid "No more threads." --msgstr "No hi ha més fils." -+msgstr "No hi ha més fils." - - #: curs_main.c:1540 - msgid "You are on the first thread." -@@ -1077,11 +1077,11 @@ msgstr "Vos trobeu en el primer fil." - #: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077 - #: thread.c:1132 - msgid "Threading is not enabled." --msgstr "No s'ha habilitat l'ús de fils." -+msgstr "No s'ha habilitat l'ús de fils." - - #: curs_main.c:1624 - msgid "Thread contains unread messages." --msgstr "El fil conté missatges no llegits." -+msgstr "El fil conté missatges no llegits." - - #: curs_main.c:1811 - msgid "Can't edit message on POP server." -@@ -1112,37 +1112,37 @@ msgid "" - "~?\t\tthis message\n" - ".\t\ton a line by itself ends input\n" - msgstr "" --"~~\t\tinsereix una línia que comença amb un sol ~\n" -+"~~\t\tinsereix una línia que comença amb un sol ~\n" - "~b USUARIS\tafig els USUARIS al camp Bcc:\n" - "~c USUARIS\tafig els USUARIS al camp Cc:\n" - "~f MISSATGES\tinclou els MISSATGES\n" --"~F MISSATGES\tel mateix que ~f, però incloent també les capçaleres\n" --"~h\t\tedita la capçalera del missatge\n" -+"~F MISSATGES\tel mateix que ~f, però incloent també les capçaleres\n" -+"~h\t\tedita la capçalera del missatge\n" - "~m MISSATGES\tinclou i cita els MISSATGES\n" --"~M MISSATGES\tel mateix que ~m, però incloent també les capçaleres\n" -+"~M MISSATGES\tel mateix que ~m, però incloent també les capçaleres\n" - "~p\t\timprimeix el missatge\n" - "~q\t\tescriu el fitxer i abandona l'editor\n" - "~r FITXER\tllig un FITXER en l'editor\n" - "~t USUARIS\tafig els USUARIS al camp To:\n" --"~u\t\tretorna a la línia anterior\n" -+"~u\t\tretorna a la línia anterior\n" - "~v\t\tedita el missatge amb l'editor $visual\n" - "~w FITXER\tescriu el missatge en el FITXER\n" - "~x\t\tavorta els canvis i abandona l'editor\n" - "~?\t\tmostra aquest missatge\n" --".\t\ta soles en una línia termina l'entrada\n" -+".\t\ta soles en una línia termina l'entrada\n" - - #: edit.c:186 - #, c-format - msgid "%d: invalid message number.\n" --msgstr "%d: El número de missatge no és vàlid.\n" -+msgstr "%d: El número de missatge no és vàlid.\n" - - #: edit.c:328 - msgid "(End message with a . on a line by itself)\n" --msgstr "(Termineu el missatge amb . a soles en una línia)\n" -+msgstr "(Termineu el missatge amb . a soles en una línia)\n" - - #: edit.c:386 - msgid "No mailbox.\n" --msgstr "No hi ha cap bústia activa.\n" -+msgstr "No hi ha cap bústia activa.\n" - - #: edit.c:390 - msgid "Message contains:\n" -@@ -1158,18 +1158,18 @@ msgstr "Manca un nom de fitxer.\n" - - #: edit.c:427 - msgid "No lines in message.\n" --msgstr "El missatge no conté cap línia.\n" -+msgstr "El missatge no conté cap línia.\n" - --# El primer camp és una capçalera de correu. ivb -+# El primer camp és una capçalera de correu. ivb - #: edit.c:444 - #, c-format - msgid "Bad IDN in %s: '%s'\n" --msgstr "L'IDN de «%s» no és vàlid: «%s»\n" -+msgstr "L'IDN de «%s» no és vàlid: «%s»\n" - - #: edit.c:462 - #, c-format - msgid "%s: unknown editor command (~? for help)\n" --msgstr "%s: L'ordre de l'editor no és coneguda («~?» per ajuda).\n" -+msgstr "%s: L'ordre de l'editor no és coneguda («~?» per ajuda).\n" - - #: editmsg.c:78 - #, c-format -@@ -1188,7 +1188,7 @@ msgstr "No s'ha pogut truncar una carpet - - #: editmsg.c:122 - msgid "Message file is empty!" --msgstr "El fitxer missatge és buit!" -+msgstr "El fitxer missatge és buit!" - - #: editmsg.c:129 - msgid "Message not modified!" -@@ -1207,16 +1207,16 @@ msgstr "No s'ha pogut afegir a la carpet - #: editmsg.c:203 - #, c-format - msgid "Error. Preserving temporary file: %s" --msgstr "Error. Es manté el fitxer temporal: %s" -+msgstr "Error. Es manté el fitxer temporal: %s" - - # ivb (2001/12/08) --# ivb Així queda més clar. El programa posa l'interrogant. -+# ivb Així queda més clar. El programa posa l'interrogant. - #: flags.c:336 - msgid "Set flag" - msgstr "Quin senyalador voleu activar" - - # ivb (2001/12/08) --# ivb Així queda més clar. El programa posa l'interrogant. -+# ivb Així queda més clar. El programa posa l'interrogant. - #: flags.c:336 - msgid "Clear flag" - msgstr "Quin senyalador voleu desactivar" -@@ -1224,7 +1224,7 @@ msgstr "Quin senyalador voleu desactivar - #: handler.c:1349 - msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" - msgstr "" --"[-- Error: No s'ha pogut mostrar cap part del «multipart/alternative»! --]\n" -+"[-- Error: No s'ha pogut mostrar cap part del «multipart/alternative»! --]\n" - - #: handler.c:1459 - #, c-format -@@ -1234,46 +1234,46 @@ msgstr "[-- Fitxer adjunt #%d" - #: handler.c:1471 - #, c-format - msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n" --msgstr "[-- Tipus: %s/%s, Codificació: %s, Mida: %s --]\n" -+msgstr "[-- Tipus: %s/%s, Codificació: %s, Mida: %s --]\n" - - #: handler.c:1534 - #, c-format - msgid "[-- Autoview using %s --]\n" - msgstr "" --"[-- Eixida de l'ordre de visualització automàtica --]\n" --"[-- «%s» --]\n" -+"[-- Eixida de l'ordre de visualització automàtica --]\n" -+"[-- «%s» --]\n" - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb S'està invocant l'ordre de visualització automàtica: %s -+# ivb S'està invocant l'ordre de visualització automàtica: %s - #: handler.c:1535 - #, c-format - msgid "Invoking autoview command: %s" --msgstr "Ordre de visualització automàtica: %s" -+msgstr "Ordre de visualització automàtica: %s" - - #: handler.c:1567 - #, c-format - msgid "[-- Can't run %s. --]\n" --msgstr "[-- No s'ha pogut executar «%s». --]\n" -+msgstr "[-- No s'ha pogut executar «%s». --]\n" - - #: handler.c:1585 handler.c:1606 - #, c-format - msgid "[-- Autoview stderr of %s --]\n" - msgstr "" --"[-- Errors de l'ordre de visualització automàtica --]\n" --"[-- «%s» --]\n" -+"[-- Errors de l'ordre de visualització automàtica --]\n" -+"[-- «%s» --]\n" - - #: handler.c:1643 - msgid "[-- Error: message/external-body has no access-type parameter --]\n" - msgstr "" --"[-- Error: La part «message/external-body» --]\n" --"[-- no té paràmetre «access-type». --]\n" -+"[-- Error: La part «message/external-body» --]\n" -+"[-- no té paràmetre «access-type». --]\n" - - #: handler.c:1662 - #, c-format - msgid "[-- This %s/%s attachment " - msgstr "" --"[-- Aquest fitxer adjunt de tipus «%s/%s» --]\n" -+"[-- Aquest fitxer adjunt de tipus «%s/%s» --]\n" - "[-- " - - #: handler.c:1669 -@@ -1298,7 +1298,7 @@ msgstr "[-- nom: %s --]\n" - #: handler.c:1694 handler.c:1710 - #, c-format - msgid "[-- This %s/%s attachment is not included, --]\n" --msgstr "[-- Aquest fitxer adjunt de tipus «%s/%s» no s'inclou, --]\n" -+msgstr "[-- Aquest fitxer adjunt de tipus «%s/%s» no s'inclou, --]\n" - - #: handler.c:1696 - msgid "" -@@ -1310,16 +1310,16 @@ msgstr "[-- i la font externa indicada h - #, c-format - msgid "[-- and the indicated access-type %s is unsupported --]\n" - msgstr "" --"[-- i el valor indicat d'«access-type» «%s» --]\n" -+"[-- i el valor indicat d'«access-type» «%s» --]\n" - "[-- no es suporta. --]\n" - - #: handler.c:1822 - msgid "Error: multipart/signed has no protocol." --msgstr "Error: La part «multipart/signed» no té paràmetre «protocol»!" -+msgstr "Error: La part «multipart/signed» no té paràmetre «protocol»!" - - #: handler.c:1832 - msgid "Error: multipart/encrypted has no protocol parameter!" --msgstr "Error: La part «multipart/encrypted» no té paràmetre «protocol»!" -+msgstr "Error: La part «multipart/encrypted» no té paràmetre «protocol»!" - - #: handler.c:1872 - msgid "Unable to open temporary file!" -@@ -1328,16 +1328,16 @@ msgstr "No s'ha pogut obrir el fitxer te - #: handler.c:1933 - #, c-format - msgid "[-- %s/%s is unsupported " --msgstr "[-- No es suporta «%s/%s». " -+msgstr "[-- No es suporta «%s/%s». " - - #: handler.c:1938 - #, c-format - msgid "(use '%s' to view this part)" --msgstr "(useu «%s» per veure aquesta part)" -+msgstr "(useu «%s» per veure aquesta part)" - - #: handler.c:1940 - msgid "(need 'view-attachments' bound to key!)" --msgstr "(vinculeu «view-attachents» a una tecla!)" -+msgstr "(vinculeu «view-attachents» a una tecla!)" - - #: headers.c:177 - #, c-format -@@ -1349,7 +1349,7 @@ msgid "ERROR: please report this bug" - msgstr "ERROR: Per favor, informeu d'aquest error." - - # ivb (2001/12/07) --# ivb Es refereix a un menú -> masculí. -+# ivb Es refereix a un menú -> masculí. - #: help.c:324 - msgid "" - msgstr "" -@@ -1361,7 +1361,7 @@ msgid "" - "\n" - msgstr "" - "\n" --"Vincles genèrics:\n" -+"Vincles genèrics:\n" - "\n" - - #: help.c:340 -@@ -1375,26 +1375,26 @@ msgstr "" - "\n" - - # ivb (2001/12/08) --# ivb El noms dels menús no estan traduïts. -+# ivb El noms dels menús no estan traduïts. - #: help.c:348 - #, c-format - msgid "Help for %s" --msgstr "Ajuda de «%s»" -+msgstr "Ajuda de «%s»" - - #: hook.c:246 - #, c-format - msgid "unhook: Can't do unhook * from within a hook." --msgstr "unhook: No es pot fer «unhook *» des d'un «hook»." -+msgstr "unhook: No es pot fer «unhook *» des d'un «hook»." - - #: hook.c:258 - #, c-format - msgid "unhook: unknown hook type: %s" --msgstr "unhook: El tipus de «hook» no és conegut: %s" -+msgstr "unhook: El tipus de «hook» no és conegut: %s" - - #: hook.c:264 - #, c-format - msgid "unhook: Can't delete a %s from within a %s." --msgstr "unhook: No es pot esborrar un «%s» des d'un «%s»." -+msgstr "unhook: No es pot esborrar un «%s» des d'un «%s»." - - #: imap/auth.c:108 pop_auth.c:415 - msgid "No authenticators available" -@@ -1402,28 +1402,28 @@ msgstr "No hi ha cap autenticador dispon - - #: imap/auth_anon.c:43 - msgid "Authenticating (anonymous)..." --msgstr "S'està autenticant (anònimament)..." -+msgstr "S'està autenticant (anònimament)..." - - #: imap/auth_anon.c:73 - msgid "Anonymous authentication failed." --msgstr "L'autenticació anònima ha fallat." -+msgstr "L'autenticació anònima ha fallat." - - #: imap/auth_cram.c:48 - msgid "Authenticating (CRAM-MD5)..." --msgstr "S'està autenticant (CRAM-MD5)..." -+msgstr "S'està autenticant (CRAM-MD5)..." - - #: imap/auth_cram.c:128 - msgid "CRAM-MD5 authentication failed." --msgstr "L'autenticació CRAM-MD5 ha fallat." -+msgstr "L'autenticació CRAM-MD5 ha fallat." - - #. now begin login - #: imap/auth_gss.c:105 - msgid "Authenticating (GSSAPI)..." --msgstr "S'està autenticant (GSSAPI)..." -+msgstr "S'està autenticant (GSSAPI)..." - - #: imap/auth_gss.c:268 - msgid "GSSAPI authentication failed." --msgstr "L'autenticació GSSAPI ha fallat." -+msgstr "L'autenticació GSSAPI ha fallat." - - #: imap/auth_login.c:38 - msgid "LOGIN disabled on this server." -@@ -1431,7 +1431,7 @@ msgstr "L'ordre LOGIN no es troba habili - - #: imap/auth_login.c:47 pop_auth.c:248 - msgid "Logging in..." --msgstr "S'està entrant..." -+msgstr "S'està entrant..." - - #: imap/auth_login.c:67 pop_auth.c:291 - msgid "Login failed." -@@ -1440,16 +1440,16 @@ msgstr "L'entrada ha fallat." - #: imap/auth_sasl.c:116 - #, c-format - msgid "Authenticating (%s)..." --msgstr "S'està autenticant (%s)..." -+msgstr "S'està autenticant (%s)..." - - #: imap/auth_sasl.c:212 pop_auth.c:176 - msgid "SASL authentication failed." --msgstr "L'autenticació SASL ha fallat." -+msgstr "L'autenticació SASL ha fallat." - - #: imap/browse.c:68 imap/imap.c:542 - #, c-format - msgid "%s is an invalid IMAP path" --msgstr "«%s» no és un camí IMAP vàlid." -+msgstr "«%s» no és un camí IMAP vàlid." - - #: imap/browse.c:85 - msgid "Getting namespaces..." -@@ -1457,7 +1457,7 @@ msgstr "S'estan obtenint els espais de n - - #: imap/browse.c:94 - msgid "Getting folder list..." --msgstr "S'està obtenint la llista de carpetes..." -+msgstr "S'està obtenint la llista de carpetes..." - - #: imap/browse.c:223 - msgid "No such folder" -@@ -1465,19 +1465,19 @@ msgstr "La carpeta no existeix." - - #: imap/browse.c:281 - msgid "Create mailbox: " --msgstr "Crea la bústia: " -+msgstr "Crea la bústia: " - - #: imap/browse.c:286 - msgid "Mailbox must have a name." --msgstr "La bústia ha de tenir un nom." -+msgstr "La bústia ha de tenir un nom." - - #: imap/browse.c:294 - msgid "Mailbox created." --msgstr "S'ha creat la bústia." -+msgstr "S'ha creat la bústia." - - #: imap/command.c:294 - msgid "Mailbox closed" --msgstr "S'ha tancat la bústia." -+msgstr "S'ha tancat la bústia." - - #. something is wrong because the server reported fewer messages - #. * than we previously saw -@@ -1489,11 +1489,11 @@ msgstr "Error fatal. El recompte de miss - #: imap/imap.c:151 - #, c-format - msgid "Closing connection to %s..." --msgstr "S'està tancant la connexió amb «%s»..." -+msgstr "S'està tancant la connexió amb «%s»..." - - #: imap/imap.c:311 - msgid "This IMAP server is ancient. Mutt does not work with it." --msgstr "Aquest servidor IMAP és antic. Mutt no pot funcionar amb ell." -+msgstr "Aquest servidor IMAP és antic. Mutt no pot funcionar amb ell." - - #: imap/imap.c:402 - #, c-format -@@ -1502,31 +1502,31 @@ msgstr "S'ha rebut una resposta inespera - - #: imap/imap.c:422 pop_lib.c:284 - msgid "Secure connection with TLS?" --msgstr "Voleu protegir la connexió usant TLS?" -+msgstr "Voleu protegir la connexió usant TLS?" - - #: imap/imap.c:435 pop_lib.c:308 - msgid "Could not negotiate TLS connection" --msgstr "No s'ha pogut negociar la connexió TLS." -+msgstr "No s'ha pogut negociar la connexió TLS." - - #: imap/imap.c:573 - #, c-format - msgid "Selecting %s..." --msgstr "S'està seleccionant la bústia «%s»..." -+msgstr "S'està seleccionant la bústia «%s»..." - - #: imap/imap.c:709 - msgid "Error opening mailbox" --msgstr "Error en obrir la bústia." -+msgstr "Error en obrir la bústia." - - #. STATUS not supported - #: imap/imap.c:763 - msgid "Unable to append to IMAP mailboxes at this server" --msgstr "Aquest servidor no permet afegir a les bústies IMAP." -+msgstr "Aquest servidor no permet afegir a les bústies IMAP." - - #. command failed cause folder doesn't exist - #: imap/imap.c:772 imap/message.c:720 muttlib.c:1234 - #, c-format - msgid "Create %s?" --msgstr "Voleu crear «%s»?" -+msgstr "Voleu crear «%s»?" - - #: imap/imap.c:958 pop.c:465 - #, c-format -@@ -1548,68 +1548,68 @@ msgstr "S'estan eliminant missatges del - - #: imap/imap.c:1071 - msgid "imap_sync_mailbox: EXPUNGE failed" --msgstr "imap_sync_mailbox: Ha fallat «EXPUNGE»." -+msgstr "imap_sync_mailbox: Ha fallat «EXPUNGE»." - - #: imap/imap.c:1105 - msgid "CLOSE failed" --msgstr "Ha fallat «CLOSE»." -+msgstr "Ha fallat «CLOSE»." - - #: imap/imap.c:1348 - msgid "Bad mailbox name" --msgstr "El nom de la bústia no és vàlid." -+msgstr "El nom de la bústia no és vàlid." - - #: imap/imap.c:1360 - #, c-format - msgid "Subscribing to %s..." --msgstr "S'està subscrivint a «%s»..." -+msgstr "S'està subscrivint a «%s»..." - - #: imap/imap.c:1362 - #, c-format - msgid "Unsubscribing to %s..." --msgstr "S'està dessubscrivint de «%s»..." -+msgstr "S'està dessubscrivint de «%s»..." - - #. Unable to fetch headers for lower versions - #: imap/message.c:94 - msgid "Unable to fetch headers from this IMAP server version." - msgstr "" --"No s'han pogut recollir les capçaleres d'aquesta versió de servidor IMAP." -+"No s'han pogut recollir les capçaleres d'aquesta versió de servidor IMAP." - - #: imap/message.c:107 - #, c-format - msgid "Could not create temporary file %s" --msgstr "No s'ha pogut crear el fitxer temporal «%s»." -+msgstr "No s'ha pogut crear el fitxer temporal «%s»." - - #: imap/message.c:134 --#, fuzzy, c-format -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]" -+msgstr "S'està avaluant la memòria cau... [%d/%d]" - - #: imap/message.c:202 pop.c:210 - #, c-format - msgid "Fetching message headers... [%d/%d]" --msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]" -+msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]" - - #: imap/message.c:367 pop.c:344 - msgid "Fetching message..." --msgstr "S'està recollint el missatge..." -+msgstr "S'està recollint el missatge..." - - #: imap/message.c:410 pop.c:381 - msgid "The message index is incorrect. Try reopening the mailbox." --msgstr "L'índex del missatge no és correcte. Proveu de reobrir la bústia." -+msgstr "L'índex del missatge no és correcte. Proveu de reobrir la bústia." - - #: imap/message.c:586 - msgid "Uploading message ..." --msgstr "S'està penjant el missatge..." -+msgstr "S'està penjant el missatge..." - - #: imap/message.c:696 - #, c-format - msgid "Copying %d messages to %s..." --msgstr "S'estan copiant %d missatges en «%s»..." -+msgstr "S'estan copiant %d missatges en «%s»..." - - #: imap/message.c:700 - #, c-format - msgid "Copying message %d to %s..." --msgstr "S'està copiant el missatge %d en «%s»..." -+msgstr "S'està copiant el missatge %d en «%s»..." - - #: imap/util.c:241 - msgid "Continue?" -@@ -1618,111 +1618,111 @@ msgstr "Voleu continuar?" - #: init.c:385 - #, c-format - msgid "Bad regexp: %s" --msgstr "L'expressió regular no és vàlida: %s" -+msgstr "L'expressió regular no és vàlida: %s" - - #: init.c:678 - msgid "spam: no matching pattern" --msgstr "spam: No s'ha indicat el patró de concordança." -+msgstr "spam: No s'ha indicat el patró de concordança." - - #: init.c:680 - msgid "nospam: no matching pattern" --msgstr "spam: No s'ha indicat el patró de concordança." -+msgstr "spam: No s'ha indicat el patró de concordança." - - #: init.c:883 - msgid "alias: no address" --msgstr "alias: No s'ha indicat cap adreça." -+msgstr "alias: No s'ha indicat cap adreça." - - #: init.c:928 - #, c-format - msgid "Warning: Bad IDN '%s' in alias '%s'.\n" --msgstr "Avís: L'IDN «%s» de l'àlies «%s» no és vàlid.\n" -+msgstr "Avís: L'IDN «%s» de l'àlies «%s» no és vàlid.\n" - - #: init.c:1006 - msgid "invalid header field" --msgstr "El camp de capçalera no és vàlid." -+msgstr "El camp de capçalera no és vàlid." - - #: init.c:1059 - #, c-format - msgid "%s: unknown sorting method" --msgstr "%s: El mètode d'ordenació no és conegut." -+msgstr "%s: El mètode d'ordenació no és conegut." - - #: init.c:1169 - #, c-format - msgid "mutt_restore_default(%s): error in regexp: %s\n" --msgstr "mutt_restore_default(%s): Error en l'expressió regular: %s\n" -+msgstr "mutt_restore_default(%s): Error en l'expressió regular: %s\n" - - #: init.c:1234 - #, c-format - msgid "%s: unknown variable" --msgstr "%s: La variable no és coneguda." -+msgstr "%s: La variable no és coneguda." - - #: init.c:1243 - #, c-format - msgid "prefix is illegal with reset" --msgstr "El prefix usat en «reset» no és permés." -+msgstr "El prefix usat en «reset» no és permés." - - #: init.c:1249 - #, c-format - msgid "value is illegal with reset" --msgstr "El valor usat en «reset» no és permés." -+msgstr "El valor usat en «reset» no és permés." - - # ivb (2001/11/24) --# ivb Es refereix a una variable lògica. -+# ivb Es refereix a una variable lògica. - #: init.c:1288 - #, c-format - msgid "%s is set" --msgstr "«%s» està activada." -+msgstr "«%s» està activada." - - # ivb (2001/11/24) --# ivb Es refereix a una variable lògica. -+# ivb Es refereix a una variable lògica. - #: init.c:1288 - #, c-format - msgid "%s is unset" --msgstr "«%s» no està activada." -+msgstr "«%s» no està activada." - - #: init.c:1478 - #, c-format - msgid "%s: invalid mailbox type" --msgstr "%s: El tipus de bústia no és vàlid." -+msgstr "%s: El tipus de bústia no és vàlid." - - #: init.c:1503 init.c:1548 - #, c-format - msgid "%s: invalid value" --msgstr "%s: El valor no és vàlid." -+msgstr "%s: El valor no és vàlid." - - #: init.c:1589 - #, c-format - msgid "%s: Unknown type." --msgstr "%s: El tipus no és conegut." -+msgstr "%s: El tipus no és conegut." - - #: init.c:1615 - #, c-format - msgid "%s: unknown type" --msgstr "%s: El tipus no és conegut." -+msgstr "%s: El tipus no és conegut." - - #: init.c:1674 - #, c-format - msgid "Error in %s, line %d: %s" --msgstr "Error en «%s», línia %d: %s" -+msgstr "Error en «%s», línia %d: %s" - - #. the muttrc source keyword - #: init.c:1697 - #, c-format - msgid "source: errors in %s" --msgstr "source: Hi ha errors en «%s»." -+msgstr "source: Hi ha errors en «%s»." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb source: S'avorta la lectura de «%s» perquè conté massa errors. -+# ivb source: S'avorta la lectura de «%s» perquè conté massa errors. - #: init.c:1698 - #, c-format - msgid "source: reading aborted due too many errors in %s" --msgstr "source: «%s» conté massa errors: s'avorta la lectura." -+msgstr "source: «%s» conté massa errors: s'avorta la lectura." - - #: init.c:1712 - #, c-format - msgid "source: error at %s" --msgstr "source: Error en «%s»." -+msgstr "source: Error en «%s»." - - #: init.c:1717 - msgid "source: too many arguments" -@@ -1731,12 +1731,12 @@ msgstr "source: Sobren arguments." - #: init.c:1768 - #, c-format - msgid "%s: unknown command" --msgstr "%s: L'ordre no és coneguda." -+msgstr "%s: L'ordre no és coneguda." - - #: init.c:2157 - #, c-format - msgid "Error in command line: %s\n" --msgstr "Error en la línia d'ordres: %s\n" -+msgstr "Error en la línia d'ordres: %s\n" - - #: init.c:2206 - msgid "unable to determine home directory" -@@ -1752,12 +1752,12 @@ msgstr "S'ha detectat un bucle entre mac - - #: keymap.c:673 keymap.c:681 - msgid "Key is not bound." --msgstr "La tecla no està vinculada." -+msgstr "La tecla no està vinculada." - - #: keymap.c:685 - #, c-format - msgid "Key is not bound. Press '%s' for help." --msgstr "La tecla no està vinculada. Premeu «%s» per obtenir ajuda." -+msgstr "La tecla no està vinculada. Premeu «%s» per obtenir ajuda." - - #: keymap.c:696 - msgid "push: too many arguments" -@@ -1766,11 +1766,11 @@ msgstr "push: Sobren arguments." - #: keymap.c:726 - #, c-format - msgid "%s: no such menu" --msgstr "%s: El menú no existeix." -+msgstr "%s: El menú no existeix." - - #: keymap.c:741 - msgid "null key sequence" --msgstr "La seqüència de tecles és nul·la." -+msgstr "La seqüència de tecles és nuŀla." - - #: keymap.c:828 - msgid "bind: too many arguments" -@@ -1779,11 +1779,11 @@ msgstr "bind: Sobren arguments." - #: keymap.c:851 - #, c-format - msgid "%s: no such function in map" --msgstr "%s: La funció no es troba en el mapa." -+msgstr "%s: La funció no es troba en el mapa." - - #: keymap.c:875 - msgid "macro: empty key sequence" --msgstr "macro: La seqüència de tecles és buida." -+msgstr "macro: La seqüència de tecles és buida." - - #: keymap.c:886 - msgid "macro: too many arguments" -@@ -1796,7 +1796,7 @@ msgstr "exec: Manquen arguments." - #: keymap.c:942 - #, c-format - msgid "%s: no such function" --msgstr "%s: La funció no existeix." -+msgstr "%s: La funció no existeix." - - #: keymap.c:963 - msgid "Enter keys (^G to abort): " -@@ -1805,22 +1805,22 @@ msgstr "Premeu les tecles (^G avorta): " - #: keymap.c:968 - #, c-format - msgid "Char = %s, Octal = %o, Decimal = %d" --msgstr "Caràcter = %s, Octal = %o, Decimal = %d" -+msgstr "Caràcter = %s, Octal = %o, Decimal = %d" - - # ivb (2001/11/24) --# ivb Totes aquestes cadenes són missatges d'ajuda. No sembla haver -+# ivb Totes aquestes cadenes són missatges d'ajuda. No sembla haver - # ivb restriccions de longitud. - #: keymap_alldefs.h:5 - msgid "null operation" --msgstr "l'operació nul·la" -+msgstr "l'operació nuŀla" - - #: keymap_alldefs.h:6 - msgid "end of conditional execution (noop)" --msgstr "termina l'execució condicional (operació nul·la)" -+msgstr "termina l'execució condicional (operació nuŀla)" - - #: keymap_alldefs.h:7 - msgid "force viewing of attachment using mailcap" --msgstr "força la visualització d'un fitxer adjunt usant «mailcap»" -+msgstr "força la visualització d'un fitxer adjunt usant «mailcap»" - - #: keymap_alldefs.h:8 - msgid "view attachment as text" -@@ -1828,11 +1828,11 @@ msgstr "mostra un fitxer adjunt com a te - - #: keymap_alldefs.h:9 - msgid "Toggle display of subparts" --msgstr "activa o desactiva la visualització de les subparts" -+msgstr "activa o desactiva la visualització de les subparts" - - #: keymap_alldefs.h:10 - msgid "move to the bottom of the page" --msgstr "va al final de la pàgina" -+msgstr "va al final de la pàgina" - - #: keymap_alldefs.h:11 - msgid "remail a message to another user" -@@ -1852,21 +1852,21 @@ msgstr "mostra el nom del fitxer selecci - - #: keymap_alldefs.h:15 - msgid "subscribe to current mailbox (IMAP only)" --msgstr "es subscriu a la bústia actual (només en IMAP)" -+msgstr "es subscriu a la bústia actual (només en IMAP)" - - #: keymap_alldefs.h:16 - msgid "unsubscribe to current mailbox (IMAP only)" --msgstr "es dessubscriu de la bústia actual (només en IMAP)" -+msgstr "es dessubscriu de la bústia actual (només en IMAP)" - - #: keymap_alldefs.h:17 - msgid "toggle view all/subscribed mailboxes (IMAP only)" - msgstr "" --"canvia entre veure totes les bústies o només aquelles subscrites (només en " -+"canvia entre veure totes les bústies o només aquelles subscrites (només en " - "IMAP)" - - #: keymap_alldefs.h:18 - msgid "list mailboxes with new mail" --msgstr "llista les bústies amb correu nou" -+msgstr "llista les bústies amb correu nou" - - #: keymap_alldefs.h:19 - msgid "change directories" -@@ -1874,7 +1874,7 @@ msgstr "canvia de directori" - - #: keymap_alldefs.h:20 - msgid "check mailboxes for new mail" --msgstr "comprova si hi ha correu nou en les bústies" -+msgstr "comprova si hi ha correu nou en les bústies" - - #: keymap_alldefs.h:21 - msgid "attach a file(s) to this message" -@@ -1886,23 +1886,23 @@ msgstr "adjunta missatges a aquest missa - - #: keymap_alldefs.h:23 - msgid "edit the BCC list" --msgstr "edita la llista de còpia cega (Bcc)" -+msgstr "edita la llista de còpia cega (Bcc)" - - #: keymap_alldefs.h:24 - msgid "edit the CC list" --msgstr "edita la llista de còpia (Cc)" -+msgstr "edita la llista de còpia (Cc)" - - #: keymap_alldefs.h:25 - msgid "edit attachment description" --msgstr "edita la descripció d'un fitxer adjunt" -+msgstr "edita la descripció d'un fitxer adjunt" - - #: keymap_alldefs.h:26 - msgid "edit attachment transfer-encoding" --msgstr "edita la codificació de la transferència d'un fitxer adjunt" -+msgstr "edita la codificació de la transferència d'un fitxer adjunt" - - #: keymap_alldefs.h:27 - msgid "enter a file to save a copy of this message in" --msgstr "demana un fitxer on desar una còpia d'aquest missatge" -+msgstr "demana un fitxer on desar una còpia d'aquest missatge" - - #: keymap_alldefs.h:28 - msgid "edit the file to be attached" -@@ -1914,7 +1914,7 @@ msgstr "edita el camp de remitent (From) - - #: keymap_alldefs.h:30 - msgid "edit the message with headers" --msgstr "edita el missatge amb capçaleres" -+msgstr "edita el missatge amb capçaleres" - - #: keymap_alldefs.h:31 - msgid "edit the message" -@@ -1922,7 +1922,7 @@ msgstr "edita el missatge" - - #: keymap_alldefs.h:32 - msgid "edit attachment using mailcap entry" --msgstr "edita el fitxer adjunt usant l'entrada de «mailcap»" -+msgstr "edita el fitxer adjunt usant l'entrada de «mailcap»" - - #: keymap_alldefs.h:33 - msgid "edit the Reply-To field" -@@ -1938,7 +1938,7 @@ msgstr "edita la llista de destinataris - - #: keymap_alldefs.h:36 - msgid "create a new mailbox (IMAP only)" --msgstr "crea una nova bústia (només en IMAP)" -+msgstr "crea una nova bústia (només en IMAP)" - - #: keymap_alldefs.h:37 - msgid "edit attachment content type" -@@ -1946,23 +1946,23 @@ msgstr "edita el tipus de contingut d'un - - #: keymap_alldefs.h:38 - msgid "get a temporary copy of an attachment" --msgstr "crea una còpia temporal d'un fitxer adjunt" -+msgstr "crea una còpia temporal d'un fitxer adjunt" - - #: keymap_alldefs.h:39 - msgid "run ispell on the message" --msgstr "executa «ispell» (comprovació ortogràfica) sobre el missatge" -+msgstr "executa «ispell» (comprovació ortogràfica) sobre el missatge" - - #: keymap_alldefs.h:40 - msgid "compose new attachment using mailcap entry" --msgstr "crea un nou fitxer adjunt usant l'entrada de «mailcap»" -+msgstr "crea un nou fitxer adjunt usant l'entrada de «mailcap»" - - #: keymap_alldefs.h:41 - msgid "toggle recoding of this attachment" --msgstr "estableix si un fitxer adjunt serà recodificat" -+msgstr "estableix si un fitxer adjunt serà recodificat" - - #: keymap_alldefs.h:42 - msgid "save this message to send later" --msgstr "desa aquest missatge per enviar-lo més endavant" -+msgstr "desa aquest missatge per enviar-lo més endavant" - - #: keymap_alldefs.h:43 - msgid "rename/move an attached file" -@@ -1974,7 +1974,7 @@ msgstr "envia el missatge" - - #: keymap_alldefs.h:45 - msgid "toggle disposition between inline/attachment" --msgstr "canvia la disposició entre en línia o adjunt" -+msgstr "canvia la disposició entre en línia o adjunt" - - #: keymap_alldefs.h:46 - msgid "toggle whether to delete file after sending it" -@@ -1982,7 +1982,7 @@ msgstr "estableix si cal esborrar un fit - - #: keymap_alldefs.h:47 - msgid "update an attachment's encoding info" --msgstr "edita la informació de codificació d'un missatge" -+msgstr "edita la informació de codificació d'un missatge" - - #: keymap_alldefs.h:48 - msgid "write the message to a folder" -@@ -1990,11 +1990,11 @@ msgstr "escriu el missatge en una carpet - - #: keymap_alldefs.h:49 - msgid "copy a message to a file/mailbox" --msgstr "còpia un missatge en un fitxer o bústia" -+msgstr "còpia un missatge en un fitxer o bústia" - - #: keymap_alldefs.h:50 - msgid "create an alias from a message sender" --msgstr "crea un àlies partint del remitent d'un missatge" -+msgstr "crea un àlies partint del remitent d'un missatge" - - #: keymap_alldefs.h:51 - msgid "move entry to bottom of screen" -@@ -2006,15 +2006,15 @@ msgstr "mou l'indicador al centre de la - - #: keymap_alldefs.h:53 - msgid "move entry to top of screen" --msgstr "mou l'indicador al començament de la pantalla" -+msgstr "mou l'indicador al començament de la pantalla" - - #: keymap_alldefs.h:54 - msgid "make decoded (text/plain) copy" --msgstr "crea una còpia descodificada (text/plain) del missatge" -+msgstr "crea una còpia descodificada (text/plain) del missatge" - - #: keymap_alldefs.h:55 - msgid "make decoded copy (text/plain) and delete" --msgstr "crea una còpia descodificada (text/plain) del missatge i l'esborra" -+msgstr "crea una còpia descodificada (text/plain) del missatge i l'esborra" - - #: keymap_alldefs.h:56 - msgid "delete the current entry" -@@ -2022,7 +2022,7 @@ msgstr "esborra l'entrada actual" - - #: keymap_alldefs.h:57 - msgid "delete the current mailbox (IMAP only)" --msgstr "esborra la bústia actual (només en IMAP)" -+msgstr "esborra la bústia actual (només en IMAP)" - - #: keymap_alldefs.h:58 - msgid "delete all messages in subthread" -@@ -2034,11 +2034,11 @@ msgstr "esborra tots els missatges d'un - - #: keymap_alldefs.h:60 - msgid "display full address of sender" --msgstr "mostra l'adreça completa del remitent" -+msgstr "mostra l'adreça completa del remitent" - - #: keymap_alldefs.h:61 - msgid "display message and toggle header weeding" --msgstr "mostra un missatge i oculta o mostra certs camps de la capçalera" -+msgstr "mostra un missatge i oculta o mostra certs camps de la capçalera" - - #: keymap_alldefs.h:62 - msgid "display a message" -@@ -2050,45 +2050,45 @@ msgstr "edita un missatge en brut" - - #: keymap_alldefs.h:64 - msgid "delete the char in front of the cursor" --msgstr "esborra el caràcter anterior al cursor" -+msgstr "esborra el caràcter anterior al cursor" - - #: keymap_alldefs.h:65 - msgid "move the cursor one character to the left" --msgstr "mou el cursor un caràcter a l'esquerra" -+msgstr "mou el cursor un caràcter a l'esquerra" - - #: keymap_alldefs.h:66 - msgid "move the cursor to the beginning of the word" --msgstr "mou el cursor al començament de la paraula" -+msgstr "mou el cursor al començament de la paraula" - - #: keymap_alldefs.h:67 - msgid "jump to the beginning of the line" --msgstr "salta al començament de la línia" -+msgstr "salta al començament de la línia" - - # ivb (2001/12/07) --# ivb Es refereix a les definides en «mailboxes». -+# ivb Es refereix a les definides en «mailboxes». - #: keymap_alldefs.h:68 - msgid "cycle among incoming mailboxes" --msgstr "canvia entre les bústies d'entrada" -+msgstr "canvia entre les bústies d'entrada" - - #: keymap_alldefs.h:69 - msgid "complete filename or alias" --msgstr "completa el nom de fitxer o l'àlies" -+msgstr "completa el nom de fitxer o l'àlies" - - #: keymap_alldefs.h:70 - msgid "complete address with query" --msgstr "completa una adreça fent una consulta" -+msgstr "completa una adreça fent una consulta" - - #: keymap_alldefs.h:71 - msgid "delete the char under the cursor" --msgstr "esborra el caràcter sota el cursor" -+msgstr "esborra el caràcter sota el cursor" - - #: keymap_alldefs.h:72 - msgid "jump to the end of the line" --msgstr "salta al final de la línia" -+msgstr "salta al final de la línia" - - #: keymap_alldefs.h:73 - msgid "move the cursor one character to the right" --msgstr "mou el cursor un caràcter a la dreta" -+msgstr "mou el cursor un caràcter a la dreta" - - #: keymap_alldefs.h:74 - msgid "move the cursor to the end of the word" -@@ -2096,23 +2096,23 @@ msgstr "mou el cursor al final de la par - - #: keymap_alldefs.h:75 - msgid "scroll down through the history list" --msgstr "es desplaça cap avall en la llista d'historial" -+msgstr "es desplaça cap avall en la llista d'historial" - - #: keymap_alldefs.h:76 - msgid "scroll up through the history list" --msgstr "es desplaça cap amunt en la llista d'historial" -+msgstr "es desplaça cap amunt en la llista d'historial" - - #: keymap_alldefs.h:77 - msgid "delete chars from cursor to end of line" --msgstr "esborra els caràcters des del cursor fins al final de la línia" -+msgstr "esborra els caràcters des del cursor fins al final de la línia" - - #: keymap_alldefs.h:78 - msgid "delete chars from the cursor to the end of the word" --msgstr "esborra els caràcters des del cursor fins al final de la paraula" -+msgstr "esborra els caràcters des del cursor fins al final de la paraula" - - #: keymap_alldefs.h:79 - msgid "delete all chars on the line" --msgstr "esborra tots els caràcters de la línia" -+msgstr "esborra tots els caràcters de la línia" - - #: keymap_alldefs.h:80 - msgid "delete the word in front of the cursor" -@@ -2120,39 +2120,39 @@ msgstr "esborra la paraula a l'esquerra - - #: keymap_alldefs.h:81 - msgid "quote the next typed key" --msgstr "escriu tal qual la tecla premuda a continuació" -+msgstr "escriu tal qual la tecla premuda a continuació" - - #: keymap_alldefs.h:82 - msgid "transpose character under cursor with previous" --msgstr "transposa el caràcter sota el cursor i l'anterior" -+msgstr "transposa el caràcter sota el cursor i l'anterior" - - #: keymap_alldefs.h:83 - msgid "capitalize the word" --msgstr "posa la primera lletra de la paraula en majúscula" -+msgstr "posa la primera lletra de la paraula en majúscula" - - #: keymap_alldefs.h:84 - msgid "convert the word to lower case" --msgstr "converteix la paraula a minúscules" -+msgstr "converteix la paraula a minúscules" - - #: keymap_alldefs.h:85 - msgid "convert the word to upper case" --msgstr "converteix la paraula a majúscules" -+msgstr "converteix la paraula a majúscules" - - #: keymap_alldefs.h:86 - msgid "enter a muttrc command" --msgstr "executa una ordre de «muttrc»" -+msgstr "executa una ordre de «muttrc»" - - #: keymap_alldefs.h:87 - msgid "enter a file mask" --msgstr "estableix una màscara de fitxers" -+msgstr "estableix una màscara de fitxers" - - #: keymap_alldefs.h:88 - msgid "exit this menu" --msgstr "abandona aquest menú" -+msgstr "abandona aquest menú" - - #: keymap_alldefs.h:89 - msgid "filter attachment through a shell command" --msgstr "filtra un fitxer adjunt amb una ordre de l'intèrpret" -+msgstr "filtra un fitxer adjunt amb una ordre de l'intèrpret" - - #: keymap_alldefs.h:90 - msgid "move to the first entry" -@@ -2160,7 +2160,7 @@ msgstr "va a la primera entrada" - - #: keymap_alldefs.h:91 - msgid "toggle a message's 'important' flag" --msgstr "canvia el senyalador «important» d'un missatge" -+msgstr "canvia el senyalador «important» d'un missatge" - - #: keymap_alldefs.h:92 - msgid "forward a message with comments" -@@ -2176,11 +2176,11 @@ msgstr "respon a tots els destinataris" - - #: keymap_alldefs.h:95 - msgid "scroll down 1/2 page" --msgstr "avança mitja pàgina" -+msgstr "avança mitja pàgina" - - #: keymap_alldefs.h:96 - msgid "scroll up 1/2 page" --msgstr "endarrereix mitja pàgina" -+msgstr "endarrereix mitja pàgina" - - #: keymap_alldefs.h:97 - msgid "this screen" -@@ -2188,11 +2188,11 @@ msgstr "mostra aquesta pantalla" - - #: keymap_alldefs.h:98 - msgid "jump to an index number" --msgstr "salta a un número d'índex" -+msgstr "salta a un número d'índex" - - #: keymap_alldefs.h:99 - msgid "move to the last entry" --msgstr "va a l'última entrada" -+msgstr "va a l'última entrada" - - #: keymap_alldefs.h:100 - msgid "reply to specified mailing list" -@@ -2212,7 +2212,7 @@ msgstr "obri una carpeta diferent" - - #: keymap_alldefs.h:104 - msgid "open a different folder in read only mode" --msgstr "obri una carpeta diferent en mode de només lectura" -+msgstr "obri una carpeta diferent en mode de només lectura" - - #: keymap_alldefs.h:105 - msgid "clear a status flag from a message" -@@ -2220,15 +2220,15 @@ msgstr "elimina un senyalador d'estat d' - - #: keymap_alldefs.h:106 - msgid "delete messages matching a pattern" --msgstr "esborra els missatges que concorden amb un patró" -+msgstr "esborra els missatges que concorden amb un patró" - - #: keymap_alldefs.h:107 - msgid "force retrieval of mail from IMAP server" --msgstr "força l'obtenció del correu d'un servidor IMAP" -+msgstr "força l'obtenció del correu d'un servidor IMAP" - - #: keymap_alldefs.h:108 - msgid "retrieve mail from POP server" --msgstr "obté el correu d'un servidor POP" -+msgstr "obté el correu d'un servidor POP" - - #: keymap_alldefs.h:109 - msgid "move to the first message" -@@ -2236,35 +2236,35 @@ msgstr "va al primer missatge" - - #: keymap_alldefs.h:110 - msgid "move to the last message" --msgstr "va a l'últim missatge" -+msgstr "va a l'últim missatge" - - #: keymap_alldefs.h:111 - msgid "show only messages matching a pattern" --msgstr "mostra només els missatges que concorden amb un patró" -+msgstr "mostra només els missatges que concorden amb un patró" - - #: keymap_alldefs.h:112 - msgid "jump to the next new message" --msgstr "salta al següent missatge nou" -+msgstr "salta al següent missatge nou" - - #: keymap_alldefs.h:113 - msgid "jump to the next new or unread message" --msgstr "salta al següent missatge nou o no llegit" -+msgstr "salta al següent missatge nou o no llegit" - - #: keymap_alldefs.h:114 - msgid "jump to the next subthread" --msgstr "salta al subfil següent" -+msgstr "salta al subfil següent" - - #: keymap_alldefs.h:115 - msgid "jump to the next thread" --msgstr "salta al fil següent" -+msgstr "salta al fil següent" - - #: keymap_alldefs.h:116 - msgid "move to the next undeleted message" --msgstr "va al següent missatge no esborrat" -+msgstr "va al següent missatge no esborrat" - - #: keymap_alldefs.h:117 - msgid "jump to the next unread message" --msgstr "salta al següent missatge no llegit" -+msgstr "salta al següent missatge no llegit" - - #: keymap_alldefs.h:118 - msgid "jump to parent message in thread" -@@ -2308,35 +2308,35 @@ msgstr "estableix un senyalador d'estat - - #: keymap_alldefs.h:128 - msgid "save changes to mailbox" --msgstr "desa els canvis realitzats a la bústia" -+msgstr "desa els canvis realitzats a la bústia" - - #: keymap_alldefs.h:129 - msgid "tag messages matching a pattern" --msgstr "marca els missatges que concorden amb un patró" -+msgstr "marca els missatges que concorden amb un patró" - - #: keymap_alldefs.h:130 - msgid "undelete messages matching a pattern" --msgstr "restaura els missatges que concorden amb un patró" -+msgstr "restaura els missatges que concorden amb un patró" - - #: keymap_alldefs.h:131 - msgid "untag messages matching a pattern" --msgstr "desmarca els missatges que concorden amb un patró" -+msgstr "desmarca els missatges que concorden amb un patró" - - #: keymap_alldefs.h:132 - msgid "move to the middle of the page" --msgstr "va al centre de la pàgina" -+msgstr "va al centre de la pàgina" - - #: keymap_alldefs.h:133 - msgid "move to the next entry" --msgstr "va a l'entrada següent" -+msgstr "va a l'entrada següent" - - #: keymap_alldefs.h:134 - msgid "scroll down one line" --msgstr "avança una línia" -+msgstr "avança una línia" - - #: keymap_alldefs.h:135 - msgid "move to the next page" --msgstr "va a la pàgina següent" -+msgstr "va a la pàgina següent" - - #: keymap_alldefs.h:136 - msgid "jump to the bottom of the message" -@@ -2348,7 +2348,7 @@ msgstr "oculta o mostra el text citat" - - #: keymap_alldefs.h:138 - msgid "skip beyond quoted text" --msgstr "avança fins al final del text citat" -+msgstr "avança fins al final del text citat" - - #: keymap_alldefs.h:139 - msgid "jump to the top of the message" -@@ -2356,7 +2356,7 @@ msgstr "salta a l'inici del missatge" - - #: keymap_alldefs.h:140 - msgid "pipe message/attachment to a shell command" --msgstr "redirigeix un missatge o fitxer adjunt a una ordre de l'intèrpret" -+msgstr "redirigeix un missatge o fitxer adjunt a una ordre de l'intèrpret" - - #: keymap_alldefs.h:141 - msgid "move to the previous entry" -@@ -2364,11 +2364,11 @@ msgstr "va a l'entrada anterior" - - #: keymap_alldefs.h:142 - msgid "scroll up one line" --msgstr "endarrereix una línia" -+msgstr "endarrereix una línia" - - #: keymap_alldefs.h:143 - msgid "move to the previous page" --msgstr "va a la pàgina anterior" -+msgstr "va a la pàgina anterior" - - #: keymap_alldefs.h:144 - msgid "print the current entry" -@@ -2376,7 +2376,7 @@ msgstr "imprimeix l'entrada actual" - - #: keymap_alldefs.h:145 - msgid "query external program for addresses" --msgstr "pregunta a un programa extern per una adreça" -+msgstr "pregunta a un programa extern per una adreça" - - #: keymap_alldefs.h:146 - msgid "append new query results to current results" -@@ -2384,7 +2384,7 @@ msgstr "afig els resultats d'una consult - - #: keymap_alldefs.h:147 - msgid "save changes to mailbox and quit" --msgstr "desa els canvis realitzats a la bústia i ix" -+msgstr "desa els canvis realitzats a la bústia i ix" - - #: keymap_alldefs.h:148 - msgid "recall a postponed message" -@@ -2395,7 +2395,7 @@ msgid "clear and redraw the screen" - msgstr "neteja i redibuixa la pantalla" - - # ivb (2001/11/26) --# ivb Es refereix a una funció -> femení. -+# ivb Es refereix a una funció -> femení. - #: keymap_alldefs.h:150 - msgid "{internal}" - msgstr "{interna}" -@@ -2414,19 +2414,19 @@ msgstr "guarda un missatge o fitxer adju - - #: keymap_alldefs.h:154 - msgid "search for a regular expression" --msgstr "cerca una expressió regular" -+msgstr "cerca una expressió regular" - - #: keymap_alldefs.h:155 - msgid "search backwards for a regular expression" --msgstr "cerca cap enrere una expressió regular" -+msgstr "cerca cap enrere una expressió regular" - - #: keymap_alldefs.h:156 - msgid "search for next match" --msgstr "cerca la concordança següent" -+msgstr "cerca la concordança següent" - - #: keymap_alldefs.h:157 - msgid "search for next match in opposite direction" --msgstr "cerca la concordança anterior" -+msgstr "cerca la concordança anterior" - - #: keymap_alldefs.h:158 - msgid "toggle search pattern coloring" -@@ -2434,7 +2434,7 @@ msgstr "estableix si cal resaltar les co - - #: keymap_alldefs.h:159 - msgid "invoke a command in a subshell" --msgstr "invoca una ordre en un subintèrpret" -+msgstr "invoca una ordre en un subintèrpret" - - #: keymap_alldefs.h:160 - msgid "sort messages" -@@ -2450,11 +2450,11 @@ msgstr "marca l'entrada actual" - - #: keymap_alldefs.h:163 - msgid "apply next function to tagged messages" --msgstr "aplica la funció següent als missatges marcats" -+msgstr "aplica la funció següent als missatges marcats" - - #: keymap_alldefs.h:164 - msgid "apply next function ONLY to tagged messages" --msgstr "aplica la funció següent NOMÉS als missatges marcats" -+msgstr "aplica la funció següent NOMÉS als missatges marcats" - - #: keymap_alldefs.h:165 - msgid "tag the current subthread" -@@ -2466,23 +2466,23 @@ msgstr "marca el fil actual" - - #: keymap_alldefs.h:167 - msgid "toggle a message's 'new' flag" --msgstr "canvia el senyalador «nou» d'un missatge" -+msgstr "canvia el senyalador «nou» d'un missatge" - - #: keymap_alldefs.h:168 - msgid "toggle whether the mailbox will be rewritten" --msgstr "estableix si s'escriuran els canvis a la bústia" -+msgstr "estableix si s'escriuran els canvis a la bústia" - - # ivb (2001/12/07) --# ivb Es refereix a les definides en «mailboxes». -+# ivb Es refereix a les definides en «mailboxes». - #: keymap_alldefs.h:169 - msgid "toggle whether to browse mailboxes or all files" - msgstr "" --"estableix si es navegarà només per les bústies d'entrada o per tots els " -+"estableix si es navegarà només per les bústies d'entrada o per tots els " - "fitxers" - - #: keymap_alldefs.h:170 - msgid "move to the top of the page" --msgstr "va a l'inici de la pàgina" -+msgstr "va a l'inici de la pàgina" - - #: keymap_alldefs.h:171 - msgid "undelete the current entry" -@@ -2498,11 +2498,11 @@ msgstr "restaura tots els missatges d'un - - #: keymap_alldefs.h:174 - msgid "show the Mutt version number and date" --msgstr "mostra el número de versió i la data de Mutt" -+msgstr "mostra el número de versió i la data de Mutt" - - #: keymap_alldefs.h:175 - msgid "view attachment using mailcap entry if necessary" --msgstr "mostra un fitxer adjunt usant l'entrada de «mailcap» si és necessari" -+msgstr "mostra un fitxer adjunt usant l'entrada de «mailcap» si és necessari" - - #: keymap_alldefs.h:176 - msgid "show MIME attachments" -@@ -2514,7 +2514,7 @@ msgstr "mostra el codi d'una tecla premu - - #: keymap_alldefs.h:178 - msgid "show currently active limit pattern" --msgstr "mostra el patró limitant actiu" -+msgstr "mostra el patró limitant actiu" - - #: keymap_alldefs.h:179 - msgid "collapse/uncollapse current thread" -@@ -2526,7 +2526,7 @@ msgstr "plega o desplega tots els fils" - - #: keymap_alldefs.h:181 - msgid "attach a PGP public key" --msgstr "adjunta una clau pública PGP" -+msgstr "adjunta una clau pública PGP" - - #: keymap_alldefs.h:182 - msgid "show PGP options" -@@ -2534,11 +2534,11 @@ msgstr "mostra les opcions de PGP" - - #: keymap_alldefs.h:183 - msgid "mail a PGP public key" --msgstr "envia una clau pública PGP" -+msgstr "envia una clau pública PGP" - - #: keymap_alldefs.h:184 - msgid "verify a PGP public key" --msgstr "verifica una clau pública PGP" -+msgstr "verifica una clau pública PGP" - - #: keymap_alldefs.h:185 - msgid "view the key's user id" -@@ -2548,23 +2548,23 @@ msgstr "mostra l'identificador d'usuari - # ivb Es refereix al format del missatge. - #: keymap_alldefs.h:186 - msgid "check for classic pgp" --msgstr "comprova si s'ha usat el PGP clàssic" -+msgstr "comprova si s'ha usat el PGP clàssic" - - #: keymap_alldefs.h:187 - msgid "Accept the chain constructed" --msgstr "accepta la cadena construïda" -+msgstr "accepta la cadena construïda" - - #: keymap_alldefs.h:188 - msgid "Append a remailer to the chain" --msgstr "afig un redistribuïdor a la cadena" -+msgstr "afig un redistribuïdor a la cadena" - - #: keymap_alldefs.h:189 - msgid "Insert a remailer into the chain" --msgstr "inserta un redistribuïdor en la cadena" -+msgstr "inserta un redistribuïdor en la cadena" - - #: keymap_alldefs.h:190 - msgid "Delete a remailer from the chain" --msgstr "esborra un redistribuïdor de la cadena" -+msgstr "esborra un redistribuïdor de la cadena" - - #: keymap_alldefs.h:191 - msgid "Select the previous element of the chain" -@@ -2572,27 +2572,27 @@ msgstr "selecciona l'element anterior de - - #: keymap_alldefs.h:192 - msgid "Select the next element of the chain" --msgstr "selecciona l'element següent de la cadena" -+msgstr "selecciona l'element següent de la cadena" - - #: keymap_alldefs.h:193 - msgid "send the message through a mixmaster remailer chain" --msgstr "envia el missatge per una cadena de redistribuïdors Mixmaster" -+msgstr "envia el missatge per una cadena de redistribuïdors Mixmaster" - - #: keymap_alldefs.h:194 - msgid "make decrypted copy and delete" --msgstr "fa una còpia desxifrada del missatge i esborra aquest" -+msgstr "fa una còpia desxifrada del missatge i esborra aquest" - - #: keymap_alldefs.h:195 - msgid "make decrypted copy" --msgstr "fa una còpia desxifrada del missatge" -+msgstr "fa una còpia desxifrada del missatge" - - #: keymap_alldefs.h:196 - msgid "wipe passphrase(s) from memory" --msgstr "esborra de la memòria la o les frases clau" -+msgstr "esborra de la memòria la o les frases clau" - - #: keymap_alldefs.h:197 - msgid "extract supported public keys" --msgstr "extreu les claus públiques suportades" -+msgstr "extreu les claus públiques suportades" - - #: keymap_alldefs.h:198 - msgid "show S/MIME options" -@@ -2600,11 +2600,11 @@ msgstr "mostra les opcions d'S/MIME" - - #: lib.c:64 - msgid "Integer overflow -- can't allocate memory!" --msgstr "Desbordament enter -- no s'ha pogut reservar memòria." -+msgstr "Desbordament enter -- no s'ha pogut reservar memòria." - - #: lib.c:71 lib.c:86 lib.c:118 - msgid "Out of memory!" --msgstr "No resta memòria!" -+msgstr "No resta memòria!" - - #: main.c:51 - msgid "" -@@ -2622,11 +2622,11 @@ msgid "" - "Mutt is free software, and you are welcome to redistribute it\n" - "under certain conditions; type `mutt -vv' for details.\n" - msgstr "" --"Copyright © 1996-2002 Michael R. Elkins i d'altres.\n" --"Mutt s'ofereix SENSE CAP GARANTIA; useu «mutt -vv» per obtenir-ne més " -+"Copyright © 1996-2002 Michael R. Elkins i d'altres.\n" -+"Mutt s'ofereix SENSE CAP GARANTIA; useu «mutt -vv» per obtenir-ne més " - "detalls.\n" --"Mutt és programari lliure i podeu, si voleu, redistribuir-lo sota certes\n" --"condicions; useu «mutt -vv» per obtenir-ne més detalls.\n" -+"Mutt és programari lliure i podeu, si voleu, redistribuir-lo sota certes\n" -+"condicions; useu «mutt -vv» per obtenir-ne més detalls.\n" - - #: main.c:61 - msgid "" -@@ -2655,37 +2655,36 @@ msgid "" - " along with this program; if not, write to the Free Software\n" - " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" - msgstr "" --"Copyright © 1996-2002 Michael R. Elkins \n" --"Copyright © 1996-2002 Brandon Long \n" --"Copyright © 1997-2002 Thomas Roessler \n" --"Copyright © 1998-2002 Werner Koch \n" --"Copyright © 1999-2002 Brendan Cully \n" --"Copyright © 1999-2002 Tommi Komulainen \n" --"Copyright © 2000-2002 Edmund Grimley Evans \n" -+"Copyright © 1996-2002 Michael R. Elkins \n" -+"Copyright © 1996-2002 Brandon Long \n" -+"Copyright © 1997-2002 Thomas Roessler \n" -+"Copyright © 1998-2002 Werner Koch \n" -+"Copyright © 1999-2002 Brendan Cully \n" -+"Copyright © 1999-2002 Tommi Komulainen \n" -+"Copyright © 2000-2002 Edmund Grimley Evans \n" - "\n" --"Moltes altres persones que no s'hi mencionen han contribuït amb gran " -+"Moltes altres persones que no s'hi mencionen han contribuït amb gran " - "quantitat\n" - "de codi, solucions i suggeriments.\n" - "\n" --" Aquest és programari lliure; podeu redistribuir-lo i/o modificar-lo " -+" Aquest és programari lliure; podeu redistribuir-lo i/o modificar-lo " - "sota\n" --" els termes de la Llicència Pública General GNU tal i com ha estat\n" --" publicada per la Free Software Foundation; bé sota la versió 2 de la\n" --" Llicència o bé (si ho preferiu) sota qualsevol versió posterior.\n" -+" els termes de la Llicència Pública General GNU tal i com ha estat\n" -+" publicada per la Free Software Foundation; bé sota la versió 2 de la\n" -+" Llicència o bé (si ho preferiu) sota qualsevol versió posterior.\n" - "\n" --" Aquest programa es distribueix amb l'expectativa de que serà útil, però\n" --" SENSE CAP GARANTIA; ni tan sols la garantia implícita de " -+" Aquest programa es distribueix amb l'expectativa de que serà útil, però\n" -+" SENSE CAP GARANTIA; ni tan sols la garantia implícita de " - "COMERCIABILITAT\n" --" o ADEQUACIÓ PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública\n" --" General GNU per obtenir-ne més detalls.\n" -+" o ADEQUACIÓ PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública\n" -+" General GNU per obtenir-ne més detalls.\n" - "\n" --" Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n" -+" Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n" - " juntament amb aquest programa; en cas contrari, escriviu a la Free\n" - " Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" - " MA 02111, USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2721,38 +2720,36 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"Forma d'ús: mutt [-nRyzZ] [-e ORDRE] [-F FITXER] [-m TIPUS] [-f FITXER]\n" -+"Forma d'ús: mutt [-nRyzZ] [-e ORDRE] [-F FITXER] [-m TIPUS] [-f FITXER]\n" - " mutt [-nR] [-e ORDRE] [-F FITXER] -Q VAR [-Q VAR] [...]\n" --" mutt [-nR] [-e ORDRE] [-F FITXER] -A ÀLIES [-A ÀLIES] [...]\n" -+" mutt [-nR] [-e ORDRE] [-F FITXER] -A ÀLIES [-A ÀLIES] [...]\n" - " mutt [-nx] [-e ORDRE] [-a FITXER] [-F FITXER] [-H FITXER]\n" --" [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] " --"ADREÇA...\n" -+" [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] ADREÇA...\n" - " mutt [-n] [-e ORDRE] [-F FITXER] -p\n" - " mutt -v[v]\n" - "\n" - "Opcions:\n" --" -A ÀLIES Expandeix l'ÀLIES indicat.\n" -+" -A ÀLIES Expandeix l'ÀLIES indicat.\n" - " -a FITXER Adjunta un FITXER al missatge.\n" --" -b ADREÇA Indica una ADREÇA per la còpia cega (BCC).\n" --" -c ADREÇA Indica una ADREÇA per la còpia (CC).\n" --" -e ORDRE Indica una ORDRE a executar abans de la " --"inicialització.\n" --" -f FITXER Indica quina bústia llegir.\n" --" -F FITXER Indica un FITXER «muttrc» alternatiu.\n" --" -H FITXER Indica un FITXER esborrany d'on llegir la capçalera.\n" --" -i FITXER Indica un FITXER que Mutt inclourà en la resposta.\n" --" -m TIPUS Indica un TIPUS de bústia per defecte.\n" --" -n Fa que Mutt no llija el fitxer «Muttrc» del sistema.\n" -+" -b ADREÇA Indica una ADREÇA per la còpia cega (BCC).\n" -+" -c ADREÇA Indica una ADREÇA per la còpia (CC).\n" -+" -e ORDRE Indica una ORDRE a executar abans de la inicialització.\n" -+" -f FITXER Indica quina bústia llegir.\n" -+" -F FITXER Indica un FITXER «muttrc» alternatiu.\n" -+" -H FITXER Indica un FITXER esborrany d'on llegir la capçalera i el\n" -+" cos.\n" -+" -i FITXER Indica un FITXER que Mutt inclourà en el cos.\n" -+" -m TIPUS Indica un TIPUS de bústia per defecte.\n" -+" -n Fa que Mutt no llija el fitxer «Muttrc» del sistema.\n" - " -p Recupera un missatge posposat.\n" --" -Q VARIABLE Consulta el valor d'una VARIABLE de configuració.\n" --" -R Obri la bústia en mode de només lectura.\n" -+" -Q VARIABLE Consulta el valor d'una VARIABLE de configuració.\n" -+" -R Obri la bústia en mode de només lectura.\n" - " -s ASSUMPTE Indica l'ASSUMPTE (entre cometes si porta espais).\n" --" -v Mostra la versió i les definicions de compil·lació.\n" --" -x Simula el mode d'enviament de «mailx».\n" --" -y Selecciona una bústia de la vostra llista " --"«mailboxes».\n" --" -z Ix immediatament si no hi ha missatges en la bústia.\n" --" -Z Obri la primera bústia amb missatges nous, i ix\n" -+" -v Mostra la versió i les definicions de compiŀlació.\n" -+" -x Simula el mode d'enviament de «mailx».\n" -+" -y Selecciona una bústia de la vostra llista «mailboxes».\n" -+" -z Ix immediatament si no hi ha missatges en la bústia.\n" -+" -Z Obri la primera bústia amb missatges nous, i ix\n" - " immediatament si no n'hi ha cap.\n" - " -h Mostra aquest missatge d'ajuda." - -@@ -2760,9 +2757,7 @@ msgstr "" - msgid "" - "\n" - "Compile options:" --msgstr "" --"\n" --"Opcions de compil·lació:" -+msgstr "\nOpcions de compiŀlació:" - - #: main.c:478 - msgid "Error initializing terminal." -@@ -2771,23 +2766,23 @@ msgstr "Error en inicialitzar el termina - #: main.c:583 - #, c-format - msgid "Debugging at level %d.\n" --msgstr "S'activa la depuració a nivell %d.\n" -+msgstr "S'activa la depuració a nivell %d.\n" - - #: main.c:585 - msgid "DEBUG was not defined during compilation. Ignored.\n" --msgstr "No es va definir «DEBUG» en la compil·lació. Es descarta l'opció.\n" -+msgstr "No es va definir «DEBUG» en la compiŀlació. Es descarta l'opció.\n" - - # ivb (2001/11/27) --# ivb Es refereix al directori «Maildir» -> masculí. -+# ivb Es refereix al directori «Maildir» -> masculí. - #: main.c:733 - #, c-format - msgid "%s does not exist. Create it?" --msgstr "«%s» no existeix. Voleu crear-lo?" -+msgstr "«%s» no existeix. Voleu crear-lo?" - - #: main.c:737 - #, c-format - msgid "Can't create %s: %s." --msgstr "No s'ha pogut crear «%s»: %s." -+msgstr "No s'ha pogut crear «%s»: %s." - - #: main.c:782 - msgid "No recipients specified.\n" -@@ -2800,36 +2795,36 @@ msgstr "%s: No s'ha pogut adjuntar el fi - - #: main.c:888 - msgid "No mailbox with new mail." --msgstr "No hi ha cap bústia amb correu nou." -+msgstr "No hi ha cap bústia amb correu nou." - - #: main.c:897 - msgid "No incoming mailboxes defined." --msgstr "No s'ha definit cap bústia d'entrada." -+msgstr "No s'ha definit cap bústia d'entrada." - - #: main.c:924 - msgid "Mailbox is empty." --msgstr "La bústia és buida." -+msgstr "La bústia és buida." - - #: mbox.c:129 mbox.c:288 - #, c-format - msgid "Reading %s... %d (%d%%)" --msgstr "S'està llegint «%s»... %d (%d%%)" -+msgstr "S'està llegint «%s»... %d (%d%%)" - - #: mbox.c:153 mbox.c:210 - msgid "Mailbox is corrupt!" --msgstr "La bústia és corrupta!" -+msgstr "La bústia és corrupta!" - - #: mbox.c:662 - msgid "Mailbox was corrupted!" --msgstr "La bústia ha estat corrompuda!" -+msgstr "La bústia ha estat corrompuda!" - - #: mbox.c:699 mbox.c:953 - msgid "Fatal error! Could not reopen mailbox!" --msgstr "Error fatal! No s'ha pogut reobrir la bústia!" -+msgstr "Error fatal! No s'ha pogut reobrir la bústia!" - - #: mbox.c:708 - msgid "Unable to lock mailbox!" --msgstr "No s'ha pogut blocar la bústia!" -+msgstr "No s'ha pogut blocar la bústia!" - - # ivb (2001/11/27) - # ivb Cal mantenir el missatge curt. -@@ -2841,7 +2836,7 @@ msgstr "No s'ha pogut blocar la bústia!" - #: mbox.c:754 - msgid "sync: mbox modified, but no modified messages! (report this bug)" - msgstr "" --"sync: La bústia és modificada però els missatges no! (informeu de l'error)" -+"sync: La bústia és modificada però els missatges no! (informeu de l'error)" - - #: mbox.c:793 - #, c-format -@@ -2857,19 +2852,19 @@ msgstr "S'estan realitzant els canvis... - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb L'escriptura ha fallat! S'ha desat la bústia parcial en «%s». -+# ivb L'escriptura ha fallat! S'ha desat la bústia parcial en «%s». - #: mbox.c:937 - #, c-format - msgid "Write failed! Saved partial mailbox to %s" --msgstr "L'escriptura fallà! Es desa la bústia parcial en «%s»." -+msgstr "L'escriptura fallà! Es desa la bústia parcial en «%s»." - - #: mbox.c:1003 - msgid "Could not reopen mailbox!" --msgstr "No s'ha pogut reobrir la bústia!" -+msgstr "No s'ha pogut reobrir la bústia!" - - #: mbox.c:1041 - msgid "Reopening mailbox..." --msgstr "S'està reobrint la bústia..." -+msgstr "S'està reobrint la bústia..." - - #: menu.c:416 - msgid "Jump to: " -@@ -2877,7 +2872,7 @@ msgstr "Salta a: " - - #: menu.c:425 - msgid "Invalid index number." --msgstr "El número d'índex no és vàlid." -+msgstr "El número d'índex no és vàlid." - - #: menu.c:429 menu.c:447 menu.c:483 menu.c:526 menu.c:542 menu.c:553 - #: menu.c:564 menu.c:606 menu.c:617 menu.c:630 menu.c:643 menu.c:1038 -@@ -2886,31 +2881,31 @@ msgstr "No hi ha cap entrada." - - #: menu.c:444 - msgid "You cannot scroll down farther." --msgstr "No podeu baixar més." -+msgstr "No podeu baixar més." - - #: menu.c:460 - msgid "You cannot scroll up farther." --msgstr "No podeu pujar més." -+msgstr "No podeu pujar més." - - #: menu.c:480 - msgid "You are on the last page." --msgstr "Vos trobeu en l'última pàgina." -+msgstr "Vos trobeu en l'última pàgina." - - #: menu.c:504 - msgid "You are on the first page." --msgstr "Vos trobeu en la primera pàgina." -+msgstr "Vos trobeu en la primera pàgina." - - #: menu.c:583 - msgid "First entry is shown." --msgstr "La primera entrada ja és visible." -+msgstr "La primera entrada ja és visible." - - #: menu.c:603 - msgid "Last entry is shown." --msgstr "L'última entrada ja és visible." -+msgstr "L'última entrada ja és visible." - - #: menu.c:654 - msgid "You are on the last entry." --msgstr "Vos trobeu en l'última entrada." -+msgstr "Vos trobeu en l'última entrada." - - #: menu.c:665 - msgid "You are on the first entry." -@@ -2926,7 +2921,7 @@ msgstr "Cerca cap enrere: " - - #: menu.c:736 pattern.c:1275 - msgid "No search pattern." --msgstr "No s'ha indicat cap patró de recerca." -+msgstr "No s'ha indicat cap patró de recerca." - - #: menu.c:766 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 - msgid "Not found." -@@ -2938,11 +2933,11 @@ msgstr "No hi ha cap entrada marcada." - - #: menu.c:995 - msgid "Search is not implemented for this menu." --msgstr "No es pot cercar en aquest menú." -+msgstr "No es pot cercar en aquest menú." - - #: menu.c:1000 - msgid "Jumping is not implemented for dialogs." --msgstr "No es pot saltar en un diàleg." -+msgstr "No es pot saltar en un diàleg." - - #: menu.c:1041 - msgid "Tagging is not supported." -@@ -2951,7 +2946,7 @@ msgstr "No es pot marcar." - #: mh.c:663 mh.c:900 - #, c-format - msgid "Reading %s... %d" --msgstr "S'està llegint «%s»... %d" -+msgstr "S'està llegint «%s»... %d" - - #: mh.c:1151 - msgid "maildir_commit_message(): unable to set time on file" -@@ -2959,16 +2954,16 @@ msgstr "maildir_commit_message(): No s'h - - #: muttlib.c:846 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" --msgstr "El fitxer és un directori; voleu desar-hi a sota? [(s)í, (n)o, (t)ots]" -+msgstr "El fitxer és un directori; voleu desar-hi a sota? [(s)í, (n)o, (t)ots]" - --# (s)í, (n)o, (t)ots ivb -+# (s)í, (n)o, (t)ots ivb - #: muttlib.c:846 - msgid "yna" - msgstr "snt" - - #: muttlib.c:862 - msgid "File is a directory, save under it?" --msgstr "El fitxer és un directori; voleu desar-hi a sota?" -+msgstr "El fitxer és un directori; voleu desar-hi a sota?" - - #: muttlib.c:868 - msgid "File under directory: " -@@ -2976,32 +2971,32 @@ msgstr "Fitxer a sota del directori: " - - #: muttlib.c:880 - msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?" --msgstr "El fitxer ja existeix; (s)obreescriu, (a)fig o (c)ancel·la?" -+msgstr "El fitxer ja existeix; (s)obreescriu, (a)fig o (c)anceŀla?" - - # ivb (2001/11/27) --# ivb (s)obreescriu, (a)fig, (c)ancel·la -+# ivb (s)obreescriu, (a)fig, (c)anceŀla - #: muttlib.c:880 - msgid "oac" - msgstr "sac" - - #: muttlib.c:1199 - msgid "Can't save message to POP mailbox." --msgstr "No es poden desar missatges en bústies POP." -+msgstr "No es poden desar missatges en bústies POP." - - #: muttlib.c:1208 - #, c-format - msgid "%s is not a mailbox!" --msgstr "«%s» no és una bústia!" -+msgstr "«%s» no és una bústia!" - - #: muttlib.c:1214 - #, c-format - msgid "Append messages to %s?" --msgstr "Voleu afegir els missatges a «%s»?" -+msgstr "Voleu afegir els missatges a «%s»?" - - #: mutt_socket.c:91 mutt_socket.c:147 - #, c-format - msgid "Connection to %s closed" --msgstr "S'ha tancat la connexió amb «%s»." -+msgstr "S'ha tancat la connexió amb «%s»." - - #: mutt_socket.c:271 - msgid "SSL is unavailable." -@@ -3009,37 +3004,37 @@ msgstr "SSL no es troba disponible." - - #: mutt_socket.c:302 - msgid "Preconnect command failed." --msgstr "L'ordre de preconnexió (preconnect) ha fallat." -+msgstr "L'ordre de preconnexió (preconnect) ha fallat." - - #: mutt_socket.c:373 mutt_socket.c:387 - #, c-format - msgid "Error talking to %s (%s)" --msgstr "Error en parlar amb «%s» (%s)." -+msgstr "Error en parlar amb «%s» (%s)." - - #: mutt_socket.c:426 mutt_socket.c:483 - #, c-format - msgid "Bad IDN \"%s\"." --msgstr "L'IDN no és vàlid: «%s»" -+msgstr "L'IDN no és vàlid: «%s»" - - #: mutt_socket.c:433 mutt_socket.c:490 - #, c-format - msgid "Looking up %s..." --msgstr "S'està cercant «%s»..." -+msgstr "S'està cercant «%s»..." - - #: mutt_socket.c:444 mutt_socket.c:497 - #, c-format - msgid "Could not find the host \"%s\"" --msgstr "No s'ha pogut trobar l'estació «%s»." -+msgstr "No s'ha pogut trobar l'estació «%s»." - - #: mutt_socket.c:448 mutt_socket.c:506 - #, c-format - msgid "Connecting to %s..." --msgstr "S'està connectant amb «%s»..." -+msgstr "S'està connectant amb «%s»..." - - #: mutt_socket.c:529 - #, c-format - msgid "Could not connect to %s (%s)." --msgstr "No s'ha pogut connectar amb «%s» (%s)." -+msgstr "No s'ha pogut connectar amb «%s» (%s)." - - #: mutt_ssl.c:175 - msgid "Failed to find enough entropy on your system" -@@ -3048,12 +3043,12 @@ msgstr "No s'ha pogut extraure l'entropi - #: mutt_ssl.c:199 - #, c-format - msgid "Filling entropy pool: %s...\n" --msgstr "S'està plenant la piscina d'entropia «%s»...\n" -+msgstr "S'està plenant la piscina d'entropia «%s»...\n" - - #: mutt_ssl.c:207 - #, c-format - msgid "%s has insecure permissions!" --msgstr "«%s» no té uns permissos segurs!" -+msgstr "«%s» no té uns permissos segurs!" - - #: mutt_ssl.c:226 - msgid "SSL disabled due the lack of entropy" -@@ -3066,7 +3061,7 @@ msgstr "Error d'E/S" - #: mutt_ssl.c:331 - #, c-format - msgid "SSL failed: %s" --msgstr "La negociació d'SSL ha fallat: %s." -+msgstr "La negociació d'SSL ha fallat: %s." - - #: mutt_ssl.c:340 - msgid "Unable to get certificate from peer" -@@ -3075,11 +3070,11 @@ msgstr "No s'ha pogut obtenir el certifi - #: mutt_ssl.c:348 - #, c-format - msgid "SSL connection using %s (%s)" --msgstr "La connexió SSL usa «%s» (%s)." -+msgstr "La connexió SSL usa «%s» (%s)." - - # ivb (2001/12/02) --# ivb Es pot referir a nom, correu, organització, unitat organitzativa, --# ivb localitat, estat, país -> ni masculí ni femení, sinò tot el contrari. -+# ivb Es pot referir a nom, correu, organització, unitat organitzativa, -+# ivb localitat, estat, país -> ni masculí ni femení, sinò tot el contrari. - #: mutt_ssl.c:388 - msgid "Unknown" - msgstr "Desconegut/da" -@@ -3091,11 +3086,11 @@ msgstr "[no s'ha pogut calcular]" - - #: mutt_ssl.c:431 - msgid "[invalid date]" --msgstr "[la data no és vàlida]" -+msgstr "[la data no és vàlida]" - - #: mutt_ssl.c:506 - msgid "Server certificate is not yet valid" --msgstr "El certificat del servidor encara no és vàlid." -+msgstr "El certificat del servidor encara no és vàlid." - - #: mutt_ssl.c:513 - msgid "Server certificate has expired" -@@ -3110,11 +3105,11 @@ msgid "This certificate was issued by:" - msgstr "Aquest certificat ha estat lliurat per:" - - # ivb (2001/12/08) --# ivb A continuació ve el rang de validesa. -+# ivb A continuació ve el rang de validesa. - #: mutt_ssl.c:608 - #, c-format - msgid "This certificate is valid" --msgstr "Aquest certificat té validesa" -+msgstr "Aquest certificat té validesa" - - #: mutt_ssl.c:609 - #, c-format -@@ -3133,7 +3128,7 @@ msgstr "Empremta digital: %s" - - #: mutt_ssl.c:619 - msgid "SSL Certificate check" --msgstr "Comprovació del certificat SSL" -+msgstr "Comprovació del certificat SSL" - - #: mutt_ssl.c:622 - msgid "(r)eject, accept (o)nce, (a)ccept always" -@@ -3161,7 +3156,7 @@ msgstr "Ix " - - #: mutt_ssl.c:659 - msgid "Warning: Couldn't save certificate" --msgstr "Avís: No s'ha pogut desar el certificat." -+msgstr "Avís: No s'ha pogut desar el certificat." - - #: mutt_ssl.c:664 - msgid "Certificate saved" -@@ -3169,18 +3164,18 @@ msgstr "S'ha desat el certificat." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb Hi ha massa forrellats; voleu eliminar-ne un de «%s»? -+# ivb Hi ha massa forrellats; voleu eliminar-ne un de «%s»? - #: mx.c:120 - #, c-format - msgid "Lock count exceeded, remove lock for %s?" --msgstr "Voleu eliminar un forrellat sobrant de «%s»?" -+msgstr "Voleu eliminar un forrellat sobrant de «%s»?" - - # ivb (2001/11/27) --# ivb «dotlock» és el programa usat per blocar. -+# ivb «dotlock» és el programa usat per blocar. - #: mx.c:132 - #, c-format - msgid "Can't dotlock %s.\n" --msgstr "No s'ha pogut blocar «%s» amb «dotlock».\n" -+msgstr "No s'ha pogut blocar «%s» amb «dotlock».\n" - - #: mx.c:190 - msgid "Timeout exceeded while attempting fcntl lock!" -@@ -3189,7 +3184,7 @@ msgstr "S'ha excedit el temps d'espera e - #: mx.c:196 - #, c-format - msgid "Waiting for fcntl lock... %d" --msgstr "S'està esperant el blocatge amb fcntl()... %d" -+msgstr "S'està esperant el blocatge amb fcntl()... %d" - - #: mx.c:224 - msgid "Timeout exceeded while attempting flock lock!" -@@ -3198,35 +3193,35 @@ msgstr "S'ha excedit el temps d'espera e - #: mx.c:231 - #, c-format - msgid "Waiting for flock attempt... %d" --msgstr "S'està esperant el blocatge amb flock()... %d" -+msgstr "S'està esperant el blocatge amb flock()... %d" - - #: mx.c:595 - #, c-format - msgid "Couldn't lock %s\n" --msgstr "No s'ha pogut blocar «%s».\n" -+msgstr "No s'ha pogut blocar «%s».\n" - - #: mx.c:679 - #, c-format - msgid "Reading %s..." --msgstr "S'està llegint «%s»..." -+msgstr "S'està llegint «%s»..." - - #: mx.c:779 - #, c-format - msgid "Writing %s..." --msgstr "S'està escrivint «%s»..." -+msgstr "S'està escrivint «%s»..." - - #: mx.c:812 - #, c-format - msgid "Could not synchronize mailbox %s!" --msgstr "No s'ha pogut sincronitzar la bústia «%s»!" -+msgstr "No s'ha pogut sincronitzar la bústia «%s»!" - - #: mx.c:878 - #, c-format - msgid "Move read messages to %s?" --msgstr "Voleu moure els missatges a «%s»?" -+msgstr "Voleu moure els missatges a «%s»?" - - # ivb (2001/12/08) --# ivb Ací «%d» sempre és 1. -+# ivb Ací «%d» sempre és 1. - #: mx.c:894 mx.c:1150 - #, c-format - msgid "Purge %d deleted message?" -@@ -3240,11 +3235,11 @@ msgstr "Voleu eliminar %d missatges esbo - #: mx.c:918 - #, c-format - msgid "Moving read messages to %s..." --msgstr "S'estan movent els missatges llegits a «%s»..." -+msgstr "S'estan movent els missatges llegits a «%s»..." - - #: mx.c:977 mx.c:1141 - msgid "Mailbox is unchanged." --msgstr "No s'ha modificat la bústia." -+msgstr "No s'ha modificat la bústia." - - #: mx.c:1013 - #, c-format -@@ -3257,28 +3252,28 @@ msgid "%d kept, %d deleted." - msgstr "%d mantinguts, %d esborrats." - - # ivb (2001/12/08) --# ivb Pot anar darrere de la següent de la següent. -+# ivb Pot anar darrere de la següent de la següent. - #: mx.c:1126 - #, c-format - msgid " Press '%s' to toggle write" --msgstr "Premeu «%s» per habilitar l'escriptura." -+msgstr "Premeu «%s» per habilitar l'escriptura." - - # ivb (2001/12/08) --# ivb Pot anar darrere de la següent. -+# ivb Pot anar darrere de la següent. - #: mx.c:1128 - msgid "Use 'toggle-write' to re-enable write!" --msgstr "Habiliteu l'escriptura amb «toggle-write»!" -+msgstr "Habiliteu l'escriptura amb «toggle-write»!" - - # ivb (2001/12/08) - # ivb Pot precedir alguna de les anteriors. Mantenir breu. - #: mx.c:1130 - #, c-format - msgid "Mailbox is marked unwritable. %s" --msgstr "Bústia en estat de només lectura. %s" -+msgstr "Bústia en estat de només lectura. %s" - - #: mx.c:1185 - msgid "Mailbox checkpointed." --msgstr "S'ha establert un punt de control en la bústia." -+msgstr "S'ha establert un punt de control en la bústia." - - #: mx.c:1494 - msgid "Can't write message" -@@ -3286,32 +3281,32 @@ msgstr "No s'ha pogut escriure el missat - - #: mx.c:1539 - msgid "Integer overflow -- can't allocate memory." --msgstr "Desbordament enter -- no s'ha pogut reservar memòria." -+msgstr "Desbordament enter -- no s'ha pogut reservar memòria." - - #: pager.c:57 - msgid "Not available in this menu." --msgstr "No es troba disponible en aquest menú." -+msgstr "No es troba disponible en aquest menú." - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: pager.c:1450 - msgid "PrevPg" --msgstr "RePàg" -+msgstr "RePàg" - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: pager.c:1451 - msgid "NextPg" --msgstr "AvPàg" -+msgstr "AvPàg" - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: pager.c:1455 - msgid "View Attachm." - msgstr "VeuAdjnt" - - # ivb (2001/12/08) --# ivb Menú superpoblat: mantenir _molt_ curt! -+# ivb Menú superpoblat: mantenir _molt_ curt! - #: pager.c:1458 - msgid "Next" - msgstr "Segnt" -@@ -3319,11 +3314,11 @@ msgstr "Segnt" - #. emulate "less -q" and don't go on to the next message. - #: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143 - msgid "Bottom of message is shown." --msgstr "El final del missatge ja és visible." -+msgstr "El final del missatge ja és visible." - - #: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891 - msgid "Top of message is shown." --msgstr "L'inici del missatge ja és visible." -+msgstr "L'inici del missatge ja és visible." - - #: pager.c:1960 - msgid "Reverse search: " -@@ -3335,54 +3330,54 @@ msgstr "Cerca: " - - #: pager.c:2081 - msgid "Help is currently being shown." --msgstr "Ja s'està mostrant l'ajuda." -+msgstr "Ja s'està mostrant l'ajuda." - - #: pager.c:2110 - msgid "No more quoted text." --msgstr "No hi ha més text citat." -+msgstr "No hi ha més text citat." - - #: pager.c:2123 - msgid "No more unquoted text after quoted text." --msgstr "No hi ha més text sense citar després del text citat." -+msgstr "No hi ha més text sense citar després del text citat." - - #: parse.c:602 - msgid "multipart message has no boundary parameter!" --msgstr "El missatge «multipart» no té paràmetre «boundary»!" -+msgstr "El missatge «multipart» no té paràmetre «boundary»!" - - #: pattern.c:244 - #, c-format - msgid "Error in expression: %s" --msgstr "Error en l'expressió: %s" -+msgstr "Error en l'expressió: %s" - - #: pattern.c:354 - #, c-format - msgid "Invalid day of month: %s" --msgstr "El dia del mes no és vàlid: %s" -+msgstr "El dia del mes no és vàlid: %s" - - #: pattern.c:368 - #, c-format - msgid "Invalid month: %s" --msgstr "El mes no és vàlid: %s" -+msgstr "El mes no és vàlid: %s" - - #. getDate has its own error message, don't overwrite it here - #: pattern.c:520 - #, c-format - msgid "Invalid relative date: %s" --msgstr "La data relativa no és vàlida: %s" -+msgstr "La data relativa no és vàlida: %s" - - #: pattern.c:534 - msgid "error in expression" --msgstr "Error en l'expressió." -+msgstr "Error en l'expressió." - - #: pattern.c:740 pattern.c:848 - #, c-format - msgid "error in pattern at: %s" --msgstr "Error en el patró en: %s" -+msgstr "Error en el patró en: %s" - - #: pattern.c:788 - #, c-format - msgid "%c: invalid command" --msgstr "%c: L'ordre no és vàlida." -+msgstr "%c: L'ordre no és vàlida." - - #: pattern.c:794 - #, c-format -@@ -3392,29 +3387,29 @@ msgstr "%c: No es suporta en aquest mode - #: pattern.c:807 - #, c-format - msgid "missing parameter" --msgstr "Manca un paràmetre." -+msgstr "Manca un paràmetre." - - #: pattern.c:823 - #, c-format - msgid "mismatched parenthesis: %s" --msgstr "Els parèntesis no estan aparellats: %s" -+msgstr "Els parèntesis no estan aparellats: %s" - - #: pattern.c:855 - msgid "empty pattern" --msgstr "El patró és buit." -+msgstr "El patró és buit." - - #: pattern.c:1061 - #, c-format - msgid "error: unknown op %d (report this error)." --msgstr "error: L'operació %d és desconeguda. (informeu d'aquest error)" -+msgstr "error: L'operació %d és desconeguda. (informeu d'aquest error)" - - #: pattern.c:1130 pattern.c:1261 - msgid "Compiling search pattern..." --msgstr "S'està compil·lant el patró de recerca..." -+msgstr "S'està compiŀlant el patró de recerca..." - - #: pattern.c:1144 - msgid "Executing command on matching messages..." --msgstr "S'està executant l'ordre sobre els missatges concordants..." -+msgstr "S'està executant l'ordre sobre els missatges concordants..." - - #: pattern.c:1206 - msgid "No messages matched criteria." -@@ -3422,11 +3417,11 @@ msgstr "No hi ha cap missatge que concor - - #: pattern.c:1299 - msgid "Search hit bottom without finding match" --msgstr "La recerca ha arribat al final sense trobar cap concordança." -+msgstr "La recerca ha arribat al final sense trobar cap concordança." - - #: pattern.c:1310 - msgid "Search hit top without finding match" --msgstr "La recerca ha arribat a l'inici sense trobar cap concordança." -+msgstr "La recerca ha arribat a l'inici sense trobar cap concordança." - - #: pattern.c:1332 - msgid "Search interrupted." -@@ -3438,11 +3433,11 @@ msgstr "Entreu la frase clau de PGP:" - - #: pgp.c:104 - msgid "PGP passphrase forgotten." --msgstr "S'ha esborrat de la memòria la frase clau de PGP." -+msgstr "S'ha esborrat de la memòria la frase clau de PGP." - - #: pgp.c:344 - msgid "[-- Error: unable to create PGP subprocess! --]\n" --msgstr "[-- Error: No s'ha pogut crear el subprocés PGP! --]\n" -+msgstr "[-- Error: No s'ha pogut crear el subprocés PGP! --]\n" - - #: pgp.c:379 pgp.c:596 pgp.c:797 - msgid "" -@@ -3457,19 +3452,19 @@ msgid "" - "[-- BEGIN PGP MESSAGE --]\n" - "\n" - msgstr "" --"[-- COMENÇA EL MISSATGE PGP --]\n" -+"[-- COMENÇA EL MISSATGE PGP --]\n" - "\n" - - #: pgp.c:396 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" --msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n" -+msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n" - - #: pgp.c:398 - msgid "" - "[-- BEGIN PGP SIGNED MESSAGE --]\n" - "\n" - msgstr "" --"[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n" -+"[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n" - "\n" - - #: pgp.c:423 -@@ -3478,7 +3473,7 @@ msgstr "[-- TERMINA EL MISSATGE PGP --]\ - - #: pgp.c:425 - msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" --msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n" -+msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n" - - #: pgp.c:427 - msgid "[-- END PGP SIGNED MESSAGE --]\n" -@@ -3501,7 +3496,7 @@ msgid "" - "[-- Error: could not create a PGP subprocess! --]\n" - "\n" - msgstr "" --"[-- Error: No s'ha pogut crear el subprocés PGP! --]\n" -+"[-- Error: No s'ha pogut crear el subprocés PGP! --]\n" - "\n" - - #: pgp.c:873 -@@ -3509,7 +3504,7 @@ msgid "" - "[-- Error: malformed PGP/MIME message! --]\n" - "\n" - msgstr "" --"[-- Error: El missatge PGP/MIME és malmés! --]\n" -+"[-- Error: El missatge PGP/MIME és malmés! --]\n" - "\n" - - #: pgp.c:886 -@@ -3521,7 +3516,7 @@ msgid "" - "[-- The following data is PGP/MIME encrypted --]\n" - "\n" - msgstr "" --"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n" -+"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n" - "\n" - - #: pgp.c:915 -@@ -3530,12 +3525,12 @@ msgstr "[-- Final de les dades xifrades - - #: pgp.c:965 - msgid "Can't open PGP subprocess!" --msgstr "No s'ha pogut obrir el subprocés PGP!" -+msgstr "No s'ha pogut obrir el subprocés PGP!" - - #: pgp.c:1109 - #, c-format - msgid "Use keyID = \"%s\" for %s?" --msgstr "Voleu usar l'ID de clau «%s» per %s?" -+msgstr "Voleu usar l'ID de clau «%s» per %s?" - - #: pgp.c:1143 smime.c:665 smime.c:790 - #, c-format -@@ -3549,21 +3544,21 @@ msgstr "No s'ha pogut invocar PGP." - #: pgp.c:1491 - #, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " --msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? " -+msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? " - --# Ull! La mateixa clau que «en línia». ivb -+# Ull! La mateixa clau que «en línia». ivb - #: pgp.c:1492 - msgid "PGP/M(i)ME" - msgstr "PGP/M(i)ME" - --# Ull! La mateixa clau que «PGP/MIME». ivb -+# Ull! La mateixa clau que «PGP/MIME». ivb - #: pgp.c:1492 - msgid "(i)nline" --msgstr "en lín(i)a" -+msgstr "en lín(i)a" - - # ivb (2004/08/16) --# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbdós, {PGP/M(i)ME|en lín(i)a}, o en (c)lar --# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb -+# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbdós, {PGP/M(i)ME|en lín(i)a}, o en (c)lar -+# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb - #: pgp.c:1494 - msgid "esabifc" - msgstr "xsgaic" -@@ -3575,7 +3570,7 @@ msgstr "Signa com a: " - - #: pgpinvoke.c:307 - msgid "Fetching PGP key..." --msgstr "S'està recollint la clau PGP..." -+msgstr "S'està recollint la clau PGP..." - - #: pgpkey.c:490 - msgid "All matching keys are expired, revoked, or disabled." -@@ -3600,11 +3595,11 @@ msgstr "Claus PGP que concorden amb <%s> - #: pgpkey.c:534 - #, c-format - msgid "PGP keys matching \"%s\"." --msgstr "Claus PGP que concordem amb «%s»." -+msgstr "Claus PGP que concordem amb «%s»." - - #: pgpkey.c:553 pgpkey.c:745 - msgid "Can't open /dev/null" --msgstr "No s'ha pogut obrir «/dev/null»." -+msgstr "No s'ha pogut obrir «/dev/null»." - - #: pgpkey.c:559 pgpkey.c:739 - msgid "Can't create temporary file" -@@ -3628,28 +3623,28 @@ msgid "ID is expired/disabled/revoked." - msgstr "ID expirat/inhabilitat/revocat." - - # ivb (2002/02/02) --# ivb ABREUJAT! (Hei! Hui és 2/2/2!) --# ivb Aquest ID té una validesa indefinida. -+# ivb ABREUJAT! (Hei! Hui és 2/2/2!) -+# ivb Aquest ID té una validesa indefinida. - #: pgpkey.c:616 - msgid "ID has undefined validity." --msgstr "L'ID té una validesa indefinida." -+msgstr "L'ID té una validesa indefinida." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb Aquest ID no és vàlid. -+# ivb Aquest ID no és vàlid. - #: pgpkey.c:619 - msgid "ID is not valid." --msgstr "L'ID no és vàlid." -+msgstr "L'ID no és vàlid." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb Aquest ID només és lleugerament vàlid. -+# ivb Aquest ID només és lleugerament vàlid. - #: pgpkey.c:622 - msgid "ID is only marginally valid." --msgstr "L'ID és lleugerament vàlid." -+msgstr "L'ID és lleugerament vàlid." - - # ivb (2001/12/08) --# ivb Davant d'açò pot anar una de les quatre anteriors. -+# ivb Davant d'açò pot anar una de les quatre anteriors. - #: pgpkey.c:626 - #, c-format - msgid "%s Do you really want to use the key?" -@@ -3661,7 +3656,7 @@ msgstr "Per favor, entreu l'ID de la cla - - #: pgpkey.c:752 - msgid "Invoking pgp..." --msgstr "S'està invocant «pgp»..." -+msgstr "S'està invocant «pgp»..." - - #: pgpkey.c:777 - #, c-format -@@ -3671,30 +3666,30 @@ msgstr "Clau PGP %s." - #: pgpkey.c:839 pgpkey.c:955 - #, c-format - msgid "Looking for keys matching \"%s\"..." --msgstr "S'estan cercant les claus que concorden amb «%s»..." -+msgstr "S'estan cercant les claus que concorden amb «%s»..." - - #: pop.c:90 pop_lib.c:201 - #, c-format - msgid "Command TOP is not supported by server." --msgstr "El servidor no suporta l'ordre «TOP»." -+msgstr "El servidor no suporta l'ordre «TOP»." - - #: pop.c:117 - msgid "Can't write header to temporary file!" --msgstr "No s'ha pogut escriure la capçalera en un fitxer temporal!" -+msgstr "No s'ha pogut escriure la capçalera en un fitxer temporal!" - - #: pop.c:198 pop_lib.c:203 - #, c-format - msgid "Command UIDL is not supported by server." --msgstr "El servidor no suporta l'ordre «UIDL»." -+msgstr "El servidor no suporta l'ordre «UIDL»." - - #: pop.c:247 pop.c:562 - #, c-format - msgid "%s is an invalid POP path" --msgstr "«%s» no és un camí POP vàlid." -+msgstr "«%s» no és un camí POP vàlid." - - #: pop.c:278 - msgid "Fetching list of messages..." --msgstr "S'està recollint la llista de missatges..." -+msgstr "S'està recollint la llista de missatges..." - - #: pop.c:415 - msgid "Can't write message to temporary file!" -@@ -3702,7 +3697,7 @@ msgstr "No s'ha pogut escriure el missat - - #: pop.c:517 pop.c:582 - msgid "Checking for new messages..." --msgstr "S'està comprovant si hi ha missatges nous..." -+msgstr "S'està comprovant si hi ha missatges nous..." - - #: pop.c:546 - msgid "POP host is not defined." -@@ -3710,10 +3705,10 @@ msgstr "No s'ha definit el servidor POP - - #: pop.c:610 - msgid "No new mail in POP mailbox." --msgstr "No hi ha correu nou en la bústia POP." -+msgstr "No hi ha correu nou en la bústia POP." - - # ivb (2001/11/30) --# ivb Use «eliminar» pq en portar els missatges s'eliminen completament -+# ivb Use «eliminar» pq en portar els missatges s'eliminen completament - # ivb del servidor POP. - #: pop.c:617 - msgid "Delete messages from server?" -@@ -3726,7 +3721,7 @@ msgstr "S'estan llegint els missatges no - - #: pop.c:661 - msgid "Error while writing mailbox!" --msgstr "Error en escriure en la bústia!" -+msgstr "Error en escriure en la bústia!" - - #: pop.c:665 - #, c-format -@@ -3735,24 +3730,24 @@ msgstr "%s [llegits %d de %d missatges]" - - #: pop.c:688 pop_lib.c:364 - msgid "Server closed connection!" --msgstr "El servidor ha tancat la connexió!" -+msgstr "El servidor ha tancat la connexió!" - - #: pop_auth.c:93 - msgid "Authenticating (SASL)..." --msgstr "S'està autenticant (SASL)..." -+msgstr "S'està autenticant (SASL)..." - - #: pop_auth.c:209 - msgid "Authenticating (APOP)..." --msgstr "S'està autenticant (APOP)..." -+msgstr "S'està autenticant (APOP)..." - - #: pop_auth.c:233 - msgid "APOP authentication failed." --msgstr "L'autenticació APOP ha fallat." -+msgstr "L'autenticació APOP ha fallat." - - #: pop_auth.c:268 - #, c-format - msgid "Command USER is not supported by server." --msgstr "El servidor no suporta l'ordre «USER»." -+msgstr "El servidor no suporta l'ordre «USER»." - - #: pop_lib.c:199 - msgid "Unable to leave messages on server." -@@ -3765,18 +3760,18 @@ msgstr "Error en connectar amb el servid - - #: pop_lib.c:378 - msgid "Closing connection to POP server..." --msgstr "S'està tancant la connexió amb el servidor POP..." -+msgstr "S'està tancant la connexió amb el servidor POP..." - - #: pop_lib.c:544 - msgid "Verifying message indexes..." --msgstr "S'estan verificant els índexs dels missatges..." -+msgstr "S'estan verificant els índexs dels missatges..." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb S'ha perdut la connexió. Voleu reconnectar amb el servidor POP? -+# ivb S'ha perdut la connexió. Voleu reconnectar amb el servidor POP? - #: pop_lib.c:568 - msgid "Connection lost. Reconnect to POP server?" --msgstr "S'ha perdut la connexió. Reconnectar amb el servidor POP?" -+msgstr "S'ha perdut la connexió. Reconnectar amb el servidor POP?" - - #: postpone.c:167 - msgid "Postponed Messages" -@@ -3788,15 +3783,15 @@ msgstr "No hi ha cap missatge posposat." - - #: postpone.c:442 postpone.c:463 postpone.c:497 - msgid "Illegal PGP header" --msgstr "La capçalera PGP no és permesa." -+msgstr "La capçalera PGP no és permesa." - - #: postpone.c:483 - msgid "Illegal S/MIME header" --msgstr "La capçalera S/MIME no és permesa." -+msgstr "La capçalera S/MIME no és permesa." - - #: postpone.c:556 - msgid "Decrypting message..." --msgstr "S'està desxifrant el missatge..." -+msgstr "S'està desxifrant el missatge..." - - #: postpone.c:565 - msgid "Decryption failed." -@@ -3808,7 +3803,7 @@ msgstr "Nova consulta" - - #: query.c:51 - msgid "Make Alias" --msgstr "Crea àlies" -+msgstr "Crea àlies" - - #: query.c:52 - msgid "Search" -@@ -3816,7 +3811,7 @@ msgstr "Cerca" - - #: query.c:99 - msgid "Waiting for response..." --msgstr "S'està esperant una resposta..." -+msgstr "S'està esperant una resposta..." - - #: query.c:235 query.c:263 - msgid "Query command not defined." -@@ -3835,7 +3830,7 @@ msgstr "Consulta: " - #: query.c:311 query.c:337 - #, c-format - msgid "Query '%s'" --msgstr "Consulta de «%s»" -+msgstr "Consulta de «%s»" - - #: recvattach.c:56 - msgid "Pipe" -@@ -3847,7 +3842,7 @@ msgstr "Imprimeix" - - #: recvattach.c:435 - msgid "Saving..." --msgstr "S'està desant..." -+msgstr "S'està desant..." - - #: recvattach.c:438 recvattach.c:527 - msgid "Attachment saved." -@@ -3855,11 +3850,11 @@ msgstr "S'ha desat el fitxer adjunt." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb AVÍS! Esteu a punt de sobreescriure «%s»; voleu continuar? -+# ivb AVÍS! Esteu a punt de sobreescriure «%s»; voleu continuar? - #: recvattach.c:539 - #, c-format - msgid "WARNING! You are about to overwrite %s, continue?" --msgstr "AVÍS! Aneu a sobreescriure «%s»; voleu continuar?" -+msgstr "AVÍS! Aneu a sobreescriure «%s»; voleu continuar?" - - #: recvattach.c:557 - msgid "Attachment filtered." -@@ -3876,7 +3871,7 @@ msgstr "Redirigeix a: " - #: recvattach.c:659 - #, c-format - msgid "I dont know how to print %s attachments!" --msgstr "No sé com imprimir els fitxers adjunts de tipus «%s»!" -+msgstr "No sé com imprimir els fitxers adjunts de tipus «%s»!" - - #: recvattach.c:724 - msgid "Print tagged attachment(s)?" -@@ -3909,11 +3904,11 @@ msgstr "No es poden esborrar els fitxers - #: recvattach.c:1094 recvattach.c:1111 - msgid "Only deletion of multipart attachments is supported." - msgstr "" --"Només es poden esborrar els fitxers adjunts dels missatges «multipart»." -+"Només es poden esborrar els fitxers adjunts dels missatges «multipart»." - - #: recvcmd.c:47 - msgid "You may only bounce message/rfc822 parts." --msgstr "Només es poden redirigir parts de tipus «message/rfc822»." -+msgstr "Només es poden redirigir parts de tipus «message/rfc822»." - - #: recvcmd.c:217 - msgid "Error bouncing message!" -@@ -3926,7 +3921,7 @@ msgstr "Error en redirigir els missatges - #: recvcmd.c:417 - #, c-format - msgid "Can't open temporary file %s." --msgstr "No s'ha pogut obrir el fitxer temporal «%s»." -+msgstr "No s'ha pogut obrir el fitxer temporal «%s»." - - #: recvcmd.c:448 - msgid "Forward as attachments?" -@@ -3946,7 +3941,7 @@ msgstr "Voleu reenviar amb encapsulament - #: recvcmd.c:595 recvcmd.c:845 - #, c-format - msgid "Can't create %s." --msgstr "No s'ha pogut crear «%s»." -+msgstr "No s'ha pogut crear «%s»." - - #: recvcmd.c:728 - msgid "Can't find any tagged messages." -@@ -3980,19 +3975,19 @@ msgid "OK" - msgstr "Accepta" - - # ivb (2001/12/07) --# ivb En aquest cas «mixmaster» és un programa. -+# ivb En aquest cas «mixmaster» és un programa. - #: remailer.c:516 - msgid "Can't get mixmaster's type2.list!" --msgstr "No s'ha pogut obtenir «type2.list» de «mixmaster»!" -+msgstr "No s'ha pogut obtenir «type2.list» de «mixmaster»!" - - #: remailer.c:542 - msgid "Select a remailer chain." --msgstr "Seleccioneu una cadena de redistribuïdors." -+msgstr "Seleccioneu una cadena de redistribuïdors." - - #: remailer.c:602 - #, c-format - msgid "Error: %s can't be used as the final remailer of a chain." --msgstr "Error: No es pot usar «%s» com a redistribuïdor final d'una cadena." -+msgstr "Error: No es pot usar «%s» com a redistribuïdor final d'una cadena." - - #: remailer.c:632 - #, c-format -@@ -4001,7 +3996,7 @@ msgstr "Les cadenes de Mixmaster estan l - - #: remailer.c:655 - msgid "The remailer chain is already empty." --msgstr "La cadena de redistribuïdors ja és buida." -+msgstr "La cadena de redistribuïdors ja és buida." - - #: remailer.c:665 - msgid "You already have the first chain element selected." -@@ -4009,22 +4004,22 @@ msgstr "Vos trobeu en el primer element - - #: remailer.c:675 - msgid "You already have the last chain element selected." --msgstr "Vos trobeu en l'últim element de la cadena." -+msgstr "Vos trobeu en l'últim element de la cadena." - - #: remailer.c:714 - msgid "Mixmaster doesn't accept Cc or Bcc headers." --msgstr "No es poden usar les capçaleres «Cc» i «Bcc» amb Mixmaster." -+msgstr "No es poden usar les capçaleres «Cc» i «Bcc» amb Mixmaster." - - #: remailer.c:738 - msgid "" - "Please set the hostname variable to a proper value when using mixmaster!" - msgstr "" --"Per favor, establiu un valor adequat per «hostname» quan useu Mixmaster!" -+"Per favor, establiu un valor adequat per «hostname» quan useu Mixmaster!" - - #: remailer.c:772 - #, c-format - msgid "Error sending message, child exited %d.\n" --msgstr "Error en enviar el missatge, el procés fill ha eixit amb codi %d.\n" -+msgstr "Error en enviar el missatge, el procés fill ha eixit amb codi %d.\n" - - #: remailer.c:776 - msgid "Error sending message." -@@ -4032,20 +4027,20 @@ msgstr "Error en enviar el missatge." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb L'entrada del tipus «%s» en «%s», línia %d, no té un format vàlid. -+# ivb L'entrada del tipus «%s» en «%s», línia %d, no té un format vàlid. - #: rfc1524.c:163 - #, c-format - msgid "Improperly formated entry for type %s in \"%s\" line %d" --msgstr "Entrada de tipus «%s» en «%s», línia %d: format no vàlid." -+msgstr "Entrada de tipus «%s» en «%s», línia %d: format no vàlid." - - #: rfc1524.c:395 - msgid "No mailcap path specified" --msgstr "No s'ha indicat cap camí a «mailcap»." -+msgstr "No s'ha indicat cap camí a «mailcap»." - - #: rfc1524.c:423 - #, c-format - msgid "mailcap entry for type %s not found" --msgstr "No s'ha trobat cap entrada pel tipus «%s» en «mailcap»" -+msgstr "No s'ha trobat cap entrada pel tipus «%s» en «mailcap»" - - #: score.c:75 - msgid "score: too few arguments" -@@ -4064,7 +4059,7 @@ msgid "No subject, aborting." - msgstr "S'avorta el missatge sense assumpte." - - # ivb (2001/12/07) --# ivb El primer «%s» és una adreça de correu i el segon potser «,...». -+# ivb El primer «%s» és una adreça de correu i el segon potser «,...». - #. There are quite a few mailing lists which set the Reply-To: - #. * header field to the list address, which makes it quite impossible - #. * to send a message to only the sender of the message. This -@@ -4076,7 +4071,7 @@ msgid "Reply to %s%s?" - msgstr "Voleu escriure una resposta a %s%s?" - - # ivb (2001/12/07) --# ivb El primer «%s» és una adreça de correu i el segon potser «,...». -+# ivb El primer «%s» és una adreça de correu i el segon potser «,...». - #: send.c:522 - #, c-format - msgid "Follow-up to %s%s?" -@@ -4087,7 +4082,7 @@ msgstr "Voleu escriure un seguiment a %s - #. - #: send.c:690 - msgid "No tagged messages are visible!" --msgstr "Cap dels missatges marcats és visible!" -+msgstr "Cap dels missatges marcats és visible!" - - #: send.c:741 - msgid "Include message in reply?" -@@ -4095,11 +4090,11 @@ msgstr "Voleu incloure el missatge en la - - #: send.c:746 - msgid "Including quoted message..." --msgstr "S'està incloent el missatge citat..." -+msgstr "S'està incloent el missatge citat..." - - #: send.c:756 - msgid "Could not include all requested messages!" --msgstr "No s'han pogut incloure tots els missatges sol·licitats!" -+msgstr "No s'han pogut incloure tots els missatges soŀlicitats!" - - #: send.c:770 - msgid "Forward as attachment?" -@@ -4107,7 +4102,7 @@ msgstr "Voleu reenviar com a fitxer adju - - #: send.c:774 - msgid "Preparing forwarded message..." --msgstr "S'està preparant el missatge a reenviar..." -+msgstr "S'està preparant el missatge a reenviar..." - - #. If the user is composing a new message, check to see if there - #. * are any postponed messages first. -@@ -4150,7 +4145,7 @@ msgstr "No s'ha indicat l'assumpte." - - #: send.c:1561 - msgid "Sending message..." --msgstr "S'està enviant el missatge..." -+msgstr "S'està enviant el missatge..." - - #: send.c:1702 - msgid "Could not send the message." -@@ -4162,43 +4157,43 @@ msgstr "S'ha enviat el missatge." - - #: send.c:1707 - msgid "Sending in background." --msgstr "S'està enviant en segon pla." -+msgstr "S'està enviant en segon pla." - - #: sendlib.c:468 - msgid "No boundary parameter found! [report this error]" --msgstr "No s'ha trobat el paràmetre «boundary»! (informeu d'aquest error)" -+msgstr "No s'ha trobat el paràmetre «boundary»! (informeu d'aquest error)" - - #: sendlib.c:498 - #, c-format - msgid "%s no longer exists!" --msgstr "«%s» ja no existeix!" -+msgstr "«%s» ja no existeix!" - - #: sendlib.c:920 - #, c-format - msgid "%s isn't a regular file." --msgstr "«%s» no és un fitxer ordinari." -+msgstr "«%s» no és un fitxer ordinari." - - #: sendlib.c:1089 - #, c-format - msgid "Could not open %s" --msgstr "No s'ha pogut obrir «%s»." -+msgstr "No s'ha pogut obrir «%s»." - - # ivb (2001/12/08) - # ivb ABREUJAT! --# ivb Error en enviar el missatge, el procés fill ha exit amb codi %d (%s). -+# ivb Error en enviar el missatge, el procés fill ha exit amb codi %d (%s). - #: sendlib.c:2057 - #, c-format - msgid "Error sending message, child exited %d (%s)." --msgstr "Error en enviament, el fill isqué amb codi %d (%s)." -+msgstr "Error en enviament, el fill isqué amb codi %d (%s)." - - #: sendlib.c:2063 - msgid "Output of the delivery process" --msgstr "Eixida del procés de repartiment" -+msgstr "Eixida del procés de repartiment" - - #: sendlib.c:2267 - #, c-format - msgid "Bad IDN %s while preparing resent-from." --msgstr "L'IDN «%s» no és vàlid, en preparar «Resent-From»." -+msgstr "L'IDN «%s» no és vàlid, en preparar «Resent-From»." - - #: signal.c:43 - #, c-format -@@ -4208,7 +4203,7 @@ msgstr "%s... Eixint.\n" - #: signal.c:46 signal.c:49 - #, c-format - msgid "Caught %s... Exiting.\n" --msgstr "S'ha rebut «%s»... Eixint.\n" -+msgstr "S'ha rebut «%s»... Eixint.\n" - - #: signal.c:51 - #, c-format -@@ -4219,8 +4214,8 @@ msgstr "S'ha rebut el senyal %d... Eixin - msgid "Enter SMIME passphrase:" - msgstr "Entreu la frase clau d'S/MIME:" - --# Es refereixen a un certificat -> masculí, singular. ivb --# La longitud crec que no és fonamental, si totes són iguals. ivb -+# Es refereixen a un certificat -> masculí, singular. ivb -+# La longitud crec que no és fonamental, si totes són iguals. ivb - #: smime.c:321 - msgid "Trusted " - msgstr "Confiat " -@@ -4243,7 +4238,7 @@ msgstr "Revocat " - - #: smime.c:336 - msgid "Invalid " --msgstr "No vàlid " -+msgstr "No vàlid " - - #: smime.c:339 - msgid "Unknown " -@@ -4256,36 +4251,36 @@ msgstr "Entreu l'ID de clau: " - #: smime.c:391 - #, c-format - msgid "S/MIME certificates matching \"%s\"." --msgstr "Certificats S/MIME que concorden amb «%s»." -+msgstr "Certificats S/MIME que concorden amb «%s»." - - #: smime.c:541 smime.c:611 smime.c:629 - #, c-format - msgid "ID %s is unverified. Do you want to use it for %s ?" --msgstr "L'ID «%s» no ha estat verificat. Voleu usar-lo per %s?" -+msgstr "L'ID «%s» no ha estat verificat. Voleu usar-lo per %s?" - - #: smime.c:545 smime.c:615 - #, c-format - msgid "Use (untrusted!) ID %s for %s ?" --msgstr "Voleu usar l'ID (no verificat!) «%s» per %s?" -+msgstr "Voleu usar l'ID (no verificat!) «%s» per %s?" - - #: smime.c:548 smime.c:618 - #, c-format - msgid "Use ID %s for %s ?" --msgstr "Voleu usar l'ID «%s» per %s?" -+msgstr "Voleu usar l'ID «%s» per %s?" - - #: smime.c:637 - #, c-format - msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" --msgstr "Avís: Encara no heu decidit confiar en l'ID «%s». (Premeu una tecla.)" -+msgstr "Avís: Encara no heu decidit confiar en l'ID «%s». (Premeu una tecla.)" - - #: smime.c:796 - #, c-format - msgid "No (valid) certificate found for %s." --msgstr "No s'ha trobat cap certificat (vàlid) per %s." -+msgstr "No s'ha trobat cap certificat (vàlid) per %s." - - #: smime.c:851 smime.c:879 smime.c:944 smime.c:988 smime.c:1053 smime.c:1128 - msgid "Error: unable to create OpenSSL subprocess!" --msgstr "Error: No s'ha pogut crear el subprocés OpenSSL!" -+msgstr "Error: No s'ha pogut crear el subprocés OpenSSL!" - - # Hau! ivb - #: smime.c:1206 -@@ -4295,7 +4290,7 @@ msgstr "No hi ha fitxer de certificat." - # Hau! ivb - #: smime.c:1209 - msgid "no mbox" --msgstr "No hi ha bústia." -+msgstr "No hi ha bústia." - - #. fatal error while trying to encrypt message - #: smime.c:1352 -@@ -4304,11 +4299,11 @@ msgstr "OpenSSL no ha produit cap eixida - - #: smime.c:1390 - msgid "Warning: Intermediate certificate not found." --msgstr "Avís: No s'ha trobat el certificat intermig." -+msgstr "Avís: No s'ha trobat el certificat intermig." - - #: smime.c:1433 - msgid "Can't open OpenSSL subprocess!" --msgstr "No s'ha pogut obrir el subprocés OpenSSL!" -+msgstr "No s'ha pogut obrir el subprocés OpenSSL!" - - #: smime.c:1471 - msgid "No output from OpenSSL..." -@@ -4324,15 +4319,15 @@ msgstr "" - - #: smime.c:1719 smime.c:1729 - msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" --msgstr "[-- Error: No s'ha pogut crear el subprocés OpenSSL! --]\n" -+msgstr "[-- Error: No s'ha pogut crear el subprocés OpenSSL! --]\n" - - #: smime.c:1762 - msgid "[-- The following data is S/MIME encrypted --]\n" --msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n" -+msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n" - - #: smime.c:1765 - msgid "[-- The following data is S/MIME signed --]\n" --msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n" -+msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n" - - #: smime.c:1829 - msgid "" -@@ -4354,11 +4349,11 @@ msgstr "" - msgid "" - "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " - msgstr "" --"S/MIME: (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar? " -+"S/MIME: (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar? " - - # ivb (2003/03/26) --# ivb (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar --# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb -+# ivb (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar -+# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb - #: smime.c:1936 - msgid "eswabfc" - msgstr "xsfgac" -@@ -4377,27 +4372,24 @@ msgstr "12345d" - # Encara no s'ha signat. ivb - #: smime.c:1971 - msgid "Can't sign: No key specified. Use Sign As." --msgstr "No es pot signar: no s'ha indicat cap clau. Useu «signa com a»." -+msgstr "No es pot signar: no s'ha indicat cap clau. Useu «signa com a»." - - #: sort.c:259 - msgid "Sorting mailbox..." --msgstr "S'està ordenant la bústia." -+msgstr "S'està ordenant la bústia." - - #: sort.c:296 - msgid "Could not find sorting function! [report this bug]" --msgstr "No s'ha pogut trobar la funció d'ordenació! (informeu d'aquest error)" -+msgstr "No s'ha pogut trobar la funció d'ordenació! (informeu d'aquest error)" - - #: status.c:106 - msgid "(no mailbox)" --msgstr "(cap bústia)" -+msgstr "(cap bústia)" - - #: thread.c:1089 - msgid "Parent message is not visible in this limited view." --msgstr "El missatge pare no és visible en aquesta vista limitada." -+msgstr "El missatge pare no és visible en aquesta vista limitada." - - #: thread.c:1095 - msgid "Parent message is not available." - msgstr "El missatge pare no es troba disponible." -- --#~ msgid "unspecified protocol error" --#~ msgstr "Error no especificat del protocol." -Index: po/de.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/de.po,v -retrieving revision 3.20 -retrieving revision 3.21 -diff -u -p -r3.20 -r3.21 ---- a/po/de.po 12 Feb 2005 20:56:31 -0000 3.20 -+++ b/po/de.po 13 Feb 2005 17:37:31 -0000 3.21 -@@ -1,9 +1,9 @@ - msgid "" - msgstr "" --"Project-Id-Version: 1.5.6 CVS 2004-08-17\n" -+"Project-Id-Version: 1.5.8\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2004-08-17 12:49+0200\n" -+"PO-Revision-Date: 2005-02-13 18:28+0100\n" - "Last-Translator: Roland Rosenfeld \n" - "Language-Team: German \n" - "MIME-Version: 1.0\n" -@@ -1499,9 +1499,9 @@ msgid "Could not create temporary file % - msgstr "Konnte Temporärdatei %s nicht erzeugen" - - #: imap/message.c:134 --#, fuzzy, c-format -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "Hole Nachrichten-Köpfe... [%d/%d]" -+msgstr "Werte Cache aus... [%d/%d]" - - #: imap/message.c:202 pop.c:210 - #, c-format -@@ -2582,7 +2582,6 @@ msgstr "" - "02111, USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2618,14 +2617,10 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " --"[...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " --"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" -+"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n" -+" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" - "\n" -@@ -2637,7 +2632,7 @@ msgstr "" - " -e \tMutt-Kommando, nach der Initialisierung ausführen\n" - " -f \tMailbox, die eingelesen werden soll\n" - " -F \tAlternatives muttrc File.\n" --" -H \tFile, aus dem der Header der Mail gelesen werdenn soll\n" -+" -H \tFile, aus dem Header und Body der Mail gelesen werden sollen\n" - " -i \tFile, das in den Body der Message eingebunden werden soll\n" - " -m \tDefault-Mailbox Typ\n" - " -n\t\tDas Muttrc des Systems ignorieren\n" -Index: po/el.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/el.po,v -retrieving revision 3.15 -retrieving revision 3.16 -diff -u -p -r3.15 -r3.16 ---- a/po/el.po 12 Feb 2005 20:56:31 -0000 3.15 -+++ b/po/el.po 16 Feb 2005 09:34:06 -0000 3.16 -@@ -10,10 +10,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: Mutt-1.5.2i\n" -+"Project-Id-Version: Mutt-1.5.7i\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2002-12-09 00:01GMT+2\n" -+"POT-Creation-Date: 2005-01-28 11:04+0100\n" -+"PO-Revision-Date: 2005-02-01 00:01GMT+2\n" - "Last-Translator: Dokianakis Fanis \n" - "Language-Team: Greek \n" - "MIME-Version: 1.0\n" -@@ -21,902 +21,897 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - - # --#: account.c:148 -+#: account.c:144 - #, c-format - msgid "Username at %s: " - msgstr "¼íïìá ÷ñÞóôç óôï %s: " - - # --#: account.c:176 -+#: account.c:172 - #, c-format - msgid "Password for %s@%s: " - msgstr "Óõíèçìáôéêü ãéá ôï %s@%s: " - - # --#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48 --#: recvattach.c:54 -+#: addrbook.c:33 browser.c:40 pager.c:1445 postpone.c:39 query.c:44 -+#: recvattach.c:50 - msgid "Exit" - msgstr "¸îïäïò" - - # --#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44 -+#: addrbook.c:34 curs_main.c:398 pager.c:1452 postpone.c:40 - msgid "Del" - msgstr "ÄéáãñáöÞ" - - # --#: addrbook.c:39 curs_main.c:403 postpone.c:45 -+#: addrbook.c:35 curs_main.c:399 postpone.c:41 - msgid "Undel" - msgstr "ÅðáíáöïñÜ" - - # --#: addrbook.c:40 -+#: addrbook.c:36 - msgid "Select" - msgstr "ÅðéëÝîôå" - - # - #. __STRCAT_CHECKED__ --#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634 --#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58 --#: smime.c:436 -+#: addrbook.c:37 browser.c:43 compose.c:92 curs_main.c:404 mutt_ssl.c:633 -+#: pager.c:1544 pgpkey.c:517 postpone.c:42 query.c:49 recvattach.c:54 -+#: smime.c:432 - msgid "Help" - msgstr "ÂïÞèåéá" - - # --#: addrbook.c:145 -+#: addrbook.c:141 - msgid "You have no aliases!" - msgstr "Äåí Ý÷åôå êáíÝíá øåõäþíõìï!" - - # --#: addrbook.c:156 -+#: addrbook.c:152 - msgid "Aliases" - msgstr "Øåõäþíõìá" - - # - #. add a new alias --#: alias.c:246 -+#: alias.c:242 - msgid "Alias as: " - msgstr "Øåõäþíõìï ùò: " - - # --#: alias.c:252 -+#: alias.c:248 - msgid "You already have an alias defined with that name!" - msgstr "¸÷åôå Þäç Ýíá øåõäþíõìï ìå áõôü ôï üíïìá!" - --#: alias.c:258 -+#: alias.c:254 - msgid "Warning: This alias name may not work. Fix it?" --msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áõôü ôï øåõäüíõìï ßóùò íá ìçí äïõëåýåé. Äéüñèùóç;" -+msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áõôü ôï øåõäþíõìï ßóùò íá ìçí äïõëåýåé. Äéüñèùóç;" - - # --#: alias.c:283 -+#: alias.c:279 - msgid "Address: " - msgstr "Äéåýèõíóç: " - --#: alias.c:293 send.c:206 -+#: alias.c:289 send.c:202 - #, c-format - msgid "Error: '%s' is a bad IDN." --msgstr "" -+msgstr "ÓöÜëìá: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN." - - # --#: alias.c:305 -+#: alias.c:301 - msgid "Personal name: " - msgstr "Ðñïóùðéêü ¼íïìá: " - - # --#: alias.c:314 -+#: alias.c:310 - #, c-format - msgid "[%s = %s] Accept?" - msgstr "[%s = %s] ÄÝ÷åóôå;" - - # --#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430 --#: recvattach.c:443 recvattach.c:471 -+#: alias.c:327 recvattach.c:390 recvattach.c:413 recvattach.c:426 -+#: recvattach.c:439 recvattach.c:467 - msgid "Save to file: " - msgstr "ÁðïèÞêåõóç óôï áñ÷åßï: " - - # --#: alias.c:346 -+#: alias.c:342 - msgid "Alias added." - msgstr "Ôï øåõäþíõìï ðñïóôÝèçêå." - - # --#: attach.c:112 attach.c:244 attach.c:472 attach.c:963 -+#: attach.c:108 attach.c:240 attach.c:468 attach.c:959 - msgid "Can't match nametemplate, continue?" - msgstr "Áäõíáìßá ôáéñéÜóìáôïò ôïõ nametemplate, óõíÝ÷åéá;" - - # - #. For now, editing requires a file, no piping --#: attach.c:125 -+#: attach.c:121 - #, c-format - msgid "Mailcap compose entry requires %%s" - msgstr "Ç êáôá÷þñçóç óôïé÷åßùí ôïõ mailcap ÷ñåéÜæåôáé ôï %%s" - - # --#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181 --#: curs_lib.c:428 -+#: attach.c:129 attach.c:259 commands.c:216 compose.c:1174 curs_lib.c:177 -+#: curs_lib.c:424 - #, c-format - msgid "Error running \"%s\"!" - msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôïõ \"%s\"!" - - # --#: attach.c:143 -+#: attach.c:139 - msgid "Failure to open file to parse headers." - msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áíÜëõóç ôùí åðéêåöáëßäùí." - - # --#: attach.c:174 -+#: attach.c:170 - msgid "Failure to open file to strip headers." - msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áðïãýìíùóç ôùí åðéêåöáëßäùí" - - # --#: attach.c:183 --#, fuzzy -+#: attach.c:179 - msgid "Failure to rename file." --msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áíÜëõóç ôùí åðéêåöáëßäùí." -+msgstr "Áðïôõ÷ßá ìåôïíïìáóßáò áñ÷åßïõ." - - # --#: attach.c:196 -+#: attach.c:192 - #, c-format - msgid "No mailcap compose entry for %s, creating empty file." - msgstr "Êáììßá êáôá÷þñçóç mailcap ãéá ôï %s, äçìéïõñãßá êåíïý áñ÷åßïõ." - - # - #. For now, editing requires a file, no piping --#: attach.c:257 -+#: attach.c:253 - #, c-format - msgid "Mailcap Edit entry requires %%s" - msgstr "Ç êáôá÷þñçóç mailcap Edit ÷ñåéÜæåôáé ôï %%s" - - # --#: attach.c:275 -+#: attach.c:271 - #, c-format - msgid "No mailcap edit entry for %s" - msgstr "Äåí õðÜñ÷åé êáôá÷þñçóç mailcap ãéá åðåîåñãáóßá êåéìÝíïõ ãéá ôï %s" - - # --#: attach.c:438 -+#: attach.c:434 - msgid "No matching mailcap entry found. Viewing as text." - msgstr "Äåí âñÝèçêå üìïéá êáôá÷þñçóç Mailcap. Áðåéêüíéóç ùò êåßìåíï." - - # --#: attach.c:451 -+#: attach.c:447 - msgid "MIME type not defined. Cannot view attachment." - msgstr "Ï ôýðïò MIME äåí Ý÷åé ïñéóôåß. Áäõíáìßá åìöÜíéóçò ðñïóáñôÞóåùò." - - # --#: attach.c:541 -+#: attach.c:537 - msgid "Cannot create filter" - msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ" - - # --#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563 --#: pgpkey.c:570 pgpkey.c:759 -+#: attach.c:667 attach.c:699 attach.c:992 attach.c:1050 handler.c:1559 -+#: pgpkey.c:566 pgpkey.c:755 - msgid "Can't create filter" - msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ" - - # --#: attach.c:835 -+#: attach.c:831 - msgid "Write fault!" - msgstr "ÓöÜëìá åããñáöÞò!" - - # --#: attach.c:1077 -+#: attach.c:1073 - msgid "I don't know how to print that!" - msgstr "Äåí ãíùñßæù ðþò íá ôï ôõðþóù áõôü!" - - # --#: browser.c:45 -+#: browser.c:41 - msgid "Chdir" - msgstr "ÁëëáãÞ êáôáëüãïõ" - - # --#: browser.c:46 -+#: browser.c:42 - msgid "Mask" - msgstr "ÌÜóêá" - - # --#: browser.c:381 browser.c:968 -+#: browser.c:377 browser.c:964 - #, c-format - msgid "%s is not a directory." - msgstr "Ôï %s äåí åßíáé êáôÜëïãïò." - - # --#: browser.c:501 -+#: browser.c:497 - #, c-format - msgid "Mailboxes [%d]" - msgstr "Ãñáììáôïêéâþôéá [%d]" - - # --#: browser.c:508 -+#: browser.c:504 - #, c-format - msgid "Subscribed [%s], File mask: %s" - msgstr "ÅããåãñáììÝíá [%s], ÌÜóêá áñ÷åßïõ: %s" - - # --#: browser.c:512 -+#: browser.c:508 - #, c-format - msgid "Directory [%s], File mask: %s" - msgstr "ÊáôÜëïãïò [%s], ÌÜóêá áñ÷åßïõ: %s" - - # --#: browser.c:524 -+#: browser.c:520 - msgid "Can't attach a directory!" - msgstr "Áäõíáìßá ðñïóÜñôçóçò åíüò êáôÜëïãïõ" - - # --#: browser.c:655 browser.c:1035 browser.c:1132 -+#: browser.c:651 browser.c:1031 browser.c:1128 - msgid "No files match the file mask" - msgstr "ÊáíÝíá áñ÷åßï äåí ôáéñéÜæåé ìå ôç ìÜóêá áñ÷åßïõ" - - # - # recvattach.c:1065 --#: browser.c:860 -+#: browser.c:856 - msgid "Create is only supported for IMAP mailboxes" - msgstr "Ç äçìéïõñãßá õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP" - - # - # recvattach.c:1065 --#: browser.c:880 -+#: browser.c:876 - msgid "Delete is only supported for IMAP mailboxes" - msgstr "Ç äéáãñáöÞ õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP" - --#: browser.c:888 -+#: browser.c:884 - #, c-format - msgid "Really delete mailbox \"%s\"?" - msgstr "ÄéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ \"%s\";" - - # --#: browser.c:902 -+#: browser.c:898 - msgid "Mailbox deleted." - msgstr "Ôï ãñáììáôïêéâþôéï äéáãñÜöçêå." - - # --#: browser.c:908 -+#: browser.c:904 - msgid "Mailbox not deleted." - msgstr "Ôï ãñáììáôïêéâþôéï äåí äéáãñÜöçêå." - - # --#: browser.c:927 -+#: browser.c:923 - msgid "Chdir to: " - msgstr "ÁëëáãÞ êáôáëüãïõ óå:" - - # --#: browser.c:956 browser.c:1028 -+#: browser.c:952 browser.c:1024 - msgid "Error scanning directory." - msgstr "ÓöÜëìá êáôÜ ôç äéåñåýíçóç ôïõ êáôáëüãïõ." - - # --#: browser.c:979 -+#: browser.c:975 - msgid "File Mask: " - msgstr "ÌÜóêá áñ÷åßïõ: " - - # --#: browser.c:1051 -+#: browser.c:1047 - msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " - msgstr "" - "ÁíÜóôñïöç ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)" - "Üêõñï;" - - # --#: browser.c:1052 -+#: browser.c:1048 - msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " - msgstr "Ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)Üêõñï;" - - # --#: browser.c:1053 -+#: browser.c:1049 - msgid "dazn" - msgstr "dazn" - - # --#: browser.c:1119 -+#: browser.c:1115 - msgid "New file name: " - msgstr "ÍÝï üíïìá áñ÷åßïõ: " - - # --#: browser.c:1150 -+#: browser.c:1146 - msgid "Can't view a directory" - msgstr "Áäõíáìßá áíÜãíùóçò åíüò êáôÜëïãïõ" - - # --#: browser.c:1167 -+#: browser.c:1163 - msgid "Error trying to view file" - msgstr "ÓöÜëìá êáôÜ ôçí åìöÜíéóç áñ÷åßïõ" - - # --#: buffy.c:446 -+#: buffy.c:442 - msgid "New mail in " - msgstr "ÍÝá áëëçëïãñáößá óôï " - - # --#: color.c:326 -+#: color.c:322 - #, c-format - msgid "%s: color not supported by term" - msgstr "%s: ôï ôåñìáôéêü äåí õðïóôçñßæåé ÷ñþìá" - - # --#: color.c:332 -+#: color.c:328 - #, c-format - msgid "%s: no such color" - msgstr "%s: äåí õðÜñ÷åé ôÝôïéï ÷ñþìá" - - # --#: color.c:378 color.c:579 color.c:590 -+#: color.c:374 color.c:575 color.c:586 - #, c-format - msgid "%s: no such object" - msgstr "%s: äåí õðÜñ÷åé ôÝôïéï áíôéêåßìåíï" - - # --#: color.c:385 -+#: color.c:381 - #, c-format - msgid "%s: command valid only for index object" - msgstr "%s: ç åíôïëÞ éó÷ýåé ìüíï ãéá ôï ÷áñáêôçñéóôéêü áíôéêåßìåíï" - - # --#: color.c:393 -+#: color.c:389 - #, c-format - msgid "%s: too few arguments" - msgstr "%s: ðïëý ëßãá ïñßóìáôá" - - # --#: color.c:567 -+#: color.c:563 - msgid "Missing arguments." - msgstr "ÅëëéðÞ ïñßóìáôá." - - # --#: color.c:606 color.c:617 -+#: color.c:602 color.c:613 - msgid "color: too few arguments" - msgstr "÷ñþìá: ðïëý ëßãá ïñßóìáôá" - - # --#: color.c:640 -+#: color.c:636 - msgid "mono: too few arguments" - msgstr "ìïíü÷ñùìá: ëßãá ïñßóìáôá" - - # --#: color.c:660 -+#: color.c:656 - #, c-format - msgid "%s: no such attribute" - msgstr "%s: äåí õðÜñ÷åé ôÝôïéá éäéüôçôá" - - # --#: color.c:700 hook.c:69 hook.c:77 keymap.c:748 -+#: color.c:696 hook.c:65 hook.c:73 keymap.c:744 - msgid "too few arguments" - msgstr "ðïëý ëßãá ïñßóìáôá" - - # --#: color.c:709 hook.c:83 -+#: color.c:705 hook.c:79 - msgid "too many arguments" - msgstr "ðÜñá ðïëëÜ ïñßóìáôá" - - # --#: color.c:725 -+#: color.c:721 - msgid "default colors not supported" - msgstr "äåí õðïóôçñßæïíôáé ôá åî'ïñéóìïý ÷ñþìáôá" - - # - # commands.c:92 - #. find out whether or not the verify signature --#: commands.c:92 -+#: commands.c:88 - msgid "Verify PGP signature?" - msgstr "Åðéâåâáßùóç ôçò PGP øçöéáêÞò õðïãñáöÞò;" - - # --#: commands.c:117 mbox.c:737 -+#: commands.c:113 mbox.c:733 - msgid "Could not create temporary file!" - msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ!" - - # --#: commands.c:130 -+#: commands.c:126 - msgid "Cannot create display filter" - msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ áðåéêüíéóçò" - - # --#: commands.c:150 -+#: commands.c:146 - msgid "Could not copy message" - msgstr "Áäõíáìßá áíôéãñáöÞò ôïõ ìçíýìáôïò." - --#: commands.c:186 -+#: commands.c:182 - msgid "S/MIME signature successfully verified." - msgstr "Ç õðïãñáöÞ S/MIME åðáëçèåýôçêå åðéôõ÷þò." - --#: commands.c:188 -+#: commands.c:184 - msgid "S/MIME certificate owner does not match sender." - msgstr "Ï éäéïêôÞôçò ôïõ ðéóôïðïéçôéêïý S/MIME äåí ôáéñéÜæåé ìå ôïí áðïóôïëÝá." - --#: commands.c:191 commands.c:202 -+#: commands.c:187 commands.c:198 - msgid "Warning: Part of this message has not been signed." --msgstr "" -+msgstr "Ðñïåéäïðïßçóç: ÔìÞìá áõôïý ôïõ ìçíýìáôïò äåí åßíáé õðïãåãñáììÝíï." - --#: commands.c:193 -+#: commands.c:189 - msgid "S/MIME signature could NOT be verified." - msgstr "Ç õðïãñáöÞ S/MIME ÄÅÍ åðáëçèåýôçêå." - --#: commands.c:200 -+#: commands.c:196 - msgid "PGP signature successfully verified." - msgstr "Ç õðïãñáöÞ PGP åðáëçèåýôçêå åðéôõ÷þò." - --#: commands.c:204 -+#: commands.c:200 - msgid "PGP signature could NOT be verified." - msgstr "Ç õðïãñáöÞ PGP ÄÅÍ åðáëçèåýôçêå." - - # --#: commands.c:227 -+#: commands.c:223 - msgid "Command: " - msgstr "ÅíôïëÞ: " - - # --#: commands.c:246 recvcmd.c:147 -+#: commands.c:242 recvcmd.c:143 - msgid "Bounce message to: " - msgstr "Äéáâßâáóç ìçíýìáôïò óôïí: " - - # --#: commands.c:248 recvcmd.c:149 -+#: commands.c:244 recvcmd.c:145 - msgid "Bounce tagged messages to: " - msgstr "Äéáâßâáóç óçìåéùìÝíùí ìçíõìÜôùí óôïí: " - - # --#: commands.c:263 recvcmd.c:158 -+#: commands.c:259 recvcmd.c:154 - msgid "Error parsing address!" - msgstr "ÓöÜëìá êáôÜ ôçí áíÜëõóç ôçò äéåýèõíóçò!" - --#: commands.c:271 recvcmd.c:166 -+#: commands.c:267 recvcmd.c:162 - #, c-format - msgid "Bad IDN: '%s'" --msgstr "" -+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN: '%s'" - - # --#: commands.c:282 recvcmd.c:180 -+#: commands.c:278 recvcmd.c:176 - #, c-format - msgid "Bounce message to %s" - msgstr "Äéáâßâáóç ìçíýìáôïò óôïí %s" - - # --#: commands.c:282 recvcmd.c:180 -+#: commands.c:278 recvcmd.c:176 - #, c-format - msgid "Bounce messages to %s" - msgstr "Äéáâßâáóç ìçíõìÜôùí óôïí %s" - - # --#: commands.c:298 recvcmd.c:196 --#, fuzzy -+#: commands.c:294 recvcmd.c:192 - msgid "Message not bounced." --msgstr "Ôï ìÞíõìá äéáâéâÜóôçêå." -+msgstr "Ôï ìÞíõìá äåí äéáâéâÜóôçêå." - - # --#: commands.c:298 recvcmd.c:196 --#, fuzzy -+#: commands.c:294 recvcmd.c:192 - msgid "Messages not bounced." --msgstr "Ôá ìçíýìáôá äéáâéâÜóôçêáí." -+msgstr "Ôá ìçíýìáôá äåí äéáâéâÜóôçêáí." - - # --#: commands.c:308 recvcmd.c:215 -+#: commands.c:304 recvcmd.c:211 - msgid "Message bounced." - msgstr "Ôï ìÞíõìá äéáâéâÜóôçêå." - - # --#: commands.c:308 recvcmd.c:215 -+#: commands.c:304 recvcmd.c:211 - msgid "Messages bounced." - msgstr "Ôá ìçíýìáôá äéáâéâÜóôçêáí." - - # --#: commands.c:385 commands.c:419 commands.c:436 -+#: commands.c:381 commands.c:415 commands.c:432 - msgid "Can't create filter process" - msgstr "Áäõíáìßá äçìéïõñãßáò äéåñãáóßáò ößëôñïõ" - - # --#: commands.c:465 -+#: commands.c:461 - msgid "Pipe to command: " - msgstr "Äéï÷Ýôåõóç óôçí åíôïëÞ: " - - # --#: commands.c:482 -+#: commands.c:478 - msgid "No printing command has been defined." - msgstr "Äåí Ý÷åé ïñéóôåß åíôïëÞ åêôõðþóåùò." - - # --#: commands.c:487 -+#: commands.c:483 - msgid "Print message?" - msgstr "Åêôýðùóç ìçíýìáôïò;" - - # --#: commands.c:487 -+#: commands.c:483 - msgid "Print tagged messages?" - msgstr "Åêôýðùóç ôùí óçìåéùìÝíùí ìçíõìÜôùí;" - - # --#: commands.c:496 -+#: commands.c:492 - msgid "Message printed" - msgstr "Ôï ìÞíõìá åêôõðþèçêå" - - # --#: commands.c:496 -+#: commands.c:492 - msgid "Messages printed" - msgstr "Ôá ìçíýìáôá åêôõðþèçêáí" - - # --#: commands.c:498 -+#: commands.c:494 - msgid "Message could not be printed" - msgstr "Áäõíáìßá åêôýðùóçò ìçíýìáôïò" - - # --#: commands.c:499 -+#: commands.c:495 - msgid "Messages could not be printed" - msgstr "Áäõíáìßá åêôýðùóçò ìçíõìÜôùí" - - # --#: commands.c:508 --#, fuzzy -+#: commands.c:504 - msgid "" - "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s" - "(p)am?: " - msgstr "" --"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: " -+"Áíô-Ôáî (d)çìí/(f)áðü/(r)ëÞø/(s)èÝì/(o)ðñïò/(t)íÞì/(u)Üíåõ/(z)ìåã/(c)âáèì/s" -+"(p)am;: " - - # --#: commands.c:509 --#, fuzzy -+#: commands.c:505 - msgid "" - "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)" - "am?: " - msgstr "" --"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: " -+"Ôáî (d)çìí/(f)áðü/(r)ëÞø/(s)èÝì/(o)ðñïò/(t)íÞì/(u)Üíåõ/(z)ìåã/(c)âáèì/s" -+"(p)am;: " - - # --#: commands.c:510 --#, fuzzy -+#: commands.c:506 - msgid "dfrsotuzcp" --msgstr "dfrsotuzc" -+msgstr "dfrsotuzcp" - - # --#: commands.c:567 -+#: commands.c:563 - msgid "Shell command: " - msgstr "ÅíôïëÞ öëïéïý: " - - # --#: commands.c:709 -+#: commands.c:705 - #, c-format - msgid "Decode-save%s to mailbox" - msgstr "Áðïêùäéêïðïßçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:710 -+#: commands.c:706 - #, c-format - msgid "Decode-copy%s to mailbox" - msgstr "Áðïêùäéêïðïßçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:711 -+#: commands.c:707 - #, c-format - msgid "Decrypt-save%s to mailbox" - msgstr "ÁðïêñõðôïãñÜöçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:712 -+#: commands.c:708 - #, c-format - msgid "Decrypt-copy%s to mailbox" - msgstr "ÁðïêñõðôïãñÜöçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:713 -+#: commands.c:709 - #, c-format - msgid "Save%s to mailbox" - msgstr "ÁðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:713 -+#: commands.c:709 - #, c-format - msgid "Copy%s to mailbox" - msgstr "ÁíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï" - - # --#: commands.c:714 -+#: commands.c:710 - msgid " tagged" - msgstr " óçìåéùìÝíï" - - # --#: commands.c:787 -+#: commands.c:783 - #, c-format - msgid "Copying to %s..." - msgstr "ÁíôéãñáöÞ óôï %s..." - --#: commands.c:909 -+#: commands.c:905 - #, c-format - msgid "Convert to %s upon sending?" - msgstr "ÌåôáôñïðÞ óå %s êáôÜ ôç ìåôáöïñÜ;" - - # --#: commands.c:919 -+#: commands.c:915 - #, c-format - msgid "Content-Type changed to %s." - msgstr "Ôï Content-Type Üëëáîå óå %s." - --#: commands.c:924 -+#: commands.c:920 - #, c-format - msgid "Character set changed to %s; %s." - msgstr "Ôï óåô ÷áñáêôÞñùí Üëëáîå óå %s; %s." - --#: commands.c:926 -+#: commands.c:922 - msgid "not converting" - msgstr "ü÷é ìåôáôñïðÞ" - --#: commands.c:926 -+#: commands.c:922 - msgid "converting" - msgstr "ìåôáôñïðÞ" - - # --#: compose.c:47 -+#: compose.c:43 - msgid "There are no attachments." - msgstr "Äåí õðÜñ÷ïõí ðñïóáñôÞóåéò." - - # --#: compose.c:89 -+#: compose.c:85 - msgid "Send" - msgstr "ÁðïóôïëÞ" - - # --#: compose.c:90 remailer.c:487 -+#: compose.c:86 remailer.c:483 - msgid "Abort" - msgstr "Áêýñùóç" - - # --#: compose.c:94 compose.c:668 -+#: compose.c:90 compose.c:664 - msgid "Attach file" - msgstr "ÐñïóáñôÞóôå áñ÷åßï" - - # --#: compose.c:95 -+#: compose.c:91 - msgid "Descrip" - msgstr "ÐåñéãñáöÞ" - - # - # compose.c:103 --#: compose.c:132 -+#: compose.c:128 - msgid "Sign, Encrypt" - msgstr "ÕðïãñáöÞ, êñõðôïãñÜöçóç" - - # - # compose.c:105 --#: compose.c:134 -+#: compose.c:130 - msgid "Encrypt" - msgstr "ÊñõðôïãñÜöçóç" - - # - # compose.c:107 --#: compose.c:136 -+#: compose.c:132 - msgid "Sign" - msgstr "ÕðïãñáöÞ" - - # --#: compose.c:138 -+#: compose.c:134 - msgid "Clear" - msgstr "ÁðåíåñãïðïéçìÝíï" - - # --#: compose.c:145 --#, fuzzy -+#: compose.c:141 - msgid " (inline)" --msgstr "(óõíå÷ßóôå)\n" -+msgstr "(åóùôåñéêü êåßìåíï)" - --#: compose.c:147 -+#: compose.c:143 - msgid " (PGP/MIME)" --msgstr "" -+msgstr " (PGP/MIME)" - - # --#: compose.c:155 compose.c:159 -+#: compose.c:151 compose.c:155 - msgid " sign as: " - msgstr " õðïãñáöÞ ùò: " - - # - # compose.c:116 --#: compose.c:155 compose.c:159 -+#: compose.c:151 compose.c:155 - msgid "" - msgstr "<åî'ïñéóìïý>" - - # - # compose.c:105 --#: compose.c:167 -+#: compose.c:163 - msgid "Encrypt with: " - msgstr "ÊñõðôïãñÜöçóç ìå: " - - # --#: compose.c:221 -+#: compose.c:217 - #, c-format - msgid "%s [#%d] no longer exists!" - msgstr "Ôï %s [#%d] äåí õðÜñ÷åé ðéá!" - - # --#: compose.c:229 -+#: compose.c:225 - #, c-format - msgid "%s [#%d] modified. Update encoding?" - msgstr "Ôï %s [#%d] ìåôáâëÞèçêå. ÅíçìÝñùóç ôçò êùäéêïðïßçóçò;" - - # --#: compose.c:272 -+#: compose.c:268 - msgid "-- Attachments" - msgstr "-- ÐñïóáñôÞóåéò" - --#: compose.c:302 -+#: compose.c:298 - #, c-format - msgid "Warning: '%s' is a bad IDN." --msgstr "" -+msgstr "Ðñïåéäïðïßçóç: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN." - - # --#: compose.c:325 -+#: compose.c:321 - msgid "You may not delete the only attachment." - msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôç ìïíáäéêÞ ðñïóÜñôçóç." - --#: compose.c:601 send.c:1486 -+#: compose.c:597 send.c:1482 - #, c-format - msgid "Bad IDN in \"%s\": '%s'" --msgstr "" -+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN óôï \"%s\": '%s'" - --#: compose.c:684 -+#: compose.c:680 - msgid "Attaching selected files..." - msgstr "ÐñïóÜñôçóç åðéëåãìÝíùí áñ÷åßùí..." - - # --#: compose.c:695 -+#: compose.c:691 - #, c-format - msgid "Unable to attach %s!" - msgstr "Áäõíáìßá ðñïóÜñôçóçò ôïõ %s!" - - # --#: compose.c:714 -+#: compose.c:710 - msgid "Open mailbox to attach message from" - msgstr "¶íïéãìá ãñáììáôïêéâùôßïõ ãéá ôçí ðñïóÜñôçóç ìçíýìáôïò áðü" - - # --#: compose.c:752 -+#: compose.c:748 - msgid "No messages in that folder." - msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá óå áõôü ôï öÜêåëï." - - # --#: compose.c:761 -+#: compose.c:757 - msgid "Tag the messages you want to attach!" - msgstr "Óçìåéþóôå ôá ìçíýìáôá ðïõ èÝëåôå íá ðñïóáñôÞóåôå!" - - # --#: compose.c:793 -+#: compose.c:789 - msgid "Unable to attach!" - msgstr "Áäõíáìßá ðñïóÜñôçóçò!" - --#: compose.c:842 -+#: compose.c:838 - msgid "Recoding only affects text attachments." - msgstr "Ç åðáíáêùäéêïðïßçóç åðçñåÜæåé ìüíï ôçò ðñïóáñôÞóåéò êåéìÝíïõ." - --#: compose.c:847 -+#: compose.c:843 - msgid "The current attachment won't be converted." - msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç äåí èá ìåôáôñáðåß." - --#: compose.c:849 -+#: compose.c:845 - msgid "The current attachment will be converted." - msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç èá ìåôáôñáðåß." - - # --#: compose.c:924 -+#: compose.c:920 - msgid "Invalid encoding." - msgstr "Ìç Ýãêõñç êùäéêïðïßçóç." - - # --#: compose.c:950 -+#: compose.c:946 - msgid "Save a copy of this message?" - msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ ôïõ ìçíýìáôïò;" - - # --#: compose.c:1006 -+#: compose.c:1002 - msgid "Rename to: " - msgstr "Ìåôïíïìáóßá óå: " - - # --#: compose.c:1011 editmsg.c:116 sendlib.c:914 -+#: compose.c:1007 editmsg.c:110 sendlib.c:910 - #, c-format - msgid "Can't stat %s: %s" - msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s" - - # --#: compose.c:1038 -+#: compose.c:1034 - msgid "New file: " - msgstr "ÍÝï áñ÷åßï: " - - # --#: compose.c:1051 -+#: compose.c:1047 - msgid "Content-Type is of the form base/sub" - msgstr "Ôï Content-Type åßíáé ôçò ìïñöÞò base/sub" - - # --#: compose.c:1057 -+#: compose.c:1053 - #, c-format - msgid "Unknown Content-Type %s" - msgstr "¶ãíùóôï Content-Type %s" - - # --#: compose.c:1070 -+#: compose.c:1066 - #, c-format - msgid "Can't create file %s" - msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s" - - # --#: compose.c:1078 -+#: compose.c:1074 - msgid "What we have here is a failure to make an attachment" - msgstr "Áðïôõ÷ßá êáôÜ ôçí äçìéïõñãßá ðñïóÜñôçóçò" - - # --#: compose.c:1139 -+#: compose.c:1135 - msgid "Postpone this message?" - msgstr "Íá áíáâëçèåß ç ôá÷õäñüìçóç áõôïý ôïõ ìçíýìáôïò;" - - # --#: compose.c:1196 -+#: compose.c:1192 - msgid "Write message to mailbox" - msgstr "ÅããñáöÞ ôïõò ìçíýìáôïò óôï ãñáììáôïêéâþôéï" - - # --#: compose.c:1199 -+#: compose.c:1195 - #, c-format - msgid "Writing message to %s ..." - msgstr "ÅããñáöÞ ìçíýìáôïò óôï %s ..." - - # --#: compose.c:1208 -+#: compose.c:1204 - msgid "Message written." - msgstr "Ôï ìÞíõìá ãñÜöôçêå." - --#: compose.c:1220 -+#: compose.c:1216 - msgid "S/MIME already selected. Clear & continue ? " - msgstr "Ôï S/MIME åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; " - --#: compose.c:1246 -+#: compose.c:1242 - msgid "PGP already selected. Clear & continue ? " - msgstr "Ôï PGP åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; " - --#: crypt.c:69 -+#: crypt.c:66 - #, c-format - msgid " (current time: %c)" - msgstr "(ôñÝ÷ïõóá þñá: %c)" - - # - # pgp.c:207 --#: crypt.c:75 -+#: crypt.c:72 - #, c-format - msgid "[-- %s output follows%s --]\n" - msgstr "[-- %s áêïëïõèåß Ýîïäïò%s --]\n" - - # - # pgp.c:146 --#: crypt.c:90 -+#: crypt.c:87 - msgid "Passphrase(s) forgotten." - msgstr "Ç öñÜóç(-åéò)-êëåéäß Ý÷åé îå÷áóôåß." - - # - # commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220 - #. they really want to send it inline... go for it --#: crypt.c:148 pgpkey.c:563 -+#: crypt.c:145 pgpkey.c:559 - msgid "Invoking PGP..." - msgstr "ÊëÞóç ôïõ PGP..." - - #. otherwise inline won't work...ask for revert --#: crypt.c:157 -+#: crypt.c:154 - msgid "Message can't be sent inline. Revert to using PGP/MIME?" --msgstr "" -+msgstr "Ôï ìÞíõìá äåí ìðïñåß íá óôáëåß ùò åóùôåñéêü êåßìåíï. Íá ÷ñçóéìïðïéçèåß PGP/MIME;" - - # - #. abort --#: crypt.c:159 send.c:1438 -+#: crypt.c:156 send.c:1434 - msgid "Mail not sent." - msgstr "Ôï ãñÜììá äåí åóôÜëç." - --#: crypt.c:395 -+#: crypt.c:392 - msgid "S/MIME messages with no hints on content are unsupported." --msgstr "Äåí õðïóôçñßæïíôå ìçíýìáôá S/MIME ÷ùñßò ðëçñïöïñßåò óôçí åðéêåöáëßäá." -+msgstr "Äåí õðïóôçñßæïíôáé ìçíýìáôá S/MIME ÷ùñßò ðëçñïöïñßåò óôçí åðéêåöáëßäá." - --#: crypt.c:614 crypt.c:658 -+#: crypt.c:611 crypt.c:655 - msgid "Trying to extract PGP keys...\n" - msgstr "ÐñïóðÜèåéá åîáãùãÞò êëåéäéþí PGP...\n" - --#: crypt.c:638 crypt.c:678 -+#: crypt.c:635 crypt.c:675 - msgid "Trying to extract S/MIME certificates...\n" - msgstr "ÐñïóðÜèåéá åîáãùãÞò ðéóôïðïéçôéêþí S/MIME...\n" - --#: crypt.c:799 -+#: crypt.c:796 - msgid "" - "[-- Error: Inconsistent multipart/signed structure! --]\n" - "\n" -@@ -926,7 +921,7 @@ msgstr "" - - # - # handler.c:1378 --#: crypt.c:821 -+#: crypt.c:818 - #, c-format - msgid "" - "[-- Error: Unknown multipart/signed protocol %s! --]\n" -@@ -935,7 +930,7 @@ msgstr "" - "[-- ÓöÜëìá: ¶ãíùóôï ðïëõìåñÝò/õðïãåãñáììÝíï ðñùôüêïëëï %s! --]\n" - "\n" - --#: crypt.c:861 -+#: crypt.c:858 - #, c-format - msgid "" - "[-- Warning: We can't verify %s/%s signatures. --]\n" -@@ -947,7 +942,7 @@ msgstr "" - # - # pgp.c:676 - #. Now display the signed body --#: crypt.c:873 -+#: crypt.c:870 - msgid "" - "[-- The following data is signed --]\n" - "\n" -@@ -955,7 +950,7 @@ msgstr "" - "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá --]\n" - "\n" - --#: crypt.c:879 -+#: crypt.c:876 - msgid "" - "[-- Warning: Can't find any signatures. --]\n" - "\n" -@@ -965,7 +960,7 @@ msgstr "" - - # - # pgp.c:682 --#: crypt.c:885 -+#: crypt.c:882 - msgid "" - "\n" - "[-- End of signed data --]\n" -@@ -974,280 +969,279 @@ msgstr "" - "[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]\n" - - # --#: curs_lib.c:190 -+#: curs_lib.c:186 - msgid "yes" - msgstr "y(íáé)" - - # --#: curs_lib.c:191 -+#: curs_lib.c:187 - msgid "no" - msgstr "n(ü÷é)" - - # - #. restore blocking operation --#: curs_lib.c:287 -+#: curs_lib.c:283 - msgid "Exit Mutt?" - msgstr "¸îïäïò áðü ôï Mutt;" - - # --#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328 -+#: curs_lib.c:376 mutt_socket.c:526 mutt_ssl.c:327 - msgid "unknown error" - msgstr "Üãíùóôï óöÜëìá" - - # --#: curs_lib.c:400 -+#: curs_lib.c:396 - msgid "Press any key to continue..." - msgstr "ÐáôÞóôå Ýíá ðëÞêôñï ãéá íá óõíå÷ßóåôå..." - - # --#: curs_lib.c:444 -+#: curs_lib.c:440 - msgid " ('?' for list): " - msgstr "('?' ãéá ëßóôá): " - - # --#: curs_main.c:51 curs_main.c:615 curs_main.c:645 -+#: curs_main.c:47 curs_main.c:611 curs_main.c:641 - msgid "No mailbox is open." - msgstr "Äåí õðÜñ÷ïõí áíïé÷ôÜ ãñáììáôïêéâþôéá." - - # --#: curs_main.c:52 -+#: curs_main.c:48 - msgid "There are no messages." - msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá." - - # --#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44 -+#: curs_main.c:49 mx.c:1131 pager.c:54 recvattach.c:40 - msgid "Mailbox is read-only." - msgstr "Ôï ãñáììáôïêéâþôéï åßíáé ìüíï ãéá áíÜãíùóç." - - # --#: curs_main.c:54 pager.c:59 recvattach.c:873 -+#: curs_main.c:50 pager.c:55 recvattach.c:869 - msgid "Function not permitted in attach-message mode." - msgstr "Ç ëåéôïõñãßá áðáãïñåýåôáé óôçí êáôÜóôáóç ðñïóÜñôçóç-ìçíýìáôïò." - - # --#: curs_main.c:55 -+#: curs_main.c:51 - msgid "No visible messages." - msgstr "Äåí õðÜñ÷ïõí ïñáôÜ ìçíýìáôá." - - # --#: curs_main.c:248 -+#: curs_main.c:244 - msgid "Cannot toggle write on a readonly mailbox!" - msgstr "" - "Áäõíáìßá áëëáãÞò óå êáôÜóôáóç åããñáöÞò óå ãñáììáôïêéâþôéï ìüíï ãéá áíÜãíùóç!" - - # --#: curs_main.c:255 -+#: curs_main.c:251 - msgid "Changes to folder will be written on folder exit." - msgstr "Ïé áëëáãÝò óôï öÜêåëï èá ãñáöïýí êáôÜ ôç Ýîïäï áðü ôï öÜêåëï." - - # --#: curs_main.c:260 -+#: curs_main.c:256 - msgid "Changes to folder will not be written." - msgstr "Ïé áëëáãÝò óôï öÜêåëï äåí èá ãñáöïýí." - - # --#: curs_main.c:401 -+#: curs_main.c:397 - msgid "Quit" - msgstr "¸îïäïò" - - # --#: curs_main.c:404 recvattach.c:55 -+#: curs_main.c:400 recvattach.c:51 - msgid "Save" - msgstr "ÁðïèÞê" - - # --#: curs_main.c:405 query.c:49 -+#: curs_main.c:401 query.c:45 - msgid "Mail" - msgstr "Ôá÷õäñ" - - # --#: curs_main.c:406 pager.c:1457 -+#: curs_main.c:402 pager.c:1453 - msgid "Reply" - msgstr "ÁðÜíô" - - # --#: curs_main.c:407 -+#: curs_main.c:403 - msgid "Group" - msgstr "ÏìÜäá" - - # --#: curs_main.c:496 -+#: curs_main.c:492 - msgid "Mailbox was externally modified. Flags may be wrong." - msgstr "" - "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ. Ïé óçìáßåò ìðïñåß íá åßíáé ëÜèïò" - - # --#: curs_main.c:499 -+#: curs_main.c:495 - msgid "New mail in this mailbox." - msgstr "ÍÝá áëëçëïãñáößá óå áõôü ôï ãñáììáôïêéâþôéï." - - # --#: curs_main.c:503 -+#: curs_main.c:499 - msgid "Mailbox was externally modified." - msgstr "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ." - - # --#: curs_main.c:621 -+#: curs_main.c:617 - msgid "No tagged messages." - msgstr "Äåí õðÜñ÷ïõí óçìåéùìÝíá ìçíýìáôá." - - # --#: curs_main.c:657 menu.c:901 --#, fuzzy -+#: curs_main.c:653 menu.c:890 - msgid "Nothing to do." --msgstr "Óýíäåóç óôï %s..." -+msgstr "Êáììßá åíÝñãåéá." - - # --#: curs_main.c:743 -+#: curs_main.c:739 - msgid "Jump to message: " - msgstr "ÌåôÜâáóç óôï ìÞíõìá: " - - # --#: curs_main.c:749 -+#: curs_main.c:745 - msgid "Argument must be a message number." - msgstr "Ç ðáñÜìåôñïò ðñÝðåé íá åßíáé áñéèìüò ìçíýìáôïò." - - # --#: curs_main.c:782 -+#: curs_main.c:778 - msgid "That message is not visible." - msgstr "Áõôü ôï ìÞíõìá äåí åßíáé ïñáôü." - - # --#: curs_main.c:785 -+#: curs_main.c:781 - msgid "Invalid message number." - msgstr "Ìç Ýãêõñïò áñéèìüò ìçíýìáôïò." - - # --#: curs_main.c:804 -+#: curs_main.c:800 - msgid "Delete messages matching: " - msgstr "ÄéáãñáöÞ ðáñüìïéùí ìçíõìÜôùí: " - - # --#: curs_main.c:826 -+#: curs_main.c:822 - msgid "No limit pattern is in effect." - msgstr "ÊáíÝíá õðüäåéãìá ïñßùí óå ëåéôïõñãßá." - - # - #. i18n: ask for a limit to apply --#: curs_main.c:831 -+#: curs_main.c:827 - #, c-format - msgid "Limit: %s" - msgstr "¼ñéï: %s" - - # --#: curs_main.c:841 -+#: curs_main.c:837 - msgid "Limit to messages matching: " - msgstr "Ðåñéïñéóìüò óôá ðáñüìïéá ìçíýìáôá: " - - # --#: curs_main.c:873 -+#: curs_main.c:869 - msgid "Quit Mutt?" - msgstr "¸îïäïò áðü ôï Mutt;" - - # --#: curs_main.c:952 -+#: curs_main.c:948 - msgid "Tag messages matching: " - msgstr "Óçìåéþóôå ìçíýìáôá ðïõ ôáéñéÜæïõí óå: " - - # --#: curs_main.c:966 -+#: curs_main.c:962 - msgid "Undelete messages matching: " - msgstr "ÅðáíáöïñÜ ôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: " - - # --#: curs_main.c:974 -+#: curs_main.c:970 - msgid "Untag messages matching: " - msgstr "Áöáßñåóç ôçò óçìåßùóçò óôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: " - - # --#: curs_main.c:1053 -+#: curs_main.c:1049 - msgid "Open mailbox in read-only mode" - msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï ãéá åããñáöÞ" - - # --#: curs_main.c:1055 -+#: curs_main.c:1051 - msgid "Open mailbox" - msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï" - - # --#: curs_main.c:1071 mx.c:512 mx.c:658 -+#: curs_main.c:1067 mx.c:508 mx.c:654 - #, c-format - msgid "%s is not a mailbox." - msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï." - - # --#: curs_main.c:1165 -+#: curs_main.c:1159 - msgid "Exit Mutt without saving?" - msgstr "¸îïäïò áðü ôï Mutt ÷ùñßò áðïèÞêåõóç;" - - # --#: curs_main.c:1199 curs_main.c:1224 -+#: curs_main.c:1193 curs_main.c:1218 - msgid "You are on the last message." - msgstr "Åßóôå óôï ôåëåõôáßï ìÞíõìá." - - # --#: curs_main.c:1206 curs_main.c:1250 -+#: curs_main.c:1200 curs_main.c:1244 - msgid "No undeleted messages." - msgstr "Äåí õðÜñ÷ïõí áðïêáôáóôçìÝíá ìçíýìáôá." - - # --#: curs_main.c:1243 curs_main.c:1267 -+#: curs_main.c:1237 curs_main.c:1261 - msgid "You are on the first message." - msgstr "Åßóôå óôï ðñþôï ìÞíõìá." - - # --#: curs_main.c:1342 pattern.c:1296 -+#: curs_main.c:1336 pattern.c:1292 - msgid "Search wrapped to top." - msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå áðü ôçí êïñõöÞ." - - # --#: curs_main.c:1351 pattern.c:1307 -+#: curs_main.c:1345 pattern.c:1303 - msgid "Search wrapped to bottom." - msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå óôç âÜóç." - - # --#: curs_main.c:1392 -+#: curs_main.c:1386 - msgid "No new messages" - msgstr "Äåí õðÜñ÷ïõí íÝá ìçíýìáôá" - - # --#: curs_main.c:1392 -+#: curs_main.c:1386 - msgid "No unread messages" - msgstr "Äåí õðÜñ÷ïõí ìç áíáãíùóìÝíá ìçíýìáôá" - - # --#: curs_main.c:1393 -+#: curs_main.c:1387 - msgid " in this limited view" - msgstr "óå áõôÞ ôçí ðåñéïñéóìÝíç üøç" - - # --#: curs_main.c:1414 pager.c:2354 -+#: curs_main.c:1408 pager.c:2348 - msgid "Can't change 'important' flag on POP server." - msgstr "Áäõíáìßá áëëáãÞò ôçò óçìáßáò 'important' óôï äéáêïìéóôÞ POP." - - # --#: curs_main.c:1538 -+#: curs_main.c:1532 - msgid "No more threads." - msgstr "Äåí õðÜñ÷ïõí Üëëåò óõæçôÞóåéò." - - # --#: curs_main.c:1540 -+#: curs_main.c:1534 - msgid "You are on the first thread." - msgstr "Åßóôå óôçí ðñþôç óõæÞôçóç." - - # --#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077 --#: thread.c:1132 -+#: curs_main.c:1600 curs_main.c:1632 flags.c:289 thread.c:1018 thread.c:1073 -+#: thread.c:1128 - msgid "Threading is not enabled." - msgstr "Ç ÷ñÞóç óõæçôÞóåùí äåí Ý÷åé åíåñãïðïéçèåß." - - # --#: curs_main.c:1624 -+#: curs_main.c:1618 - msgid "Thread contains unread messages." - msgstr "Ç óõæÞôçóç ðåñéÝ÷åé ìç áíáãíùóìÝíá ìçíýìáôá." - - # --#: curs_main.c:1811 -+#: curs_main.c:1805 - msgid "Can't edit message on POP server." - msgstr "Áäõíáìßá åðåîåñãáóßáò ìçíýìáôïò óôï äéáêïìéóôÞ POP." - -@@ -1256,7 +1250,7 @@ msgstr "Áäõíáìßá åðåîåñãáóßáò ìçíýìáôïò - #. * SLcurses_waddnstr() can't take a "const char *", so this is only - #. * declared "static" (sigh) - #. --#: edit.c:41 -+#: edit.c:37 - msgid "" - "~~\t\tinsert a line begining with a single ~\n" - "~b users\tadd users to the Bcc: field\n" -@@ -1297,194 +1291,194 @@ msgstr "" - ".\t\tìüíç ôçò óå ìéá ãñáììÞ ôåñìáôßæåé ôçí åßóïäï\n" - - # --#: edit.c:186 -+#: edit.c:182 - #, c-format - msgid "%d: invalid message number.\n" - msgstr "%d: ìç Ýãêõñïò áñéèìüò ìçíýìáôïò.\n" - - # --#: edit.c:328 -+#: edit.c:324 - msgid "(End message with a . on a line by itself)\n" - msgstr "(Ôåëåéþóôå ôï ìÞíõìá ìå . ìüíç ôçò óå ìéá ãñáììÞ)\n" - - # --#: edit.c:386 -+#: edit.c:382 - msgid "No mailbox.\n" - msgstr "ÊáíÝíá ãñáììáôïêéâþôéï.\n" - - # --#: edit.c:390 -+#: edit.c:386 - msgid "Message contains:\n" - msgstr "Ôï ìÞíõìá ðåñéÝ÷åé:\n" - - # --#: edit.c:394 edit.c:451 -+#: edit.c:390 edit.c:447 - msgid "(continue)\n" - msgstr "(óõíå÷ßóôå)\n" - - # --#: edit.c:407 -+#: edit.c:403 - msgid "missing filename.\n" - msgstr "ëåßðåé ôï üíïìá ôïõ áñ÷åßïõ.\n" - - # --#: edit.c:427 -+#: edit.c:423 - msgid "No lines in message.\n" - msgstr "Äåí õðÜñ÷ïõí ãñáììÝò óôï ìÞíõìá.\n" - --#: edit.c:444 -+#: edit.c:440 - #, c-format - msgid "Bad IDN in %s: '%s'\n" --msgstr "" -+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN óôï %s: '%s'\n" - - # --#: edit.c:462 -+#: edit.c:458 - #, c-format - msgid "%s: unknown editor command (~? for help)\n" - msgstr "%s: Üãíùóôç åíôïëÞ êåéìåíïãñÜöïõ (~? ãéá âïÞèåéá)\n" - - # --#: editmsg.c:78 -+#: editmsg.c:74 - #, c-format - msgid "could not create temporary folder: %s" - msgstr "áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý öáêÝëïõ: %s" - - # --#: editmsg.c:90 -+#: editmsg.c:84 - #, c-format - msgid "could not write temporary mail folder: %s" - msgstr "áäõíáìßá åããñáöÞò ðñïóùñéíïý öáêÝëïõ áëëçëïãñáößáò: %s" - - # --#: editmsg.c:107 -+#: editmsg.c:101 - #, c-format - msgid "could not truncate temporary mail folder: %s" - msgstr "áäõíáìßá ðåñéêïðÞ ðñïóùñéíïý öáêÝëïõ áëëçëïãñáößáò: %s" - - # --#: editmsg.c:122 -+#: editmsg.c:116 - msgid "Message file is empty!" - msgstr "Ôï áñ÷åßï ìçíõìÜôùí åßíáé Üäåéï!" - - # --#: editmsg.c:129 -+#: editmsg.c:123 - msgid "Message not modified!" - msgstr "Ôï ìÞíõìá äåí ôñïðïðïéÞèçêå!" - - # --#: editmsg.c:137 -+#: editmsg.c:131 - #, c-format - msgid "Can't open message file: %s" - msgstr "Áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ìçíõìÜôùí: %s" - - # --#: editmsg.c:144 editmsg.c:172 -+#: editmsg.c:138 editmsg.c:165 - #, c-format - msgid "Can't append to folder: %s" - msgstr "Áäõíáìßá ðñüóèåóçò óôï öÜêåëï: %s" - - # --#: editmsg.c:203 -+#: editmsg.c:196 - #, c-format - msgid "Error. Preserving temporary file: %s" - msgstr "ÓöÜëìá. ÄéáôÞñçóç ðñïóùñéíïý áñ÷åßïõ: %s" - - # --#: flags.c:336 -+#: flags.c:332 - msgid "Set flag" - msgstr "Ïñßóôå óçìáßá" - - # --#: flags.c:336 -+#: flags.c:332 - msgid "Clear flag" - msgstr "Êáèáñßóôå óçìáßá" - - # --#: handler.c:1349 -+#: handler.c:1345 - msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" - msgstr "" - "[-- ÓöÜëìá: Áäõíáìßá áðåéêüíéóçò óå üëá ôá ìÝñç ôïõ Multipart/Alternative! " - "--]\n" - - # --#: handler.c:1459 -+#: handler.c:1455 - #, c-format - msgid "[-- Attachment #%d" - msgstr "[-- ÐñïóÜñôçóç #%d" - - # --#: handler.c:1471 -+#: handler.c:1467 - #, c-format - msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n" - msgstr "[-- Ôýðïò: %s/%s, Êùäéêïðïßçóç: %s, ÌÝãåèïò: %s --]\n" - - # --#: handler.c:1534 -+#: handler.c:1530 - #, c-format - msgid "[-- Autoview using %s --]\n" - msgstr "[-- Autoview ÷ñçóéìïðïéþíôáò ôï %s --]\n" - - # --#: handler.c:1535 -+#: handler.c:1531 - #, c-format - msgid "Invoking autoview command: %s" - msgstr "ÊëÞóç ôçò åíôïëÞò autoview: %s" - - # --#: handler.c:1567 -+#: handler.c:1563 - #, c-format - msgid "[-- Can't run %s. --]\n" - msgstr "[-- Áäõíáìßá åêôÝëåóçò óôéò %s --]\n" - - # --#: handler.c:1585 handler.c:1606 -+#: handler.c:1581 handler.c:1602 - #, c-format - msgid "[-- Autoview stderr of %s --]\n" - msgstr "[-- Autoview êáíïíéêÞ Ýîïäïò ôïõ %s --]\n" - - # --#: handler.c:1643 -+#: handler.c:1639 - msgid "[-- Error: message/external-body has no access-type parameter --]\n" - msgstr "" - "[-- ÓöÜëìá: ôï ìÞíõìá/åîùôåñéêü-óþìá äåí Ý÷åé ðáñÜìåôñï access-type --]\n" - - # --#: handler.c:1662 -+#: handler.c:1658 - #, c-format - msgid "[-- This %s/%s attachment " - msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç " - - # --#: handler.c:1669 -+#: handler.c:1665 - #, c-format - msgid "(size %s bytes) " - msgstr "(ìÝãåèïò %s bytes) " - - # --#: handler.c:1671 -+#: handler.c:1667 - msgid "has been deleted --]\n" - msgstr "Ý÷åé äéáãñáöåß --]\n" - - # --#: handler.c:1676 -+#: handler.c:1672 - #, c-format - msgid "[-- on %s --]\n" - msgstr "[-- óôéò %s --]\n" - - # --#: handler.c:1681 -+#: handler.c:1677 - #, c-format - msgid "[-- name: %s --]\n" - msgstr "[-- üíïìá: %s --]\n" - - # --#: handler.c:1694 handler.c:1710 -+#: handler.c:1690 handler.c:1706 - #, c-format - msgid "[-- This %s/%s attachment is not included, --]\n" - msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç äåí ðåñéëáìâÜíåôå, --]\n" - - # --#: handler.c:1696 -+#: handler.c:1692 - msgid "" - "[-- and the indicated external source has --]\n" - "[-- expired. --]\n" -@@ -1493,62 +1487,62 @@ msgstr "" - "[-- ëÞîåé. --]\n" - - # --#: handler.c:1714 -+#: handler.c:1710 - #, c-format - msgid "[-- and the indicated access-type %s is unsupported --]\n" - msgstr "[-- êáé ôï åíäåäåéãìÝíï access-type %s äåí õðïóôçñßæåôáé --]\n" - - # - # handler.c:1378 --#: handler.c:1822 -+#: handler.c:1818 - msgid "Error: multipart/signed has no protocol." - msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/õðïãåãñáììÝíï äåí Ý÷åé ðñùôüêïëëï" - - # --#: handler.c:1832 -+#: handler.c:1828 - msgid "Error: multipart/encrypted has no protocol parameter!" - msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/êñõðôïãñáöçìÝíï äåí Ý÷åé ðáñÜìåôñï ðñùôïêüëëïõ!" - - # --#: handler.c:1872 -+#: handler.c:1868 - msgid "Unable to open temporary file!" - msgstr "Áäõíáìßá áíïßãìáôïò ðñïóùñéíïý áñ÷åßïõ!" - - # --#: handler.c:1933 -+#: handler.c:1929 - #, c-format - msgid "[-- %s/%s is unsupported " - msgstr "[-- Ôï %s/%s äåí õðïóôçñßæåôáé " - - # --#: handler.c:1938 -+#: handler.c:1934 - #, c-format - msgid "(use '%s' to view this part)" - msgstr "(÷ñçóéìïðïéÞóôå ôï '%s' ãéá íá äåßôå áõôü ôï ìÝñïò)" - - # --#: handler.c:1940 -+#: handler.c:1936 - msgid "(need 'view-attachments' bound to key!)" - msgstr "(áðáéôåßôáé ôï 'view-attachments' íá åßíáé óõíäåäåìÝíï ìå ðëÞêôñï!" - - # --#: headers.c:177 -+#: headers.c:173 - #, c-format - msgid "%s: unable to attach file" - msgstr "%s: áäõíáìßá óôçí ðñïóÜñôçóç ôïõ áñ÷åßïõ" - - # --#: help.c:282 -+#: help.c:278 - msgid "ERROR: please report this bug" - msgstr "ÓÖÁËÌÁ: ðáñáêáëþ áíáöÝñáôå áõôü ôï óöÜëìá ðñïãñÜììáôïò" - - # --#: help.c:324 -+#: help.c:320 - msgid "" - msgstr "<ÁÃÍÙÓÔÏ>" - - # --#: help.c:336 -+#: help.c:332 - msgid "" - "\n" - "Generic bindings:\n" -@@ -1559,7 +1553,7 @@ msgstr "" - "\n" - - # --#: help.c:340 -+#: help.c:336 - msgid "" - "\n" - "Unbound functions:\n" -@@ -1570,115 +1564,115 @@ msgstr "" - "\n" - - # --#: help.c:348 -+#: help.c:344 - #, c-format - msgid "Help for %s" - msgstr "ÂïÞèåéá ãéá ôï %s" - --#: hook.c:246 -+#: hook.c:242 - #, c-format - msgid "unhook: Can't do unhook * from within a hook." - msgstr "unhook: Áäõíáìßá unhook * ìÝóá áðü Ýíá hook." - - # --#: hook.c:258 -+#: hook.c:254 - #, c-format - msgid "unhook: unknown hook type: %s" - msgstr "unhook: Üãíùóôïò ôýðïò hook: %s" - --#: hook.c:264 -+#: hook.c:260 - #, c-format - msgid "unhook: Can't delete a %s from within a %s." - msgstr "unhook: Áäõíáìßá äéáãñáöÞò åíüò %s ìÝóá áðü Ýíá %s." - --#: imap/auth.c:108 pop_auth.c:415 -+#: imap/auth.c:104 pop_auth.c:411 - msgid "No authenticators available" - msgstr "Äåí õðÜñ÷åé äéáèÝóéìç áõèåíôéêïðïßçóç." - --#: imap/auth_anon.c:43 -+#: imap/auth_anon.c:39 - msgid "Authenticating (anonymous)..." - msgstr "Áõèåíôéêïðïßçóç (áíþíõìç)..." - --#: imap/auth_anon.c:73 -+#: imap/auth_anon.c:69 - msgid "Anonymous authentication failed." - msgstr "Ç áíþíõìç áõèåíôéêïðïßçóç áðÝôõ÷å." - --#: imap/auth_cram.c:48 -+#: imap/auth_cram.c:44 - msgid "Authenticating (CRAM-MD5)..." - msgstr "Áõèåíôéêïðïßçóç (CRAM-MD5)..." - --#: imap/auth_cram.c:128 -+#: imap/auth_cram.c:124 - msgid "CRAM-MD5 authentication failed." - msgstr "Áõèåíôéêïðïßçóç CRAM-MD5 áðÝôõ÷å." - - #. now begin login --#: imap/auth_gss.c:105 -+#: imap/auth_gss.c:104 - msgid "Authenticating (GSSAPI)..." - msgstr "Áõèåíôéêïðïßçóç (GSSAPI)..." - --#: imap/auth_gss.c:268 -+#: imap/auth_gss.c:267 - msgid "GSSAPI authentication failed." - msgstr "Áõèåíôéêïðïßçóç GSSAPI áðÝôõ÷å." - --#: imap/auth_login.c:38 -+#: imap/auth_login.c:34 - msgid "LOGIN disabled on this server." - msgstr "Ôï LOGIN áðåíåñãïðïéÞèçêå óå áõôü ôïí äéáêïìéóôÞ." - - # --#: imap/auth_login.c:47 pop_auth.c:248 -+#: imap/auth_login.c:43 pop_auth.c:244 - msgid "Logging in..." - msgstr "Åßóïäïò óôï óýóôçìá..." - - # --#: imap/auth_login.c:67 pop_auth.c:291 -+#: imap/auth_login.c:63 pop_auth.c:287 - msgid "Login failed." - msgstr "ÁðÝôõ÷å ç åßóïäïò óôï óýóôçìá." - --#: imap/auth_sasl.c:116 --#, fuzzy, c-format -+#: imap/auth_sasl.c:112 -+#, c-format - msgid "Authenticating (%s)..." --msgstr "Áõèåíôéêïðïßçóç (APOP)..." -+msgstr "Áõèåíôéêïðïßçóç (%s)..." - --#: imap/auth_sasl.c:212 pop_auth.c:176 -+#: imap/auth_sasl.c:208 pop_auth.c:172 - msgid "SASL authentication failed." - msgstr "Áõèåíôéêïðïßçóç SASL áðÝôõ÷å." - --#: imap/browse.c:68 imap/imap.c:542 -+#: imap/browse.c:64 imap/imap.c:538 - #, c-format - msgid "%s is an invalid IMAP path" - msgstr "%s åßíáé ìç Ýãêõñç äéáäñïìÞ IMAP" - - # --#: imap/browse.c:85 -+#: imap/browse.c:81 - msgid "Getting namespaces..." - msgstr "ËÞøç namespaces..." - --#: imap/browse.c:94 -+#: imap/browse.c:90 - msgid "Getting folder list..." - msgstr "ËÞøç ëßóôáò öáêÝëùí..." - - # --#: imap/browse.c:223 -+#: imap/browse.c:219 - msgid "No such folder" - msgstr "Äåí õðÜñ÷åé ôÝôïéïò öÜêåëïò" - - # --#: imap/browse.c:281 -+#: imap/browse.c:277 - msgid "Create mailbox: " - msgstr "Äçìéïõñãßá ãñáììáôïêéâùôßïõ: " - - # --#: imap/browse.c:286 -+#: imap/browse.c:282 - msgid "Mailbox must have a name." - msgstr "Ôï ãñáììáôïêéâþôéï ðñÝðåé íá Ý÷åé üíïìá." - - # --#: imap/browse.c:294 -+#: imap/browse.c:290 - msgid "Mailbox created." - msgstr "Ôï ãñáììáôïêéâþôéï äçìéïõñãÞèçêå." - - # --#: imap/command.c:294 -+#: imap/command.c:290 - msgid "Mailbox closed" - msgstr "Ôï ãñáììáôïêéâþôéï Ýêëåéóå" - -@@ -1686,387 +1680,383 @@ msgstr "Ôï ãñáììáôïêéâþôéï Ýêëåéóå" - #. something is wrong because the server reported fewer messages - #. * than we previously saw - #. --#: imap/command.c:336 -+#: imap/command.c:332 - msgid "Fatal error. Message count is out of sync!" - msgstr "Ìïéñáßï óöÜëìá. Ï áñéèìüò ôùí ìçíõìÜôùí äåí åßíáé óå óõìöùíßá!" - - # --#: imap/imap.c:151 -+#: imap/imap.c:147 - #, c-format - msgid "Closing connection to %s..." - msgstr "Êëåßóéìï óýíäåóçò óôï óôï %s..." - - # --#: imap/imap.c:311 -+#: imap/imap.c:307 - msgid "This IMAP server is ancient. Mutt does not work with it." - msgstr "" - "Áõôüò ï åîõðçñåôçôÞò IMAP åßíáé áñ÷áßïò. Ôï Mutt äåí åßíáé óõìâáôü ìå áõôüí." - --#: imap/imap.c:402 -+#: imap/imap.c:398 - #, c-format - msgid "Unexpected response received from server: %s" --msgstr "" -+msgstr "ÅëÞöèç áðñïóäüêçôç áðÜíôçóç áðü ôï äéáêïìéóôÞ: %s" - --#: imap/imap.c:422 pop_lib.c:284 -+#: imap/imap.c:418 pop_lib.c:280 - msgid "Secure connection with TLS?" - msgstr "ÁóöáëÞò óýíäåóç ìå TLS;" - --#: imap/imap.c:435 pop_lib.c:308 -+#: imap/imap.c:431 pop_lib.c:304 - msgid "Could not negotiate TLS connection" - msgstr "Áäõíáìßá äéáðñáãìÜôåõóçò óýíäåóçò TLS" - - # --#: imap/imap.c:573 -+#: imap/imap.c:569 - #, c-format - msgid "Selecting %s..." - msgstr "ÅðéëïãÞ %s..." - - # --#: imap/imap.c:709 -+#: imap/imap.c:705 - msgid "Error opening mailbox" - msgstr "ÓöÜëìá êáôÜ ôï Üíïéãìá ôïõ ãñáììáôïêéâùôßïõ" - - # - #. STATUS not supported --#: imap/imap.c:763 -+#: imap/imap.c:759 - msgid "Unable to append to IMAP mailboxes at this server" - msgstr "Áäõíáìßá óôçí ðñïóèÞêç óôá ãñáìì/ôéá IMAP óå áõôüí ôïí åîõðçñåôçôÞ" - - # - #. command failed cause folder doesn't exist --#: imap/imap.c:772 imap/message.c:720 muttlib.c:1234 -+#: imap/imap.c:768 imap/message.c:713 muttlib.c:1222 - #, c-format - msgid "Create %s?" - msgstr "Äçìéïõñãßá ôïõ %s;" - - # --#: imap/imap.c:958 pop.c:465 -+#: imap/imap.c:954 pop.c:461 - #, c-format - msgid "Marking %d messages deleted..." - msgstr "Óçìåßùóç %d äéáãñáöÝíôùí ìçíõìÜôùí..." - - # --#: imap/imap.c:967 -+#: imap/imap.c:963 - msgid "Expunge failed" - msgstr "ÄéáãñáöÞ áðÝôõ÷å" - - # --#: imap/imap.c:982 -+#: imap/imap.c:978 - #, c-format - msgid "Saving message status flags... [%d/%d]" - msgstr "ÁðïèÞêåõóç óçìáéþí êáôÜóôáóçò ìçíýìáôïò... [%d/%d]" - - # --#: imap/imap.c:1066 -+#: imap/imap.c:1062 - msgid "Expunging messages from server..." - msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ..." - --#: imap/imap.c:1071 -+#: imap/imap.c:1067 - msgid "imap_sync_mailbox: EXPUNGE failed" - msgstr "imap_sync_mailbox: EXPUNGE áðÝôõ÷å" - - # --#: imap/imap.c:1105 -+#: imap/imap.c:1101 - msgid "CLOSE failed" - msgstr "CLOSE áðÝôõ÷å" - - # --#: imap/imap.c:1348 -+#: imap/imap.c:1344 - msgid "Bad mailbox name" - msgstr "Êáêü üíïìá ãñáììáôïêéâùôßïõ" - - # --#: imap/imap.c:1360 -+#: imap/imap.c:1356 - #, c-format - msgid "Subscribing to %s..." - msgstr "ÅããñáöÞ óôï %s..." - - # --#: imap/imap.c:1362 -+#: imap/imap.c:1358 - #, c-format - msgid "Unsubscribing to %s..." - msgstr "ÄéáãñáöÞ óôï %s..." - - # - #. Unable to fetch headers for lower versions --#: imap/message.c:94 -+#: imap/message.c:90 - msgid "Unable to fetch headers from this IMAP server version." - msgstr "Áäõíáìßá ëÞøçò åðéêåöáëßäùí áðü áõôÞ ôçí Ýêäïóç ôïõ åîõðçñåôçôÞ IMAP." - - # --#: imap/message.c:107 -+#: imap/message.c:103 - #, c-format - msgid "Could not create temporary file %s" - msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ %s" - - # --#: imap/message.c:134 --#, fuzzy, c-format -+#: imap/message.c:130 -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]" -+msgstr "¸ëåã÷ïò ðñïóùñéíÞò ìíÞìçò... [%d/%d]" - - # --#: imap/message.c:202 pop.c:210 -+#: imap/message.c:198 pop.c:206 - #, c-format - msgid "Fetching message headers... [%d/%d]" - msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]" - - # --#: imap/message.c:367 pop.c:344 -+#: imap/message.c:363 pop.c:340 - msgid "Fetching message..." - msgstr "ËÞøç ìçíýìáôïò..." - --#: imap/message.c:410 pop.c:381 -+#: imap/message.c:406 pop.c:377 - msgid "The message index is incorrect. Try reopening the mailbox." - msgstr "Ï äåßêôçò ôïõ ìçíýìáôïò åßíáé Üêõñïò. Îáíáíïßîôå ôï ãñáììáôïêéâþôéï." - - # --#: imap/message.c:586 -+#: imap/message.c:579 - msgid "Uploading message ..." - msgstr "ÁíÝâáóìá ìçíýìáôïò ..." - - # --#: imap/message.c:696 -+#: imap/message.c:689 - #, c-format - msgid "Copying %d messages to %s..." - msgstr "ÁíôéãñáöÞ %d ìçíõìÜôùí óôï %s..." - - # --#: imap/message.c:700 -+#: imap/message.c:693 - #, c-format - msgid "Copying message %d to %s..." - msgstr "ÁíôéãñáöÞ ìçíýìáôïò %d óôï %s ..." - - # --#: imap/util.c:241 -+#: imap/util.c:239 - msgid "Continue?" - msgstr "ÓõíÝ÷åéá;" - --#: init.c:385 -+#: init.c:381 - #, c-format - msgid "Bad regexp: %s" --msgstr "" -+msgstr "ëáíèáóìÝíç êáíïíéêÞ Ýêöñáóç: %s" - - # --#: init.c:678 --#, fuzzy -+#: init.c:646 - msgid "spam: no matching pattern" --msgstr "óçìåßùóç ôùí ìçíõìÜôùí ðïõ ôáéñéÜæïõí ìå ìéá ìïñöÞ/ìïíôÝëï" -+msgstr "spam: äåí õðÜñ÷åé ìïíôÝëï ðïõ íá ôáéñéÜæåé" - - # --#: init.c:680 --#, fuzzy -+#: init.c:648 - msgid "nospam: no matching pattern" --msgstr "" --"áöáßñåóç ôçò óçìåßùóçò áðü ôá ìçíýìáôá ðïõ ôáéñéÜæïõí ìå ìßá ìïñöÞ/ìïíôÝëï" -+msgstr "nospam: äåí õðÜñ÷åé ìïíôÝëï ðïõ íá ôáéñéÜæåé" - - # --#: init.c:883 -+#: init.c:814 - msgid "alias: no address" - msgstr "øåõäþíõìï: êáììßá äéåýèõíóç" - --#: init.c:928 -+#: init.c:859 - #, c-format - msgid "Warning: Bad IDN '%s' in alias '%s'.\n" --msgstr "" -+msgstr "Ðñïåéäïðïßçóç: ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN '%s' óôï øåõäþíõìï '%s'.\n" - - # --#: init.c:1006 -+#: init.c:937 - msgid "invalid header field" - msgstr "ìç Ýãêõñï ðåäßï åðéêåöáëßäáò" - - # --#: init.c:1059 -+#: init.c:990 - #, c-format - msgid "%s: unknown sorting method" - msgstr "%s: Üãíùóôç ìÝèïäïò ôáîéíüìçóçò" - - # --#: init.c:1169 -+#: init.c:1100 - #, c-format - msgid "mutt_restore_default(%s): error in regexp: %s\n" - msgstr "mutt_restore_default(%s): ëÜèïò óôï regexp: %s\n" - - # --#: init.c:1234 -+#: init.c:1165 - #, c-format - msgid "%s: unknown variable" - msgstr "%s: Üãíùóôç ìåôáâëçôÞ" - - # --#: init.c:1243 -+#: init.c:1174 - #, c-format - msgid "prefix is illegal with reset" - msgstr "ôï ðñüèåìá åßíáé Üêõñï ìå ôçí åðáíáöïñÜ" - - # --#: init.c:1249 -+#: init.c:1180 - #, c-format - msgid "value is illegal with reset" - msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí åðáíáöïñÜ" - - # --#: init.c:1288 -+#: init.c:1219 - #, c-format - msgid "%s is set" - msgstr "Ôï %s Ý÷åé ôåèåß" - - # --#: init.c:1288 -+#: init.c:1219 - #, c-format - msgid "%s is unset" - msgstr "Ôï %s äåí Ý÷åé ôåèåß" - - # --#: init.c:1478 -+#: init.c:1409 - #, c-format - msgid "%s: invalid mailbox type" - msgstr "%s: ìç Ýãêõñïò ôýðïò ãñáììáôïêéâùôßïõ" - - # --#: init.c:1503 init.c:1548 -+#: init.c:1434 init.c:1479 - #, c-format - msgid "%s: invalid value" - msgstr "%s: ìç Ýãêõñç ôéìÞ" - - # --#: init.c:1589 --#, fuzzy, c-format -+#: init.c:1520 -+#, c-format - msgid "%s: Unknown type." --msgstr "%s: Üãíùóôïò ôýðïò" -+msgstr "%s: Üãíùóôïò ôýðïò." - - # --#: init.c:1615 -+#: init.c:1546 - #, c-format - msgid "%s: unknown type" - msgstr "%s: Üãíùóôïò ôýðïò" - - # --#: init.c:1674 -+#: init.c:1605 - #, c-format - msgid "Error in %s, line %d: %s" - msgstr "ÓöÜëìá óôï %s, ãñáììÞ %d: %s" - - # - #. the muttrc source keyword --#: init.c:1697 -+#: init.c:1628 - #, c-format - msgid "source: errors in %s" - msgstr "source: ëÜèç óôï %s" - --#: init.c:1698 -+#: init.c:1629 - #, c-format - msgid "source: reading aborted due too many errors in %s" - msgstr "ðçãÞ: áðüññéøç áíÜãíùóçò ëüãù ðïëëþí óöáëìÜôùí óôï %s" - - # --#: init.c:1712 -+#: init.c:1643 - #, c-format - msgid "source: error at %s" - msgstr "source: ëÜèïò óôï %s" - - # --#: init.c:1717 -+#: init.c:1648 - msgid "source: too many arguments" - msgstr "source: ðÜñá ðïëëÜ ïñßóìáôá" - - # --#: init.c:1768 -+#: init.c:1699 - #, c-format - msgid "%s: unknown command" - msgstr "%s: Üãíùóôç åíôïëÞ" - - # --#: init.c:2157 -+#: init.c:2088 - #, c-format - msgid "Error in command line: %s\n" - msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n" - - # --#: init.c:2206 -+#: init.c:2137 - msgid "unable to determine home directory" - msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ êáôáëüãïõ ÷ñÞóôç (home directory)" - - # --#: init.c:2214 -+#: init.c:2145 - msgid "unable to determine username" - msgstr "áäõíáìßá óôïí åíôïðéóìü ôïõ ïíüìáôïò ÷ñÞóôç" - - # --#: keymap.c:463 -+#: keymap.c:459 - msgid "Macro loop detected." - msgstr "Åíôïðßóôçêå âñüã÷ïò ìáêñïåíôïëÞò." - - # --#: keymap.c:673 keymap.c:681 -+#: keymap.c:669 keymap.c:677 - msgid "Key is not bound." - msgstr "Ôï ðëÞêôñï äåí åßíáé óõíäåäåìÝíï." - - # --#: keymap.c:685 -+#: keymap.c:681 - #, c-format - msgid "Key is not bound. Press '%s' for help." - msgstr "Ôï ðëÞêôñï äåí åßíáé óõíäåäåìÝíï. ÐáôÞóôå '%s' ãéá âïÞèåéá." - - # --#: keymap.c:696 -+#: keymap.c:692 - msgid "push: too many arguments" - msgstr "push: ðÜñá ðïëëÜ ïñßóìáôá" - - # --#: keymap.c:726 -+#: keymap.c:722 - #, c-format - msgid "%s: no such menu" - msgstr "%s: äåí õðÜñ÷åé ôÝôïéï ìåíïý" - - # --#: keymap.c:741 -+#: keymap.c:737 - msgid "null key sequence" - msgstr "êåíÞ áêïëïõèßá ðëÞêôñùí" - - # --#: keymap.c:828 -+#: keymap.c:824 - msgid "bind: too many arguments" - msgstr "bind: ðÜñá ðïëëÜ ïñßóìáôá" - - # --#: keymap.c:851 -+#: keymap.c:847 - #, c-format - msgid "%s: no such function in map" - msgstr "%s: äåí Ý÷åé êáèïñéóôåß ôÝôïéá ëåéôïõñãßá" - - # --#: keymap.c:875 -+#: keymap.c:871 - msgid "macro: empty key sequence" - msgstr "macro: Üäåéá áêïëïõèßá ðëÞêôñùí" - - # --#: keymap.c:886 -+#: keymap.c:882 - msgid "macro: too many arguments" - msgstr "macro: ðÜñá ðïëëÝò ðáñÜìåôñïé" - - # --#: keymap.c:922 -+#: keymap.c:918 - msgid "exec: no arguments" - msgstr "exec: êáèüëïõ ïñßóìáôá" - - # --#: keymap.c:942 -+#: keymap.c:938 - #, c-format - msgid "%s: no such function" - msgstr "%s: äåí õðÜñ÷åé ôÝôïéá ëåéôïõñãßá" - - # - # pgp.c:1200 --#: keymap.c:963 --#, fuzzy -+#: keymap.c:959 - msgid "Enter keys (^G to abort): " --msgstr "ÅéóÜãåôå keyID ãéá ôï %s: " -+msgstr "ÅéóÜãåôå êëåéäéÜ (^G ãéá áðüññéøç): " - --#: keymap.c:968 -+#: keymap.c:964 - #, c-format - msgid "Char = %s, Octal = %o, Decimal = %d" --msgstr "" -+msgstr "×áñáêô = %s, Ïêôáäéêüò = %o, Äåêáäéêüò = %d" - - # - #: keymap_alldefs.h:5 -@@ -2075,7 +2065,7 @@ msgstr "êåíÞ ëåéôïõñãßá" - - #: keymap_alldefs.h:6 - msgid "end of conditional execution (noop)" --msgstr "" -+msgstr "ôÝëïò åêôÝëåóçò õðü óõíèÞêç (noop)" - - # - #: keymap_alldefs.h:7 -@@ -2599,9 +2589,8 @@ msgstr "ìåôÜâáóç óôï åðüìåíï íÝï ìÞíõìá" - - # - #: keymap_alldefs.h:113 --#, fuzzy - msgid "jump to the next new or unread message" --msgstr "ìåôÜâáóç óôï åðüìåíï ìç áíáãíùóìÝíï ìÞíõìá" -+msgstr "ìåôÜâáóç óôï åðüìåíï íÝï Þ ìç áíáãíùóìÝíï ìÞíõìá" - - # - #: keymap_alldefs.h:114 -@@ -2650,9 +2639,8 @@ msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï íÝï ìÞí - - # - #: keymap_alldefs.h:123 --#, fuzzy - msgid "jump to the previous new or unread message" --msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï ìç áíáãíùóìÝíï ìÞíõìá" -+msgstr "ìåôÜâáóç óôï ðñïçãïýìåíï íÝï Þ ìç áíáãíùóìÝíï ìÞíõìá" - - # - #: keymap_alldefs.h:124 -@@ -2857,9 +2845,8 @@ msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßá - - # - #: keymap_alldefs.h:164 --#, fuzzy - msgid "apply next function ONLY to tagged messages" --msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßáò óôá óçìåéùìÝíá ìçíýìáôá" -+msgstr "åöáñìïãÞ ôçò åðüìåíçò ëåéôïõñãßáò ÌÏÍÏ óôá óçìåéùìÝíá ìçíýìáôá" - - # - #: keymap_alldefs.h:165 -@@ -2924,7 +2911,7 @@ msgstr "åìöÜíéóç ôùí ðñïóáñôÞóåùí MIME" - - #: keymap_alldefs.h:177 - msgid "display the keycode for a key press" --msgstr "" -+msgstr "åìöÜíéóç êùäéêïý ðëçêôñïëïãßïõ ãéá ðáôçèÝí ðëÞêôñï" - - # - #: keymap_alldefs.h:178 -@@ -3024,7 +3011,7 @@ msgstr "åîáöÜíéóç ôçò öñÜóçò(-åùí) êëåéä - # keymap_defs.h:160 - #: keymap_alldefs.h:197 - msgid "extract supported public keys" --msgstr "åîáãùãÞ ôùí äçìüóéùí êëåéäéþí ðïõ õðïóôçñßæïíôå" -+msgstr "åîáãùãÞ ôùí äçìüóéùí êëåéäéþí ðïõ õðïóôçñßæïíôáé" - - # - # keymap_defs.h:159 -@@ -3032,17 +3019,17 @@ msgstr "åîáãùãÞ ôùí äçìüóéùí êëåéäéþí ðï - msgid "show S/MIME options" - msgstr "åìöÜíéóç ôùí åðéëïãþí S/MIME" - --#: lib.c:64 -+#: lib.c:60 - msgid "Integer overflow -- can't allocate memory!" --msgstr "" -+msgstr "Õðåñ÷åßëéóç áêåñáßïõ -- áäõíáìßá åê÷þñçóçò ìíÞìçò!" - - # --#: lib.c:71 lib.c:86 lib.c:118 -+#: lib.c:67 lib.c:82 lib.c:114 - msgid "Out of memory!" - msgstr "Ç ìíÞìç åîáíôëÞèçêå!" - - # --#: main.c:51 -+#: main.c:47 - msgid "" - "To contact the developers, please mail to .\n" - "To report a bug, please use the flea(1) utility.\n" -@@ -3052,7 +3039,7 @@ msgstr "" - "Ãéá íá áíáöÝñåôå Ýíá ðñüâëçìá ÷ñçóéìïðïéÞóåôå ôï åñãáëåßï flea(1).\n" - - # --#: main.c:55 -+#: main.c:51 - msgid "" - "Copyright (C) 1996-2002 Michael R. Elkins and others.\n" - "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n" -@@ -3067,8 +3054,7 @@ msgstr "" - "õðü ïñéóìÝíïõò üñïõò; ãñÜøôå `mutt -vv' ãéá ëåðôïìÝñåéåò.\n" - - # --#: main.c:61 --#, fuzzy -+#: main.c:57 - msgid "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3095,9 +3081,9 @@ msgid "" - " along with this program; if not, write to the Free Software\n" - " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" - msgstr "" --"Copyright (C) 1996-2002 Michael R. Elkins \n" -+"Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" --"Copyright (C) 1997-2002 Thomas Roessler \n" -+"Copyright (C) 1997-2002 Thomas Roessler \n" - "Copyright (C) 1998-2002 Werner Koch \n" - "Copyright (C) 1999-2002 Brendan Cully \n" - "Copyright (C) 1999-2002 Tommi Komulainen \n" -@@ -3114,7 +3100,7 @@ msgstr "" - "êÜèå ìåôÝðåéôá Ýêäïóç.\n" - "\n" - "Áõôü ôï ðñüãñáììá äéáíÝìåôáé ìå ôçí åëðßäá üôé èá åßíáé ÷ñÞóéìï,\n" --"áëëÜ ×ÙÑÉÓ ÊÁÌÉÁ ÅÃÃÕÇÓÇ. Ïýôå áêüìá ãéá ôçí õðïíïïýìåíç åããýçóç ôçò\n" -+"áëëÜ ×ÙÑÉÓ ÊÁÌÌÉÁ ÅÃÃÕÇÓÇ. Ïýôå áêüìá ãéá ôçí õðïíïïýìåíç åããýçóç ôçò\n" - "ÅÌÐÏÑÅÕÓÉÌÏÔÇÔÁÓ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ. Äåßôå ôçí\n" - "GNU ÃåíéêÞ Äçìüóéá ¶äåéá ãéá ðåñéóóüôåñåò ëåðôïìÝñåéåò.\n" - "\n" -@@ -3124,8 +3110,7 @@ msgstr "" - "\n" - - # --#: main.c:99 --#, fuzzy -+#: main.c:95 - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3146,8 +3131,8 @@ msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" - " -F \tspecify an alternate muttrc file\n" --" -H \tspecify a draft file to read header and body from\n" --" -i \tspecify a file which Mutt should include in the body\n" -+" -H \tspecify a draft file to read header from\n" -+" -i \tspecify a file which Mutt should include in the reply\n" - " -m \tspecify a default mailbox type\n" - " -n\t\tcauses Mutt not to read the system Muttrc\n" - " -p\t\trecall a postponed message\n" -@@ -3172,7 +3157,7 @@ msgstr "" - " mutt -v[v]\n" - "\n" - "åðéëïãÝò:\n" --" -A \táðåéêüíéóç ôïõ óõãêåêñéìÝíïõ øåõäüíõìïõ\n" -+" -A \táðåéêüíéóç ôïõ óõãêåêñéìÝíïõ øåõäþíõìïõ\n" - " -a <áñ÷åßï>\tðñïóáñôÞóôå Ýíá áñ÷åßï óå áõôü ôï ìÞíõìá\n" - " -b <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ôõöëïý-ðéóôïý-áíôéãñÜöïõ (BCC)\n" - " -c <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ðéóôïý-áíôéãñÜöïõ (CC)\n" -@@ -3198,7 +3183,7 @@ msgstr "" - " -h\t\táõôü ôï ìÞíõìá âïÞèåéáò" - - # --#: main.c:167 -+#: main.c:163 - msgid "" - "\n" - "Compile options:" -@@ -3207,81 +3192,81 @@ msgstr "" - "ÐáñÜìåôñïé ìåôáãëþôôéóçò:" - - # --#: main.c:478 -+#: main.c:474 - msgid "Error initializing terminal." - msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý." - - # --#: main.c:583 -+#: main.c:579 - #, c-format - msgid "Debugging at level %d.\n" - msgstr "ÁðïóöáëìÜôùóç óôï åðßðåäï %d.\n" - - # --#: main.c:585 -+#: main.c:581 - msgid "DEBUG was not defined during compilation. Ignored.\n" - msgstr "Ôï DEBUG äåí ïñßóôçêå êáôÜ ôçí äéÜñêåéá ôïõ compile. ÁãíïÞèçêå.\n" - --#: main.c:733 -+#: main.c:729 - #, c-format - msgid "%s does not exist. Create it?" - msgstr "Ôï %s äåí õðÜñ÷åé. Äçìéïõñãßá;" - - # --#: main.c:737 -+#: main.c:733 - #, c-format - msgid "Can't create %s: %s." - msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s." - - # --#: main.c:782 -+#: main.c:778 - msgid "No recipients specified.\n" - msgstr "Äåí Ý÷ïõí ïñéóôåß ðáñáëÞðôåò.\n" - - # --#: main.c:868 -+#: main.c:864 - #, c-format - msgid "%s: unable to attach file.\n" - msgstr "%s: áäõíáìßá ðñïóÜñôçóçò ôïõ áñ÷åßïõ.\n" - - # --#: main.c:888 -+#: main.c:884 - msgid "No mailbox with new mail." - msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï." - - # --#: main.c:897 -+#: main.c:893 - msgid "No incoming mailboxes defined." - msgstr "Äåí Ý÷åé ïñéóôåß ãñáììáôïêéâþôéï åéóåñ÷ïìÝíùí." - - # --#: main.c:924 -+#: main.c:920 - msgid "Mailbox is empty." - msgstr "Ôï ãñáììáôïêéâþôéï åßíáé Üäåéï." - - # --#: mbox.c:129 mbox.c:288 -+#: mbox.c:125 mbox.c:284 - #, c-format - msgid "Reading %s... %d (%d%%)" - msgstr "ÁíÜãíùóç %s... %d (%d%%)" - - # --#: mbox.c:153 mbox.c:210 -+#: mbox.c:149 mbox.c:206 - msgid "Mailbox is corrupt!" - msgstr "Ôï ãñáììáôïêéâþôéï Ý÷åé áëëïéùèåß!" - - # --#: mbox.c:662 -+#: mbox.c:658 - msgid "Mailbox was corrupted!" - msgstr "Ôï ãñáììáôïêéâþôéï åß÷å áëëïéùèåß!" - - # --#: mbox.c:699 mbox.c:953 -+#: mbox.c:695 mbox.c:949 - msgid "Fatal error! Could not reopen mailbox!" - msgstr "Ìïéñáßï ëÜèïò! Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!" - - # --#: mbox.c:708 -+#: mbox.c:704 - msgid "Unable to lock mailbox!" - msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ ãñáììáôïêéâùôßïõ!" - -@@ -3290,14 +3275,14 @@ msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ ãñáììáô - #. * messages were found to be changed or deleted. This should - #. * never happen, is we presume it is a bug in mutt. - #. --#: mbox.c:754 -+#: mbox.c:750 - msgid "sync: mbox modified, but no modified messages! (report this bug)" - msgstr "" - "sync: ôï mbox Ý÷åé ôñïðïðïéçèåß, äåí õðÜñ÷ïõí ôñïðïðïéçìÝíá ìçíýìáôá!\n" - "(áíáöÝñáôå áõôü ôï óöÜëìá)" - - # --#: mbox.c:793 -+#: mbox.c:789 - #, c-format - msgid "Writing messages... %d (%d%%)" - msgstr "ÅããñáöÞ ìçíõìÜôùí... %d (%d%%)" -@@ -3306,664 +3291,663 @@ msgstr "ÅããñáöÞ ìçíõìÜôùí... %d (%d%%)" - #. copy the temp mailbox back into place starting at the first - #. * change/deleted message - #. --#: mbox.c:906 -+#: mbox.c:902 - msgid "Committing changes..." - msgstr "ÅöáñìïãÞ ôùí áëëáãþí..." - - # --#: mbox.c:937 -+#: mbox.c:933 - #, c-format - msgid "Write failed! Saved partial mailbox to %s" - msgstr "Ç åããñáöÞ áðÝôõ÷å! ÌÝñïò ôïõ ãñáììáôïêéâùôßïõ áðïèçêåýôçêå óôï %s" - - # --#: mbox.c:1003 -+#: mbox.c:999 - msgid "Could not reopen mailbox!" - msgstr "Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!" - - # --#: mbox.c:1041 -+#: mbox.c:1037 - msgid "Reopening mailbox..." - msgstr "Åðáíáðñüóâáóç óôï ãñáììáôïêéâþôéï..." - - # --#: menu.c:416 -+#: menu.c:407 - msgid "Jump to: " - msgstr "Ìåôáêßíçóç óôï: " - - # --#: menu.c:425 -+#: menu.c:416 - msgid "Invalid index number." - msgstr "Ìç Ýãêõñïò áñéèìüò äåßêôç" - - # --#: menu.c:429 menu.c:447 menu.c:483 menu.c:526 menu.c:542 menu.c:553 --#: menu.c:564 menu.c:606 menu.c:617 menu.c:630 menu.c:643 menu.c:1038 -+#: menu.c:420 menu.c:438 menu.c:474 menu.c:515 menu.c:531 menu.c:542 -+#: menu.c:553 menu.c:595 menu.c:606 menu.c:619 menu.c:632 menu.c:1027 - msgid "No entries." - msgstr "Êáììßá êáôá÷þñçóç" - - # --#: menu.c:444 -+#: menu.c:435 - msgid "You cannot scroll down farther." - msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáêÜôù." - - # --#: menu.c:460 -+#: menu.c:451 - msgid "You cannot scroll up farther." - msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáðÜíù." - - # --#: menu.c:480 -+#: menu.c:471 - msgid "You are on the last page." - msgstr "Åßóôå óôçí ôåëåõôáßá óåëßäá." - - # --#: menu.c:504 -+#: menu.c:493 - msgid "You are on the first page." - msgstr "Åßóôå óôçí ðñþôç óåëßäá." - - # --#: menu.c:583 -+#: menu.c:572 - msgid "First entry is shown." - msgstr "Ç ðñþôç êáôá÷þñçóç åìöáíßæåôáé." - - # --#: menu.c:603 -+#: menu.c:592 - msgid "Last entry is shown." - msgstr "Ç ôåëåõôáßá êáôá÷þñçóç åìöáíßæåôáé." - - # --#: menu.c:654 -+#: menu.c:643 - msgid "You are on the last entry." - msgstr "Åßóôå óôçí ôåëåõôáßá êáôá÷þñçóç." - - # --#: menu.c:665 -+#: menu.c:654 - msgid "You are on the first entry." - msgstr "Åßóôå óôçí ðñþôç êáôá÷þñçóç." - - # --#: menu.c:725 pattern.c:1242 -+#: menu.c:714 pattern.c:1238 - msgid "Search for: " - msgstr "ÁíáæÞôçóç ãéá: " - - # --#: menu.c:726 pattern.c:1243 -+#: menu.c:715 pattern.c:1239 - msgid "Reverse search for: " - msgstr "ÁíÜóôñïöç áíáæÞôçóç ãéá: " - - # --#: menu.c:736 pattern.c:1275 -+#: menu.c:725 pattern.c:1271 - msgid "No search pattern." - msgstr "ÊáíÝíá ó÷Ýäéï áíáæÞôçóçò." - - # --#: menu.c:766 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 -+#: menu.c:755 pager.c:1925 pager.c:1941 pager.c:2049 pattern.c:1336 - msgid "Not found." - msgstr "Äå âñÝèçêå." - - # --#: menu.c:890 -+#: menu.c:879 - msgid "No tagged entries." - msgstr "Êáììßá óçìåéùìÝíç åßóïäïò." - - # --#: menu.c:995 -+#: menu.c:984 - msgid "Search is not implemented for this menu." - msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý." - - # --#: menu.c:1000 -+#: menu.c:989 - msgid "Jumping is not implemented for dialogs." - msgstr "Äåí Ý÷åé åöáñìïóôåß ìåôáêßíçóç ãéá ôïõò äéáëüãïõò." - - # --#: menu.c:1041 -+#: menu.c:1030 - msgid "Tagging is not supported." - msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé." - - # --#: mh.c:663 mh.c:900 -+#: mh.c:659 mh.c:896 - #, c-format - msgid "Reading %s... %d" - msgstr "ÁíÜãíùóç %s... %d" - --#: mh.c:1151 -+#: mh.c:1147 - msgid "maildir_commit_message(): unable to set time on file" - msgstr "maildir_commit_message(): áäõíáìßá ïñéóìïý ÷ñüíïõ óôï áñ÷åßï" - --#: muttlib.c:846 --#, fuzzy -+#: muttlib.c:842 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" --msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;" -+msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý; [(y)íáé, (n)ü÷é, (a)üëá]" - --#: muttlib.c:846 -+#: muttlib.c:842 - msgid "yna" --msgstr "" -+msgstr "yna" - --#: muttlib.c:862 -+#: muttlib.c:858 - msgid "File is a directory, save under it?" - msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;" - --#: muttlib.c:868 -+#: muttlib.c:864 - msgid "File under directory: " - msgstr "Áñ÷åßï õðü öÜêåëï:" - --#: muttlib.c:880 -+#: muttlib.c:876 - msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?" - msgstr "Ôï áñ÷åßï õðÜñ÷åé, (o)äéáãñáöÞ ôïõ õðÜñ÷ïíôïò, (a)ðñüóèåóç, (c)Üêõñï;" - --#: muttlib.c:880 -+#: muttlib.c:876 - msgid "oac" - msgstr "oac" - - # --#: muttlib.c:1199 -+#: muttlib.c:1187 - msgid "Can't save message to POP mailbox." - msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò óôï POP ãñáììáôïêéâþôéï." - - # --#: muttlib.c:1208 -+#: muttlib.c:1196 - #, c-format - msgid "%s is not a mailbox!" - msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï!" - - # --#: muttlib.c:1214 -+#: muttlib.c:1202 - #, c-format - msgid "Append messages to %s?" - msgstr "Ðñüóèåóç ìçíõìÜôùí óôï %s;" - - # --#: mutt_socket.c:91 mutt_socket.c:147 -+#: mutt_socket.c:87 mutt_socket.c:143 - #, c-format - msgid "Connection to %s closed" - msgstr "¸êëåéóå ç óýíäåóç óôï %s" - --#: mutt_socket.c:271 -+#: mutt_socket.c:267 - msgid "SSL is unavailable." - msgstr "Ôï SSL äåí åßíáé äéáèÝóéìï." - --#: mutt_socket.c:302 -+#: mutt_socket.c:298 - msgid "Preconnect command failed." - msgstr "Áðïôõ÷ßá åíôïëÞò ðñïóýíäåóçò" - - # --#: mutt_socket.c:373 mutt_socket.c:387 -+#: mutt_socket.c:369 mutt_socket.c:383 - #, c-format - msgid "Error talking to %s (%s)" - msgstr "ÓöÜëìá óôç óõíïìéëßá ìå ôï %s (%s)" - --#: mutt_socket.c:426 mutt_socket.c:483 -+#: mutt_socket.c:422 mutt_socket.c:479 - #, c-format - msgid "Bad IDN \"%s\"." --msgstr "" -+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN \"%s\"." - - # --#: mutt_socket.c:433 mutt_socket.c:490 -+#: mutt_socket.c:429 mutt_socket.c:486 - #, c-format - msgid "Looking up %s..." - msgstr "ÁíáæÞôçóç ôïõ %s..." - - # --#: mutt_socket.c:444 mutt_socket.c:497 -+#: mutt_socket.c:440 mutt_socket.c:493 - #, c-format - msgid "Could not find the host \"%s\"" - msgstr "Áäõíáìßá åýñåóçò ôïõ äéáêïìéóôÞ \"%s\"" - - # --#: mutt_socket.c:448 mutt_socket.c:506 -+#: mutt_socket.c:444 mutt_socket.c:502 - #, c-format - msgid "Connecting to %s..." - msgstr "Óýíäåóç óôï %s..." - - # --#: mutt_socket.c:529 -+#: mutt_socket.c:525 - #, c-format - msgid "Could not connect to %s (%s)." - msgstr "Áäõíáìßá óýíäåóçò óôï %s (%s)." - --#: mutt_ssl.c:175 -+#: mutt_ssl.c:174 - msgid "Failed to find enough entropy on your system" - msgstr "Áðïôõ÷ßá óôçí åýñåóç áñêåôÞò åíôñïðßáò óôï óýóôçìá óáò" - --#: mutt_ssl.c:199 -+#: mutt_ssl.c:198 - #, c-format - msgid "Filling entropy pool: %s...\n" - msgstr "ÁðïèÞêåõóç åíôñïðßáò: %s...\n" - --#: mutt_ssl.c:207 -+#: mutt_ssl.c:206 - #, c-format - msgid "%s has insecure permissions!" - msgstr "Ôï %s Ý÷åé áíáóöáëÞ äéêáéþìáôá!" - --#: mutt_ssl.c:226 -+#: mutt_ssl.c:225 - msgid "SSL disabled due the lack of entropy" - msgstr "Ôï SSL áðåíåñãïðïéÞèçêå ëüãù ëÞøçò åíôñïðßáò" - --#: mutt_ssl.c:322 -+#: mutt_ssl.c:321 - msgid "I/O error" - msgstr "I/O óöÜëìá" - - # --#: mutt_ssl.c:331 -+#: mutt_ssl.c:330 - #, c-format - msgid "SSL failed: %s" - msgstr "SSL áðÝôõ÷å: %s" - - # --#: mutt_ssl.c:340 -+#: mutt_ssl.c:339 - msgid "Unable to get certificate from peer" - msgstr "Áäõíáìßá óôç ëÞøç ðéóôïðïéçôéêïý áðü ôï ôáßñé" - - # --#: mutt_ssl.c:348 -+#: mutt_ssl.c:347 - #, c-format - msgid "SSL connection using %s (%s)" - msgstr "Óýíäåóç SSL ÷ñçóéìïðïéþíôáò ôï %s (%s)" - - # --#: mutt_ssl.c:388 -+#: mutt_ssl.c:387 - msgid "Unknown" - msgstr "¶ãíùóôï" - - # --#: mutt_ssl.c:413 -+#: mutt_ssl.c:412 - #, c-format - msgid "[unable to calculate]" - msgstr "[áäõíáìßá õðïëïãéóìïý]" - - # --#: mutt_ssl.c:431 -+#: mutt_ssl.c:430 - msgid "[invalid date]" - msgstr "[ìç Ýãêõñç çìåñïìçíßá]" - --#: mutt_ssl.c:506 -+#: mutt_ssl.c:505 - msgid "Server certificate is not yet valid" - msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç" - --#: mutt_ssl.c:513 -+#: mutt_ssl.c:512 - msgid "Server certificate has expired" - msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå" - --#: mutt_ssl.c:586 -+#: mutt_ssl.c:585 - msgid "This certificate belongs to:" - msgstr "Áõôü ôï ðéóôïðïéçôéêü áíÞêåé óôï:" - --#: mutt_ssl.c:597 -+#: mutt_ssl.c:596 - msgid "This certificate was issued by:" - msgstr "Áõôü ôï ðéóôïðïéçôéêü åêäüèçêå áðü ôï:" - --#: mutt_ssl.c:608 -+#: mutt_ssl.c:607 - #, c-format - msgid "This certificate is valid" - msgstr "Áõôü ôï ðéóôïðïéçôéêü åßíáé Ýãêõñï" - --#: mutt_ssl.c:609 -+#: mutt_ssl.c:608 - #, c-format - msgid " from %s" - msgstr " áðü %s" - --#: mutt_ssl.c:611 -+#: mutt_ssl.c:610 - #, c-format - msgid " to %s" - msgstr " ðñïò %s" - --#: mutt_ssl.c:617 -+#: mutt_ssl.c:616 - #, c-format - msgid "Fingerprint: %s" - msgstr "Áðïôýðùìá: %s" - --#: mutt_ssl.c:619 -+#: mutt_ssl.c:618 - msgid "SSL Certificate check" - msgstr "¸ëåã÷ïò Ðéóôïðïéçôéêïý SSL" - --#: mutt_ssl.c:622 -+#: mutt_ssl.c:621 - msgid "(r)eject, accept (o)nce, (a)ccept always" - msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ, (a)áðïäï÷Þ ðÜíôá" - --#: mutt_ssl.c:623 -+#: mutt_ssl.c:622 - msgid "roa" - msgstr "roa" - --#: mutt_ssl.c:627 -+#: mutt_ssl.c:626 - msgid "(r)eject, accept (o)nce" - msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ" - --#: mutt_ssl.c:628 -+#: mutt_ssl.c:627 - msgid "ro" - msgstr "ro" - - # --#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431 -+#: mutt_ssl.c:631 pgpkey.c:510 smime.c:427 - msgid "Exit " - msgstr "¸îïäïò " - --#: mutt_ssl.c:659 -+#: mutt_ssl.c:658 - msgid "Warning: Couldn't save certificate" - msgstr "Ðñïåéäïðïßçóç: Áäõíáìßá áðïèÞêåõóçò ðéóôïðïéçôéêïý" - --#: mutt_ssl.c:664 -+#: mutt_ssl.c:663 - msgid "Certificate saved" - msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå" - - # --#: mx.c:120 -+#: mx.c:116 - #, c-format - msgid "Lock count exceeded, remove lock for %s?" - msgstr "Ï áñéèìüò êëåéäùìÜôùí îåðåñÜóôçêå, îåêëåßäùìá ôïõ %s;" - - # --#: mx.c:132 -+#: mx.c:128 - #, c-format - msgid "Can't dotlock %s.\n" - msgstr "Áäõíáìßá dotlock ôïõ %s.\n" - - # --#: mx.c:190 -+#: mx.c:186 - msgid "Timeout exceeded while attempting fcntl lock!" - msgstr "Ôï üñéï ÷ñüíïõ îåðåñÜóôçêå êáôÜ ôçí ðñïóðÜèåéá êëåéäþìáôïò ìå fcntl!" - - # --#: mx.c:196 -+#: mx.c:192 - #, c-format - msgid "Waiting for fcntl lock... %d" - msgstr "ÁíáìïíÞ ãéá ôï êëåßäùìá fcntl... %d" - - # --#: mx.c:224 -+#: mx.c:220 - msgid "Timeout exceeded while attempting flock lock!" - msgstr "Ôï üñéï ÷ñüíïõ îåðåñÜóôçêå êáôÜ ôçí ðñïóðÜèåéá êëåéäþìáôïò flock!" - - # --#: mx.c:231 -+#: mx.c:227 - #, c-format - msgid "Waiting for flock attempt... %d" - msgstr "ÁíáìïíÞ ãéá ðñïóðÜèåéá flock... %d" - - # --#: mx.c:595 -+#: mx.c:591 - #, c-format - msgid "Couldn't lock %s\n" - msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ %s\n" - - # --#: mx.c:679 -+#: mx.c:675 - #, c-format - msgid "Reading %s..." - msgstr "ÁíÜãíùóç %s..." - - # --#: mx.c:779 -+#: mx.c:775 - #, c-format - msgid "Writing %s..." - msgstr "ÅããñáöÞ %s..." - - # --#: mx.c:812 -+#: mx.c:808 - #, c-format - msgid "Could not synchronize mailbox %s!" - msgstr "Áäõíáìßá óõã÷ñïíéóìïý ôïõ ãñáììáôïêéâùôßïõ %s!" - - # --#: mx.c:878 -+#: mx.c:874 - #, c-format - msgid "Move read messages to %s?" - msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s;" - - # --#: mx.c:894 mx.c:1150 -+#: mx.c:890 mx.c:1146 - #, c-format - msgid "Purge %d deleted message?" - msgstr "Êáèáñéóìüò %d äéåãñáììÝíïõ ìçíýìáôïò;" - - # --#: mx.c:894 mx.c:1150 -+#: mx.c:890 mx.c:1146 - #, c-format - msgid "Purge %d deleted messages?" - msgstr "Êáèáñéóìüò %d äéåãñáììÝíùí ìçíõìÜôùí;" - - # --#: mx.c:918 -+#: mx.c:914 - #, c-format - msgid "Moving read messages to %s..." - msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s..." - - # --#: mx.c:977 mx.c:1141 -+#: mx.c:973 mx.c:1137 - msgid "Mailbox is unchanged." - msgstr "Äåí Ýãéíå áëëáãÞ óôï ãñáììáôïêéâþôéï " - - # --#: mx.c:1013 -+#: mx.c:1009 - #, c-format - msgid "%d kept, %d moved, %d deleted." - msgstr "%d êñáôÞèçêáí, %d ìåôáêéíÞèçêáí, %d äéáãñÜöçêáí." - - # --#: mx.c:1016 mx.c:1188 -+#: mx.c:1012 mx.c:1184 - #, c-format - msgid "%d kept, %d deleted." - msgstr "%d êñáôÞèçêáí, %d äéáãñÜöçêáí." - - # --#: mx.c:1126 -+#: mx.c:1122 - #, c-format - msgid " Press '%s' to toggle write" - msgstr "ÐáôÞóôå '%s' ãéá íá åíåñãïðïéÞóåôå ôçí åããñáöÞ!" - - # --#: mx.c:1128 -+#: mx.c:1124 - msgid "Use 'toggle-write' to re-enable write!" - msgstr "×ñçóéìïðïéÞóôå ôï 'toggle-write' ãéá íá åíåñãïðïéÞóåôå ôçí åããñáöÞ!" - - # --#: mx.c:1130 -+#: mx.c:1126 - #, c-format - msgid "Mailbox is marked unwritable. %s" - msgstr "Ôï ãñáììáôïêéâþôéï åßíáé óçìåéùìÝíï ìç åããñÜøéìï. %s" - - # --#: mx.c:1185 -+#: mx.c:1181 - msgid "Mailbox checkpointed." - msgstr "Ôï ãñáììáôïêéâþôéï óçìåéþèçêå." - - # --#: mx.c:1494 -+#: mx.c:1490 - msgid "Can't write message" - msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò" - --#: mx.c:1539 -+#: mx.c:1535 - msgid "Integer overflow -- can't allocate memory." --msgstr "" -+msgstr "Õðåñ÷åßëéóç áêåñáßïõ -- áäõíáìßá åê÷þñçóçò ìíÞìçò." - - # --#: pager.c:57 -+#: pager.c:53 - msgid "Not available in this menu." - msgstr "Äåí åßíáé äéáèÝóéìï óå áõôü ôï ìåíïý." - - # --#: pager.c:1450 -+#: pager.c:1446 - msgid "PrevPg" - msgstr "ÐñïçãÓåë" - - # --#: pager.c:1451 -+#: pager.c:1447 - msgid "NextPg" - msgstr "ÅðüìÓåë" - - # --#: pager.c:1455 -+#: pager.c:1451 - msgid "View Attachm." - msgstr "¼øçÐñïóÜñô" - - # --#: pager.c:1458 -+#: pager.c:1454 - msgid "Next" - msgstr "Åðüìåíï" - - # - #. emulate "less -q" and don't go on to the next message. --#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143 -+#: pager.c:1833 pager.c:1864 pager.c:1896 pager.c:2137 - msgid "Bottom of message is shown." - msgstr "Åìöáíßæåôáé ç âÜóç ôïõ ìçíýìáôïò." - - # --#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891 -+#: pager.c:1849 pager.c:1871 pager.c:1878 pager.c:1885 - msgid "Top of message is shown." - msgstr "Åìöáíßæåôáé ç áñ÷Þ ôïõ ìçíýìáôïò." - - # --#: pager.c:1960 -+#: pager.c:1954 - msgid "Reverse search: " - msgstr "ÁíÜóôñïöç áíáæÞôçóç: " - - # --#: pager.c:1961 -+#: pager.c:1955 - msgid "Search: " - msgstr "ÁíáæÞôçóç:" - - # --#: pager.c:2081 -+#: pager.c:2075 - msgid "Help is currently being shown." - msgstr "Ç âïÞèåéá Þäç åìöáíßæåôáé." - - # --#: pager.c:2110 -+#: pager.c:2104 - msgid "No more quoted text." - msgstr "¼÷é Üëëï êáèïñéóìÝíï êåßìåíï." - - # --#: pager.c:2123 -+#: pager.c:2117 - msgid "No more unquoted text after quoted text." - msgstr "¼÷é Üëëï ìç êáèïñéóìÝíï êåßìåíï ìåôÜ áðü êáèïñéóìÝíï." - - # --#: parse.c:602 -+#: parse.c:598 - msgid "multipart message has no boundary parameter!" - msgstr "ôï ðïëõìåñÝò ìÞíõìá äåí Ý÷åé ïñéïèÝôïõóá ðáñÜìåôñï!" - - # --#: pattern.c:244 -+#: pattern.c:240 - #, c-format - msgid "Error in expression: %s" - msgstr "ËÜèïò óôçí Ýêöñáóç: %s" - - # --#: pattern.c:354 -+#: pattern.c:350 - #, c-format - msgid "Invalid day of month: %s" - msgstr "Ìç Ýãêõñç ìÝñá ôïõ ìÞíá: %s" - - # --#: pattern.c:368 -+#: pattern.c:364 - #, c-format - msgid "Invalid month: %s" - msgstr "Ìç Ýãêõñïò ìÞíáò: %s" - - # - #. getDate has its own error message, don't overwrite it here --#: pattern.c:520 -+#: pattern.c:516 - #, c-format - msgid "Invalid relative date: %s" - msgstr "Ìç Ýãêõñïò áíáöïñéêþò ìÞíáò: %s" - - # --#: pattern.c:534 -+#: pattern.c:530 - msgid "error in expression" - msgstr "óöÜëìá óôçí Ýêöñáóç" - - # --#: pattern.c:740 pattern.c:848 -+#: pattern.c:736 pattern.c:844 - #, c-format - msgid "error in pattern at: %s" - msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s" - - # --#: pattern.c:788 -+#: pattern.c:784 - #, c-format - msgid "%c: invalid command" - msgstr "%c: ìç Ýãêõñç åíôïëÞ" - - # --#: pattern.c:794 -+#: pattern.c:790 - #, c-format - msgid "%c: not supported in this mode" - msgstr "Ôï %c: äåí õðïóôçñßæåôáé óå áõôÞ ôçí êáôÜóôáóç" - - # --#: pattern.c:807 -+#: pattern.c:803 - #, c-format - msgid "missing parameter" - msgstr "Ýëëåéøç ðáñáìÝôñïõ" - - # --#: pattern.c:823 -+#: pattern.c:819 - #, c-format - msgid "mismatched parenthesis: %s" - msgstr "áôáßñéáóôç ðáñÝíèåóç/åéò: %s" - - # --#: pattern.c:855 -+#: pattern.c:851 - msgid "empty pattern" - msgstr "Üäåéï ìïíôÝëï/ìïñöÞ" - - # --#: pattern.c:1061 -+#: pattern.c:1057 - #, c-format - msgid "error: unknown op %d (report this error)." - msgstr "ëÜèïò: Üãíùóôç äéåñãáóßá %d (áíÝöåñå áõôü ôï óöÜëìá)." - - # --#: pattern.c:1130 pattern.c:1261 -+#: pattern.c:1126 pattern.c:1257 - msgid "Compiling search pattern..." - msgstr "Óýíôáîç ìïíôÝëïõ áíáæÞôçóçò..." - - # --#: pattern.c:1144 -+#: pattern.c:1140 - msgid "Executing command on matching messages..." - msgstr "ÅêôÝëåóç åíôïëÞò óôá ðáñüìïéá ìçíýìáôá..." - - # --#: pattern.c:1206 -+#: pattern.c:1202 - msgid "No messages matched criteria." - msgstr "ÊáíÝíá ìÞíõìá äåí ôáéñéÜæåé óôá êñéôÞñéá." - - # --#: pattern.c:1299 -+#: pattern.c:1295 - msgid "Search hit bottom without finding match" - msgstr "Ç áíáæÞôçóç Ýöèáóå óôï ôÝëïò ÷ùñßò íá âñåé üìïéï" - - # --#: pattern.c:1310 -+#: pattern.c:1306 - msgid "Search hit top without finding match" - msgstr "Ç áíáæÞôçóç Ýöèáóå óôçí áñ÷Þ ÷ùñßò íá âñåé üìïéï" - - # --#: pattern.c:1332 -+#: pattern.c:1328 - msgid "Search interrupted." - msgstr "Ç áíáæÞôçóç äéáêüðçêå." - - # - # pgp.c:130 --#: pgp.c:90 -+#: pgp.c:86 - msgid "Enter PGP passphrase:" - msgstr "ÅéóÜãåôå ôçí öñÜóç-êëåéäß PGP:" - - # - # pgp.c:146 --#: pgp.c:104 -+#: pgp.c:100 - msgid "PGP passphrase forgotten." - msgstr "Ç öñÜóç-êëåéäß PGP Ý÷åé îå÷áóôåß." - - # --#: pgp.c:344 -+#: pgp.c:340 - msgid "[-- Error: unable to create PGP subprocess! --]\n" - msgstr "[-- ÓöÜëìá: áäõíáìßá óôç äçìéïõñãßá õðïäéåñãáóßáò PGP! --]\n" - - # - # pgp.c:669 pgp.c:894 --#: pgp.c:379 pgp.c:596 pgp.c:797 -+#: pgp.c:375 pgp.c:592 pgp.c:793 - msgid "" - "[-- End of PGP output --]\n" - "\n" -@@ -3973,7 +3957,7 @@ msgstr "" - - # - # pgp.c:353 --#: pgp.c:394 -+#: pgp.c:390 - msgid "" - "[-- BEGIN PGP MESSAGE --]\n" - "\n" -@@ -3983,13 +3967,13 @@ msgstr "" - - # - # pgp.c:355 --#: pgp.c:396 -+#: pgp.c:392 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- ÅÍÁÑÎÇ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n" - - # - # pgp.c:357 --#: pgp.c:398 -+#: pgp.c:394 - msgid "" - "[-- BEGIN PGP SIGNED MESSAGE --]\n" - "\n" -@@ -3999,24 +3983,24 @@ msgstr "" - - # - # pgp.c:459 --#: pgp.c:423 -+#: pgp.c:419 - msgid "[-- END PGP MESSAGE --]\n" - msgstr "[-- ÔÅËÏÓ ÌÇÍÕÌÁÔÏÓ PGP --]\n" - - # - # pgp.c:461 --#: pgp.c:425 -+#: pgp.c:421 - msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- ÔÅËÏÓ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n" - - # - # pgp.c:463 --#: pgp.c:427 -+#: pgp.c:423 - msgid "[-- END PGP SIGNED MESSAGE --]\n" - msgstr "[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n" - - # --#: pgp.c:454 -+#: pgp.c:450 - msgid "" - "[-- Error: could not find beginning of PGP message! --]\n" - "\n" -@@ -4026,14 +4010,13 @@ msgstr "" - - # - # pgp.c:801 --#: pgp.c:704 --#, fuzzy -+#: pgp.c:700 - msgid "Internal error. Inform ." --msgstr "Åóùôåñéêü óöÜëìá. ÐëçñïöïñÞóôå ." -+msgstr "Åóùôåñéêü óöÜëìá. ÐëçñïöïñÞóôå ." - - # - # pgp.c:865 --#: pgp.c:764 -+#: pgp.c:760 - msgid "" - "[-- Error: could not create a PGP subprocess! --]\n" - "\n" -@@ -4043,7 +4026,7 @@ msgstr "" - - # - # pgp.c:958 --#: pgp.c:873 -+#: pgp.c:867 - msgid "" - "[-- Error: malformed PGP/MIME message! --]\n" - "\n" -@@ -4052,13 +4035,13 @@ msgstr "" - "\n" - - # --#: pgp.c:886 -+#: pgp.c:880 - msgid "[-- Error: could not create temporary file! --]\n" - msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n" - - # - # pgp.c:980 --#: pgp.c:895 -+#: pgp.c:889 - msgid "" - "[-- The following data is PGP/MIME encrypted --]\n" - "\n" -@@ -4068,569 +4051,564 @@ msgstr "" - - # - # pgp.c:988 --#: pgp.c:915 -+#: pgp.c:909 - msgid "[-- End of PGP/MIME encrypted data --]\n" - msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n" - - # - # pgp.c:1070 --#: pgp.c:965 -+#: pgp.c:959 - msgid "Can't open PGP subprocess!" - msgstr "Áäõíáìßá áíïßãìáôïò õðïäéåñãáóßáò PGP!" - - # - # pgp.c:1194 --#: pgp.c:1109 -+#: pgp.c:1103 - #, c-format - msgid "Use keyID = \"%s\" for %s?" - msgstr "Íá ÷ñçóéìïðïéçèåß keyID = \"%s\" ãéá ôï %s;" - - # - # pgp.c:1200 --#: pgp.c:1143 smime.c:665 smime.c:790 -+#: pgp.c:1137 smime.c:661 smime.c:786 - #, c-format - msgid "Enter keyID for %s: " - msgstr "ÅéóÜãåôå keyID ãéá ôï %s: " - --#: pgp.c:1397 -+#: pgp.c:1391 - msgid "Can't invoke PGP" - msgstr "Áäõíáìßá êëÞóçò ôïõ PGP" - - # - # compose.c:132 --#: pgp.c:1491 --#, fuzzy, c-format -+#: pgp.c:1485 -+#, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " --msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)êåßìåíï, Þ (f)orget it? " -+msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; " - --#: pgp.c:1492 -+#: pgp.c:1486 - msgid "PGP/M(i)ME" --msgstr "" -+msgstr "PGP/M(i)ME" - --#: pgp.c:1492 -+#: pgp.c:1486 - msgid "(i)nline" --msgstr "" -+msgstr "(i)åóùôåñéêü êåßìåíï" - - # - # compose.c:133 --#: pgp.c:1494 --#, fuzzy -+#: pgp.c:1488 - msgid "esabifc" --msgstr "esabif" -+msgstr "esabifc" - - # - #. sign (a)s --#: pgp.c:1509 smime.c:1981 -+#: pgp.c:1503 smime.c:1977 - msgid "Sign as: " - msgstr "ÕðïãñáöÞ ùò: " - - # --#: pgpinvoke.c:307 -+#: pgpinvoke.c:303 - msgid "Fetching PGP key..." - msgstr "ËÞøç êëåéäéïý PGP..." - --#: pgpkey.c:490 --#, fuzzy -+#: pgpkey.c:486 - msgid "All matching keys are expired, revoked, or disabled." --msgstr "¼ëá ôá üìïéá êëåéäéÜ åßíáé óçìåéùìÝíá óáí ëçãìÝíá/Üêõñá." -+msgstr "¼ëá ôá êëåéäéÜ ðïõ ôáéñéÜæïõí åßíáé ëçãìÝíá, áêõñùìÝíá Þ áíåíåñãÜ." - - # - #. __STRCAT_CHECKED__ --#: pgpkey.c:516 smime.c:433 -+#: pgpkey.c:512 smime.c:429 - msgid "Select " - msgstr "ÄéáëÝîôå " - - # - # pgpkey.c:178 - #. __STRCAT_CHECKED__ --#: pgpkey.c:519 -+#: pgpkey.c:515 - msgid "Check key " - msgstr "ÅëÝãîôå êëåéäß " - - # --#: pgpkey.c:532 -+#: pgpkey.c:528 - #, c-format - msgid "PGP keys matching <%s>." - msgstr "¼ìïéá PGP êëåéäéÜ <%s>." - - # --#: pgpkey.c:534 -+#: pgpkey.c:530 - #, c-format - msgid "PGP keys matching \"%s\"." - msgstr "¼ìïéá PGP êëåéäéÜ \"%s\"." - - # - # pgpkey.c:210 pgpkey.c:387 --#: pgpkey.c:553 pgpkey.c:745 -+#: pgpkey.c:549 pgpkey.c:741 - msgid "Can't open /dev/null" - msgstr "Áäõíáìßá áíïßãìáôïò /dev/null" - - # --#: pgpkey.c:559 pgpkey.c:739 -+#: pgpkey.c:555 pgpkey.c:735 - msgid "Can't create temporary file" - msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ" - - # - # pgpkey.c:236 --#: pgpkey.c:580 -+#: pgpkey.c:576 - #, c-format - msgid "Key ID: 0x%s" - msgstr "ID êëåéäéïý: 0x%s" - --#: pgpkey.c:600 -+#: pgpkey.c:596 - msgid "This key can't be used: expired/disabled/revoked." - msgstr "" - "Áõôü ôï êëåéäß äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï." - --#: pgpkey.c:612 -+#: pgpkey.c:608 - msgid "ID is expired/disabled/revoked." - msgstr "Ôï ID åßíáé ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï." - --#: pgpkey.c:616 -+#: pgpkey.c:612 - msgid "ID has undefined validity." - msgstr "Ôï ID Ý÷åé ìç ïñéóìÝíç åãêõñüôçôá." - - # --#: pgpkey.c:619 -+#: pgpkey.c:615 - msgid "ID is not valid." - msgstr "Ôï ID äåí åßíáé Ýãêõñï." - - # - # pgpkey.c:259 --#: pgpkey.c:622 -+#: pgpkey.c:618 - msgid "ID is only marginally valid." - msgstr "Ôï ID åßíáé ìüíï ìåñéêþò Ýãêõñï." - - # - # pgpkey.c:262 --#: pgpkey.c:626 -+#: pgpkey.c:622 - #, c-format - msgid "%s Do you really want to use the key?" - msgstr "%s ÈÝëåôå óßãïõñá íá ÷ñçóéìïðïéÞóåôå ôï êëåéäß;" - - # - # pgpkey.c:369 --#: pgpkey.c:724 -+#: pgpkey.c:720 - msgid "Please enter the key ID: " - msgstr "Ðáñáêáëþ ãñÜøôå ôï ID ôïõ êëåéäéïý: " - - # - # commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220 --#: pgpkey.c:752 -+#: pgpkey.c:748 - msgid "Invoking pgp..." - msgstr "ÊëÞóç ôïõ pgp..." - - # - # pgpkey.c:416 --#: pgpkey.c:777 -+#: pgpkey.c:773 - #, c-format - msgid "PGP Key %s." - msgstr "Êëåéäß PGP %s." - --#: pgpkey.c:839 pgpkey.c:955 -+#: pgpkey.c:835 pgpkey.c:951 - #, c-format - msgid "Looking for keys matching \"%s\"..." - msgstr "Åýñåóç üìïéùí êëåéäéþí ìå \"%s\"..." - - # --#: pop.c:90 pop_lib.c:201 -+#: pop.c:86 pop_lib.c:197 - #, c-format - msgid "Command TOP is not supported by server." - msgstr "Ç åíôïëÞ TOP äåí õðïóôçñßæåôå áðü ôï äéáêïìéóôÞ." - - # --#: pop.c:117 -+#: pop.c:113 - msgid "Can't write header to temporary file!" - msgstr "Áäõíáìßá åããñáöÞò åðéêåöáëßäáò óôï ðñïóùñéíü áñ÷åßï!" - - # --#: pop.c:198 pop_lib.c:203 -+#: pop.c:194 pop_lib.c:199 - #, c-format - msgid "Command UIDL is not supported by server." - msgstr "Ç åíôïëÞ UIDL äåí õðïóôçñßæåôå áðü ôï äéáêïìéóôÞ." - --#: pop.c:247 pop.c:562 -+#: pop.c:243 pop.c:558 - #, c-format - msgid "%s is an invalid POP path" - msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ" - - # --#: pop.c:278 -+#: pop.c:274 - msgid "Fetching list of messages..." - msgstr "ËÞøç ëßóôáò ìçíõìÜôùí..." - - # --#: pop.c:415 -+#: pop.c:411 - msgid "Can't write message to temporary file!" - msgstr "Áäõíáìßá åããñáöÞò ìçíýìáôïò óôï ðñïóùñéíü áñ÷åßï!" - - # --#: pop.c:517 pop.c:582 -+#: pop.c:513 pop.c:578 - msgid "Checking for new messages..." - msgstr "¸ëåã÷ïò ãéá íÝá ìçíýìáôá..." - - # --#: pop.c:546 -+#: pop.c:542 - msgid "POP host is not defined." - msgstr "Ï POP host äåí êáèïñßóôçêå." - - # --#: pop.c:610 -+#: pop.c:606 - msgid "No new mail in POP mailbox." - msgstr "Äåí õðÜñ÷åé áëëçëïãñáößá óôï POP ãñáììáôïêéâþôéï." - - # --#: pop.c:617 -+#: pop.c:613 - msgid "Delete messages from server?" - msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ;" - - # --#: pop.c:619 -+#: pop.c:615 - #, c-format - msgid "Reading new messages (%d bytes)..." - msgstr "ÁíÜãíùóç íÝùí ìçíõìÜôùí (%d bytes)..." - - # --#: pop.c:661 -+#: pop.c:657 - msgid "Error while writing mailbox!" - msgstr "ÓöÜëìá êáôÜ ôçí åããñáöÞ óôï ãñáììáôïêéâþôéï" - - # --#: pop.c:665 -+#: pop.c:661 - #, c-format - msgid "%s [%d of %d messages read]" - msgstr "%s [%d áðü %d ìçíýìáôá äéáâÜóôçêáí]" - - # --#: pop.c:688 pop_lib.c:364 -+#: pop.c:684 pop_lib.c:360 - msgid "Server closed connection!" - msgstr "Ç óýíäåóç ìå ôïí åîõðçñåôçôÞ Ýêëåéóå!" - --#: pop_auth.c:93 -+#: pop_auth.c:89 - msgid "Authenticating (SASL)..." - msgstr "Áõèåíôéêïðïßçóç (SASL)..." - --#: pop_auth.c:209 -+#: pop_auth.c:205 - msgid "Authenticating (APOP)..." - msgstr "Áõèåíôéêïðïßçóç (APOP)..." - --#: pop_auth.c:233 -+#: pop_auth.c:229 - msgid "APOP authentication failed." - msgstr "Áõèåíôéêïðïßçóç APOP áðÝôõ÷å." - - # --#: pop_auth.c:268 -+#: pop_auth.c:264 - #, c-format - msgid "Command USER is not supported by server." - msgstr "Ç åíôïëÞ USER äåí õðïóôçñßæåôå áðü ôï äéáêïìéóôÞ." - - # --#: pop_lib.c:199 -+#: pop_lib.c:195 - msgid "Unable to leave messages on server." - msgstr "Áäõíáìßá Üöåóçò ôùí ìçíõìÜôùí óôïí åîõðçñåôçôÞ." - - # --#: pop_lib.c:229 -+#: pop_lib.c:225 - #, c-format - msgid "Error connecting to server: %s" - msgstr "ÓöÜëìá êáôá ôç óýíäåóç óôï äéáêïìéóôÞ: %s" - - # --#: pop_lib.c:378 -+#: pop_lib.c:374 - msgid "Closing connection to POP server..." - msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..." - - # --#: pop_lib.c:544 -+#: pop_lib.c:540 - msgid "Verifying message indexes..." - msgstr "Åðéâåâáßùóç ôùí åõñåôçñßùí ìçíõìÜôùí..." - - # --#: pop_lib.c:568 -+#: pop_lib.c:564 - msgid "Connection lost. Reconnect to POP server?" - msgstr "Áðþëåéá óýíäåóçò. Åðáíáóýíäåóç óôï äéáêïìéóôÞ POP;" - - # --#: postpone.c:167 -+#: postpone.c:163 - msgid "Postponed Messages" - msgstr "ÁíáâëçèÝíôá Ìçíýìáôá" - - # --#: postpone.c:247 postpone.c:256 -+#: postpone.c:243 postpone.c:252 - msgid "No postponed messages." - msgstr "Äåí õðÜñ÷ïõí áíáâëçèÝíôá ìçíýìáôá." - - # - # postpone.c:338 postpone.c:358 postpone.c:367 --#: postpone.c:442 postpone.c:463 postpone.c:497 -+#: postpone.c:438 postpone.c:459 postpone.c:493 - msgid "Illegal PGP header" - msgstr "ÁêáôÜëëçëç åðéêåöáëßäá PGP" - - # - # postpone.c:338 postpone.c:358 postpone.c:367 --#: postpone.c:483 -+#: postpone.c:479 - msgid "Illegal S/MIME header" - msgstr "ÁêáôÜëëçëç åðéêåöáëßäá S/MIME" - - # --#: postpone.c:556 --#, fuzzy -+#: postpone.c:552 - msgid "Decrypting message..." --msgstr "ËÞøç ìçíýìáôïò..." -+msgstr "ÁðïêñõðôïãñÜöçóç ìçíýìáôïò..." - - # --#: postpone.c:565 -+#: postpone.c:561 - msgid "Decryption failed." - msgstr "Ç áðïêñõðôïãñÜöçóç áðÝôõ÷å." - - # --#: query.c:50 -+#: query.c:46 - msgid "New Query" - msgstr "ÍÝá Åñþôçóç" - - # --#: query.c:51 -+#: query.c:47 - msgid "Make Alias" - msgstr "Äçìéïõñãßá Øåõäþíõìïõ" - - # --#: query.c:52 -+#: query.c:48 - msgid "Search" - msgstr "ÁíáæÞôçóç" - - # --#: query.c:99 -+#: query.c:95 - msgid "Waiting for response..." - msgstr "ÁíáìïíÞ áðÜíôçóçò..." - - # --#: query.c:235 query.c:263 -+#: query.c:231 query.c:259 - msgid "Query command not defined." - msgstr "Ç åíôïëÞ åñùôÞóåùò äåí êáèïñßóôçêå." - - # --#: query.c:290 -+#: query.c:286 - #, c-format - msgid "Query" - msgstr "Åñþôçóç" - - # - #. Prompt for Query --#: query.c:303 query.c:328 -+#: query.c:299 query.c:324 - msgid "Query: " - msgstr "Åñþôçóç: " - - # --#: query.c:311 query.c:337 -+#: query.c:307 query.c:333 - #, c-format - msgid "Query '%s'" - msgstr "Åñþôçóç '%s'" - - # --#: recvattach.c:56 -+#: recvattach.c:52 - msgid "Pipe" - msgstr "Äéï÷Ýôåõóç" - - # --#: recvattach.c:57 -+#: recvattach.c:53 - msgid "Print" - msgstr "Åêôýðùóç" - - # --#: recvattach.c:435 -+#: recvattach.c:431 - msgid "Saving..." - msgstr "ÁðïèÞêåõóç..." - - # --#: recvattach.c:438 recvattach.c:527 -+#: recvattach.c:434 recvattach.c:523 - msgid "Attachment saved." - msgstr "Ç ðñïóÜñôçóç áðïèçêåýèçêå." - - # --#: recvattach.c:539 -+#: recvattach.c:535 - #, c-format - msgid "WARNING! You are about to overwrite %s, continue?" - msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! Ðñüêåéôáé íá ãñÜøåéò ðÜíù áðü ôï %s, óõíÝ÷åéá;" - - # --#: recvattach.c:557 -+#: recvattach.c:553 - msgid "Attachment filtered." - msgstr "Ç ðñïóÜñôçóç Ý÷åé öéëôñáñéóôåß." - - # --#: recvattach.c:624 -+#: recvattach.c:620 - msgid "Filter through: " - msgstr "ÖéëôñÜñéóìá ìÝóù: " - - # --#: recvattach.c:624 -+#: recvattach.c:620 - msgid "Pipe to: " - msgstr "Äéï÷Ýôåõóç óôï: " - - # --#: recvattach.c:659 -+#: recvattach.c:655 - #, c-format - msgid "I dont know how to print %s attachments!" - msgstr "Äåí îÝñù ðùò íá ôõðþóù ôéò %s ðñïóáñôÞóåéò!" - - # --#: recvattach.c:724 -+#: recvattach.c:720 - msgid "Print tagged attachment(s)?" - msgstr "Åêôýðùóç óçìåéùìÝíïõ/ùí ðñïóÜñôçóçò/óåùí;" - - # --#: recvattach.c:724 -+#: recvattach.c:720 - msgid "Print attachment?" - msgstr "Åêôýðùóç ðñïóáñôÞóåùí;" - - # --#: recvattach.c:957 -+#: recvattach.c:953 - msgid "Can't decrypt encrypted message!" - msgstr "Áäõíáìßá áðïêñõðôïãñÜöçóçò ôïõ êñõðôïãñáöçìÝíïõ ìçíýìáôïò!" - - # --#: recvattach.c:970 -+#: recvattach.c:966 - msgid "Attachments" - msgstr "ÐñïóáñôÞóåéò" - - # --#: recvattach.c:1006 -+#: recvattach.c:1002 - msgid "There are no subparts to show!" - msgstr "Äåí õðÜñ÷ïõí åðéìÝñïõò ôìÞìáôá ãéá íá åìöáíéóôïýí." - - # --#: recvattach.c:1067 -+#: recvattach.c:1063 - msgid "Can't delete attachment from POP server." - msgstr "Áäõíáìßá äéáãñáöÞò ðñïóÜñôçóçò áðü ôïí åîõðçñåôçôÞ POP." - - # --#: recvattach.c:1075 -+#: recvattach.c:1071 - msgid "Deletion of attachments from encrypted messages is unsupported." - msgstr "" - "Ç äéáãñáöÞ ðñïóáñôÞóåùí áðü êñõðôïãñáöçìÝíá ìçíýìáôá äåí õðïóôçñßæåôáé." - - # --#: recvattach.c:1094 recvattach.c:1111 -+#: recvattach.c:1090 recvattach.c:1107 - msgid "Only deletion of multipart attachments is supported." - msgstr "Ìüíï ç äéáãñáöÞ ðïëõìåñþí ðñïóáñôÞóåùí õðïóôçñßæåôáé." - - # --#: recvcmd.c:47 -+#: recvcmd.c:43 - msgid "You may only bounce message/rfc822 parts." - msgstr "Ìðïñåßôå íá äéáâéâÜóåôå ìüíï ìÞíõìá/ìÝñç rfc822" - - # --#: recvcmd.c:217 --#, fuzzy -+#: recvcmd.c:213 - msgid "Error bouncing message!" --msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò." -+msgstr "ÓöÜëìá êáôÜ ôçí ìåôáâßâáóç ôïõ ìçíýìáôïò!" - - # --#: recvcmd.c:217 --#, fuzzy -+#: recvcmd.c:213 - msgid "Error bouncing messages!" --msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò." -+msgstr "ÓöÜëìá êáôÜ ôçí ìåôáâßâáóç ôùí ìçíõìÜôùí!" - - # --#: recvcmd.c:417 -+#: recvcmd.c:413 - #, c-format - msgid "Can't open temporary file %s." - msgstr "Áäõíáìßá ðñüóâáóçò óôï ðñïóùñéíü áñ÷åßï %s." - - # --#: recvcmd.c:448 -+#: recvcmd.c:444 - msgid "Forward as attachments?" - msgstr "Ðñïþèçóç óáí ðñïóáñôÞóåéò;" - --#: recvcmd.c:462 -+#: recvcmd.c:458 - msgid "Can't decode all tagged attachments. MIME-forward the others?" - msgstr "" - "Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. Ðñïþèçóç-MIME " - "ôùí Üëëùí;" - - # --#: recvcmd.c:587 -+#: recvcmd.c:583 - msgid "Forward MIME encapsulated?" - msgstr "Ðñïþèçóç åíóùìáôùìÝíïõ MIME;" - - # --#: recvcmd.c:595 recvcmd.c:845 -+#: recvcmd.c:591 recvcmd.c:841 - #, c-format - msgid "Can't create %s." - msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s." - - # --#: recvcmd.c:728 -+#: recvcmd.c:724 - msgid "Can't find any tagged messages." - msgstr "Áäõíáìßá åýñåóçò óçìåéùìÝíùí ìçíõìÜôùí." - - # --#: recvcmd.c:749 send.c:715 -+#: recvcmd.c:745 send.c:711 - msgid "No mailing lists found!" - msgstr "Äåí âñÝèçêáí ëßóôåò óõæçôÞóåùí!" - --#: recvcmd.c:824 -+#: recvcmd.c:820 - msgid "Can't decode all tagged attachments. MIME-encapsulate the others?" - msgstr "" - "Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. MIME-" - "encapsulate ôéò Üëëåò;" - - # --#: remailer.c:484 -+#: remailer.c:480 - msgid "Append" - msgstr "Ðñüóèåóç" - --#: remailer.c:485 -+#: remailer.c:481 - msgid "Insert" - msgstr "Åßóïäïò" - - # --#: remailer.c:486 -+#: remailer.c:482 - msgid "Delete" - msgstr "ÄéáãñáöÞ" - --#: remailer.c:488 -+#: remailer.c:484 - msgid "OK" - msgstr "OK" - --#: remailer.c:516 -+#: remailer.c:512 - msgid "Can't get mixmaster's type2.list!" - msgstr "Áäõíáìßá ëÞøçò ôçò type2.list ôïõ mixmaster!" - - # --#: remailer.c:542 -+#: remailer.c:538 - msgid "Select a remailer chain." - msgstr "ÅðéëïãÞ ìéáò áëõóßäáò åðáíáðïóôïëÝùí." - --#: remailer.c:602 -+#: remailer.c:598 - #, c-format - msgid "Error: %s can't be used as the final remailer of a chain." - msgstr "" - "ÓöÜëìá: ôï %s äåí ìðïñåß íá åßíáé ï ôåëéêüò åðáíáðïóôïëÝáò ôçò áëõóßäáò." - --#: remailer.c:632 -+#: remailer.c:628 - #, c-format - msgid "Mixmaster chains are limited to %d elements." - msgstr "Ïé áëõóßäåò Mixmaster åßíáé ðåñéïñéóìÝíåò óå %d óôïé÷åßá." - --#: remailer.c:655 -+#: remailer.c:651 - msgid "The remailer chain is already empty." - msgstr "Ç áëõóßäá åðáíáðïóôïëÝùí åßíáé Þäç Üäåéá." - - # --#: remailer.c:665 -+#: remailer.c:661 - msgid "You already have the first chain element selected." - msgstr "¸÷åôå Þäç åðéëÝîåé ôï ðñþôï óôïé÷åßï ôçò áëõóßäáò." - --#: remailer.c:675 -+#: remailer.c:671 - msgid "You already have the last chain element selected." - msgstr "¸÷åôå Þäç åðéëÝîåé ôï ôåëåõôáßï óôïé÷åßï ôçò áëõóßäáò." - --#: remailer.c:714 -+#: remailer.c:710 - msgid "Mixmaster doesn't accept Cc or Bcc headers." - msgstr "Ï Mixmaster äåí äÝ÷åôáé Cc Þ Bcc åðéêåöáëßäåò." - --#: remailer.c:738 -+#: remailer.c:734 - msgid "" - "Please set the hostname variable to a proper value when using mixmaster!" - msgstr "" -@@ -4638,50 +4616,50 @@ msgstr "" - "÷ñçóéìïðïéåßôå ôï mixmaster!" - - # --#: remailer.c:772 -+#: remailer.c:768 - #, c-format - msgid "Error sending message, child exited %d.\n" - msgstr "ÓöÜëìá óôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d.\n" - - # --#: remailer.c:776 -+#: remailer.c:772 - msgid "Error sending message." - msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò." - - # --#: rfc1524.c:163 -+#: rfc1524.c:159 - #, c-format - msgid "Improperly formated entry for type %s in \"%s\" line %d" - msgstr "ÁêáôÜëëçëá ìïñöïðïéçìÝíç åßóïäïò ãéá ôï ôýðï %s óôç \"%s\" ãñáììÞ %d" - - # --#: rfc1524.c:395 -+#: rfc1524.c:391 - msgid "No mailcap path specified" - msgstr "Äåí êáèïñßóôçêå äéáäñïìÞ mailcap" - - # --#: rfc1524.c:423 -+#: rfc1524.c:419 - #, c-format - msgid "mailcap entry for type %s not found" - msgstr "Ç åßóïäïò mailcap ãéá ôï ôýðï %s äå âñÝèçêå" - - # --#: score.c:75 -+#: score.c:71 - msgid "score: too few arguments" - msgstr "score: ðïëý ëßãá ïñßóìáôá" - - # --#: score.c:84 -+#: score.c:80 - msgid "score: too many arguments" - msgstr "score: ðÜñá ðïëëÜ ïñßóìáôá" - - # --#: send.c:252 -+#: send.c:248 - msgid "No subject, abort?" - msgstr "Äåí õðÜñ÷åé èÝìá, íá åãêáôáëåßøù;" - - # --#: send.c:254 -+#: send.c:250 - msgid "No subject, aborting." - msgstr "Äåí õðÜñ÷åé èÝìá, åãêáôÜëåéøç." - -@@ -4691,13 +4669,13 @@ msgstr "Äåí õðÜñ÷åé èÝìá, åãêáôÜëåéøç." - #. * to send a message to only the sender of the message. This - #. * provides a way to do that. - #. --#: send.c:488 -+#: send.c:484 - #, c-format - msgid "Reply to %s%s?" - msgstr "ÁðÜíôçóç óôï %s%s;" - - # --#: send.c:522 -+#: send.c:518 - #, c-format - msgid "Follow-up to %s%s?" - msgstr "ÓõíÝ÷åéá óôï %s%s;" -@@ -4706,32 +4684,32 @@ msgstr "ÓõíÝ÷åéá óôï %s%s;" - #. This could happen if the user tagged some messages and then did - #. * a limit such that none of the tagged message are visible. - #. --#: send.c:690 -+#: send.c:686 - msgid "No tagged messages are visible!" - msgstr "ÊáíÝíá óçìåéùìÝíï ìÞíõìá äåí åßíáé ïñáôü!" - - # --#: send.c:741 -+#: send.c:737 - msgid "Include message in reply?" - msgstr "Óõìðåñßëçøç ôïõ ìçíýìáôïò óôçí áðÜíôçóç;" - - # --#: send.c:746 -+#: send.c:742 - msgid "Including quoted message..." - msgstr "Óõìðåñßëçøç êáèïñéóìÝíïõ ìçíýìáôïò..." - - # --#: send.c:756 -+#: send.c:752 - msgid "Could not include all requested messages!" - msgstr "Áäõíáìßá óõìðåñßëçøçò üëùí ôùí ìçíõìÜôùí ðïõ æçôÞèçêáí!" - - # --#: send.c:770 -+#: send.c:766 - msgid "Forward as attachment?" - msgstr "Ðñïþèçóç óáí ðñïóÜñôçóç;" - - # --#: send.c:774 -+#: send.c:770 - msgid "Preparing forwarded message..." - msgstr "Åôïéìáóßá ðñïùèçìÝíïõ ìçíýìáôïò ..." - -@@ -4739,244 +4717,244 @@ msgstr "Åôïéìáóßá ðñïùèçìÝíïõ ìçíýìáôïò - #. If the user is composing a new message, check to see if there - #. * are any postponed messages first. - #. --#: send.c:1070 -+#: send.c:1066 - msgid "Recall postponed message?" - msgstr "ÁíÜêëçóç áíáâëçèÝíôïò ìçíýìáôïò;" - - # --#: send.c:1369 -+#: send.c:1365 - msgid "Edit forwarded message?" - msgstr "Åðåîåñãáóßá ðñïùèçìÝíïõ ìçíýìáôïò;" - - # --#: send.c:1394 -+#: send.c:1390 - msgid "Abort unmodified message?" - msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò;" - - # --#: send.c:1396 -+#: send.c:1392 - msgid "Aborted unmodified message." - msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò." - - # --#: send.c:1465 -+#: send.c:1461 - msgid "Message postponed." - msgstr "Ôï ìÞíõìá áíåâëÞèç." - - # --#: send.c:1474 -+#: send.c:1470 - msgid "No recipients are specified!" - msgstr "Äåí Ý÷ïõí êáèïñéóôåß ðáñáëÞðôåò!" - - # --#: send.c:1479 -+#: send.c:1475 - msgid "No recipients were specified." - msgstr "Äåí êáèïñßóôçêáí ðáñáëÞðôåò." - - # --#: send.c:1495 -+#: send.c:1491 - msgid "No subject, abort sending?" - msgstr "Äåí õðÜñ÷åé èÝìá, áêýñùóç áðïóôïëÞò;" - - # --#: send.c:1499 -+#: send.c:1495 - msgid "No subject specified." - msgstr "Äåí êáèïñßóôçêå èÝìá." - - # --#: send.c:1561 -+#: send.c:1557 - msgid "Sending message..." - msgstr "ÁðïóôïëÞ ìçíýìáôïò..." - - # --#: send.c:1702 -+#: send.c:1698 - msgid "Could not send the message." - msgstr "Áäõíáìßá áðïóôïëÞò ôïõ ìçíýìáôïò." - - # --#: send.c:1707 -+#: send.c:1703 - msgid "Mail sent." - msgstr "Ôï ãñÜììá åóôÜëç." - - # --#: send.c:1707 -+#: send.c:1703 - msgid "Sending in background." - msgstr "ÁðïóôïëÞ óôï ðáñáóêÞíéï." - - # --#: sendlib.c:468 -+#: sendlib.c:464 - msgid "No boundary parameter found! [report this error]" - msgstr "Äå âñÝèçêå ðáñÜìåôñïò ïñéïèÝôçóçò! [áíáöÝñáôå áõôü ôï óöÜëìá]" - - # --#: sendlib.c:498 -+#: sendlib.c:494 - #, c-format - msgid "%s no longer exists!" - msgstr "Ôï %s äåí õðÜñ÷åé ðéá!" - - # --#: sendlib.c:920 -+#: sendlib.c:916 - #, c-format - msgid "%s isn't a regular file." - msgstr "Ôï %s äåí åßíáé êáíïíéêü áñ÷åßï." - - # --#: sendlib.c:1089 -+#: sendlib.c:1085 - #, c-format - msgid "Could not open %s" - msgstr "Áäõíáìßá áíïßãìáôïò ôïõ %s" - - # --#: sendlib.c:2057 -+#: sendlib.c:2053 - #, c-format - msgid "Error sending message, child exited %d (%s)." - msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d (%s)." - - # --#: sendlib.c:2063 -+#: sendlib.c:2059 - msgid "Output of the delivery process" - msgstr "¸îïäïò ôçò äéåñãáóßáò áðïóôïëÞò" - --#: sendlib.c:2267 -+#: sendlib.c:2263 - #, c-format - msgid "Bad IDN %s while preparing resent-from." --msgstr "" -+msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN %s êáôÜ ôçí äçìéïõñãßá ôïõ ðåäßïõ ÅðáíáðïóôïëÞ-Áðü." - - # --#: signal.c:43 -+#: signal.c:39 - #, c-format - msgid "%s... Exiting.\n" - msgstr "%s... ÅãêáôÜëåéøç.\n" - - # --#: signal.c:46 signal.c:49 -+#: signal.c:42 signal.c:45 - #, c-format - msgid "Caught %s... Exiting.\n" - msgstr "Åíôïðéóìüò ôïõ %s... ÅãêáôÜëåéøç.\n" - - # --#: signal.c:51 -+#: signal.c:47 - #, c-format - msgid "Caught signal %d... Exiting.\n" - msgstr "Åíôïðéóìüò óÞìáôïò %d... ÅãêáôÜëåéøç.\n" - - # - # pgp.c:130 --#: smime.c:111 -+#: smime.c:107 - msgid "Enter SMIME passphrase:" - msgstr "ÅéóÜãåôå ôçí öñÜóç-êëåéäß SMIME:" - --#: smime.c:321 -+#: smime.c:317 - msgid "Trusted " - msgstr "ÅìðéóôåõìÝíï " - --#: smime.c:324 -+#: smime.c:320 - msgid "Verified " - msgstr "ÅðéâåâáéùìÝíï " - --#: smime.c:327 -+#: smime.c:323 - msgid "Unverified" - msgstr "Ìç ÅðéâåâáéùìÝíï" - - # --#: smime.c:330 -+#: smime.c:326 - msgid "Expired " - msgstr "¸ëçîå " - --#: smime.c:333 -+#: smime.c:329 - msgid "Revoked " - msgstr "ÁíáêëÞèçêå " - - # --#: smime.c:336 -+#: smime.c:332 - msgid "Invalid " - msgstr "Ìç Ýãêõñï " - - # --#: smime.c:339 -+#: smime.c:335 - msgid "Unknown " - msgstr "¶ãíùóôï " - - # - # pgp.c:1200 --#: smime.c:368 -+#: smime.c:364 - msgid "Enter keyID: " - msgstr "ÅéóÜãåôå ôï keyID: " - - # --#: smime.c:391 -+#: smime.c:387 - #, c-format - msgid "S/MIME certificates matching \"%s\"." - msgstr "¼ìïéá ðéóôïðïéçôéêÜ S/MIME \"%s\"." - --#: smime.c:541 smime.c:611 smime.c:629 -+#: smime.c:537 smime.c:607 smime.c:625 - #, c-format - msgid "ID %s is unverified. Do you want to use it for %s ?" - msgstr "Ôï ID %s äåí Ý÷åé åðéâåâáéùèåß. Óßãïõñá íá ãßíåé ÷ñÞóç ôïõ ãéá %s ;" - - # - # pgp.c:1194 --#: smime.c:545 smime.c:615 -+#: smime.c:541 smime.c:611 - #, c-format - msgid "Use (untrusted!) ID %s for %s ?" - msgstr "×ñÞóç ôïõ (ìç åìðéóôåõìÝíïõ) ID %s ãéá ôï %s " - - # - # pgp.c:1194 --#: smime.c:548 smime.c:618 -+#: smime.c:544 smime.c:614 - #, c-format - msgid "Use ID %s for %s ?" - msgstr "×ñÞóç ôïõ ID = %s ãéá ôï %s ;" - --#: smime.c:637 -+#: smime.c:633 - #, c-format - msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" - msgstr "" - "Ðñïåéäïðïßçóç: Äåí Ý÷åé ïñéóôåß åìðéóôïóýíç óôï ID %s. (ðëÞêôñï. ãéá " - "óõíÝ÷åéá)" - --#: smime.c:796 -+#: smime.c:792 - #, c-format - msgid "No (valid) certificate found for %s." - msgstr "Äåí âñÝèçêáí (Ýãêõñá) ðéóôïðïéçôéêÜ ãéá ôï %s." - - # --#: smime.c:851 smime.c:879 smime.c:944 smime.c:988 smime.c:1053 smime.c:1128 -+#: smime.c:847 smime.c:875 smime.c:940 smime.c:984 smime.c:1049 smime.c:1124 - msgid "Error: unable to create OpenSSL subprocess!" - msgstr "ÓöÜëìá: áäõíáìßá äçìéïõñãßáò õðïäéåñãáóßáò OpenSSL!" - - # --#: smime.c:1206 -+#: smime.c:1202 - msgid "no certfile" - msgstr "êáíÝíá áñ÷åßï ðéóôïðïéçôéêþí" - - # --#: smime.c:1209 -+#: smime.c:1205 - msgid "no mbox" - msgstr "êáíÝíá ãñáììáôïêéâþôéï" - - #. fatal error while trying to encrypt message --#: smime.c:1352 -+#: smime.c:1348 - msgid "No output from OpenSSL.." - msgstr "Êáììßá Ýîïäïò áðü OpenSSL.." - --#: smime.c:1390 -+#: smime.c:1386 - msgid "Warning: Intermediate certificate not found." - msgstr "Ðñïåéäïðïßçóç: Äåí âñÝèçêå åíäéÜìåóï ðéóôïðïéçôéêü." - - # - # pgp.c:1070 --#: smime.c:1433 -+#: smime.c:1429 - msgid "Can't open OpenSSL subprocess!" - msgstr "Áäõíáìßá åêêßíçóçò õðïäéåñãáóßáò OpenSSL!" - --#: smime.c:1471 -+#: smime.c:1467 - msgid "No output from OpenSSL..." - msgstr "Êáììßá Ýîïäïò áðü OpenSSL.." - - # - # pgp.c:669 pgp.c:894 --#: smime.c:1636 smime.c:1758 -+#: smime.c:1632 smime.c:1754 - msgid "" - "[-- End of OpenSSL output --]\n" - "\n" -@@ -4985,25 +4963,25 @@ msgstr "" - "\n" - - # --#: smime.c:1719 smime.c:1729 -+#: smime.c:1715 smime.c:1725 - msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" - msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò õðïäéåñãáóßáò OpenSSL! --]\n" - - # - # pgp.c:980 --#: smime.c:1762 -+#: smime.c:1758 - msgid "[-- The following data is S/MIME encrypted --]\n" - msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù S/MIME --]\n" - - # - # pgp.c:676 --#: smime.c:1765 -+#: smime.c:1761 - msgid "[-- The following data is S/MIME signed --]\n" - msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá ìå S/MIME --]\n" - - # - # pgp.c:988 --#: smime.c:1829 -+#: smime.c:1825 - msgid "" - "\n" - "[-- End of S/MIME encrypted data. --]\n" -@@ -5013,7 +4991,7 @@ msgstr "" - - # - # pgp.c:682 --#: smime.c:1831 -+#: smime.c:1827 - msgid "" - "\n" - "[-- End of S/MIME signed data. --]\n" -@@ -5023,62 +5001,59 @@ msgstr "" - - # - # compose.c:132 --#: smime.c:1935 --#, fuzzy -+#: smime.c:1931 - msgid "" - "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " - msgstr "" --"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, Þ (f)orget it? " -+"S/MIME (e)êëåßä,(s)õðïãñ,(w)õðïãñ.ìå,õðïãñ.ó(a)í,(b)êë+õð, %s, Þ (c)ôßðïôá; " - - # - # compose.c:133 --#: smime.c:1936 --#, fuzzy -+#: smime.c:1932 - msgid "eswabfc" --msgstr "esabf" -+msgstr "eswabfc" - --#: smime.c:1945 -+#: smime.c:1941 - msgid "" - "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? " - msgstr "" --"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, Þ (f)orget it? " -+"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, Þ (f)Üêõñï; " - --#: smime.c:1947 -+#: smime.c:1943 - msgid "12345f" - msgstr "12345f" - --#: smime.c:1971 -+#: smime.c:1967 - msgid "Can't sign: No key specified. Use Sign As." --msgstr "" -+msgstr "Áäõíáìßá õðïãñáöÞò. Äåí Ý÷åé ïñéóôåß êëåéäß. ×ñçóéìïðïéÞóôå Õðïãñ.óáí" - - # --#: sort.c:259 -+#: sort.c:255 - msgid "Sorting mailbox..." - msgstr "Ôáêôïðïßçóç ãñáììáôïêéâùôßïõ..." - - # --#: sort.c:296 -+#: sort.c:292 - msgid "Could not find sorting function! [report this bug]" - msgstr "" - "Áäõíáìßá åýñåóçò ôçò ëåéôïõñãßáò ôáîéíüìçóçò! [áíáöÝñáôå áõôü ôï óöÜëìá]" - - # --#: status.c:106 -+#: status.c:102 - msgid "(no mailbox)" - msgstr "(êáíÝíá ãñáììáôïêéâþôéï)" - - # --#: thread.c:1089 -+#: thread.c:1085 - msgid "Parent message is not visible in this limited view." - msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé ïñáôü óå áõôÞ ôç ðåñéïñéóìÝíç üøç" - - # --#: thread.c:1095 -+#: thread.c:1091 - msgid "Parent message is not available." - msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé äéáèÝóéìï." - - # --#, fuzzy - #~ msgid "Create a traditional (inline) PGP message?" - #~ msgstr "Äçìéïõñãßá åíüò åóùôåñéêïý ìçíýìáôïò PGP;" - -@@ -5087,14 +5062,12 @@ msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé äéáèÝ - #~ msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..." - - # --#, fuzzy - #~ msgid "%s: stat: %s" --#~ msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s" -+#~ msgstr "êáôÜóôáóçò ôïõ %s óôï äßóêï: %s" - - # --#, fuzzy - #~ msgid "%s: not a regular file" --#~ msgstr "Ôï %s äåí åßíáé êáíïíéêü áñ÷åßï." -+#~ msgstr "%s: äåí åßíáé êáíïíéêü áñ÷åßï" - - #~ msgid "unspecified protocol error" - #~ msgstr "ìç êáèïñéóìÝíï óöÜëìá ðñùôïêüëëïõ" -Index: po/fr.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/fr.po,v -retrieving revision 3.29 -retrieving revision 3.30 -diff -u -p -r3.29 -r3.30 ---- a/po/fr.po 12 Feb 2005 20:56:32 -0000 3.29 -+++ b/po/fr.po 14 Feb 2005 08:48:43 -0000 3.30 -@@ -5,10 +5,10 @@ - # , fuzzy - msgid "" - msgstr "" --"Project-Id-Version: Mutt 1.5.7\n" -+"Project-Id-Version: Mutt 1.5.8\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2005-02-02 12:13+0100\n" -+"POT-Creation-Date: 2005-02-13 03:20+0100\n" -+"PO-Revision-Date: 2005-02-13 03:24+0100\n" - "Last-Translator: Vincent Lefevre \n" - "Language-Team: mutt-dev \n" - "MIME-Version: 1.0\n" -@@ -2673,7 +2673,6 @@ msgstr "" - " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2728,8 +2727,8 @@ msgstr "" - " -e \tspécifie une commande à exécuter après l'initialisation\n" - " -f \tspécifie quelle boîte aux lettres lire\n" - " -F \tspécifie un fichier muttrc alternatif\n" --" -H \tspécifie un fichier de brouillon d'où lire les en-têtes\n" --" -i \tspécifie un fichier que Mutt doit inclure dans la réponse\n" -+" -H \tspécifie un fichier de brouillon d'où lire en-têtes et corps\n" -+" -i \tspécifie un fichier que Mutt doit inclure dans le corps\n" - " -m \tspécifie un type de boîte aux lettres par défaut\n" - " -n\t\tfait que Mutt ne lit pas le fichier Muttrc système\n" - " -p\t\trappelle un message ajourné\n" -Index: po/id.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/id.po,v -retrieving revision 3.19 -retrieving revision 3.20 -diff -u -p -r3.19 -r3.20 ---- a/po/id.po 12 Feb 2005 20:56:32 -0000 3.19 -+++ b/po/id.po 16 Feb 2005 08:48:41 -0000 3.20 -@@ -1,13 +1,13 @@ --# Ronny Haryanto , 1999-2003 -+# Ronny Haryanto , 1999-2005 - # - # http://www.linux.or.id - # - msgid "" - msgstr "" --"Project-Id-Version: 1.5.6i\n" -+"Project-Id-Version: 1.5.8i\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2004-08-18 00:10+1000\n" -+"PO-Revision-Date: 2005-02-14 10:59+0700\n" - "Last-Translator: Ronny Haryanto \n" - "Language-Team: Indonesia \n" - "MIME-Version: 1.0\n" -@@ -1501,9 +1501,9 @@ msgid "Could not create temporary file % - msgstr "Tidak bisa membuat file sementara %s" - - #: imap/message.c:134 --#, fuzzy, c-format -+#, c-format - msgid "Evaluating cache... [%d/%d]" --msgstr "Mengambil header surat... [%d/%d]" -+msgstr "Memeriksa cache... [%d/%d]" - - #: imap/message.c:202 pop.c:210 - #, c-format -@@ -2580,7 +2580,6 @@ msgstr "" - "02111, USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2616,7 +2615,7 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"penggunaan: mutt [ -nRzZ ] [ -e ] [ -F ] [ -m ] [ -f " -+"penggunaan: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" - " mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " - "[...]\n" -@@ -2635,8 +2634,8 @@ msgstr "" - " -e \tperintah yang dijalankan setelah inisialisasi\n" - " -f \tkotak surat yang dibaca\n" - " -F \tfile muttrc alternatif\n" --" -H \tfile contoh daftar headers\n" --" -i \tfile yang disertakan dalam surat balasan\n" -+" -H \tfile draft sebagai sumber header dan badan\n" -+" -i \tfile yang disertakan dalam badan surat\n" - " -m \tjenis kotak surat yang digunakan\n" - " -n\t\tmenyuruh Mutt untuk tidak membaca muttrc dari system\n" - " -p\t\tlanjutkan surat yang ditunda\n" -@@ -2648,7 +2647,7 @@ msgstr "" - " -y\t\tpilih kotak surat yg ada di daftar `mailboxes'\n" - " -z\t\tlangsung keluar jika tidak ada surat di kotak surat\n" - " -Z\t\tbuka folder pertama dg surat baru, langsung keluar jika tidak ada\n" --" -h\t\tsurat ini" -+" -h\t\tpesan bantuan ini" - - #: main.c:167 - msgid "" -@@ -2966,9 +2965,9 @@ msgid "Unknown" - msgstr "Tidak diketahui" - - #: mutt_ssl.c:413 --#, fuzzy, c-format -+#, c-format - msgid "[unable to calculate]" --msgstr "%s: tidak bisa melampirkan file" -+msgstr "[tidak bisa melakukan penghitungan]" - - #: mutt_ssl.c:431 - msgid "[invalid date]" -Index: po/ru.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ru.po,v -retrieving revision 3.24 -retrieving revision 3.25 -diff -u -p -r3.24 -r3.25 ---- a/po/ru.po 12 Feb 2005 20:56:34 -0000 3.24 -+++ b/po/ru.po 1 Mar 2005 15:53:25 -0000 3.25 -@@ -10,10 +10,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: mutt-1.5.7i\n" -+"Project-Id-Version: mutt-1.5.8i\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-02-12 21:58+0100\n" --"PO-Revision-Date: 2005-02-05 14:11+0200\n" -+"PO-Revision-Date: 2005-02-13 11:51+0200\n" - "Last-Translator: mutt-ru@woe.spb.ru\n" - "Language-Team: RUSSIAN \n" - "MIME-Version: 1.0\n" -@@ -2597,7 +2597,6 @@ msgstr "" - " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" - - #: main.c:99 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -2653,8 +2652,8 @@ msgstr "" - "ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n" - " -f \tÕËÁÚÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÄÌÑ ÒÁÂÏÔÙ\n" - " -F \tÕËÁÚÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ muttrc\n" --" -H \tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ\n" --" -i \tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÏÔ×ÅÔ\n" -+" -H \tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ É ÔÅÌÁ ÐÉÓØÍÁ\n" -+" -i \tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÔÅÌÏ ÐÉÓØÍÁ\n" - " -m <ÔÉÐ>\tÕËÁÚÁÔØ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" - " -n\t\tÚÁÐÒÅÔÉÔØ ÞÔÅÎÉÅ ÓÉÓÔÅÍÎÏÇÏ Muttrc\n" - " -p\t\tÐÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ\n" diff --git a/upstream/patches/cvs_2005-04-03 b/upstream/patches/cvs_2005-04-03 new file mode 100644 index 0000000..2b51ad9 --- /dev/null +++ b/upstream/patches/cvs_2005-04-03 @@ -0,0 +1,2765 @@ +Index: mutt/ChangeLog +=================================================================== +RCS file: /home/roessler/cvs/mutt/ChangeLog,v +retrieving revision 3.406 +retrieving revision 3.420 +diff -u -p -r3.406 -r3.420 +--- mutt/ChangeLog 13 Mar 2005 16:29:39 -0000 3.406 ++++ mutt/ChangeLog 3 Apr 2005 00:15:36 -0000 3.420 +@@ -1,3 +1,78 @@ ++2005-04-03 00:14:51 Daniel Jacobowitz (brendan) ++ ++ * imap/imap.c, imap/imap_private.h, imap/message.c: Synchronise ++ message flags before moving messages. ++ ++2005-03-31 04:55:09 Thomas Glanzmann (brendan) ++ ++ * mh.c: Another hcache cygwin portability fix. ++ ++2005-03-23 10:51:11 Thomas Glanzmann (roessler) ++ ++ * init.h, mh.c, mutt.h: Maildir header cache. ++ ++2005-03-22 19:58:15 Horst Schirmeier (roessler) ++ ++ * Makefile.am: Use install-exec-hook install of ++ install-exec-local. ++ ++2005-03-22 19:53:49 Ronny Haryanto (roessler) ++ ++ * po/id.po: update ++ ++2005-03-22 19:49:31 René Clerc (roessler) ++ ++ * po/nl.po: update ++ ++2005-03-22 19:48:35 Roland Rosenfeld (roessler) ++ ++ * po/de.po: update ++ ++2005-03-22 19:46:59 Paul Walker (roessler) ++ ++ * init.c, init.h: remove some unused functions. ++ ++2005-03-22 19:43:13 Vsevolod Volkov (roessler) ++ ++ * po/ru.po: update ++ ++2005-03-22 03:40:54 Thomas Glanzmann (brendan) ++ ++ * hcache.c, imap/imap.c, imap/imap_private.h, imap/message.c, ++ protos.h: Thomas graces us with this patch that resolves a ++ type-size inconsistency in the UIDVALIDITY parser. ++ ++ Edited for correctness. ++ ++2005-03-17 09:30:06 Pawel Dziekonski (roessler) ++ ++ * po/pl.po: update ++ ++2005-03-16 07:01:59 Brendan Cully (brendan) ++ ++ * doc/Makefile.in: As Ralf Wildenhues noted, the cygwin EXEEXT ++ patch was incomplete. Note to self: avoid patching on short ++ sleep. Starting tomorrow. ++ ++2005-03-16 02:49:33 Brendan Cully (brendan) ++ ++ * configure.in, doc/Makefile.in, hcache.c, Makefile.am: Various ++ cygwin portability fixes ++ ++2005-03-15 04:40:40 Brendan Cully (brendan) ++ ++ * crypthash.h: Don't define uint32_t anywhere but in ++ config.h. Spotted by Alain Bench. ++ ++2005-03-13 16:35:35 roessler (roessler) ++ ++ * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, ++ po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, ++ po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, VERSION, po/bg.po, ++ po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, ++ po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, reldate.h: ++ automatic post-release commit for mutt-1.5.9 ++ + 2005-03-13 16:29:09 Morten Bo Johansen (roessler) + + * po/da.po: update +@@ -330,7 +405,7 @@ + 2005-01-29 19:15:07 Thomas Glanzmann (roessler) + + * hcache.c: - make hcache.c conform to mutt codingstyle +- - use $Id: ChangeLog,v 3.406 2005/03/13 16:29:39 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword ++ - use $Id: ChangeLog,v 3.420 2005/04/03 00:15:36 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword + + 2005-01-29 19:15:07 Thomas Glanzmann (roessler) + +Index: mutt/Makefile.am +=================================================================== +RCS file: /home/roessler/cvs/mutt/Makefile.am,v +retrieving revision 3.32 +retrieving revision 3.34 +diff -u -p -r3.32 -r3.34 +--- mutt/Makefile.am 13 Feb 2005 09:53:07 -0000 3.32 ++++ mutt/Makefile.am 22 Mar 2005 19:58:15 -0000 3.34 +@@ -2,7 +2,7 @@ + ## Use aclocal -I m4; automake --foreign + + AUTOMAKE_OPTIONS = 1.6 foreign +-EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc ++EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc + + if BUILD_IMAP + IMAP_SUBDIR = imap +@@ -127,7 +127,7 @@ reldate: + patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh + $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c + +-install-exec-local: ++install-exec-hook: + if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \ + rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ + ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ +Index: mutt/configure.in +=================================================================== +RCS file: /home/roessler/cvs/mutt/configure.in,v +retrieving revision 3.24 +retrieving revision 3.25 +diff -u -p -r3.24 -r3.25 +--- mutt/configure.in 13 Feb 2005 00:25:37 -0000 3.24 ++++ mutt/configure.in 16 Mar 2005 02:49:33 -0000 3.25 +@@ -129,7 +129,7 @@ else + if test x$have_pgp != xno ; then + AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, + [ Define if you want classic PGP support. ]) +- PGPAUX_TARGET="pgpring pgpewrap" ++ PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" + fi + +Index: mutt/crypthash.h +=================================================================== +RCS file: /home/roessler/cvs/mutt/crypthash.h,v +retrieving revision 3.2 +retrieving revision 3.3 +diff -u -p -r3.2 -r3.3 +--- mutt/crypthash.h 5 Feb 2005 14:11:36 -0000 3.2 ++++ mutt/crypthash.h 15 Mar 2005 04:40:40 -0000 3.3 +@@ -14,12 +14,4 @@ + /* POINTER defines a generic pointer type */ + typedef unsigned char *POINTER; + +-# ifndef HAVE_UINT32_T +-# if SIZEOF_INT == 4 +-typedef unsigned int uint32_t; +-# elif SIZEOF_LONG == 4 +-typedef unsigned long uint32_t; +-# endif +-# endif +- + #endif +Index: mutt/hcache.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/hcache.c,v +retrieving revision 3.4 +retrieving revision 3.6 +diff -u -p -r3.4 -r3.6 +--- mutt/hcache.c 3 Feb 2005 19:46:53 -0000 3.4 ++++ mutt/hcache.c 22 Mar 2005 03:40:54 -0000 3.6 +@@ -30,6 +30,9 @@ + + #include + #include ++#if HAVE_SYS_TIME_H ++#include ++#endif + #include "mutt.h" + #ifdef USE_IMAP + #include "message.h" +@@ -60,7 +63,7 @@ static struct header_cache + typedef union + { + struct timeval timeval; +- uint64_t uid_validity; ++ unsigned long uid_validity; + } validate; + + static void * +@@ -447,7 +450,7 @@ generate_crc32() + SPAM_LIST *sp = SpamList; + RX_LIST *rx = NoSpamList; + +- crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.4 2005/02/03 19:46:53 roessler Exp $", mutt_strlen("$Id: hcache.c,v 3.4 2005/02/03 19:46:53 roessler Exp $")); ++ crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.6 2005/03/22 03:40:54 brendan Exp $", mutt_strlen("$Id: hcache.c,v 3.6 2005/03/22 03:40:54 brendan Exp $")); + + #if HAVE_LANGINFO_CODESET + crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset)); +@@ -547,7 +550,7 @@ mutt_hcache_per_folder(const char *path, + * db_store */ + static void * + mutt_hcache_dump(void *_db, HEADER * h, int *off, +- uint64_t uid_validity) ++ unsigned long uid_validity) + { + struct header_cache *db = _db; + unsigned char *d = NULL; +@@ -556,7 +559,7 @@ mutt_hcache_dump(void *_db, HEADER * h, + d = lazy_malloc(sizeof (validate)); + + if (uid_validity) +- memcpy(d, &uid_validity, sizeof (uint64_t)); ++ memcpy(d, &uid_validity, sizeof (unsigned long)); + else + { + struct timeval now; +@@ -693,7 +696,7 @@ mutt_hcache_fetch(void *db, const char * + + int + mutt_hcache_store(void *db, const char *filename, HEADER * header, +- uint64_t uid_validity, ++ unsigned long uid_validity, + size_t(*keylen) (const char *fn)) + { + struct header_cache *h = db; +@@ -883,7 +886,7 @@ mutt_hcache_fetch(void *db, const char * + + int + mutt_hcache_store(void *db, const char *filename, HEADER * header, +- uint64_t uid_validity, ++ unsigned long uid_validity, + size_t(*keylen) (const char *fn)) + { + DBT key; +Index: mutt/init.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/init.c,v +retrieving revision 3.30 +retrieving revision 3.31 +diff -u -p -r3.30 -r3.31 +--- mutt/init.c 12 Feb 2005 19:12:40 -0000 3.30 ++++ mutt/init.c 22 Mar 2005 19:46:59 -0000 3.31 +@@ -585,42 +585,6 @@ static int parse_list (BUFFER *buf, BUFF + return 0; + } + +-static int _parse_rx_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err, int flags) +-{ +- do +- { +- mutt_extract_token (buf, s, 0); +- if (add_to_rx_list ((RX_LIST **) data, buf->data, flags, err) != 0) +- return -1; +- +- } +- while (MoreArgs (s)); +- +- return 0; +-} +- +-static int parse_rx_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) +-{ +- return _parse_rx_list (buf, s, data, err, REG_ICASE); +-} +- +-static int parse_rx_unlist (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) +-{ +- do +- { +- mutt_extract_token (buf, s, 0); +- if (mutt_strcmp (buf->data, "*") == 0) +- { +- mutt_free_rx_list ((RX_LIST **) data); +- break; +- } +- remove_from_rx_list ((RX_LIST **) data, buf->data); +- } +- while (MoreArgs (s)); +- +- return 0; +-} +- + static void _alternates_clean (void) + { + int i; +Index: mutt/init.h +=================================================================== +RCS file: /home/roessler/cvs/mutt/init.h,v +retrieving revision 3.68 +retrieving revision 3.70 +diff -u -p -r3.68 -r3.70 +--- mutt/init.h 1 Mar 2005 15:52:33 -0000 3.68 ++++ mutt/init.h 23 Mar 2005 10:51:11 -0000 3.70 +@@ -1032,6 +1032,13 @@ struct option_t MuttVars[] = { + ** be a single global header cache. By default it is unset and so no + ** header caching will be used. + */ ++ { "maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 }, ++ /* ++ ** .pp ++ ** Check for Maildir unaware programs other than mutt having modified maildir ++ ** files when the header cache is in use. This incurs one stat(2) per ++ ** message every time the folder is opened. ++ */ + { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" }, + /* + ** .pp +@@ -2885,10 +2892,8 @@ const struct mapping_t SortKeyMethods[] + /* functions used to parse commands in a rc file */ + + static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); +-static int parse_rx_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); +-static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); + + static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); + static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); +Index: mutt/mh.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/mh.c,v +retrieving revision 3.23 +retrieving revision 3.25 +diff -u -p -r3.23 -r3.25 +--- mutt/mh.c 3 Feb 2005 17:01:43 -0000 3.23 ++++ mutt/mh.c 31 Mar 2005 04:55:09 -0000 3.25 +@@ -47,6 +47,10 @@ + #include + #include + ++#if HAVE_SYS_TIME_H ++#include ++#endif ++ + struct maildir + { + HEADER *h; +@@ -791,6 +795,14 @@ static int maildir_move_to_context (CONT + return r; + } + ++#if USE_HCACHE ++static size_t maildir_hcache_keylen (const char *fn) ++{ ++ const char * p = strrchr (fn, ':'); ++ return p ? (size_t) (p - fn) : mutt_strlen(fn); ++} ++#endif ++ + #ifdef USE_INODESORT + /* + * Merge two maildir lists according to the inode numbers. +@@ -886,27 +898,67 @@ static struct maildir* maildir_sort_inod + * This function does the second parsing pass for a maildir-style + * folder. + */ +- + void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md) + { + struct maildir *p; + char fn[_POSIX_PATH_MAX]; + int count; + ++#if USE_HCACHE ++ void *hc = NULL; ++ void *data; ++ struct timeval *when = NULL; ++ struct stat lastchanged; ++ int ret; ++ ++ hc = mutt_hcache_open (HeaderCache, ctx->path); ++#endif ++ + for (p = md, count = 0; p; p = p->next, count++) +- if (p && p->h && !p->header_parsed) +- { +- if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) +- mutt_message (_("Reading %s... %d"), ctx->path, count); +- snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); +- if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) +- p->header_parsed = 1; +- else +- mutt_free_header (&p->h); +- } +-} ++ { ++ if (! (p && p->h && !p->header_parsed)) ++ continue; + ++ if (!ctx->quiet && ReadInc && ((count % ReadInc) == 0 || count == 1)) ++ mutt_message (_("Reading %s... %d"), ctx->path, count); + ++#if USE_HCACHE ++ data = mutt_hcache_fetch (hc, p->h->path + 3, &maildir_hcache_keylen); ++ when = (struct timeval *) data; ++#endif ++ ++ snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); ++ ++#if USE_HCACHE ++ if (option(OPTHCACHEVERIFY)) ++ ret = stat(fn, &lastchanged); ++ else { ++ lastchanged.st_mtime = 0; ++ ret = 0; ++ } ++ ++ if (data != NULL && !ret && lastchanged.st_mtime <= when->tv_sec) ++ { ++ p->h = mutt_hcache_restore ((unsigned char *)data, &p->h); ++ maildir_parse_flags (p->h, fn); ++ } else ++#endif ++ if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) ++ { ++ p->header_parsed = 1; ++#if USE_HCACHE ++ mutt_hcache_store (hc, p->h->path + 3, p->h, 0, &maildir_hcache_keylen); ++#endif ++ } else ++ mutt_free_header (&p->h); ++#if USE_HCACHE ++ FREE(&data); ++#endif ++ } ++#if USE_HCACHE ++ mutt_hcache_close (hc); ++#endif ++} + + /* Read a MH/maildir style mailbox. + * +@@ -1403,6 +1455,9 @@ int mh_sync_mailbox (CONTEXT * ctx, int + { + char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX]; + int i, j; ++#if USE_HCACHE ++ void *hc = NULL; ++#endif /* USE_HCACHE */ + + if (ctx->magic == M_MH) + i = mh_check_mailbox (ctx, index_hint); +@@ -1412,6 +1467,11 @@ int mh_sync_mailbox (CONTEXT * ctx, int + if (i != 0) + return i; + ++#if USE_HCACHE ++ if (ctx->magic == M_MAILDIR) ++ hc = mutt_hcache_open(HeaderCache, ctx->path); ++#endif /* USE_HCACHE */ ++ + for (i = 0; i < ctx->msgcount; i++) + { + if (ctx->hdrs[i]->deleted +@@ -1420,7 +1480,13 @@ int mh_sync_mailbox (CONTEXT * ctx, int + snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path); + if (ctx->magic == M_MAILDIR + || (option (OPTMHPURGE) && ctx->magic == M_MH)) ++ { ++#if USE_HCACHE ++ if (ctx->magic == M_MAILDIR) ++ mutt_hcache_delete (hc, ctx->hdrs[i]->path + 3, &maildir_hcache_keylen); ++#endif /* USE_HCACHE */ + unlink (path); ++ } + else if (ctx->magic == M_MH) + { + /* MH just moves files out of the way when you delete them */ +@@ -1442,16 +1508,21 @@ int mh_sync_mailbox (CONTEXT * ctx, int + if (ctx->magic == M_MAILDIR) + { + if (maildir_sync_message (ctx, i) == -1) +- return -1; ++ goto err; + } + else + { + if (mh_sync_message (ctx, i) == -1) +- return -1; ++ goto err; + } + } + } + ++#if USE_HCACHE ++ if (ctx->magic == M_MAILDIR) ++ mutt_hcache_close (hc); ++#endif /* USE_HCACHE */ ++ + if (ctx->magic == M_MH) + mh_update_sequences (ctx); + +@@ -1472,6 +1543,13 @@ int mh_sync_mailbox (CONTEXT * ctx, int + } + + return 0; ++ ++err: ++#if USE_HCACHE ++ if (ctx->magic == M_MAILDIR) ++ mutt_hcache_close (hc); ++#endif /* USE_HCACHE */ ++ return -1; + } + + static char *maildir_canon_filename (char *dest, const char *src, size_t l) +Index: mutt/mutt.h +=================================================================== +RCS file: /home/roessler/cvs/mutt/mutt.h,v +retrieving revision 3.40 +retrieving revision 3.41 +diff -u -p -r3.40 -r3.41 +--- mutt/mutt.h 28 Feb 2005 15:15:23 -0000 3.40 ++++ mutt/mutt.h 23 Mar 2005 10:51:11 -0000 3.41 +@@ -351,6 +351,9 @@ enum + OPTFORCENAME, + OPTFORWDECODE, + OPTFORWQUOTE, ++#if USE_HCACHE ++ OPTHCACHEVERIFY, ++#endif + OPTHDRS, + OPTHEADER, + OPTHELP, +Index: mutt/protos.h +=================================================================== +RCS file: /home/roessler/cvs/mutt/protos.h,v +retrieving revision 3.25 +retrieving revision 3.26 +diff -u -p -r3.25 -r3.26 +--- mutt/protos.h 1 Feb 2005 03:36:39 -0000 3.25 ++++ mutt/protos.h 22 Mar 2005 03:40:54 -0000 3.26 +@@ -111,7 +111,7 @@ void *mutt_hcache_open(const char *path, + void mutt_hcache_close(void *db); + HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh); + void *mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char *fn)); +-int mutt_hcache_store(void *db, const char *filename, HEADER *h, uint64_t uid_validity, size_t (*keylen)(const char *fn)); ++int mutt_hcache_store(void *db, const char *filename, HEADER *h, unsigned long uid_validity, size_t (*keylen)(const char *fn)); + int mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const char *fn)); + #endif /* USE_HCACHE */ + +Index: mutt/doc/Makefile.in +=================================================================== +RCS file: /home/roessler/cvs/mutt/doc/Makefile.in,v +retrieving revision 3.5 +retrieving revision 3.7 +diff -u -p -r3.5 -r3.7 +--- mutt/doc/Makefile.in 15 Feb 2005 19:28:24 -0000 3.5 ++++ mutt/doc/Makefile.in 16 Mar 2005 07:01:59 -0000 3.7 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 3.5 2005/02/15 19:28:24 roessler Exp $ ++# $Id: Makefile.in,v 3.7 2005/03/16 07:01:59 brendan Exp $ + + SHELL = /bin/sh + +@@ -21,6 +21,7 @@ VPATH = @srcdir@ + INSTALL = @INSTALL@ + CC = @CC@ + CPP = @CPP@ ++EXEEXT = @EXEEXT@ + XCPPFLAGS = -I. @CPPFLAGS@ + CFLAGS = @CFLAGS@ $(XCPPFLAGS) + LDFLAGS = @LDFLAGS@ +@@ -65,10 +66,10 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA + + all: muttrc.man try-html try-txt + +-try-html: ../makedoc ++try-html: ../makedoc$(EXEEXT) + test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ + +-try-txt: ../makedoc ++try-txt: ../makedoc$(EXEEXT) + test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ + + install: all instdoc +@@ -149,21 +150,21 @@ dist distdir: Makefile $(DISTFILES) + || cp -p $$file $(distdir) ; \ + done + +-../makedoc: $(top_srcdir)/makedoc.c +- (cd .. && $(MAKE) makedoc) ++../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c ++ (cd .. && $(MAKE) makedoc$(EXEEXT)) + + # hack around autoconf mixing up patterns. + at = @ + +-update-doc: ../makedoc stamp-doc-sgml stamp-doc-man manual.txt manual.html ++update-doc: ../makedoc$(EXEEXT) stamp-doc-sgml stamp-doc-man manual.txt manual.html + +-muttrc.man stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail ++muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail + $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \ + cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\ + > muttrc.man + touch stamp-doc-man + +-manual.sgml stamp-doc-sgml: ../makedoc $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION ++manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION + ( sed -e "s/$(at)VERSION$(at)/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.sgml.head ;\ + $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) | \ + cat - $(srcdir)/manual.sgml.tail > manual.sgml +Index: mutt/imap/imap.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/imap/imap.c,v +retrieving revision 3.21 +retrieving revision 3.23 +diff -u -p -r3.21 -r3.23 +--- mutt/imap/imap.c 17 Feb 2005 03:33:00 -0000 3.21 ++++ mutt/imap/imap.c 3 Apr 2005 00:14:51 -0000 3.23 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) 1996-8 Michael R. Elkins + * Copyright (C) 1996-9 Brandon Long +- * Copyright (C) 1999-2003 Brendan Cully ++ * Copyright (C) 1999-2005 Brendan Cully + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -635,7 +635,7 @@ int imap_open_mailbox (CONTEXT* ctx) + dprint(2, (debugfile, "Getting mailbox UIDVALIDITY\n")); + pc += 3; + pc = imap_next_word(pc); +- sscanf(pc, "%u", &(idata->uid_validity)); ++ sscanf(pc, "%lu", &(idata->uid_validity)); + } + #endif + else +@@ -921,6 +921,76 @@ int imap_make_msg_set (IMAP_DATA* idata, + return count; + } + ++/* Update the IMAP server to reflect the flags a single message. */ ++ ++int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, ++ int *err_continue) ++{ ++ char flags[LONG_STRING]; ++ char uid[11]; ++ ++ hdr->changed = 0; ++ ++ snprintf (uid, sizeof (uid), "%u", HEADER_DATA(hdr)->uid); ++ cmd->dptr = cmd->data; ++ mutt_buffer_addstr (cmd, "UID STORE "); ++ mutt_buffer_addstr (cmd, uid); ++ ++ flags[0] = '\0'; ++ ++ imap_set_flag (idata, IMAP_ACL_SEEN, hdr->read, "\\Seen ", ++ flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_WRITE, hdr->flagged, ++ "\\Flagged ", flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_WRITE, hdr->replied, ++ "\\Answered ", flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_DELETE, hdr->deleted, ++ "\\Deleted ", flags, sizeof (flags)); ++ ++ /* now make sure we don't lose custom tags */ ++ if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) ++ imap_add_keywords (flags, hdr, idata->flags, sizeof (flags)); ++ ++ mutt_remove_trailing_ws (flags); ++ ++ /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to ++ * explicitly revoke all system flags (if we have permission) */ ++ if (!*flags) ++ { ++ imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); ++ imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); ++ ++ mutt_remove_trailing_ws (flags); ++ ++ mutt_buffer_addstr (cmd, " -FLAGS.SILENT ("); ++ } else ++ mutt_buffer_addstr (cmd, " FLAGS.SILENT ("); ++ ++ mutt_buffer_addstr (cmd, flags); ++ mutt_buffer_addstr (cmd, ")"); ++ ++ /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ ++ hdr->active = 0; ++ ++ /* after all this it's still possible to have no flags, if you ++ * have no ACL rights */ ++ if (*flags && (imap_exec (idata, cmd->data, 0) != 0) && ++ err_continue && (*err_continue != M_YES)) ++ { ++ *err_continue = imap_continue ("imap_sync_message: STORE failed", ++ idata->cmd.buf); ++ if (*err_continue != M_YES) ++ return -1; ++ } ++ ++ hdr->active = 1; ++ idata->ctx->changed--; ++ ++ return 0; ++} ++ + /* update the IMAP server to reflect message changes done within mutt. + * Arguments + * ctx: the current context +@@ -932,12 +1002,10 @@ int imap_sync_mailbox (CONTEXT* ctx, int + IMAP_DATA* idata; + CONTEXT* appendctx = NULL; + BUFFER cmd; +- char flags[LONG_STRING]; +- char uid[11]; + int deleted; + int n; +- int err_continue = M_NO; /* continue on error? */ + int rc; ++ int err_continue = M_NO; /* continue on error? */ + + idata = (IMAP_DATA*) ctx->data; + +@@ -994,16 +1062,9 @@ int imap_sync_mailbox (CONTEXT* ctx, int + { + if (ctx->hdrs[n]->active && ctx->hdrs[n]->changed) + { +- ctx->hdrs[n]->changed = 0; +- + mutt_message (_("Saving message status flags... [%d/%d]"), n+1, + ctx->msgcount); + +- snprintf (uid, sizeof (uid), "%u", HEADER_DATA(ctx->hdrs[n])->uid); +- cmd.dptr = cmd.data; +- mutt_buffer_addstr (&cmd, "UID STORE "); +- mutt_buffer_addstr (&cmd, uid); +- + /* if attachments have been deleted we delete the message and reupload + * it. This works better if we're expunging, of course. */ + if (ctx->hdrs[n]->attach_del) +@@ -1018,60 +1079,12 @@ int imap_sync_mailbox (CONTEXT* ctx, int + else + _mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0); + } +- flags[0] = '\0'; +- +- imap_set_flag (idata, IMAP_ACL_SEEN, ctx->hdrs[n]->read, "\\Seen ", +- flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->flagged, +- "\\Flagged ", flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->replied, +- "\\Answered ", flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_DELETE, ctx->hdrs[n]->deleted, +- "\\Deleted ", flags, sizeof (flags)); +- +- /* now make sure we don't lose custom tags */ +- if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) +- imap_add_keywords (flags, ctx->hdrs[n], idata->flags, sizeof (flags)); +- +- mutt_remove_trailing_ws (flags); +- +- /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to +- * explicitly revoke all system flags (if we have permission) */ +- if (!*flags) +- { +- imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); +- imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); +- +- mutt_remove_trailing_ws (flags); +- +- mutt_buffer_addstr (&cmd, " -FLAGS.SILENT ("); +- } +- else +- mutt_buffer_addstr (&cmd, " FLAGS.SILENT ("); +- +- mutt_buffer_addstr (&cmd, flags); +- mutt_buffer_addstr (&cmd, ")"); + +- /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ +- ctx->hdrs[n]->active = 0; +- +- /* after all this it's still possible to have no flags, if you +- * have no ACL rights */ +- if (*flags && (imap_exec (idata, cmd.data, 0) != 0) && +- (err_continue != M_YES)) ++ if (imap_sync_message (idata, ctx->hdrs[n], &cmd, &err_continue) < 0) + { +- err_continue = imap_continue ("imap_sync_mailbox: STORE failed", +- idata->cmd.buf); +- if (err_continue != M_YES) +- { +- rc = -1; +- goto out; +- } ++ rc = -1; ++ goto out; + } +- +- ctx->hdrs[n]->active = 1; + } + } + ctx->changed = 0; +Index: mutt/imap/imap_private.h +=================================================================== +RCS file: /home/roessler/cvs/mutt/imap/imap_private.h,v +retrieving revision 3.5 +retrieving revision 3.7 +diff -u -p -r3.5 -r3.7 +--- mutt/imap/imap_private.h 17 Feb 2005 03:33:00 -0000 3.5 ++++ mutt/imap/imap_private.h 3 Apr 2005 00:14:51 -0000 3.7 +@@ -180,7 +180,7 @@ typedef struct + IMAP_CACHE cache[IMAP_CACHE_LEN]; + unsigned int noclose : 1; + #ifdef USE_HCACHE +- uint64_t uid_validity; ++ unsigned long uid_validity; + #endif + + /* all folder flags - system flags AND keywords */ +@@ -203,6 +203,8 @@ int imap_parse_list_response(IMAP_DATA* + int imap_read_literal (FILE* fp, IMAP_DATA* idata, long bytes); + void imap_expunge_mailbox (IMAP_DATA* idata); + void imap_logout (IMAP_DATA* idata); ++int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, ++ int *err_continue); + + /* auth.c */ + int imap_authenticate (IMAP_DATA* idata); +Index: mutt/imap/message.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/imap/message.c,v +retrieving revision 3.19 +retrieving revision 3.21 +diff -u -p -r3.19 -r3.21 +--- mutt/imap/message.c 27 Feb 2005 03:18:23 -0000 3.19 ++++ mutt/imap/message.c 3 Apr 2005 00:14:51 -0000 3.21 +@@ -69,7 +69,7 @@ int imap_read_headers (IMAP_DATA* idata, + + #if USE_HCACHE + void *hc = NULL; +- uint64_t *uid_validity = NULL; ++ unsigned long *uid_validity = NULL; + char uid_buf[64]; + #endif /* USE_HCACHE */ + +@@ -154,7 +154,7 @@ int imap_read_headers (IMAP_DATA* idata, + fputs ("\n\n", fp); + + sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */ +- uid_validity = (uint64_t *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen); ++ uid_validity = (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen); + + if (uid_validity != NULL + && *uid_validity == idata->uid_validity) { +@@ -640,13 +640,14 @@ int imap_append_message (CONTEXT *ctx, M + int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) + { + IMAP_DATA* idata; +- BUFFER cmd; ++ BUFFER cmd, sync_cmd; + char uid[11]; + char mbox[LONG_STRING]; + char mmbox[LONG_STRING]; + int rc; + int n; + IMAP_MBOX mx; ++ int err_continue = M_NO; + + idata = (IMAP_DATA*) ctx->data; + +@@ -672,6 +673,7 @@ int imap_copy_messages (CONTEXT* ctx, HE + + imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox)); + ++ memset (&sync_cmd, 0, sizeof (sync_cmd)); + memset (&cmd, 0, sizeof (cmd)); + mutt_buffer_addstr (&cmd, "UID COPY "); + +@@ -688,6 +690,17 @@ int imap_copy_messages (CONTEXT* ctx, HE + dprint (3, (debugfile, "imap_copy_messages: Message contains attachments to be deleted\n")); + return 1; + } ++ ++ if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->active && ++ ctx->hdrs[n]->changed) ++ { ++ rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue); ++ if (rc < 0) ++ { ++ dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); ++ goto fail; ++ } ++ } + } + + rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); +@@ -703,6 +716,16 @@ int imap_copy_messages (CONTEXT* ctx, HE + mutt_message (_("Copying message %d to %s..."), h->index+1, mbox); + snprintf (uid, sizeof (uid), "%u", HEADER_DATA (h)->uid); + mutt_buffer_addstr (&cmd, uid); ++ ++ if (h->active && h->changed) ++ { ++ rc = imap_sync_message (idata, h, &sync_cmd, &err_continue); ++ if (rc < 0) ++ { ++ dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); ++ goto fail; ++ } ++ } + } + + /* let's get it on */ +@@ -761,12 +784,16 @@ int imap_copy_messages (CONTEXT* ctx, HE + + if (cmd.data) + FREE (&cmd.data); ++ if (sync_cmd.data) ++ FREE (&sync_cmd.data); + FREE (&mx.mbox); + return 0; + + fail: + if (cmd.data) + FREE (&cmd.data); ++ if (sync_cmd.data) ++ FREE (&sync_cmd.data); + FREE (&mx.mbox); + return -1; + } +@@ -923,7 +950,6 @@ static size_t imap_hcache_keylen (const + static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp) + { + IMAP_DATA* idata; +- long bytes; + int rc = -1; /* default now is that string isn't FETCH response*/ + + idata = (IMAP_DATA*) ctx->data; +Index: mutt/po/de.po +=================================================================== +RCS file: /home/roessler/cvs/mutt/po/de.po,v +retrieving revision 3.22 +retrieving revision 3.23 +diff -u -p -r3.22 -r3.23 +--- mutt/po/de.po 13 Mar 2005 16:35:33 -0000 3.22 ++++ mutt/po/de.po 22 Mar 2005 19:48:35 -0000 3.23 +@@ -1,9 +1,9 @@ + msgid "" + msgstr "" +-"Project-Id-Version: 1.5.8\n" ++"Project-Id-Version: 1.5.9\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-03-13 17:38+0100\n" +-"PO-Revision-Date: 2005-02-13 18:28+0100\n" ++"PO-Revision-Date: 2005-03-20 14:03+0100\n" + "Last-Translator: Roland Rosenfeld \n" + "Language-Team: German \n" + "MIME-Version: 1.0\n" +@@ -204,9 +204,8 @@ msgid "Create is only supported for IMAP + msgstr "Es können nur IMAP Mailboxen erzeugt werden" + + #: browser.c:880 +-#, fuzzy + msgid "Rename is only supported for IMAP mailboxes" +-msgstr "Es können nur IMAP Mailboxen erzeugt werden" ++msgstr "Es können nur IMAP Mailboxen umbenannt werden" + + #: browser.c:901 + msgid "Delete is only supported for IMAP mailboxes" +@@ -1400,19 +1399,18 @@ msgid "Mailbox created." + msgstr "Mailbox erzeugt." + + #: imap/browse.c:325 +-#, fuzzy, c-format ++#, c-format + msgid "Rename mailbox %s to: " +-msgstr "Erzeuge Mailbox: " ++msgstr "Benenne Mailbox %s um in: " + + #: imap/browse.c:338 +-#, fuzzy, c-format ++#, c-format + msgid "Rename failed: %s" +-msgstr "SSL fehlgeschlagen: %s" ++msgstr "Umbenennung fehlgeschlagen: %s" + + #: imap/browse.c:343 +-#, fuzzy + msgid "Mailbox renamed." +-msgstr "Mailbox erzeugt." ++msgstr "Mailbox umbenannt." + + #: imap/command.c:294 + msgid "Mailbox closed" +@@ -2325,9 +2323,8 @@ msgid "{internal}" + msgstr "{intern}" + + #: keymap_alldefs.h:151 +-#, fuzzy + msgid "rename the current mailbox (IMAP only)" +-msgstr "Lösche die aktuelle Mailbox (nur für IMAP)" ++msgstr "benenne die aktuelle Mailbox um (nur für IMAP)" + + #: keymap_alldefs.h:152 + msgid "reply to a message" +Index: mutt/po/id.po +=================================================================== +RCS file: /home/roessler/cvs/mutt/po/id.po,v +retrieving revision 3.21 +retrieving revision 3.22 +diff -u -p -r3.21 -r3.22 +--- mutt/po/id.po 13 Mar 2005 16:35:34 -0000 3.21 ++++ mutt/po/id.po 22 Mar 2005 19:53:49 -0000 3.22 +@@ -4,10 +4,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: 1.5.8i\n" ++"Project-Id-Version: 1.5.9i\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-03-13 17:38+0100\n" +-"PO-Revision-Date: 2005-02-14 10:59+0700\n" ++"PO-Revision-Date: 2005-03-21 17:31+1100\n" + "Last-Translator: Ronny Haryanto \n" + "Language-Team: Indonesia \n" + "MIME-Version: 1.0\n" +@@ -207,9 +207,8 @@ msgid "Create is only supported for IMAP + msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP." + + #: browser.c:880 +-#, fuzzy + msgid "Rename is only supported for IMAP mailboxes" +-msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP." ++msgstr "Penggantian nama hanya didukung untuk kotak surat jenis IMAP." + + #: browser.c:901 + msgid "Delete is only supported for IMAP mailboxes" +@@ -1403,19 +1402,18 @@ msgid "Mailbox created." + msgstr "Kotak surat telah dibuat." + + #: imap/browse.c:325 +-#, fuzzy, c-format ++#, c-format + msgid "Rename mailbox %s to: " +-msgstr "Membuat kotak surat: " ++msgstr "Ganti nama kotak surat %s ke: " + + #: imap/browse.c:338 +-#, fuzzy, c-format ++#, c-format + msgid "Rename failed: %s" +-msgstr "SSL gagal: %s" ++msgstr "Penggantian nama gagal: %s" + + #: imap/browse.c:343 +-#, fuzzy + msgid "Mailbox renamed." +-msgstr "Kotak surat telah dibuat." ++msgstr "Kotak surat telah diganti namanya." + + #: imap/command.c:294 + msgid "Mailbox closed" +@@ -1783,11 +1781,11 @@ msgstr "tampilkan nama file yang sedang + + #: keymap_alldefs.h:15 + msgid "subscribe to current mailbox (IMAP only)" +-msgstr "berlangganan ke kotak surat (untuk IMAP)" ++msgstr "berlangganan ke kotak surat ini (untuk IMAP)" + + #: keymap_alldefs.h:16 + msgid "unsubscribe to current mailbox (IMAP only)" +-msgstr "berhenti langganan dari kotak surat (untuk IMAP)" ++msgstr "berhenti langganan dari kotak surat ini (untuk IMAP)" + + #: keymap_alldefs.h:17 + msgid "toggle view all/subscribed mailboxes (IMAP only)" +@@ -1947,11 +1945,11 @@ msgstr "buat salinan (text/plain) yang s + + #: keymap_alldefs.h:56 + msgid "delete the current entry" +-msgstr "hapus entry" ++msgstr "hapus entry ini" + + #: keymap_alldefs.h:57 + msgid "delete the current mailbox (IMAP only)" +-msgstr "hapus kotak surat (untuk IMAP)" ++msgstr "hapus kotak surat ini (untuk IMAP)" + + #: keymap_alldefs.h:58 + msgid "delete all messages in subthread" +@@ -2095,7 +2093,7 @@ msgstr "forward surat dengan komentar" + + #: keymap_alldefs.h:93 + msgid "select the current entry" +-msgstr "pilih entry" ++msgstr "pilih entry ini" + + #: keymap_alldefs.h:94 + msgid "reply to all recipients" +@@ -2223,11 +2221,11 @@ msgstr "ke surat sebelumnya yang belum d + + #: keymap_alldefs.h:125 + msgid "mark the current thread as read" +-msgstr "tandai thread 'sudah dibaca'" ++msgstr "tandai thread ini 'sudah dibaca'" + + #: keymap_alldefs.h:126 + msgid "mark the current subthread as read" +-msgstr "tandai subthread 'sudah dibaca'" ++msgstr "tandai subthread ini 'sudah dibaca'" + + #: keymap_alldefs.h:127 + msgid "set a status flag on a message" +@@ -2299,7 +2297,7 @@ msgstr "ke halaman sebelumnya" + + #: keymap_alldefs.h:144 + msgid "print the current entry" +-msgstr "cetak entry" ++msgstr "cetak entry ini" + + #: keymap_alldefs.h:145 + msgid "query external program for addresses" +@@ -2326,9 +2324,8 @@ msgid "{internal}" + msgstr "{jerohan}" + + #: keymap_alldefs.h:151 +-#, fuzzy + msgid "rename the current mailbox (IMAP only)" +-msgstr "hapus kotak surat (untuk IMAP)" ++msgstr "ganti nama kotak surat ini (untuk IMAP)" + + #: keymap_alldefs.h:152 + msgid "reply to a message" +@@ -2336,7 +2333,7 @@ msgstr "balas surat" + + #: keymap_alldefs.h:153 + msgid "use the current message as a template for a new one" +-msgstr "gunakan surat sebagai template" ++msgstr "gunakan surat ini sebagai template" + + #: keymap_alldefs.h:154 + msgid "save message/attachment to a file" +@@ -2376,7 +2373,7 @@ msgstr "urutkan terbalik surat-surat" + + #: keymap_alldefs.h:163 + msgid "tag the current entry" +-msgstr "tandai entry" ++msgstr "tandai entry ini" + + #: keymap_alldefs.h:164 + msgid "apply next function to tagged messages" +@@ -2388,11 +2385,11 @@ msgstr "lakukan fungsi berikutnya HANYA + + #: keymap_alldefs.h:166 + msgid "tag the current subthread" +-msgstr "tandai subthread" ++msgstr "tandai subthread ini" + + #: keymap_alldefs.h:167 + msgid "tag the current thread" +-msgstr "tandai thread" ++msgstr "tandai thread ini" + + #: keymap_alldefs.h:168 + msgid "toggle a message's 'new' flag" +@@ -2412,7 +2409,7 @@ msgstr "ke awal halaman" + + #: keymap_alldefs.h:172 + msgid "undelete the current entry" +-msgstr "tidak jadi hapus entry" ++msgstr "tidak jadi hapus entry ini" + + #: keymap_alldefs.h:173 + msgid "undelete all messages in thread" +@@ -2440,11 +2437,11 @@ msgstr "tampilkan keycode untuk penekana + + #: keymap_alldefs.h:179 + msgid "show currently active limit pattern" +-msgstr "tampilkan kriteria batas yang aktif" ++msgstr "tampilkan kriteria batas yang sedang aktif" + + #: keymap_alldefs.h:180 + msgid "collapse/uncollapse current thread" +-msgstr "collapse/uncollapse thread" ++msgstr "collapse/uncollapse thread ini" + + #: keymap_alldefs.h:181 + msgid "collapse/uncollapse all threads" +@@ -3213,7 +3210,7 @@ msgstr "Cari: " + + #: pager.c:2081 + msgid "Help is currently being shown." +-msgstr "Bantuan sudah ditampilkan." ++msgstr "Bantuan sedang ditampilkan." + + #: pager.c:2110 + msgid "No more quoted text." +Index: mutt/po/nl.po +=================================================================== +RCS file: /home/roessler/cvs/mutt/po/nl.po,v +retrieving revision 3.22 +retrieving revision 3.23 +diff -u -p -r3.22 -r3.23 +--- mutt/po/nl.po 13 Mar 2005 16:35:34 -0000 3.22 ++++ mutt/po/nl.po 22 Mar 2005 19:49:31 -0000 3.23 +@@ -1,10 +1,10 @@ +-# $Id: nl.po,v 3.21 2005/02/12 20:56:33 roessler Exp $ ++# $Id: nl.po,v 3.23 2005/03/22 19:49:31 roessler Exp $ + msgid "" + msgstr "" +-"Project-Id-Version: Mutt 1.5.6\n" ++"Project-Id-Version: Mutt 1.5.9\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-03-13 17:38+0100\n" +-"PO-Revision-Date: 2005-01-28 15:08+0100\n" ++"PO-Revision-Date: 2005-03-20 15:17+0100\n" + "Last-Translator: René Clerc \n" + "Language-Team: René Clerc \n" + "MIME-Version: 1.0\n" +@@ -203,9 +203,8 @@ msgid "Create is only supported for IMAP + msgstr "Alleen IMAP folders kunnen aangemaakt worden" + + #: browser.c:880 +-#, fuzzy + msgid "Rename is only supported for IMAP mailboxes" +-msgstr "Alleen IMAP folders kunnen aangemaakt worden" ++msgstr "Alleen IMAP folders kunnen hernoemd worden" + + #: browser.c:901 + msgid "Delete is only supported for IMAP mailboxes" +@@ -1195,7 +1194,7 @@ msgstr "[-- Foutenuitvoer van %s --]\n" + + #: handler.c:1643 + msgid "[-- Error: message/external-body has no access-type parameter --]\n" +-msgstr "[-- Fout: message/external-body heeft geen access-type paramter --]\n" ++msgstr "[-- Fout: message/external-body heeft geen access-type parameter --]\n" + + #: handler.c:1662 + #, c-format +@@ -1398,19 +1397,18 @@ msgid "Mailbox created." + msgstr "Mailfolder is aangemaakt." + + #: imap/browse.c:325 +-#, fuzzy, c-format ++#, c-format + msgid "Rename mailbox %s to: " +-msgstr "Mailfolder aanmaken: " ++msgstr "Mailfolder %s hernoemen naar: " + + #: imap/browse.c:338 +-#, fuzzy, c-format ++#, c-format + msgid "Rename failed: %s" +-msgstr "SSL mislukt: %s" ++msgstr "Hernoemen mislukt: %s" + + #: imap/browse.c:343 +-#, fuzzy + msgid "Mailbox renamed." +-msgstr "Mailfolder is aangemaakt." ++msgstr "Mailfolder is hernoemd." + + #: imap/command.c:294 + msgid "Mailbox closed" +@@ -2321,9 +2319,8 @@ msgid "{internal}" + msgstr "(intern)" + + #: keymap_alldefs.h:151 +-#, fuzzy + msgid "rename the current mailbox (IMAP only)" +-msgstr "verwijder de huidige mailfolder (alleen met IMAP)" ++msgstr "hernoem de huidige mailfolder (alleen met IMAP)" + + #: keymap_alldefs.h:152 + msgid "reply to a message" +@@ -2599,7 +2596,6 @@ msgstr "" + "USA.\n" + + #: main.c:99 +-#, fuzzy + msgid "" + "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " + " ]\n" +@@ -2653,18 +2649,18 @@ msgstr "" + " -e \tspecificeer een uit te voeren opdracht na initialisatie\n" + " -f \tspecificeer de te lezen mailfolder\n" + " -F \tspecificeer een alternatieve muttrc\n" +-" -H \tspecificeer een een bestand om de headers uit te lezen\n" ++" -H \tspecificeer een bestand om de headers uit te lezen\n" + " -i \tspecificeer een bestand dat Mutt moet bijsluiten in het " +-"antwoord\n" ++"bericht\n" + " -m \tspecificeer een standaard mailfolder type\n" +-" -n\t\tzorgt dat Mutt niet de systeem Muttrc inleest\n" ++" -n\t\tzorgt dat Mutt de systeem Muttrc niet inleest\n" + " -p\t\troept een uitgesteld bericht op\n" + " -Q \tvraagt de waarde van een configuratievariabele op\n" + " -R\t\topent de mailfolder met alleen-lezen rechten\n" + " -s \tspecificeer een onderwerp (tussen aanhalingstekens i.g.v. " + "spaties)\n" + " -v\t\ttoont het versienummer en opties tijdens het compileren\n" +-" -x\t\tsimuleert de mailx verstuurmodus\n" ++" -x\t\tsimuleert de mailx verzendmodus\n" + " -y\t\tselecteert een mailfolder gespecificeerd in de `mailboxes' lijst\n" + " -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n" + " -Z\t\topent de eerste mailfolder met nieuwe berichten, eindigt indien " +Index: mutt/po/pl.po +=================================================================== +RCS file: /home/roessler/cvs/mutt/po/pl.po,v +retrieving revision 3.24 +retrieving revision 3.25 +diff -u -p -r3.24 -r3.25 +--- mutt/po/pl.po 13 Mar 2005 16:35:34 -0000 3.24 ++++ mutt/po/pl.po 17 Mar 2005 09:30:06 -0000 3.25 +@@ -6,10 +6,10 @@ + # get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html + msgid "" + msgstr "" +-"Project-Id-Version: mutt-cvs-2004.08.16\n" ++"Project-Id-Version: mutt-1.5.8\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2005-03-13 17:38+0100\n" +-"PO-Revision-Date: 2004-08-16\n" ++"POT-Creation-Date: 2005-02-15 13:41+0100\n" ++"PO-Revision-Date: 2005-02-15\n" + "Last-Translator: Pawe³ Dziekoñski \n" + "Language-Team: POLISH \n" + "MIME-Version: 1.0\n" +@@ -175,7 +175,7 @@ msgstr "Zmieñ katalog" + msgid "Mask" + msgstr "Wzorzec" + +-#: browser.c:381 browser.c:989 ++#: browser.c:381 browser.c:968 + #, c-format + msgid "%s is not a directory." + msgstr "%s nie jest katalogiem." +@@ -199,7 +199,7 @@ msgstr "Katalog [%s], wzorzec nazw plikó + msgid "Can't attach a directory!" + msgstr "Za³±cznikiem nie mo¿e zostaæ katalog!" + +-#: browser.c:655 browser.c:1056 browser.c:1153 ++#: browser.c:655 browser.c:1035 browser.c:1132 + msgid "No files match the file mask" + msgstr "¯aden plik nie pasuje do wzorca" + +@@ -208,60 +208,55 @@ msgid "Create is only supported for IMAP + msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" + + #: browser.c:880 +-#, fuzzy +-msgid "Rename is only supported for IMAP mailboxes" +-msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" +- +-#: browser.c:901 + msgid "Delete is only supported for IMAP mailboxes" + msgstr "Usuwanie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP" + +-#: browser.c:909 ++#: browser.c:888 + #, c-format + msgid "Really delete mailbox \"%s\"?" + msgstr "Naprawdê usun±æ skrzynkê \"%s\"?" + +-#: browser.c:923 ++#: browser.c:902 + msgid "Mailbox deleted." + msgstr "Skrzynka zosta³a usuniêta." + +-#: browser.c:929 ++#: browser.c:908 + msgid "Mailbox not deleted." + msgstr "Skrzynka nie zosta³a usuniêta." + +-#: browser.c:948 ++#: browser.c:927 + msgid "Chdir to: " + msgstr "Zmieñ katalog na: " + +-#: browser.c:977 browser.c:1049 ++#: browser.c:956 browser.c:1028 + msgid "Error scanning directory." + msgstr "B³±d przegl±dania katalogu." + +-#: browser.c:1000 ++#: browser.c:979 + msgid "File Mask: " + msgstr "Wzorzec nazw plików: " + +-#: browser.c:1072 ++#: browser.c:1051 + msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " + msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?" + +-#: browser.c:1073 ++#: browser.c:1052 + msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " + msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?" + +-#: browser.c:1074 ++#: browser.c:1053 + msgid "dazn" + msgstr "dawn" + +-#: browser.c:1140 ++#: browser.c:1119 + msgid "New file name: " + msgstr "Nazwa nowego pliku: " + +-#: browser.c:1171 ++#: browser.c:1150 + msgid "Can't view a directory" + msgstr "Nie mo¿na przegl±daæ tego katalogu" + +-#: browser.c:1188 ++#: browser.c:1167 + msgid "Error trying to view file" + msgstr "B³±d podczas próby przegl±dania pliku" + +@@ -448,19 +443,12 @@ msgid "Messages could not be printed" + msgstr "Listy nie zosta³y wydrukowane" + + #: commands.c:508 +-msgid "" +-"Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s" +-"(p)am?: " +-msgstr "" +-"Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)" +-"pam?: " ++msgid "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: " ++msgstr "Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " + + #: commands.c:509 +-msgid "" +-"Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)" +-"am?: " +-msgstr "" +-"Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " ++msgid "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: " ++msgstr "Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: " + + #: commands.c:510 + msgid "dfrsotuzcp" +@@ -746,68 +734,44 @@ msgstr "Nie mo¿na wys³aæ listu w trybie + msgid "Mail not sent." + msgstr "List nie zosta³ wys³any." + +-#: crypt.c:398 ++#: crypt.c:395 + msgid "S/MIME messages with no hints on content are unsupported." + msgstr "Listy S/MIME bez wskazówek co do zawarto¶ci nie s± obs³ugiwane." + +-#: crypt.c:617 crypt.c:661 ++#: crypt.c:614 crypt.c:658 + msgid "Trying to extract PGP keys...\n" + msgstr "Próba skopiowania kluczy PGP...\n" + +-#: crypt.c:641 crypt.c:681 ++#: crypt.c:638 crypt.c:678 + msgid "Trying to extract S/MIME certificates...\n" + msgstr "Próba skopiowania kluczy S/MIME...\n" + +-#: crypt.c:802 +-msgid "" +-"[-- Error: Inconsistent multipart/signed structure! --]\n" +-"\n" +-msgstr "" +-"[-- B³±d: Niespójna struktura multipart/signed ! --]\n" +-"\n" +- +-#: crypt.c:824 +-#, c-format +-msgid "" +-"[-- Error: Unknown multipart/signed protocol %s! --]\n" +-"\n" +-msgstr "" +-"[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n" +-"\n" +- +-#: crypt.c:864 +-#, c-format +-msgid "" +-"[-- Warning: We can't verify %s/%s signatures. --]\n" +-"\n" +-msgstr "" +-"[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n" +-"\n" ++#: crypt.c:799 ++msgid "[-- Error: Inconsistent multipart/signed structure! --]\n\n" ++msgstr "[-- B³±d: Niespójna struktura multipart/signed ! --]\n\n" ++ ++#: crypt.c:821 ++#, c-format ++msgid "[-- Error: Unknown multipart/signed protocol %s! --]\n\n" ++msgstr "[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n\n" ++ ++#: crypt.c:861 ++#, c-format ++msgid "[-- Warning: We can't verify %s/%s signatures. --]\n\n" ++msgstr "[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n\n" + + #. Now display the signed body +-#: crypt.c:876 +-msgid "" +-"[-- The following data is signed --]\n" +-"\n" +-msgstr "" +-"[-- Poni¿sze dane s± podpisane --]\n" +-"\n" +- +-#: crypt.c:882 +-msgid "" +-"[-- Warning: Can't find any signatures. --]\n" +-"\n" +-msgstr "" +-"[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n" +-"\n" +- +-#: crypt.c:888 +-msgid "" +-"\n" +-"[-- End of signed data --]\n" +-msgstr "" +-"\n" +-"[-- Koniec podpisanych danych --]\n" ++#: crypt.c:873 ++msgid "[-- The following data is signed --]\n\n" ++msgstr "[-- Poni¿sze dane s± podpisane --]\n\n" ++ ++#: crypt.c:879 ++msgid "[-- Warning: Can't find any signatures. --]\n\n" ++msgstr "[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n\n" ++ ++#: crypt.c:885 ++msgid "\n[-- End of signed data --]\n" ++msgstr "\n[-- Koniec podpisanych danych --]\n" + + #: curs_lib.c:190 + msgid "yes" +@@ -902,7 +866,7 @@ msgstr "Skrzynka zosta³a zmodyfikowana z + msgid "No tagged messages." + msgstr "Brak zaznaczonych listów." + +-#: curs_main.c:657 menu.c:906 ++#: curs_main.c:657 menu.c:901 + msgid "Nothing to do." + msgstr "Brak akcji do wykonania." + +@@ -1035,44 +999,8 @@ msgstr "Nie mo¿na edytowaæ listów na ser + #. * declared "static" (sigh) + #. + #: edit.c:41 +-msgid "" +-"~~\t\tinsert a line begining with a single ~\n" +-"~b users\tadd users to the Bcc: field\n" +-"~c users\tadd users to the Cc: field\n" +-"~f messages\tinclude messages\n" +-"~F messages\tsame as ~f, except also include headers\n" +-"~h\t\tedit the message header\n" +-"~m messages\tinclude and quote messages\n" +-"~M messages\tsame as ~m, except include headers\n" +-"~p\t\tprint the message\n" +-"~q\t\twrite file and quit editor\n" +-"~r file\t\tread a file into the editor\n" +-"~t users\tadd users to the To: field\n" +-"~u\t\trecall the previous line\n" +-"~v\t\tedit message with the $visual editor\n" +-"~w file\t\twrite message to file\n" +-"~x\t\tabort changes and quit editor\n" +-"~?\t\tthis message\n" +-".\t\ton a line by itself ends input\n" +-msgstr "" +-"~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n" +-"~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n" +-"~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n" +-"~f listy\tdo³±cz listy\n" +-"~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n" +-"~h\t\tedytuj nag³ówki\n" +-"~m listy\tdodaj i komentuj listy\n" +-"~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n" +-"~p\t\tdrukuj list\n" +-"~q\t\tzapisz plik i wyjd¼ z edytora\n" +-"~r plik\t\twczytaj plik do edytora\n" +-"~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n" +-"~u\t\todtwórz poprzedni± liniê\n" +-"~v\t\tedytuj list edytorem $visual\n" +-"~w plik\t\tzapisz list do pliku\n" +-"~x\t\tporzuæ zmiany i wyjd¼ z edytora\n" +-"~?\t\tten list\n" +-".\t\tstoj±c sama w linii koñczy wpisywanie\n" ++msgid "~~\t\tinsert a line begining with a single ~\n~b users\tadd users to the Bcc: field\n~c users\tadd users to the Cc: field\n~f messages\tinclude messages\n~F messages\tsame as ~f, except also include headers\n~h\t\tedit the message header\n~m messages\tinclude and quote messages\n~M messages\tsame as ~m, except include headers\n~p\t\tprint the message\n~q\t\twrite file and quit editor\n~r file\t\tread a file into the editor\n~t users\tadd users to the To: field\n~u\t\trecall the previous line\n~v\t\tedit message with the $visual editor\n~w file\t\twrite message to file\n~x\t\tabort changes and quit editor\n~?\t\tthis message\n.\t\ton a line by itself ends input\n" ++msgstr "~~\t\twstaw liniê zaczynaj±c± siê pojedyñczym ~\n~b u¿ytkownicy\tdodaj u¿ytkowników do pola BCC:\n~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n~f listy\tdo³±cz listy\n~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n~h\t\tedytuj nag³ówki\n~m listy\tdodaj i komentuj listy\n~M listy\tto samo co ~m ale do³±cz te¿ nag³ówki\n~p\t\tdrukuj list\n~q\t\tzapisz plik i wyjd¼ z edytora\n~r plik\t\twczytaj plik do edytora\n~t u¿ytkownicy\tdodaj u¿ytkowników do pola To:\n~u\t\todtwórz poprzedni± liniê\n~v\t\tedytuj list edytorem $visual\n~w plik\t\tzapisz list do pliku\n~x\t\tporzuæ zmiany i wyjd¼ z edytora\n~?\t\tten list\n.\t\tstoj±c sama w linii koñczy wpisywanie\n" + + #: edit.c:186 + #, c-format +@@ -1161,9 +1089,7 @@ msgstr "Wyczy¶æ flagê" + + #: handler.c:1349 + msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" +-msgstr "" +-"[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! " +-"--]\n" ++msgstr "[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! --]\n" + + #: handler.c:1459 + #, c-format +@@ -1197,8 +1123,7 @@ msgstr "[-- Komunikaty b³êdów %s --]\n" + + #: handler.c:1643 + msgid "[-- Error: message/external-body has no access-type parameter --]\n" +-msgstr "" +-"[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n" ++msgstr "[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n" + + #: handler.c:1662 + #, c-format +@@ -1230,12 +1155,8 @@ msgid "[-- This %s/%s attachment is not + msgstr "[-- Ten za³±cznik typu %s/%s nie jest zawarty, --]\n" + + #: handler.c:1696 +-msgid "" +-"[-- and the indicated external source has --]\n" +-"[-- expired. --]\n" +-msgstr "" +-"[-- a podane ¼ród³o zewnêtrzne jest --]\n" +-"[-- nieaktualne. --]\n" ++msgid "[-- and the indicated external source has --]\n[-- expired. --]\n" ++msgstr "[-- a podane ¼ród³o zewnêtrzne jest --]\n[-- nieaktualne. --]\n" + + #: handler.c:1714 + #, c-format +@@ -1282,24 +1203,12 @@ msgid "" + msgstr "" + + #: help.c:336 +-msgid "" +-"\n" +-"Generic bindings:\n" +-"\n" +-msgstr "" +-"\n" +-"Standardowe przypisania klawiszy:\n" +-"\n" ++msgid "\nGeneric bindings:\n\n" ++msgstr "\nStandardowe przypisania klawiszy:\n\n" + + #: help.c:340 +-msgid "" +-"\n" +-"Unbound functions:\n" +-"\n" +-msgstr "" +-"\n" +-"Nie przypisane klawiszom funkcje:\n" +-"\n" ++msgid "\nUnbound functions:\n\n" ++msgstr "\nNie przypisane klawiszom funkcje:\n\n" + + #: help.c:348 + #, c-format +@@ -1307,7 +1216,6 @@ msgid "Help for %s" + msgstr "Pomoc dla menu %s" + + #: hook.c:246 +-#, c-format + msgid "unhook: Can't do unhook * from within a hook." + msgstr "unhook: Nie mo¿na wykonaæ \"unhook *\" wewn±trz innego polecenia hook." + +@@ -1371,7 +1279,7 @@ msgstr "Uwierzytelnianie (%s)..." + msgid "SASL authentication failed." + msgstr "Uwierzytelnianie SASL nie powiod³o siê." + +-#: imap/browse.c:68 imap/imap.c:559 ++#: imap/browse.c:68 imap/imap.c:542 + #, c-format + msgid "%s is an invalid IMAP path" + msgstr "%s jest b³êdn± ¶cie¿k± IMAP" +@@ -1392,7 +1300,7 @@ msgstr "Brak skrzynki" + msgid "Create mailbox: " + msgstr "Nazwa skrzynki: " + +-#: imap/browse.c:286 imap/browse.c:332 ++#: imap/browse.c:286 + msgid "Mailbox must have a name." + msgstr "Skrzynka musi zostaæ nazwana." + +@@ -1400,21 +1308,6 @@ msgstr "Skrzynka musi zostaæ nazwana." + msgid "Mailbox created." + msgstr "Skrzynka zosta³a utworzona." + +-#: imap/browse.c:325 +-#, fuzzy, c-format +-msgid "Rename mailbox %s to: " +-msgstr "Nazwa skrzynki: " +- +-#: imap/browse.c:338 +-#, fuzzy, c-format +-msgid "Rename failed: %s" +-msgstr "SSL nie powiod³o siê: %s" +- +-#: imap/browse.c:343 +-#, fuzzy +-msgid "Mailbox renamed." +-msgstr "Skrzynka zosta³a utworzona." +- + #: imap/command.c:294 + msgid "Mailbox closed" + msgstr "Skrzynka zosta³a zamkniêta" +@@ -1426,84 +1319,84 @@ msgstr "Skrzynka zosta³a zamkniêta" + msgid "Fatal error. Message count is out of sync!" + msgstr "B³±d krytyczny. Niezidentyfikowana ilo¶æ listów!" + +-#: imap/imap.c:168 ++#: imap/imap.c:151 + #, c-format + msgid "Closing connection to %s..." + msgstr "Zamykanie po³±czenia do %s..." + +-#: imap/imap.c:328 ++#: imap/imap.c:311 + msgid "This IMAP server is ancient. Mutt does not work with it." + msgstr "Zbyt stara wersja serwera IMAP. Praca z tym serwerem nie jest mo¿liwa." + +-#: imap/imap.c:419 ++#: imap/imap.c:402 + #, c-format + msgid "Unexpected response received from server: %s" + msgstr "Otrzymano nieoczekiwan± odpowied¼ od serwera: %s" + +-#: imap/imap.c:439 pop_lib.c:284 ++#: imap/imap.c:422 pop_lib.c:284 + msgid "Secure connection with TLS?" + msgstr "Po³±czyæ u¿ywaj±c TLS?" + +-#: imap/imap.c:452 pop_lib.c:308 ++#: imap/imap.c:435 pop_lib.c:308 + msgid "Could not negotiate TLS connection" + msgstr "Po³±czenie TSL nie zosta³o wynegocjowane" + +-#: imap/imap.c:590 ++#: imap/imap.c:573 + #, c-format + msgid "Selecting %s..." + msgstr "Wybieranie %s..." + +-#: imap/imap.c:726 ++#: imap/imap.c:709 + msgid "Error opening mailbox" + msgstr "B³±d otwarcia skrzynki" + + #. STATUS not supported +-#: imap/imap.c:780 ++#: imap/imap.c:763 + msgid "Unable to append to IMAP mailboxes at this server" + msgstr "Nie mo¿na dopisaæ do skrzynek IMAP na tym serwerze" + + #. command failed cause folder doesn't exist +-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234 ++#: imap/imap.c:772 imap/message.c:720 muttlib.c:1234 + #, c-format + msgid "Create %s?" + msgstr "Utworzyæ %s?" + +-#: imap/imap.c:975 pop.c:465 ++#: imap/imap.c:958 pop.c:465 + #, c-format + msgid "Marking %d messages deleted..." + msgstr "Zaznaczanie %d listów jako skasowanych..." + +-#: imap/imap.c:984 ++#: imap/imap.c:967 + msgid "Expunge failed" + msgstr "Skasowanie nie powiod³o siê" + +-#: imap/imap.c:999 ++#: imap/imap.c:982 + #, c-format + msgid "Saving message status flags... [%d/%d]" + msgstr "Zapisywanie stanu flag listów... [%d/%d]" + +-#: imap/imap.c:1083 ++#: imap/imap.c:1066 + msgid "Expunging messages from server..." + msgstr "Kasowanie listów na serwerze... " + +-#: imap/imap.c:1088 ++#: imap/imap.c:1071 + msgid "imap_sync_mailbox: EXPUNGE failed" + msgstr "imap_sync_mailbox: skasowanie nie powiod³o siê" + +-#: imap/imap.c:1122 ++#: imap/imap.c:1105 + msgid "CLOSE failed" + msgstr "Polecenie CLOSE nie powiod³o siê" + +-#: imap/imap.c:1365 ++#: imap/imap.c:1348 + msgid "Bad mailbox name" + msgstr "B³êdna nazwa skrzynki" + +-#: imap/imap.c:1377 ++#: imap/imap.c:1360 + #, c-format + msgid "Subscribing to %s..." + msgstr "Subskrybowanie %s..." + +-#: imap/imap.c:1379 ++#: imap/imap.c:1362 + #, c-format + msgid "Unsubscribing to %s..." + msgstr "Odsubskrybowanie %s..." +@@ -1519,9 +1412,9 @@ msgid "Could not create temporary file % + msgstr "Nie mo¿na utworzyæ pliku tymczasowego %s" + + #: imap/message.c:134 +-#, fuzzy, c-format ++#, c-format + msgid "Evaluating cache... [%d/%d]" +-msgstr "Pobieranie nag³ówków listów... [%d/%d]" ++msgstr "Szacowanie bufora... [%d/%d]" + + #: imap/message.c:202 pop.c:210 + #, c-format +@@ -1536,16 +1429,16 @@ msgstr "Pobieranie listu..." + msgid "The message index is incorrect. Try reopening the mailbox." + msgstr "B³êdny indeks listów. Spróbuj ponownie otworzyæ skrzynkê." + +-#: imap/message.c:589 ++#: imap/message.c:586 + msgid "Uploading message ..." + msgstr "£adowanie listu ..." + +-#: imap/message.c:699 ++#: imap/message.c:696 + #, c-format + msgid "Copying %d messages to %s..." + msgstr "Kopiowanie %d listów do %s..." + +-#: imap/message.c:703 ++#: imap/message.c:700 + #, c-format + msgid "Copying message %d to %s..." + msgstr "Kopiowanie listu %d do %s..." +@@ -1596,12 +1489,10 @@ msgid "%s: unknown variable" + msgstr "%s: nieznana zmienna" + + #: init.c:1243 +-#, c-format + msgid "prefix is illegal with reset" + msgstr "reset: nieprawid³owy prefiks" + + #: init.c:1249 +-#, c-format + msgid "value is illegal with reset" + msgstr "reset: nieprawid³owa warto¶æ" + +@@ -1789,8 +1680,7 @@ msgstr "odsubskrybuj bie¿±c± skrzynkê (t + + #: keymap_alldefs.h:17 + msgid "toggle view all/subscribed mailboxes (IMAP only)" +-msgstr "" +-"zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)" ++msgstr "zmieñ tryb przegl±dania skrzynek: wszystkie/zasubskrybowane (tylko IMAP)" + + #: keymap_alldefs.h:18 + msgid "list mailboxes with new mail" +@@ -2325,199 +2215,194 @@ msgid "{internal}" + msgstr "{wewnêtrzne}" + + #: keymap_alldefs.h:151 +-#, fuzzy +-msgid "rename the current mailbox (IMAP only)" +-msgstr "usuñ bie¿±c± skrzynkê (tylko IMAP)" +- +-#: keymap_alldefs.h:152 + msgid "reply to a message" + msgstr "odpowiedz na list" + +-#: keymap_alldefs.h:153 ++#: keymap_alldefs.h:152 + msgid "use the current message as a template for a new one" + msgstr "u¿yj bie¿±cego listu jako wzorca dla nowych wiadomo¶ci" + +-#: keymap_alldefs.h:154 ++#: keymap_alldefs.h:153 + msgid "save message/attachment to a file" + msgstr "zapisz list/za³±cznik do pliku" + +-#: keymap_alldefs.h:155 ++#: keymap_alldefs.h:154 + msgid "search for a regular expression" + msgstr "szukaj wyra¿enia regularnego" + +-#: keymap_alldefs.h:156 ++#: keymap_alldefs.h:155 + msgid "search backwards for a regular expression" + msgstr "szukaj wstecz wyra¿enia regularnego" + +-#: keymap_alldefs.h:157 ++#: keymap_alldefs.h:156 + msgid "search for next match" + msgstr "szukaj nastêpnego pozytywnego rezultatu" + +-#: keymap_alldefs.h:158 ++#: keymap_alldefs.h:157 + msgid "search for next match in opposite direction" + msgstr "szukaj wstecz nastêpnego pozytywnego rezultatu" + +-#: keymap_alldefs.h:159 ++#: keymap_alldefs.h:158 + msgid "toggle search pattern coloring" + msgstr "ustala czy szukana fraza ma byæ zaznaczona kolorem" + +-#: keymap_alldefs.h:160 ++#: keymap_alldefs.h:159 + msgid "invoke a command in a subshell" + msgstr "wywo³aj polecenie w podpow³oce" + +-#: keymap_alldefs.h:161 ++#: keymap_alldefs.h:160 + msgid "sort messages" + msgstr "uszereguj listy" + +-#: keymap_alldefs.h:162 ++#: keymap_alldefs.h:161 + msgid "sort messages in reverse order" + msgstr "uszereguj listy w odwrotnej kolejno¶ci" + +-#: keymap_alldefs.h:163 ++#: keymap_alldefs.h:162 + msgid "tag the current entry" + msgstr "zaznacz bie¿±c± pozycjê" + +-#: keymap_alldefs.h:164 ++#: keymap_alldefs.h:163 + msgid "apply next function to tagged messages" + msgstr "wykonaj nastêpne polecenie na zaznaczonych listach" + +-#: keymap_alldefs.h:165 ++#: keymap_alldefs.h:164 + msgid "apply next function ONLY to tagged messages" + msgstr "wykonaj nastêpne polecenie TYLKO na zaznaczonych listach" + +-#: keymap_alldefs.h:166 ++#: keymap_alldefs.h:165 + msgid "tag the current subthread" + msgstr "zaznacz bie¿±cy podw±tek" + +-#: keymap_alldefs.h:167 ++#: keymap_alldefs.h:166 + msgid "tag the current thread" + msgstr "zaznacz bie¿±cy w±tek" + +-#: keymap_alldefs.h:168 ++#: keymap_alldefs.h:167 + msgid "toggle a message's 'new' flag" + msgstr "ustaw flagê listu na 'nowy'" + +-#: keymap_alldefs.h:169 ++#: keymap_alldefs.h:168 + msgid "toggle whether the mailbox will be rewritten" + msgstr "ustala czy skrzynka bêdzie ponownie zapisana" + +-#: keymap_alldefs.h:170 ++#: keymap_alldefs.h:169 + msgid "toggle whether to browse mailboxes or all files" + msgstr "ustala czy przegl±daæ skrzynki czy wszystkie pliki" + +-#: keymap_alldefs.h:171 ++#: keymap_alldefs.h:170 + msgid "move to the top of the page" + msgstr "przejd¼ na pocz±tek strony" + +-#: keymap_alldefs.h:172 ++#: keymap_alldefs.h:171 + msgid "undelete the current entry" + msgstr "odtwórz bie¿±c± pozycjê listy" + +-#: keymap_alldefs.h:173 ++#: keymap_alldefs.h:172 + msgid "undelete all messages in thread" + msgstr "odtwórz wszystkie listy z tego w±tku" + +-#: keymap_alldefs.h:174 ++#: keymap_alldefs.h:173 + msgid "undelete all messages in subthread" + msgstr "odtwórz wszystkie listy z tego podw±tku" + +-#: keymap_alldefs.h:175 ++#: keymap_alldefs.h:174 + msgid "show the Mutt version number and date" + msgstr "poka¿ wersjê i datê programu pocztowego Mutt" + +-#: keymap_alldefs.h:176 ++#: keymap_alldefs.h:175 + msgid "view attachment using mailcap entry if necessary" + msgstr "poka¿ za³±cznik u¿ywaj±c, je¶li to niezbêdne, pliku 'mailcap'" + +-#: keymap_alldefs.h:177 ++#: keymap_alldefs.h:176 + msgid "show MIME attachments" + msgstr "poka¿ za³±czniki MIME" + +-#: keymap_alldefs.h:178 ++#: keymap_alldefs.h:177 + msgid "display the keycode for a key press" + msgstr "wy¶wietl kod wprowadzonego znaku" + +-#: keymap_alldefs.h:179 ++#: keymap_alldefs.h:178 + msgid "show currently active limit pattern" + msgstr "poka¿ bie¿±cy wzorzec ograniczaj±cy" + +-#: keymap_alldefs.h:180 ++#: keymap_alldefs.h:179 + msgid "collapse/uncollapse current thread" + msgstr "zwiñ/rozwiñ bie¿±cy w±tek" + +-#: keymap_alldefs.h:181 ++#: keymap_alldefs.h:180 + msgid "collapse/uncollapse all threads" + msgstr "zwiñ/rozwiñ wszystkie w±tki" + +-#: keymap_alldefs.h:182 ++#: keymap_alldefs.h:181 + msgid "attach a PGP public key" + msgstr "do³±cz w³asny klucz publiczny PGP" + +-#: keymap_alldefs.h:183 ++#: keymap_alldefs.h:182 + msgid "show PGP options" + msgstr "poka¿ opcje PGP" + +-#: keymap_alldefs.h:184 ++#: keymap_alldefs.h:183 + msgid "mail a PGP public key" + msgstr "wy¶lij w³asny klucz publiczny PGP" + +-#: keymap_alldefs.h:185 ++#: keymap_alldefs.h:184 + msgid "verify a PGP public key" + msgstr "zweryfikuj klucz publiczny PGP" + +-#: keymap_alldefs.h:186 ++#: keymap_alldefs.h:185 + msgid "view the key's user id" + msgstr "obejrzyj identyfikator u¿ytkownika klucza" + +-#: keymap_alldefs.h:187 ++#: keymap_alldefs.h:186 + msgid "check for classic pgp" + msgstr "u¿yj starej wersji pgp" + +-#: keymap_alldefs.h:188 ++#: keymap_alldefs.h:187 + msgid "Accept the chain constructed" + msgstr "Potwierd¼ skonstruowany ³añcuch" + +-#: keymap_alldefs.h:189 ++#: keymap_alldefs.h:188 + msgid "Append a remailer to the chain" + msgstr "Dodaj remailera do ³añcucha" + +-#: keymap_alldefs.h:190 ++#: keymap_alldefs.h:189 + msgid "Insert a remailer into the chain" + msgstr "Wprowadz remailera do ³añcucha" + +-#: keymap_alldefs.h:191 ++#: keymap_alldefs.h:190 + msgid "Delete a remailer from the chain" + msgstr "Usuñ remailera z ³añcucha" + +-#: keymap_alldefs.h:192 ++#: keymap_alldefs.h:191 + msgid "Select the previous element of the chain" + msgstr "Wybierz poprzedni element ³añcucha" + +-#: keymap_alldefs.h:193 ++#: keymap_alldefs.h:192 + msgid "Select the next element of the chain" + msgstr "Wybierz nastepny element ³añcucha" + +-#: keymap_alldefs.h:194 ++#: keymap_alldefs.h:193 + msgid "send the message through a mixmaster remailer chain" + msgstr "przeslij list przez ³añcuch anonimowych remailerów typu mixmaster" + +-#: keymap_alldefs.h:195 ++#: keymap_alldefs.h:194 + msgid "make decrypted copy and delete" + msgstr "utwórz rozszyfrowana± kopiê i usuñ orygina³" + +-#: keymap_alldefs.h:196 ++#: keymap_alldefs.h:195 + msgid "make decrypted copy" + msgstr "utwórz rozszyfrowan± kopiê" + +-#: keymap_alldefs.h:197 ++#: keymap_alldefs.h:196 + msgid "wipe passphrase(s) from memory" + msgstr "wyma¿ has³o z pamiêci operacyjnej" + +-#: keymap_alldefs.h:198 ++#: keymap_alldefs.h:197 + msgid "extract supported public keys" + msgstr "kopiuj klucze publiczne" + +-#: keymap_alldefs.h:199 ++#: keymap_alldefs.h:198 + msgid "show S/MIME options" + msgstr "poka¿ opcje S/MIME" + +@@ -2530,159 +2415,24 @@ msgid "Out of memory!" + msgstr "Brak pamiêci!" + + #: main.c:51 +-msgid "" +-"To contact the developers, please mail to .\n" +-"To report a bug, please use the flea(1) utility.\n" +-msgstr "" +-"Aby powiadomiæ autorów, proszê pisaæ na .\n" +-"Aby zg³osiæ b³±d u¿yj programu flea(1).\n" ++msgid "To contact the developers, please mail to .\nTo report a bug, please use the flea(1) utility.\n" ++msgstr "Aby powiadomiæ autorów, proszê pisaæ na .\nAby zg³osiæ b³±d u¿yj programu flea(1).\n" + + #: main.c:55 +-msgid "" +-"Copyright (C) 1996-2002 Michael R. Elkins and others.\n" +-"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n" +-"Mutt is free software, and you are welcome to redistribute it\n" +-"under certain conditions; type `mutt -vv' for details.\n" +-msgstr "" +-"Copyright (C) 1996-2002 Michael R. Elkins i inni.\n" +-"Program nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -" +-"vv'.\n" +-"Mutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\n" +-"jego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -" +-"vv'.\n" ++msgid "Copyright (C) 1996-2002 Michael R. Elkins and others.\nMutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\nMutt is free software, and you are welcome to redistribute it\nunder certain conditions; type `mutt -vv' for details.\n" ++msgstr "Copyright (C) 1996-2002 Michael R. Elkins i inni.\nProgram nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -vv'.\nMutt jest darmowym oprogramowaniem, jeste¶ jak najbardziej uprawniony do\njego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -vv'.\n" + + #: main.c:61 +-msgid "" +-"Copyright (C) 1996-2002 Michael R. Elkins \n" +-"Copyright (C) 1996-2002 Brandon Long \n" +-"Copyright (C) 1997-2002 Thomas Roessler \n" +-"Copyright (C) 1998-2002 Werner Koch \n" +-"Copyright (C) 1999-2002 Brendan Cully \n" +-"Copyright (C) 1999-2002 Tommi Komulainen \n" +-"Copyright (C) 2000-2002 Edmund Grimley Evans \n" +-"\n" +-"Lots of others not mentioned here contributed lots of code,\n" +-"fixes, and suggestions.\n" +-"\n" +-" This program is free software; you can redistribute it and/or modify\n" +-" it under the terms of the GNU General Public License as published by\n" +-" the Free Software Foundation; either version 2 of the License, or\n" +-" (at your option) any later version.\n" +-"\n" +-" This program is distributed in the hope that it will be useful,\n" +-" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +-" GNU General Public License for more details.\n" +-"\n" +-" You should have received a copy of the GNU General Public License\n" +-" along with this program; if not, write to the Free Software\n" +-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" +-msgstr "" +-"Copyright (C) 1996-2002 Michael R. Elkins \n" +-"Copyright (C) 1996-2002 Brandon Long \n" +-"Copyright (C) 1997-2002 Thomas Roessler \n" +-"Copyright (C) 1998-2002 Werner Koch \n" +-"Copyright (C) 1999-2002 Brendan Cully \n" +-"Copyright (C) 1999-2002 Tommi Komulainen \n" +-"Copyright (C) 2000-2002 Edmund Grimley Evans \n" +-"\n" +-"Wielu innych twórców, nie wspomnianych tutaj,\n" +-"wnios³o wiele nowego kodu, poprawek i sugestii.\n" +-"\n" +-" Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n" +-" zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n" +-" Licence), opublikowanej przez Free Software Foundation, w wersji 2\n" +-" lub wy¿szej.\n" +-"\n" +-" Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n" +-" ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n" +-" w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH " +-"CELÓW.\n" +-" Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n" +-"\n" +-" W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n" +-" Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n" +-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" ++msgid "Copyright (C) 1996-2002 Michael R. Elkins \nCopyright (C) 1996-2002 Brandon Long \nCopyright (C) 1997-2002 Thomas Roessler \nCopyright (C) 1998-2002 Werner Koch \nCopyright (C) 1999-2002 Brendan Cully \nCopyright (C) 1999-2002 Tommi Komulainen \nCopyright (C) 2000-2002 Edmund Grimley Evans \n\nLots of others not mentioned here contributed lots of code,\nfixes, and suggestions.\n\n This program is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" ++msgstr "Copyright (C) 1996-2002 Michael R. Elkins \nCopyright (C) 1996-2002 Brandon Long \nCopyright (C) 1997-2002 Thomas Roessler \nCopyright (C) 1998-2002 Werner Koch \nCopyright (C) 1999-2002 Brendan Cully \nCopyright (C) 1999-2002 Tommi Komulainen \nCopyright (C) 2000-2002 Edmund Grimley Evans \n\nWielu innych twórców, nie wspomnianych tutaj,\nwnios³o wiele nowego kodu, poprawek i sugestii.\n\n Ten program jest darmowy; mo¿esz rozprowadzaæ go i/lub modyfikowaæ\n zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n Licence), opublikowanej przez Free Software Foundation, w wersji 2\n lub wy¿szej.\n\n Program ten jest rozprowadzany w nadziei, ¿e bêdzie przydatny,\n ale BEZ ¯ADNYCH GWARANCJI, wyra¿onych wprost lub domy¶lnie nawet,\n w tym gwarancji mo¿liwo¶ci SPRZEDA¯Y i PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n Szczegó³y znajdziesz w Powszechnej Licencji Publicznej GNU.\n\n W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" + + #: main.c:99 +-#, fuzzy +-msgid "" +-"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " +-" ]\n" +-" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " +-"[...]\n" +-" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " +-"[...]\n" +-" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " +-"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" +-" mutt [ -n ] [ -e ] [ -F ] -p\n" +-" mutt -v[v]\n" +-"\n" +-"options:\n" +-" -A \texpand the given alias\n" +-" -a \tattach a file to the message\n" +-" -b

\tspecify a blind carbon-copy (BCC) address\n" +-" -c
\tspecify a carbon-copy (CC) address\n" +-" -e \tspecify a command to be executed after initialization\n" +-" -f \tspecify which mailbox to read\n" +-" -F \tspecify an alternate muttrc file\n" +-" -H \tspecify a draft file to read header and body from\n" +-" -i \tspecify a file which Mutt should include in the body\n" +-" -m \tspecify a default mailbox type\n" +-" -n\t\tcauses Mutt not to read the system Muttrc\n" +-" -p\t\trecall a postponed message\n" +-" -Q \tquery a configuration variable\n" +-" -R\t\topen mailbox in read-only mode\n" +-" -s \tspecify a subject (must be in quotes if it has spaces)\n" +-" -v\t\tshow version and compile-time definitions\n" +-" -x\t\tsimulate the mailx send mode\n" +-" -y\t\tselect a mailbox specified in your `mailboxes' list\n" +-" -z\t\texit immediately if there are no messages in the mailbox\n" +-" -Z\t\topen the first folder with new message, exit immediately if none\n" +-" -h\t\tthis help message" +-msgstr "" +-"u¿ycie: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " +-" ]\n" +-" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q " +-" ] [...]\n" +-" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " +-"[...]\n" +-" mutt [ -nx ] [ -e ] [ -F ] [ -a ] [ -H " +-" ] [ -i ] [ -s ] [ -b ] [ -c ] " +-"[ ... ]\n" +-" mutt [ -n ] [ -e ] [ -F ] -p\n" +-" mutt -v[v]\n" +-"\n" +-"opcje:\n" +-" -A \tu¿yj aliasu\n" +-" -a \tdo³±cz plik do listu\n" +-" -b \tpodaj adres blind carbon-copy (BCC)\n" +-" -c \tpodaj adres carbon-copy (CC)\n" +-" -e \tpodaj polecenie do wykonania po inicjalizacji\n" +-" -f \totwórz najpierw t± skrzynkê\n" +-" -F \tu¿yj alternatywnego pliku muttrc\n" +-" -H \tczytaj nag³ówki z pliku\n" +-" -i \twstaw ten plik w odpowiedzi\n" +-" -m \tpodaj typ skrzynki\n" +-" -n\t\tnie czytaj systemowego Muttrc\n" +-" -p\t\tponownie edytuj zarzucony list\n" +-" -Q \tpodaj warto¶æ zmiennej konfiguracyjnej\n" +-" -R\t\totwórz skrzynkê w trybie tylko do odczytu\n" +-" -s \tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n" +-" -v\t\tpoka¿ wersjê i wkompilowane parametry\n" +-" -x\t\tsymuluj zachowanie mailx\n" +-" -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n" +-" -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n" +-" -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n" +-" -h\t\tten tekst" ++msgid "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n mutt [ -n ] [ -e ] [ -F ] -p\n mutt -v[v]\n\noptions:\n -A \texpand the given alias\n -a \tattach a file to the message\n -b
\tspecify a blind carbon-copy (BCC) address\n -c
\tspecify a carbon-copy (CC) address\n -e \tspecify a command to be executed after initialization\n -f \tspecify which mailbox to read\n -F \tspecify an alternate muttrc file\n -H \tspecify a draft file to read header and body from\n -i \tspecify a file which Mutt should include in the body\n -m \tspecify a default mailbox type\n -n\t\tcauses Mutt not to read the system Muttrc\n -p\t\trecall a postponed message\n -Q \tquery a configuration variable\n -R\t\topen mailbox in read-only mode\n -s \tspecify a subject (must be in quotes if it has spaces)\n -v\t\tshow version and compile-time definitions\n -x\t\tsimulate the mailx send mode\n -y\t\tselect a mailbox specified in your `mailboxes' list\n -z\t\texit immediately if there are no messages in the mailbox\n -Z\t\topen the first folder with new message, exit immediately if none\n -h\t\tthis help message" ++msgstr "u¿ycie: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n mutt [ -nx ] [ -e ] [ -F ] [ -a ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n mutt [ -n ] [ -e ] [ -F ] -p\n mutt -v[v]\n\nopcje:\n -A \tu¿yj aliasu\n -a \tdo³±cz plik do listu\n -b \tpodaj adres blind carbon-copy (BCC)\n -c \tpodaj adres carbon-copy (CC)\n -e \tpodaj polecenie do wykonania po inicjalizacji\n -f \totwórz najpierw t± skrzynkê\n -F \tu¿yj alternatywnego pliku muttrc\n -H \twczytaj szablon nag³ówków i tre¶ci listu z pliku\n -i \twstaw ten plik w odpowiedzi\n -m \tpodaj typ skrzynki\n -n\t\tnie czytaj systemowego Muttrc\n -p\t\tponownie edytuj zarzucony list\n -Q \tpodaj warto¶æ zmiennej konfiguracyjnej\n -R\t\totwórz skrzynkê w trybie tylko do odczytu\n -s \tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n -v\t\tpoka¿ wersjê i wkompilowane parametry\n -x\t\tsymuluj zachowanie mailx\n -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n -h\t\tten tekst" + + #: main.c:167 +-msgid "" +-"\n" +-"Compile options:" +-msgstr "" +-"\n" +-"Parametry kompilacji:" ++msgid "\nCompile options:" ++msgstr "\nParametry kompilacji:" + + #: main.c:478 + msgid "Error initializing terminal." +@@ -2755,9 +2505,7 @@ msgstr "Nie mo¿na zablokowaæ skrzynki po + #. + #: mbox.c:754 + msgid "sync: mbox modified, but no modified messages! (report this bug)" +-msgstr "" +-"sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! " +-"(zg³o¶ ten b³±d)" ++msgstr "sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! (zg³o¶ ten b³±d)" + + #: mbox.c:793 + #, c-format +@@ -2792,72 +2540,72 @@ msgstr "Przeskocz do: " + msgid "Invalid index number." + msgstr "Niew³a¶ciwy numer indeksu." + +-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558 +-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043 ++#: menu.c:429 menu.c:447 menu.c:483 menu.c:526 menu.c:542 menu.c:553 ++#: menu.c:564 menu.c:606 menu.c:617 menu.c:630 menu.c:643 menu.c:1038 + msgid "No entries." + msgstr "Brak pozycji." + +-#: menu.c:447 ++#: menu.c:444 + msgid "You cannot scroll down farther." + msgstr "Nie mo¿na ni¿ej przewin±æ." + +-#: menu.c:465 ++#: menu.c:460 + msgid "You cannot scroll up farther." + msgstr "Nie mo¿na wy¿ej przewin±æ." + +-#: menu.c:485 ++#: menu.c:480 + msgid "You are on the last page." + msgstr "To jest ostatnia strona." + +-#: menu.c:509 ++#: menu.c:504 + msgid "You are on the first page." + msgstr "To jest pierwsza strona." + +-#: menu.c:588 ++#: menu.c:583 + msgid "First entry is shown." + msgstr "Pokazana jest pierwsza pozycja." + +-#: menu.c:608 ++#: menu.c:603 + msgid "Last entry is shown." + msgstr "Pokazana jest ostatnia pozycja." + +-#: menu.c:659 ++#: menu.c:654 + msgid "You are on the last entry." + msgstr "To jest ostatnia pozycja." + +-#: menu.c:670 ++#: menu.c:665 + msgid "You are on the first entry." + msgstr "To jest pierwsza pozycja." + +-#: menu.c:730 pattern.c:1242 ++#: menu.c:725 pattern.c:1242 + msgid "Search for: " + msgstr "Szukaj frazy: " + +-#: menu.c:731 pattern.c:1243 ++#: menu.c:726 pattern.c:1243 + msgid "Reverse search for: " + msgstr "Szukaj frazy w przeciwnym kierunku: " + +-#: menu.c:741 pattern.c:1275 ++#: menu.c:736 pattern.c:1275 + msgid "No search pattern." + msgstr "Nie ustalono wzorca poszukiwañ." + +-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 ++#: menu.c:766 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340 + msgid "Not found." + msgstr "Nic nie znaleziono." + +-#: menu.c:895 ++#: menu.c:890 + msgid "No tagged entries." + msgstr "Brak zaznaczonych pozycji listy." + +-#: menu.c:1000 ++#: menu.c:995 + msgid "Search is not implemented for this menu." + msgstr "Poszukiwanie nie jest mo¿liwe w tym menu." + +-#: menu.c:1005 ++#: menu.c:1000 + msgid "Jumping is not implemented for dialogs." + msgstr "Przeskakiwanie nie jest mo¿liwe w oknach dialogowych." + +-#: menu.c:1046 ++#: menu.c:1041 + msgid "Tagging is not supported." + msgstr "Zaznaczanie nie jest obs³ugiwane." + +@@ -2992,7 +2740,6 @@ msgid "Unknown" + msgstr "Nieznany" + + #: mutt_ssl.c:413 +-#, c-format + msgid "[unable to calculate]" + msgstr "[niemo¿liwe do wyznaczenia]" + +@@ -3017,7 +2764,6 @@ msgid "This certificate was issued by:" + msgstr "Ten certyfikat zosta³ wydany przez:" + + #: mutt_ssl.c:608 +-#, c-format + msgid "This certificate is valid" + msgstr "Ten certyfikat jest wa¿ny" + +@@ -3270,7 +3016,6 @@ msgid "%c: not supported in this mode" + msgstr "%c: nie obs³ugiwane w tym trybie" + + #: pattern.c:807 +-#, c-format + msgid "missing parameter" + msgstr "brakuj±cy parametr" + +@@ -3325,32 +3070,20 @@ msgid "[-- Error: unable to create PGP s + msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n" + + #: pgp.c:379 pgp.c:596 pgp.c:797 +-msgid "" +-"[-- End of PGP output --]\n" +-"\n" +-msgstr "" +-"[-- Koniec komunikatów PGP --]\n" +-"\n" ++msgid "[-- End of PGP output --]\n\n" ++msgstr "[-- Koniec komunikatów PGP --]\n\n" + + #: pgp.c:394 +-msgid "" +-"[-- BEGIN PGP MESSAGE --]\n" +-"\n" +-msgstr "" +-"[-- POCZ¡TEK LISTU PGP --]\n" +-"\n" ++msgid "[-- BEGIN PGP MESSAGE --]\n\n" ++msgstr "[-- POCZ¡TEK LISTU PGP --]\n\n" + + #: pgp.c:396 + msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" + msgstr "[-- POCZ¡TEK KLUCZA PUBLICZNEGO PGP --]\n" + + #: pgp.c:398 +-msgid "" +-"[-- BEGIN PGP SIGNED MESSAGE --]\n" +-"\n" +-msgstr "" +-"[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n" +-"\n" ++msgid "[-- BEGIN PGP SIGNED MESSAGE --]\n\n" ++msgstr "[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n\n" + + #: pgp.c:423 + msgid "[-- END PGP MESSAGE --]\n" +@@ -3365,44 +3098,28 @@ msgid "[-- END PGP SIGNED MESSAGE --]\n" + msgstr "[-- KONIEC LISTU PODPISANEGO PGP --]\n" + + #: pgp.c:454 +-msgid "" +-"[-- Error: could not find beginning of PGP message! --]\n" +-"\n" +-msgstr "" +-"[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n" +-"\n" ++msgid "[-- Error: could not find beginning of PGP message! --]\n\n" ++msgstr "[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n\n" + + #: pgp.c:704 + msgid "Internal error. Inform ." + msgstr "B³±d wewnêtrzny. Zg³o¶ go pod adres ." + + #: pgp.c:764 +-msgid "" +-"[-- Error: could not create a PGP subprocess! --]\n" +-"\n" +-msgstr "" +-"[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n" +-"\n" ++msgid "[-- Error: could not create a PGP subprocess! --]\n\n" ++msgstr "[-- B³±d: nie mo¿na utworzyæ podprocesu PGP! --]\n\n" + + #: pgp.c:873 +-msgid "" +-"[-- Error: malformed PGP/MIME message! --]\n" +-"\n" +-msgstr "" +-"[-- B³±d: uszkodzony list PGP/MIME! --]\n" +-"\n" ++msgid "[-- Error: malformed PGP/MIME message! --]\n\n" ++msgstr "[-- B³±d: uszkodzony list PGP/MIME! --]\n\n" + + #: pgp.c:886 + msgid "[-- Error: could not create temporary file! --]\n" + msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n" + + #: pgp.c:895 +-msgid "" +-"[-- The following data is PGP/MIME encrypted --]\n" +-"\n" +-msgstr "" +-"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n" +-"\n" ++msgid "[-- The following data is PGP/MIME encrypted --]\n\n" ++msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n\n" + + #: pgp.c:915 + msgid "[-- End of PGP/MIME encrypted data --]\n" +@@ -3426,25 +3143,25 @@ msgstr "Wprowad¼ numer klucza dla %s: " + msgid "Can't invoke PGP" + msgstr "Nie mo¿na wywo³aæ PGP" + +-#: pgp.c:1496 ++#: pgp.c:1491 + #, c-format + msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " + msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? " + +-#: pgp.c:1497 ++#: pgp.c:1492 + msgid "PGP/M(i)ME" + msgstr "PGP/M(i)ME" + +-#: pgp.c:1497 ++#: pgp.c:1492 + msgid "(i)nline" + msgstr "(i)nline" + +-#: pgp.c:1499 ++#: pgp.c:1494 + msgid "esabifc" + msgstr "zsabife" + + #. sign (a)s +-#: pgp.c:1514 smime.c:1981 ++#: pgp.c:1509 smime.c:1981 + msgid "Sign as: " + msgstr "Podpisz jako: " + +@@ -3533,7 +3250,6 @@ msgid "Looking for keys matching \"%s\". + msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..." + + #: pop.c:90 pop_lib.c:201 +-#, c-format + msgid "Command TOP is not supported by server." + msgstr "Polecenie TOP nie jest obs³ugiwane przez serwer." + +@@ -3542,7 +3258,6 @@ msgid "Can't write header to temporary f + msgstr "Nie mo¿na zapisaæ nag³ówka do pliku tymczasowego!" + + #: pop.c:198 pop_lib.c:203 +-#, c-format + msgid "Command UIDL is not supported by server." + msgstr "Polecenie UIDL nie jest obs³ugiwane przez serwer." + +@@ -3606,7 +3321,6 @@ msgid "APOP authentication failed." + msgstr "Uwierzytelnianie APOP nie powiod³o siê." + + #: pop_auth.c:268 +-#, c-format + msgid "Command USER is not supported by server." + msgstr "Polecenie USER nie jest obs³ugiwane przez serwer." + +@@ -3676,7 +3390,6 @@ msgid "Query command not defined." + msgstr "Pytanie nie zosta³o okre¶lone." + + #: query.c:290 +-#, c-format + msgid "Query" + msgstr "Pytanie" + +@@ -3783,8 +3496,7 @@ msgstr "Przes³aæ dalej jako za³±czniki?" + + #: recvcmd.c:462 + msgid "Can't decode all tagged attachments. MIME-forward the others?" +-msgstr "" +-"Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?" ++msgstr "Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?" + + #: recvcmd.c:587 + msgid "Forward MIME encapsulated?" +@@ -3805,8 +3517,7 @@ msgstr "Nie znaleziono list pocztowych!" + + #: recvcmd.c:824 + msgid "Can't decode all tagged attachments. MIME-encapsulate the others?" +-msgstr "" +-"Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?" ++msgstr "Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?" + + #: remailer.c:484 + msgid "Append" +@@ -3859,8 +3570,7 @@ msgid "Mixmaster doesn't accept Cc or Bc + msgstr "Mixmaster nie akceptuje nag³ówków Cc i Bcc." + + #: remailer.c:738 +-msgid "" +-"Please set the hostname variable to a proper value when using mixmaster!" ++msgid "Please set the hostname variable to a proper value when using mixmaster!" + msgstr "Ustaw poprawn± warto¶æ hostname je¶li chcesz u¿ywaæ mixmastera!" + + #: remailer.c:772 +@@ -4018,16 +3728,16 @@ msgstr "%s nie jest zwyk³ym plikiem." + msgid "Could not open %s" + msgstr "Nie mo¿na otworzyæ %s" + +-#: sendlib.c:2060 ++#: sendlib.c:2057 + #, c-format + msgid "Error sending message, child exited %d (%s)." + msgstr "B³±d podczas wysy³ania listu, proces potomny zwróci³ %d (%s)." + +-#: sendlib.c:2066 ++#: sendlib.c:2063 + msgid "Output of the delivery process" + msgstr "Wynik procesu dostarczania" + +-#: sendlib.c:2272 ++#: sendlib.c:2267 + #, c-format + msgid "Bad IDN %s while preparing resent-from." + msgstr "B³êdny IDN %s w trakcie przygotowywania resent-from." +@@ -4106,9 +3816,7 @@ msgstr "U¿yæ identyfikatora %s dla %s ?" + #: smime.c:637 + #, c-format + msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" +-msgstr "" +-"Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by " +-"kontynuowaæ)." ++msgstr "Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by kontynuowaæ)." + + #: smime.c:796 + #, c-format +@@ -4145,12 +3853,8 @@ msgid "No output from OpenSSL..." + msgstr "Brak wyników dzia³ania OpenSSL..." + + #: smime.c:1636 smime.c:1758 +-msgid "" +-"[-- End of OpenSSL output --]\n" +-"\n" +-msgstr "" +-"[-- Koniec komunikatów OpenSSL --]\n" +-"\n" ++msgid "[-- End of OpenSSL output --]\n\n" ++msgstr "[-- Koniec komunikatów OpenSSL --]\n\n" + + #: smime.c:1719 smime.c:1729 + msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" +@@ -4165,34 +3869,23 @@ msgid "[-- The following data is S/MIME + msgstr "[-- Poni¿sze dane s± podpisane S/MIME --]\n" + + #: smime.c:1829 +-msgid "" +-"\n" +-"[-- End of S/MIME encrypted data. --]\n" +-msgstr "" +-"\n" +-"[-- Koniec danych zaszyfrowanych S/MIME. --]\n" ++msgid "\n[-- End of S/MIME encrypted data. --]\n" ++msgstr "\n[-- Koniec danych zaszyfrowanych S/MIME. --]\n" + + #: smime.c:1831 +-msgid "" +-"\n" +-"[-- End of S/MIME signed data. --]\n" +-msgstr "" +-"\n" +-"[-- Koniec danych podpisanych S/MIME. --]\n" ++msgid "\n[-- End of S/MIME signed data. --]\n" ++msgstr "\n[-- Koniec danych podpisanych S/MIME. --]\n" + + #: smime.c:1935 +-msgid "" +-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " +-msgstr "" +-"S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?" ++msgid "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? " ++msgstr "S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba, (a)nuluj?" + + #: smime.c:1936 + msgid "eswabfc" + msgstr "zpmjoa" + + #: smime.c:1945 +-msgid "" +-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? " ++msgid "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? " + msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, (a)nuluj? " + + #: smime.c:1947 +@@ -4217,15 +3910,9 @@ msgstr "(brak skrzynki)" + + #: thread.c:1089 + msgid "Parent message is not visible in this limited view." +-msgstr "" +-"Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania." ++msgstr "Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania." + + #: thread.c:1095 + msgid "Parent message is not available." + msgstr "Pierwszy list tego w±tku nie jest dostêpny." + +-#~ msgid "unspecified protocol error" +-#~ msgstr "nieznany b³±d protoko³u" +- +-#~ msgid "Closing connection to IMAP server..." +-#~ msgstr "Zamykanie po³±czenia z serwerem IMAP..." +Index: mutt/po/ru.po +=================================================================== +RCS file: /home/roessler/cvs/mutt/po/ru.po,v +retrieving revision 3.26 +retrieving revision 3.27 +diff -u -p -r3.26 -r3.27 +--- mutt/po/ru.po 13 Mar 2005 16:35:34 -0000 3.26 ++++ mutt/po/ru.po 22 Mar 2005 19:43:13 -0000 3.27 +@@ -10,10 +10,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: mutt-1.5.8i\n" ++"Project-Id-Version: mutt-1.5.9i\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2005-03-13 17:38+0100\n" +-"PO-Revision-Date: 2005-02-13 11:51+0200\n" ++"PO-Revision-Date: 2005-03-13 19:49+0200\n" + "Last-Translator: mutt-ru@woe.spb.ru\n" + "Language-Team: RUSSIAN \n" + "MIME-Version: 1.0\n" +@@ -213,9 +213,9 @@ msgid "Create is only supported for IMAP + msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ" + + #: browser.c:880 +-#, fuzzy + msgid "Rename is only supported for IMAP mailboxes" +-msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ" ++msgstr "" ++"ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ" + + #: browser.c:901 + msgid "Delete is only supported for IMAP mailboxes" +@@ -1410,19 +1410,18 @@ msgid "Mailbox created." + msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ." + + #: imap/browse.c:325 +-#, fuzzy, c-format ++#, c-format + msgid "Rename mailbox %s to: " +-msgstr "óÏÚÄÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË: " ++msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË %s ×: " + + #: imap/browse.c:338 +-#, fuzzy, c-format ++#, c-format + msgid "Rename failed: %s" +-msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ SSL-ÓÏÅÄÉÎÅÎÉÅ: %s" ++msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s" + + #: imap/browse.c:343 +-#, fuzzy + msgid "Mailbox renamed." +-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ." ++msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÅÒÅÉÍÅÎÏ×ÁÎ." + + #: imap/command.c:294 + msgid "Mailbox closed" +@@ -2341,9 +2340,8 @@ msgid "{internal}" + msgstr "{×ÎÕÔÒÅÎÎÉÊ}" + + #: keymap_alldefs.h:151 +-#, fuzzy + msgid "rename the current mailbox (IMAP only)" +-msgstr "ÕÄÁÌÉÔØ ÔÅËÕÝÉÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË (ÔÏÌØËÏ IMAP)" ++msgstr "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÔÅËÕÝÉÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË (ÔÏÌØËÏ IMAP)" + + #: keymap_alldefs.h:152 + msgid "reply to a message"