From: Adeodato Simó Date: Fri, 25 Mar 2005 20:55:52 +0000 (+0100) Subject: Import mutt_1.5.8-1 X-Git-Tag: 1.5.8-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad?ds=inline Import mutt_1.5.8-1 --- 4c13acfc45a942f5f481ce6a3dfcea461da505ad diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..e67afa8 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,16 @@ +mutt (1.5.6-1) unstable; urgency=low + + In this release the alternates, lists, and subscribe configuration + variables have been turned into regular expression lists. + Additionaly, alternates is now an option, not a variable. + This means that you should change: + + set alternates="foo|bar" + + into + + alternates "foo|bar" + + in your .muttrc file. See muttrc(5) for details. + + -- Artur R. Czechowski Sun, 4 Apr 2004 14:04:03 +0200 diff --git a/debian/README.CVS b/debian/README.CVS new file mode 100644 index 0000000..cc7b63b --- /dev/null +++ b/debian/README.CVS @@ -0,0 +1,25 @@ +#!/bin/sh -e +# you can use this script to build the CVS source tarball + +cd upstream/tarballs/ +cvs -z3 -d :pserver:anonymous@cvs.mutt.org:/home/roessler/cvs co mutt +cd mutt/ +./prepare +make distclean +rm -rf autom4te.cache/ doc/instdoc.sh imap/Makefile +cd .. +tar czf mutt-1.5.4+$(date +%Y%m%d).tar.gz mutt/ +rm -rf mutt/ +exit 0 + +# update procedure: +cd upstream/tarballs/ +tar xzf mutt-*.tar.gz +rm mutt-*.tar.gz +cd mutt/ +cvs -z3 update +# run ./prepare etc if appropriate +cd .. +tar czf mutt-1.5.4+$(date +%Y%m%d).tar.gz mutt/ +rm -rf mutt/ + diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..73895f5 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,86 @@ +l10n support +~~~~~~~~~~~~ +If you want to see non-ASCII characters on a Debian system, there's no +use fiddling with the variable "charset", as described in the manual +page muttrc(5). +Instead, you'll need to have the Debian package "locales" installed on +your system and set the LANG or LC_CTYPE environment variable. +e.g. US users will want to add "export LC_CTYPE=en_US" to their ~/.bashrc. +If you have a /etc/locale.gen file read carefully the comment and do +what it says, or it will not work. +No, linux systems do not need --enable-locales-fix or --without-wc-funcs, +so don't bother me saying these switches cure your problems. + + +PGP support +~~~~~~~~~~~ +GnuPG support works out of the box with the default /etc/Muttrc. +You do not need any of the example files in /usr/share/doc/mutt/ +unless you plan to send signed+encrypted messages to pgp2 users. + + +BUFFY_SIZE support +~~~~~~~~~~~~~~~~~~ +Please do not ask for this to be enabled, it annoys too many people. +See #179970 for details. + + +gpg-2comp +~~~~~~~~~ +/usr/share/doc/mutt/examples/gpg.rc uses a wrapper program called +gpg-2comp which is not available as a debian package. +This program is needed only to sign and encrypt messages with a method +compatible with PGP 2.x. Users who don't need this feature can use the +commands provided in the default /etc/Muttrc. +The pgpewrap and pgpring programs used by some example rc files have +been installed in /usr/lib/mutt. +The files /usr/share/doc/mutt/examples/*.rc are just examples and are not +supposed to be used as is. Actually they are not supposed to be used at +all, PGP support works out of the box if gnupg is installed. + + +GnuPG passphrase +~~~~~~~~~~~~~~~~ +The GnuPG passphrase is not asked if the $GPG_AGENT_INFO environment +variable exists. + + +Scripts +~~~~~~~ +Look at /usr/lib/mutt/{debian-ldap-query,mailspell}. + + +pgp_encryptself +~~~~~~~~~~~~~~~ +This mutt 1.0.x configuration option does not exist anymore and this +will not change. To achieve the same effect you can add something like +--encrypt-to=your@mail.address to the relevant ~/.muttrc configuration +lines (pgp_encrypt_only_command and pgp_encrypt_sign_command) or to +~/.gnupg/options . + + +S/MIME Support +~~~~~~~~~~~~~~ +See README.SMIME for details. + + +About temporary files and security +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +When using mutt to view an encrypted message, the plain text is saved in +a temporary file. If you have reasons to worry an attacker may recover +the deleted file from your hard disk please take appropriate actions to +prevent this (e.g. use a ramdisk or shred(1) or wipe(1)). +Also don't forget about the temporary files created by your editor. +Mutt creates temporary files in a secure way. See #222125 for details. + + +/etc/Muttrc.d/ +~~~~~~~~~~~~~~ +The default /etc/Muttrc will source more configuration directives from +files in the /etc/Muttrc.d/ directory ending in ".rc". +The system administrator may use the directory for local customizations +and packages enhancing mutt may use it to install their configuration +directives. +The directory is processed last in /etc/Muttrc, so that settings there +may override the defaults from the file. + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9ad4057 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,877 @@ +mutt (1.5.8-1) unstable; urgency=low + + * New upstream release, with a CVS pull to get all the translation updates + that happen right after a release. New features worth mentioning: + + the PGP auto decode patch by Derek Martin has been accepted upstream, + so inline PGP messages are automatically verified/decrypted now if + $pgp_auto_decode is set. (Closes: #269699) + + IDN decoding can be disabled by unseting $use_idn (set by default). + + new hook 'send2-hook', which gets executed each time there is a change + 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. + + * This version also includes the following fixes: + + message flags are not lost after editing a message. (Closes: #275060) + + IMAP folder paths ending with the delimiter are trimmed so that they + don't fail to open with some servers, e.g. Courier. (Closes: #277665) + + the correct charset is used when signing a forwarded message. + (Closes: #295528) + + correctly forget the S/MIME passphrase. (Closes: #300516) + + * Explicitly pass --enable-inodesort to ./configure, since upstream has + disabled it by default in this version. + + * 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. + + * Lots of patches in the Debian package have been applied upstream, drop + them (16 in total). Worth mentioning is the gnutls patch. The + maildir_inode_sort patch has been adopted too, with the static functions + no longer being nested, which closes: #287744 (FTBFS with gcc-4.0). + + * Implemented a conf.d style directory for mutt: other packages or local + admins may now drop configuration snippets in /etc/Muttrc.d/*.rc and have + them sourced at the end of the default Muttrc. (Closes: #285574) + + * Updated the header cache patch to version 28. The size of this patch has + 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. + + * Use mixmaster-filter by default. (Closes: #299060) + + -- Adeodato Simó Fri, 25 Mar 2005 21:55:52 +0100 + +mutt (1.5.6-20040907+3) unstable; urgency=high + + * Upload targeted at sarge to include some must-have fixes. + + * Include small patch to fix imap-related segfaults in ia64, due to a buffer + length being declared as int instead of size_t in the gnutls patch. Thanks + to David Mosberger for spotting the problem. (Closes: #234783, #285001) + [New file: upstream/extra-patches/gnutls.59.size_t-fix] + + * Include (finally!) a patch that really prevents decrypt-save from deleting + the message if the supplied password was wrong. (Closes: #275188) + [New file: upstream/patches/decrypt-save_non-empty-output] + + * Updated the header-cache patch to version 25, which includes a fix to make + it possible for hcache to talk to broken Lotus IMAP servers. (Closes: #282451) + [Modified file: upstream/extra-patches/header-cache] + + * The mutt BTS has been closed due to excessive spam in their debbugs + installation. Included the patch that substitutes flea and flea.1 by a + note that states so. + [New file: upstream/patches/empty-muttbug, + removed file: debian/patches/080_Md.muttbug] + + * Removed /usr/share/bug/mutt/presubj, now useless. + + * Added Domainkey-Signature to the list of ignored headers. + [Modified file: debian/patches/080_Md.Muttrc] + + -- Adeodato Simó Fri, 28 Jan 2005 19:02:58 +0100 + +mutt (1.5.6-20040907+2) unstable; urgency=medium + + * A "Let's procrastinate some important stuff and fix a bunch of mutt bugs + instead" release. + + * Include small patch to fix the Swedish translation, which was making + impossible to turn off pgp signing and/or encrypting. (Closes: #281265) + [New file: upstream/patches/i18n-sv-fix.diff] + + * Make the default Muttrc work out the box for people using gnupg-agent. + Wrote and applied a one-line patch to make the %?p? conditional escape + work correctly, patch forwarded upstream. (Closes: #277646) + [New file: debian/patches/patch.asp.%p-escape-agent-compatible.1] + + * Relocate the definition of the USE_GNUTLS macro, so that it gets passed to + the documentation build process too. Otherwise, options that end up in the + manual wouldn't match those that are really compiled in. (Closes: #278124) + [Modified files: debian/rules, upstream/extra-patches/gnutls.debian] + + * Honour /etc/alternatives/pager in the muttbug script. (Closes: #275448) + [Modified file: debian/patches/080_Md.muttbug] + + * Include patch by Nicolas François to + fix typo in muttrc.5. (Closes: #272579) + [New file: debian/patches/patch.nf.fix-bug-272579.1] + + * Updated the (formerly unmaintained) current-shortcut patch with a new + version by Christoph Berg . Now the actual used Fcc will be + shown instead of '^' when you folder-hook . 'set record="^"'. + [Modified file: upstream/extra-patches/current-shortcut] + + * Updated the header-cache patch to version 24. + + -- Adeodato Simó Wed, 17 Nov 2004 15:17:14 +0100 + +mutt (1.5.6-20040907+1) unstable; urgency=low + + * Updated to CVS snapshot 20040907 (includes updated ja translation). + + * The maildir-mtime patch is now NOT enabled by default, you need to set the + maildir_mtime variable in your ~/.muttrc. This variable has been necessary + since people with large maildirs over NFS experienced a large performance + impact with the mtime patch enabled. (Closes: #253261) + + * Updated the header cache patch to version 21. This fixes a file descriptor + leak which could cause problems for people who keep their mutt open for a + long time. Also includes support for per-folder cache: setting $header_cache + to a directory will enable it, and you should experience some performance + gains. + + * Included the current shortcut patch. It's completely unintrusive and + allows you to specify ^ as a shortcut for the current folder (e.g., in a + Fcc). (Closes: #253104) + + * Updated the autotools stuff. Include in it also stuff from patches, so + that --enable-foo options can be used in debian/rules. Put files directly + in extra/autotools and cp from there in debian/rules instead of using a + patch file (which was too big due to automake1.4/autoconf2.13 => 1.8/2.50 + migration). + + * debian/rules: + + use --enable-compresed --enable-hcache --without-gdbm in configure. + + copy autotools files from extra/autotools when unpacking, and emulate + the 000_Md.config.h.in patch. + + * debian/patches/: + + removed 000_Md.config.h.in, no longer needed since config.h.in is now + overwritten from extra/autotools. + + added patch.asp.fix-bug-266493.1, which makes mutt not wait for a + keypress to handle SIGWINCH in certain situations. (Closes: #123943, + #266493) + + -- Adeodato Simó Tue, 21 Sep 2004 01:39:22 +0200 + +mutt (1.5.6-20040818+1) unstable; urgency=low + + * The post-Sarge era officially begins for mutt. This mostly means + that patch inclusion policy will untighten a bit. + + * Added the maildir/imap header caching patch by Thomas Glanzmann, see: + . For a quick + start, read documentation for the $header_cache variable. + (Closes: #242762, #255475) + + * Added the maildir-mtime patch by Dale Woolridge, see + . This patch should make happy + users that use maildir and have $sort_browser=reverse-date. + (Closes: #253261) + + * Reorganized patches location: + + patches not written by the mutt maintainers are now in the + upstream/extra-patches directory. + + each patch in that directory now contains a preamble listing: + - the patch author + - the patch home page + - last time patch was updated + - exact URL to the patch file + - applied changes, if any + + all preambles are available in the doc/README.Patches file, and + debian/copyright now points to this file too. + + * Other changes in upstream/extra-patches/: + + updated the edit-threads patch. + + updated the compressed-folders patch. + + * Updated to CVS snapshot 20040818: + + various memory leaks spotted and fixed. + + several translations updated: pl, sv, fr, id, nl, de, ca, cs. + The Czech translation addresses a bad chosen shorcut in the crypt menu, + and thus closes: #140639. Updated German translation closes: #265120. + + fix some UI flaws in the new PGP and S/MIME menus which could easily + make the user send in clear mail which was meant to be signed and/or + encrypted (the (e)ncrypt, (s)ign and (b)oth commands were toggles). + Also renamed the (f)orget action to (c)lear for newbie's benefit; accept + the (f) key for long time users' benefit. + + make mutt not hang if STARTTLS fails to complete the SSL handshake. + + try all methods in $imap_authenticators when one of them fails; + previously mutt would give up upon the first of them failing. + + * debian/: + + scripts/vars: add upstream/extra-patches to SRC_PATCH_DIR. + + control: Build-Depend on libdb4.2-dev for the header-cache patch. + + rules: call scripts/patch-preamble to create the README.Patches file. + + copyright: add pointer to README.Patches, where patch authors are listed. + + * debian/patches/: + + updated 000_VERSION to reflect new snapshot date. + + removed obsolete #defines from 000_Md.config.h.in. Added #include + "debian-config.h" there, which is used by upstream/extra-patches/*.debian. + + removed patch.asp.fix-bug-260578.1, included upstream. + + * debian/rules: sort the PATCHES file, which is printed by `mutt -v`. + + -- Adeodato Simó Sat, 21 Aug 2004 20:53:39 +0200 + +mutt (1.5.6-20040803+1) unstable; urgency=low + + * Updated to CVS snapshot 20040803: + + fixes the code that closed #213412. + * debian/control: + + Rebuilt against gnutls11. (Closes: #263067, #263625) + + List myself in Uploaders field. + * debian/patches/: + + updated 000_VERSION to reflect new snapshot date. + + removed patch-1.5.6.tt.compat.1.asp.fix.1, which was not meant to be + included in the last upload. (Closes: #261951) + + update the gnutls patch to include TLS support for POP3 as well. Patch + provided by Alexander Neumann . (Closes: #260638) + + -- Adeodato Simó Thu, 5 Aug 2004 18:13:33 +0200 + +mutt (1.5.6-20040722+1) unstable; urgency=high + + * Updated to CVS snapshot 20040722: + + bugfixes: + - does not segfault when chdir'ing to a directory without read + permission. (Closes: #237426) + - does not segfault when applying check-traditional-pgp to multiple + messages. (Closes: #257277) + - uses the right From address when composing a new message from the + pager and $reverse_name is set. (Closes: #249870) + - initial IMAP header download does not take quadratic time on the + number of messages. (Closes: #213412) + + new functionality: + - support for spam-scoring filters (see §3.24 of the fine manual). + - $include_onlyfirst: controls whether or not Mutt includes only the + first attachment of the message you are replying. + - $hide_thread_subject: when unset, mutt will show the subject for all + messages in a thread. + - uses List-Post header when doing list-reply. (Initial RFC 2369 support, + closes: #49048) + * debian/patches/: + + updated 000_VERSION to reflect new snapshot date. + + updated the following patches to apply cleanly: + - 001_patch-1.5.4.rr.compressed.1 [Makefile.in] + - 002_patch-1.5.5.1.admcd.gnutls.59 [globals.h] + - patch-1.5.3.cd.edit_threads.9.2-1arc [mutt.h] + + updated patch-1.5.6.tt.compat.1 (does not close #259145). + + removed patch-1.5.3.Md.gpg-agent, issue fixed upstream. + + added patch-1.5.6.helmersson.incomplete-mbyte.2 by Anders Helmersson + to avoid passing incomplete multibyte sequences to regexec(), which can + cause segfaults due to libc6 Bug#261135. (Closes: #254314, #260623) + [Yes, this is a sequel, not a dejà-vu.] + + added patch.asp.fix-bug-{210679,254294,258621,260578}.1, which fix + several minor issues unaddressed by upstream for some time. All patches + submitted upstream. (Closes: #210679, #254294, #258621, #260578). + * debian/rules: + + be robust to any locale by exporting LC_ALL=C. (Closes: #253048) + + touch some autotools files to prevent having them to be built again. + * Using "urgency=high" at maintainer's discretion + + -- Adeodato Simó Wed, 21 Jul 2004 19:31:55 +0200 + +mutt (1.5.6-20040523+2) unstable; urgency=low + + * Renamed patch-1.5.5.1.tt.compat-fix to patch-1.5.5.1.tt.compat.2-fix. + (Closes: #253048) + + -- Marco d'Itri Mon, 7 Jun 2004 00:45:40 +0200 + +mutt (1.5.6-20040523+1) unstable; urgency=low + + * This release is based on the work of Adeodato Simó . + * Updated to CVS snapshot 20040523: + + now mutt includes better support for inline/traditional signing and + encrypting. See http://www.woolridge.ca/mutt/pgp-menu-traditional.html + for details. (Closes: #190204) + + sourcing output of a command works again. (Closes: #247007) + + corrected .PP usage in flea.1 and mbox.5. (Closes: #237827) + + do not eat chars on rfc822-valid From:address lines (i.e., when there + is no space between the colon and address; fixes the already archived + #226759). + * debian/patches/: + + added 000_VERSION: reflect CVS snapshot date. + + removed 081_nbrown.auth_imap_plain: included upstream. + + added patch-1.5.5.1.tt.compat-fix: introduces a fix for the compat + patch which prevents mutt from segfaulting when there is binary junk + in headers. (Closes: #233315, #247366, #249588) + + removed patch-1.5.4.Md.gpg_by_keyid-1arc: no longer needed. + (Closes: #250108, #248994) + + added 004_ranty.fix-compressed: written some time ago by Manuel Estrada + to prevent mutt from deleting a message if saving to a compressed folder + fails. In memoriam. (Closes: #210429) + + added patch-1.5.6.asp.pgp_getkeys: set pgp_getkeys_command in Muttrc. + Currently commented out because of #172960. (Closes: #237691) + + 080_Md.Muttrc: make colors respect terminal scheme. (Closes: #86393) + * debian/rules: pass --enable-debug to configure. (Closes: #198073) + + -- Marco d'Itri Sun, 6 Jun 2004 01:17:14 +0200 + +mutt (1.5.6-1) unstable; urgency=low + + * New upstream release. Old configuration files may become incompatible, + see NEWS.Debian.gz for details. + * Added debian/NEWS. + * debian/patches/: + - updated patch-1.5.4.Md.gpg_by_keyid-1arc - pgp_export_command uses %r + instead %k. (Closes: #223960) + - updated 002_patch-1.5.5.1.admcd.gnutls.59 - mutt can save server's + certificate. (Closes: #228607, #234623, #236886) + - removed 000_VERSION (not needed in this release). + - removed 004_patch-1.5.5.1.Md.libgnutls10 - included in + 002_patch-1.5.5.1.admcd.gnutls.59. + - added 081_nbrown.auth_imap_plain - mutt can authenthicate itself to imap + server via sasl2 using PLAIN method, thanks to Neil Brown. + (Closes: #206078, #214758) + - removed patch-1.5.4.helmersson.incomplete_multibyte because it's broken. + (Closes: #244549) + - removed 003_patch-1.4.admcd.gnutlsdlopen.53, now the mutt binary will + be linked with libgnutls. (Closes: #228279, #228323, #230287) + - updated patch-1.3.27.bse.xtitles.1 with patch-1.5.5.1.nt.xtitles.3.ab.1. + * Update the default MTA: Depend on exim4 | mail-transport-agent. + (Closes: #228560) + * This release is the work of Artur R. Czechowski. + + -- Marco d'Itri Sun, 2 May 2004 18:02:10 +0200 + +mutt (1.5.5.1-20040112+1) unstable; urgency=medium + + * Build-Depend on libidn11-dev instead of libidn9-dev + and libgnutls10-dev instead of libgnutls7-dev. (Closes: #226910, #227426) + * Updated to CVS snapshot 20040112: + + fixed manual (Closes: #226936) + + fixed pgp_retainable_sigs (Closes: #226424) + * New patch patch-1.4.1.tt.compat.1-ter, a part of mutt-ja which allows + configuring a default character set to be used for non-MIME messages. + (Closes: #222191) + * Added a note about temporary files to README.Debian. + (Closes: #141143, #222125) + * New patch 100_arc.smime_descripitive_messages which adds some + error messages to smime_keys.pl. (Closes: #226696) + * Conflicts/Replaces mutt-utf8. + * New patch 004_patch-1.5.5.1.Md.libgnutls10. + * This release is the work of Artur R. Czechowski. + + -- Marco d'Itri Sat, 17 Jan 2004 17:50:16 +0100 + +mutt (1.5.5.1-20040105+1) unstable; urgency=low + + * New upstream release: + + fixed infinite loop during attachment saving. (Closes: #219314, #224654) + * Updated to CVS snapshot 20040105: + + fixed a lot of crashes/coredumps. + (Closes: #141214, #141468, #192341, #197322, #219499, #223663) + + honor Reply-To while generating Mail-Followup-To headers. + (Closes: #182526) + + improved colouring of thread tree. (Closes: #219594) + + fixed retrieving mail via preauth imap over ssh. (Closes: #209025) + * debian/rules: added extra-clean target to delete *.orig and *.rej files + when debian/sys-build.mk make-diff is called. + * Modified patches to apply without conflicts: + + 001_patch-1.5.4.rr.compressed.1 + + 003_patch-1.4.admcd.gnutlsbuild.53 + * Suggests libgnutls7 instead libgnutls5 (Closes: #217716), updated + README.Debian. + * Added README.SMIME. (Closes: #222903) + * smime_keys moved to /usr/bin. (Closes: #222905) + * Suggests ca-certificates and openssl. + * Killed mutt-utf8. + * This release is the work of Artur R. Czechowski. + + -- Marco d'Itri Tue, 6 Jan 2004 15:38:58 +0100 + +mutt (1.5.4+20031024-1) unstable; urgency=medium + + * New CVS snapshot. (Closes: #133021, #207242, #208430, #213007, #213917) + * Fix FTBFS bug in debian/control. (Closes: #216508) + * Compiled with libgnutls7. (Closes: #209722) + * New patch patch-1.5.4.fw.maildir_inode_sort. (Closes: #212664) + * New patch patch-1.5.4.helmersson.incomplete_multibyte. + (Closes: #187991, #188605) + * New patch patch-1.5.4.Md.gpg_by_keyid. (Closes: #210668) + * Removed README.NFS, as it talks about 2.0 and 2.2 kernels. + * Removed reference to $AGENT_SOCKET from README.Debian. (Closes: #215412) + + -- Marco d'Itri Fri, 24 Oct 2003 15:06:01 +0200 + +mutt (1.5.4+20030913-1) unstable; urgency=medium + + * New CVS snapshot. (Closes: #210354, #210423) + * Added patch-1.5.3.vk.pgp_verbose_mime. (Closes: #201306) + + -- Marco d'Itri Sat, 13 Sep 2003 15:59:49 +0200 + +mutt (1.5.4+20030817-1) unstable; urgency=medium + + * New CVS snapshot, packaged with the great help of arturcz@hell.pl + (co-maintainer). (Closes: #138966) + * Switched to libsasl2. (Closes: #201210) + * Removed hcache patch. + (Closes: #189999, #194843, #196832, #196978, #197182, #199052) + * Updated gnutls patch to 002_patch-1.5.4.admcd.gnutls.56. (Closes: #196117) + * Removed libdb4.0-dev from Build-Depends (Closes: #204015) + * /etc/Muttrc: call gpg without a path. (Closes: #193756) + * locales upgraded to Recommended status. + * Added an icon. (Closes: #188726) + * Make pgp_import_command nonverbose. (Closes: #195310) + + -- Marco d'Itri Sun, 17 Aug 2003 15:56:55 +0200 + +mutt (1.5.4-1) unstable; urgency=high + + * New upstream release. (Closes: #142266, #148858, #169740, #178563) + * Fixes remotely exploitable buffer overflow in the IMAP code. + (Core Security Technologies Advisory CORE-2003-03-04-02.) + * Removed again BUFFY_SIZE support, too many people complained. + Added a note to README.Debian. + * Provides: imap-client. (Closes: #183351) + * Always include the whole certificates chain in S/MIME mail to comply + with RFC 2315 spirit. (Closes: #182477) + * Applied ME's headers caching patch (provided by Nicolas Bougues). + * Fixed pgpewrap core dump. (Closes: #170666) + + -- Marco d'Itri Thu, 20 Mar 2003 15:06:13 +0100 + +mutt (1.5.3-3) unstable; urgency=medium + + * Recompiled to fix missing dependencies information. (Closes: #181167) + + -- Marco d'Itri Sun, 16 Feb 2003 11:46:46 +0100 + +mutt (1.5.3-2) unstable; urgency=medium + + * Compiled with BUFFY_SIZE. (Closes: #179970) + * Stop generating escape codes in the manual. (Closes: #167006) + * Set the default editor as specified by policy. (Closes: #177245) + + -- Marco d'Itri Fri, 14 Feb 2003 19:13:15 +0100 + +mutt (1.5.3-1) unstable; urgency=low + + * New upstream release (Closes: #112865, #165397, #168907, #169018). + * Suggests ispell | aspell (Closes: #175324). + * Add & and = to the URL coloring regex (Closes: #169646). + * Removed message-hook for clearsigned PGP messages (Closes: #168275). + * Removed obsolete patch-1.4.0.dw.pgp-traditional.2. + * By popular (?) demand, use /etc/mailname and only if it fails fall + back to gethostbyname(3) and then to uname(2) (Closes: #167549). + + -- Marco d'Itri Tue, 14 Jan 2003 18:31:01 +0100 + +mutt (1.4.0-5) unstable; urgency=medium + + * Try a different strategy to find the FQDN. Stop using /etc/mailname. + (Closes: #166060). + * Suggests: mixmaster (Closes: #166360). + * Updated copyright file (Closes: #163783). + * *Really* enable --enable-imap-edit-threads (Closes: #162352). + * Ignore Microsoft Thread-* header (Closes: #161473). + * Do not ask the password if gpg-agent or quintuple-agent are active + (Closes: #161508). + * Applied patch-1.5-me_editor.1 (Closes: #72318). + * Applied patch-1.5.1.tlr.mailboxes-overflow.1 (Closes: #153751). + * Applied patch-1.4-me.regex_doc.1 (Closes: #162550). + * Removed patch-1.3.15.sw.pgp-outlook.1 in favour of + patch-1.4.0.dw.pgp-traditional.2. All "traditional" PGP messages now + use text/plain. + + -- Marco d'Itri Tue, 29 Oct 2002 14:38:52 +0100 + +mutt (1.4.0-4) unstable; urgency=medium + + * Recompile with newer libgnutls5 (Closes: #160114). + * Updated contrib/colors.angdraug. + * Updated 010_patch-1.4.admcd.gnutls.55. + + -- Marco d'Itri Tue, 17 Sep 2002 16:07:50 +0200 + +mutt (1.4.0-3) unstable; urgency=medium + + * *Really* compile mutt with --enable-imap-edit-threads (Closes: #154864). + * *Really* merge the Maildirs new messages patch (Closes: #151582). + * Recompile with libgnutls5 (Closes: #152787, #157120). + + -- Marco d'Itri Sun, 18 Aug 2002 16:59:06 +0200 + +mutt (1.4.0-2) unstable; urgency=low + + * Update GNUTLS patch and link against gnutls4. (Closes: #152141). + * Link mutt-utf8 against libncursesw5 instead of slang1a-utf8. + * set pipe_decode=yes in /etc/Muttrc (Closes: #151460). + * Compile mutt with --enable-imap-edit-threads (Closes: #150274). + * Make debian/scripts/lib work even if $CDPATH is set (Closes: #152678). + * Merged patch to fix spurious new message notifications with Maildirs + (Closes: #151582). + + -- Marco d'Itri Fri, 12 Jul 2002 03:34:48 +0200 + +mutt (1.4.0-1) unstable; urgency=medium + + * New upstream release (Closes: #146889, #149348, #148558). + * Updated patch edit_threads.9.2 (Closes: #146451). + * Priority of mutt-utf8 changed from optional to extra. + + -- Marco d'Itri Mon, 10 Jun 2002 21:26:08 +0200 + +mutt (1.3.28-2) unstable; urgency=medium + + * Moved into main. + * Suggests: libgcrypt1, gnutls3 (Closes: #140970). + * Added patch from CVS to fix crash with UTF-8 locales (Closes: #126336). + + -- Marco d'Itri Sat, 6 Apr 2002 18:35:01 +0200 + +mutt (1.3.28-1) unstable; urgency=medium + + * New upstream release (Closes: #138200). + * Updated GNUTLS patch. + * Make flea(1) work even if bug(1) is not installed (Closes: #138273). + * Added /usr/share/bug/mutt/presubj file (Closes: #138274). + + -- Marco d'Itri Tue, 19 Mar 2002 14:42:39 +0100 + +mutt (1.3.27-5) unstable; urgency=medium + + * Added build dependancy on linuxdoc-tools-text (Closes: #137890). + * Use sensible-pager instead of zless to read the manual (Closes: #136206). + * Added example colors scheme contributed by Dmitry Borodaenko. + + -- Marco d'Itri Mon, 11 Mar 2002 19:40:20 +0100 + +mutt (1.3.27-4) unstable; urgency=high + + * Recompiled against new slang packages (Closes: #133255, #134115). + * Added patch-1.3.27.me.aliasdups.1 (Closes: #133559). + * Updated GNUTLS patch. + * Added missing flea(1) symlink (Closes: #133646). + + -- Marco d'Itri Sun, 17 Feb 2002 03:27:50 +0100 + +mutt (1.3.27-3) unstable; urgency=high + + * Recompiled against new slang and packages (Closes: #132644). + * Title bar is changed on more xterm variants (Closes: #131178). + * Removed obsolete advice about shred from README.Debian (Closes: #132786). + + -- Marco d'Itri Sun, 10 Feb 2002 13:26:20 +0100 + +mutt (1.3.27-2) unstable; urgency=high + + * Updated GNUTLS patch (Closes: #131386, #131424). + * Added patch-1.3.27.me.listfrom_doc.1 (Closes: #45706). + * Added missing -fPIC (Closes: #131209). + * Added missing commas in charset.c (Closes: #130481). + + -- Marco d'Itri Thu, 31 Jan 2002 15:23:34 +0100 + +mutt (1.3.27-1) unstable; urgency=medium + + * New upstream release. + * Small fix to pt_BR translation (Closes: #130416). + * Hide gpg status messages (Closes: #127519). + + -- Marco d'Itri Tue, 22 Jan 2002 20:18:21 +0100 + +mutt (1.3.26-1) unstable; urgency=medium + + * New upstream release. + * Removed patch-1.3.25.chip.fast-limited-threads because the patched + code has changed. + + -- Marco d'Itri Sat, 19 Jan 2002 19:30:13 +0100 + +mutt (1.3.25-5) unstable; urgency=high + + * Added build dependancy on groff (Closes: #129605, #129698). + + -- Marco d'Itri Thu, 17 Jan 2002 19:03:29 +0100 + +mutt (1.3.25-4) unstable; urgency=high + + * Forced build dependancy on newer gnutls-dev (Closes: #129283). + * Updated GNUTLS patch (Closes: #129291). + + -- Marco d'Itri Wed, 16 Jan 2002 19:47:45 +0100 + +mutt (1.3.25-3) unstable; urgency=medium + + * Force documentation rebuilding (Closes: #128758, #129045). + * TLS patch update from Andrew McDonald (Closes: #125924, #128718, #129039). + * Suggests gnutls0. + * Fixed typo in manual (Closes: #128836). + * Added patch-1.3.25.chip.fast-limited-threads, which is supposed to + speed up limited threaded display (Closes: #128174). + * Added patch-1.3.25.tlr.attach_overwrite.1 (Closes: #126122). + + -- Marco d'Itri Sun, 13 Jan 2002 17:18:21 +0100 + +mutt (1.3.25-2) unstable; urgency=low + + * Force dependancy on slang1-utf8 (Closes: #127938). + * Enable again optimization (Closes: #127653, #127682). + * Enable {open,close,append}-hook by default again (Closes: #127894). + + -- Marco d'Itri Sun, 6 Jan 2002 19:35:57 +0100 + +mutt (1.3.25-1) unstable; urgency=high + + * New upstream release, fixes remotely exploitable buffer overflow. + * Fixed mutt_dotlock permissions + (Closes: #127264, #127265, #127278, #127308, #127312, #127357). + + -- Marco d'Itri Wed, 2 Jan 2002 18:49:54 +0100 + +mutt (1.3.24-3) unstable; urgency=medium + + * A new mutt-utf8 package is generated (Closes: #99898). + * Added patch-1.3.24.de.new_threads.3 to fix segfaults while sorting + thread (Closes: #123658). + * Added --status-fd option to gpg command line and working $pgp_good_sign + variable to default /etc/Muttrc (see #110414 and #123273 for details). + * Updated thread editing patch to patch-1.3.24.cd.edit_threads.8. + * Added patch-1.3.24.appoct.2 to lookup application/octet-stream files + extensions in mime.types. + * Fixed coredump processing in flea(1) (Closes: #123081). + * Removed obsolete contrib/pgp-macros. + + -- Marco d'Itri Thu, 27 Dec 2001 03:32:16 +0100 + +mutt (1.3.24-2) unstable; urgency=medium + + * Added better GNUTLS code from Andrew McDonald. + * Added again threads editing patch. + * Enable {open,close,append}-hook by default again (Closes: #115473). + * Removed default $pgp_good_sign from Muttrc (related to #110414). + + -- Marco d'Itri Wed, 5 Dec 2001 02:26:13 +0100 + +mutt (1.3.24-1) unstable; urgency=high + + * New upstream release (Closes: #74484, #98630, #114938). + * Added conflict with gnutls < 0.2.9 (Closes: #121645). + * Fixed mailspell script (Closes: #120446). + * Removed 000_patch-1.3.22.1.cd.edit_threads-5.1. + * Added 000_patch-1.3.23.1.ametzler.pgp_good_sign (Closes: #110414). + + -- Marco d'Itri Fri, 30 Nov 2001 22:52:42 +0100 + +mutt (1.3.23-4) unstable; urgency=high + + * Added Build Dependandcies on libgcrypt-dev and zlib1g-dev + (Closes: #119309). + * Added a comment to README.Debian about stunnel (Closes: #115421). + * Removed safefilter script (Closes: #118630). + * Added the broken-outlook-pgp-clearsigning patch (Closes: #120090). + + -- Marco d'Itri Fri, 30 Nov 2001 20:49:02 +0100 + +mutt (1.3.23-3) unstable; urgency=high + + * Moved to non-US (Closes: #118294). + + -- Marco d'Itri Mon, 5 Nov 2001 12:06:43 +0100 + +mutt (1.3.23-2) unstable; urgency=medium + + * Added SSL support using GNUTLS. WARNING: requires the CVS library! + * Added unpack target to debian/rules (Closes: #115765). + * Fixed account-hook (Closes: #117125). + * Added default compression hooks to /etc/Muttrc (Closes: #115473). + + -- Marco d'Itri Sun, 4 Nov 2001 13:59:25 +0100 + +mutt (1.3.23-1) unstable; urgency=medium + + * New upstream release (Closes: #106864, #106229, #110414) + (Closes: #69135, #89195, #92651, #97319, #98627). + * Added README.NFS note from the liblockfile maintainer (Closes: #96788). + * Fixed gpg operations (Closes: #113458, #114163, #114938). + * Fixed compressed folder patch (Closes: #114199). + * Highlight https URLs too (Closes: #113791). + + -- Marco d'Itri Wed, 10 Oct 2001 02:30:15 +0200 + +mutt (1.3.22-2) unstable; urgency=medium + + * Renamed dotlock.1 (Closes: #112545). + * Fixed the threads editing patch (Closes: #112554). + + -- Marco d'Itri Wed, 19 Sep 2001 12:18:47 +0200 + +mutt (1.3.22-1) unstable; urgency=low + + * New upstream release (Closes: ). + * Old bugs fixed in the last NMU (Closes: #29884, #101075, #101484) + (Closes: #101890, #101890, #102439, #106863, #104469, #105391) + (Closes: #110262). + * Fixed bashism in vars.build (Closes: #104137). + * Updated libssl package name in README.Debian (Closes: #96564). + * Added a note about temporary files in README.Debian (Closes: #89277). + * Added a note about locales in README.Debian (Closes: #105545). + * Included threads editing patch (Closes: #111291). + * Fixed paths in mutt.man (Closes: #110462). + + -- Marco d'Itri Sat, 15 Sep 2001 17:33:51 +0200 + +mutt (1.3.19-1) unstable; urgency=low + + * New upstream release (Closes: #81155, #93830, #95426, #100298, #101075). + (Closes: #101451). + * Suggests locales instead of i18ndata (Closes: #98814). + + -- Marco d'Itri Tue, 22 May 2001 13:42:34 +0200 + +mutt (1.3.18-1) unstable; urgency=low + + * New upstream release (Closes: #81155, #92234, #90400, #92860, #95426) + (Closes: #88358, #92846, #92847, #91979, #97658, #98014). + + -- Marco d'Itri Tue, 22 May 2001 13:42:34 +0200 + +mutt (1.3.17-1) unstable; urgency=high + + * New upstream release (Closes: #89011, #82372, #86228, #83187). + + -- Marco d'Itri Sun, 1 Apr 2001 22:09:27 +0200 + +mutt (1.3.15-2) unstable; urgency=high + + * Built again without linking libiconv. + + -- Marco d'Itri Wed, 14 Feb 2001 23:02:23 +0100 + +mutt (1.3.15-1) unstable; urgency=low + + * New upstream release (Closes: #81873, #81155, #81640, #76922). + * Added more headers to the ignore list. + * Removed dh_suidregister (Closes: #84826). + * Removed US-ASCII charset-hook (Closes: #81240). + * Commented all "color header" lines in the default /etc/Muttrc. + * Fixed default colors on white background xterm. + + -- Marco d'Itri Mon, 12 Feb 2001 23:34:41 +0100 + +mutt (1.3.12-2) unstable; urgency=low + + * Fixed typo in muttbug (Closes: #79230). + * Added menu hints (Closes: #80067). + * Compiled with libsasl (Closes: #78746). + + -- Marco d'Itri Sun, 24 Dec 2000 12:18:23 +0100 + +mutt (1.3.12-1) experimental; urgency=low + + * Packaged the development tree (Closes: #60459, #73050, #75885, #77856). + * Documented the fact that pgp_encryptself is gone and will not be back + (Closes: #47833, #69221). + + -- Marco d'Itri Tue, 28 Nov 2000 02:25:50 +0100 + +mutt (1.2.5-5) unstable; urgency=low + + * Added support for libc6 2.2 compressed charmaps + (Closes: #74975). + * Updated README.Debian about SSL support (Closes: #75895). + * Added the compressed folder patch (Closes: #76224). + * Removed some colorization (Closes: #77976). + + -- Marco d'Itri Mon, 27 Nov 2000 18:46:25 +0100 + +mutt (1.2.5-4) stable unstable; urgency=high + + * Typo in debian-ldap-query prevented it from running (#74575). + + -- Marco d'Itri Sun, 29 Oct 2000 13:09:42 +0100 + +mutt (1.2.5-3) stable unstable; urgency=high + + * ====> Removed non GPL-compatible SHA code (patch-1.3.9.tlr.sha.1). <==== + * ====> Disabled linking with the GPL-incompatible openssl library. <==== + * Update debian-ldap-query for new libnet-ldap-perl package (Closes: #74575). + + -- Marco d'Itri Thu, 12 Oct 2000 10:28:10 +0200 + +mutt (1.2.5-2) unstable; urgency=low + + * Disallow suspend by default if mutt is the session leader (Closes: #64169). + * Fixed the check for optional crypto libraries (Closes: #68518). + * Added build dependency to debhelper (Closes: #68401). + * Added some info to README.NFS (Closes: #71163). + * Added ispell wrapper. + + -- Marco d'Itri Thu, 21 Sep 2000 19:43:57 +0200 + +mutt (1.2.5-1) unstable; urgency=low + + * New upstream release (Closes: #67885, #65999, #67420, #65638, #62580). + (Closes: #67420). + * Fixed charmaps handling for autobuilders (Closes: #67609).\ + * Added debian-ldap-query script. + * mutt_imap_*_.so and pgp* moved to /usr/lib/mutt/. + * Added safefilter contributed script. + + -- Marco d'Itri Tue, 1 Aug 2000 18:22:58 +0200 + +mutt (1.2-1) unstable; urgency=low + + * New upstream release. + * Fixed manual.txt.gz path in F1 macro (Closes: #63384). + + -- Marco d'Itri Sun, 7 May 2000 19:51:09 +0200 + +mutt (1.1.12-1) unstable; urgency=low + + * New upstream release. + * Removed duplicated install-docs commands (Closes: #60788). + + -- Marco d'Itri Mon, 20 Mar 2000 22:14:53 +0100 + +mutt (1.1.9-1) unstable; urgency=low + + * New upstream release (Closes: #60139, #57965, #60139). + * pgp_sign_micalg=pgp-sha1 added to the default Muttrc (Closes: #59765). + + -- Marco d'Itri Wed, 15 Mar 2000 10:57:49 +0100 + +mutt (1.1.5-1) unstable; urgency=low + + * New upstream release (Closes: #56011, #58703). + + -- Marco d'Itri Sat, 26 Feb 2000 15:13:09 +0100 + +mutt (1.1.4-1) unstable; urgency=low + + * New upstream release. + + -- Marco d'Itri Wed, 16 Feb 2000 01:14:31 +0100 + +mutt (1.1.3-1) unstable; urgency=low + + * New upstream release (Closes: #57373, #57155, #57533, #56970). + * Fixed Pine.rc (Closes: #57647). + + -- Marco d'Itri Wed, 16 Feb 2000 01:14:20 +0100 + +mutt (1.1.2-2) unstable; urgency=low + + * README.UPDATE installed in the documentation directory (Closes: 56970). + * Patched for run time loading of SSL and Kerberos libraries. + + -- Marco d'Itri Thu, 10 Feb 2000 23:56:21 +0100 + +mutt (1.1.2-1) unstable; urgency=low + + * New upstream release (Closes: #30639, #28727). + * Fixed color problems in xterms. + + -- Marco d'Itri Tue, 1 Feb 2000 12:31:26 +0100 + +mutt (1.1.1-1) experimental; urgency=low + + * My christmas present: packaged the development tree. + + -- Marco d'Itri Sun, 19 Dec 1999 12:08:53 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..bf9f8f2 --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: mutt +Section: mail +Priority: standard +Maintainer: Marco d'Itri +Uploaders: Marco d'Itri , Adeodato Simó +Build-Depends: debhelper (>= 4), linuxdoc-tools-text, gettext, groff, libncurses5-dev, libsasl2-dev, libgnutls11-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev +Standards-Version: 3.6.1.1 + +Package: mutt +Architecture: any +Priority: standard +Depends: ${shlibs:Depends}, ${misc:Depends}, exim4 | mail-transport-agent +Suggests: urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates +Recommends: locales, mime-support +Provides: mail-reader, imap-client +Conflicts: suidmanager (<< 0.50), mutt-i, mutt-utf8 +Replaces: mutt-i, mutt-utf8 +Description: Text-based mailreader supporting MIME, GPG, PGP and threading + Mutt is a sophisticated text-based Mail User Agent. Some highlights: + o MIME support (including RFC1522 encoding/decoding of 8-bit message + headers and UTF-8 support). + o PGP/MIME support (RFC 2015). + o Advanced IMAP client supporting SSL encryption and SASL authentication. + o POP3 support. + o Mailbox threading (both strict and non-strict). + o Default keybindings are much like ELM. + o Keybindings are configurable; Mush and PINE-like ones are provided as + examples. + o Handles MMDF, MH and Maildir in addition to regular mbox format. + o Messages may be (indefinitely) postponed. + o Colour support. + o Highly configurable through easy but powerful rc file. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1403560 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,36 @@ +This package was originally debianized by Stephen Pitts + on Thu, 14 Nov 1996 19:04:20 -0600. + +The next debian maintainer was J.H.M. Dassen . + +Current debian maintainer is Marco d'Itri (since sept. 1998). + +Original source has been downloaded from ftp://ftp.mutt.org/mutt/ . + + +The following copyright notices apply to most of the program. Some +modules are under different licenses, or in the public domain. + +Please note that this is by no means an exhaustive list of all the +persons who have been contributing to this program. Please see the +manual for a (probably still non complete) list of the persons who +have been helpful with the development of this program. + +Copyright (C) 1996-2001 Michael R. Elkins +Copyright (C) 1996-2001 Brandon Long +Copyright (C) 1997-2001 Thomas Roessler +Copyright (C) 1998-2001 Werner Koch +Copyright (C) 1999-2001 Brendan Cully +Copyright (C) 1999-2001 Tommi Komulainen +Copyright (C) 2000-2001 Edmund Grimley Evans + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + +The list of authors of the applied patches to this version of mutt can +be found in `/usr/share/doc/mutt/README.Patches.gz'. diff --git a/debian/doc-base b/debian/doc-base new file mode 100644 index 0000000..00354b5 --- /dev/null +++ b/debian/doc-base @@ -0,0 +1,14 @@ +Document: mutt +Title: The Mutt E-Mail Client Manual +Author: Various +Abstract: The documentation for Mutt, a sophisticated text oriented mail + user agent ("mail reader"). +Section: Apps/Net + +Format: text +Files: /usr/share/doc/mutt/manual.txt.gz + +Format: HTML +Index: /usr/share/doc/mutt/html/manual.html +Files: /usr/share/doc/mutt/html/* + diff --git a/debian/gen-README.Patches b/debian/gen-README.Patches new file mode 100644 index 0000000..912e748 --- /dev/null +++ b/debian/gen-README.Patches @@ -0,0 +1,24 @@ +#!/usr/bin/mawk -f + +BEGIN { + sep = "=============================================================================" +} + +FILENAME ~ /debian$/ { + exit +} + +/^== END PATCH$/ { + print "" + exit +} + +FNR == 1 { + print FILENAME "\n" substr(sep, 0, 1+length(FILENAME)) "\n" + next +} + +{ + print +} + diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..9377eb0 --- /dev/null +++ b/debian/menu @@ -0,0 +1,5 @@ +?package(mutt): title="Mutt" \ + section="Apps/Net" hints="Mail" \ + needs="text" \ + icon="/usr/share/pixmaps/mutt.xpm" \ + command="/usr/bin/mutt" diff --git a/debian/patches/080_Md.Muttrc b/debian/patches/080_Md.Muttrc new file mode 100644 index 0000000..1fae231 --- /dev/null +++ b/debian/patches/080_Md.Muttrc @@ -0,0 +1,92 @@ +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 @@ + # + 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 ++ ++# emacs-like bindings ++bind editor "\e" kill-word ++bind editor "\e" kill-word ++ ++# map delete-char to a sane value ++bind editor delete-char ++ ++# some people actually like these settings ++#set pager_stop ++#bind pager previous-line ++#bind pager next-line ++ ++# don't add the hostname to the From header ++unset use_domain ++# don't generate a From header ++unset use_from ++ ++# Specifies how to sort messages in the index menu. ++set sort=threads ++ ++# Exim does not remove Bcc headers ++unset write_bcc ++# Postfix and qmail use Delivered-To for detecting loops ++unset bounce_delivered ++ ++# weed out binary-only announcements to -devel-changes ++#macro index \CW T!~s\(.*source.*\)\nWn^T~A\n "Weed out binary-only announcements" + + # 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' + 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" +-macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" +-macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" ++macro generic "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" ++macro index "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" ++macro pager "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation" ++ ++# Use folders which match on \\.gz$ or \\.bz2$ as [gb]zipped folders: ++open-hook \\.gz$ "gzip -cd %f > %t" ++close-hook \\.gz$ "gzip -c %t > %f" ++append-hook \\.gz$ "gzip -c %t >> %f" ++open-hook \\.bz2$ "bzip2 -cd %f > %t" ++close-hook \\.bz2$ "bzip2 -c %t > %f" ++append-hook \\.bz2$ "bzip2 -c %t >> %f" + + # If Mutt is unable to determine your site's domain name correctly, you can + # set the default here. +@@ -28,7 +68,22 @@ + # + # set use_8bitmime + +-## +-## More settings +-## ++# colors ++color normal white black ++color attachment brightyellow black ++color hdrdefault cyan black ++color indicator black cyan ++color markers brightred black ++color quoted green black ++color signature cyan black ++color status brightgreen blue ++color tilde blue black ++color tree red black ++#color header brightgreen black ^From: ++#color header brightcyan black ^To: ++#color header brightcyan black ^Reply-To: ++#color header brightcyan black ^Cc: ++#color header brightblue black ^Subject: ++#color body brightred black [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ ++#color body brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ + diff --git a/debian/patches/080_Md.paths_mutt.man b/debian/patches/080_Md.paths_mutt.man new file mode 100644 index 0000000..9e3b0f0 --- /dev/null +++ b/debian/patches/080_Md.paths_mutt.man @@ -0,0 +1,15 @@ +diff -urN mutt-1.3.22.orig/doc/mutt.man mutt-1.3.22/doc/mutt.man +--- mutt-1.3.22.orig/doc/mutt.man Thu Aug 30 14:55:04 2001 ++++ mutt-1.3.22/doc/mutt.man Sat Sep 15 18:41:08 2001 +@@ -136,9 +136,9 @@ + User's personal mapping between MIME types and file extensions. + .IP "/etc/mime.types" + System mapping between MIME types and file extensions. +-.IP "/usr/local/bin/mutt_dotlock" ++.IP "/usr/bin/mutt_dotlock" + The privileged dotlocking program. +-.IP "/usr/local/doc/mutt/manual.txt" ++.IP "/usr/share/doc/mutt/manual.txt.gz" + The Mutt manual. + .SH BUGS + .PP diff --git a/debian/patches/080_Md.po_norebuild b/debian/patches/080_Md.po_norebuild new file mode 100644 index 0000000..aa14e19 --- /dev/null +++ b/debian/patches/080_Md.po_norebuild @@ -0,0 +1,11 @@ +--- mutt-1.3.25.orig/po/Makefile.in.in Tue Jan 1 21:17:15 2002 ++++ mutt-1.3.25/po/Makefile.in.in Wed Jan 2 00:53:40 2002 +@@ -85,7 +85,7 @@ + # otherwise packages like GCC can not be built if only parts of the source + # have been downloaded. + +-$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in ++$(srcdir)/$(PACKAGE).pot: #$(POTFILES) $(srcdir)/POTFILES.in + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ + --files-from=$(srcdir)/POTFILES.in \ diff --git a/debian/patches/080_Md.use_debian_editor b/debian/patches/080_Md.use_debian_editor new file mode 100644 index 0000000..a46f314 --- /dev/null +++ b/debian/patches/080_Md.use_debian_editor @@ -0,0 +1,29 @@ +diff -urNp mutt-1.5.3+CVS20030214.orig/PATCHES mutt-1.5.3+CVS20030214/PATCHES +--- mutt-1.5.3+CVS20030214.orig/PATCHES 2002-12-09 18:44:54.000000000 +0100 ++++ mutt-1.5.3+CVS20030214/PATCHES 2003-02-14 17:25:15.000000000 +0100 +@@ -1,0 +1 @@ ++Debian.Md.use_debian_editor +diff -urNp mutt-1.5.3+CVS20030214.orig/init.c mutt-1.5.3+CVS20030214/init.c +--- mutt-1.5.3+CVS20030214.orig/init.c 2003-01-21 13:33:41.000000000 +0100 ++++ mutt-1.5.3+CVS20030214/init.c 2003-02-14 17:25:44.000000000 +0100 +@@ -1853,7 +1853,7 @@ void mutt_init (int skip_sys_rc, LIST *c + { + p = getenv ("EDITOR"); + if (!p) +- p = "vi"; ++ p = "/usr/bin/editor"; + } + Editor = safe_strdup (p); + Visual = safe_strdup (p); +diff -urNp mutt-1.5.3+CVS20030214.orig/init.h mutt-1.5.3+CVS20030214/init.h +--- mutt-1.5.3+CVS20030214.orig/init.h 2003-02-13 10:55:02.000000000 +0100 ++++ mutt-1.5.3+CVS20030214/init.h 2003-02-14 17:27:41.000000000 +0100 +@@ -466,7 +466,7 @@ struct option_t MuttVars[] = { + ** .pp + ** This variable specifies which editor is used by mutt. + ** It defaults to the value of the VISUAL, or EDITOR, environment +- ** variable, or to the string "vi" if neither of those are set. ++ ** variable, or to the string "/usr/bin/editor" if neither of those are set. + */ + { "encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, 0 }, + /* diff --git a/debian/patches/100_asp.pgp_getkeys b/debian/patches/100_asp.pgp_getkeys new file mode 100644 index 0000000..1afcdd1 --- /dev/null +++ b/debian/patches/100_asp.pgp_getkeys @@ -0,0 +1,12 @@ +diff -u -r mutt-1.5.6.orig/contrib/gpg.rc mutt-1.5.6/contrib/gpg.rc +--- mutt-1.5.6.orig/contrib/gpg.rc 2002-03-26 23:23:58.000000000 +0100 ++++ mutt-1.5.6/contrib/gpg.rc 2004-05-23 15:01:52.000000000 +0200 +@@ -72,6 +72,8 @@ + + # fetch keys + # set pgp_getkeys_command="pkspxycwrap %r" ++# This will work when #172960 will be fixed upstream ++# set pgp_getkeys_command="/usr/bin/gpg --recv-keys %r" + + # pattern for good signature - may need to be adapted to locale! + diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update new file mode 100644 index 0000000..eeccd6c --- /dev/null +++ b/debian/patches/autotools-update @@ -0,0 +1,1770 @@ +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 +@@ -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. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # 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. +@@ -76,10 +76,10 @@ + am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ + attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ + buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ +- cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \ +- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \ +- curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \ +- enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ ++ cryptglue.$(OBJEXT) compress.$(OBJEXT) commands.$(OBJEXT) \ ++ complete.$(OBJEXT) compose.$(OBJEXT) copy.$(OBJEXT) \ ++ curs_lib.$(OBJEXT) curs_main.$(OBJEXT) date.$(OBJEXT) \ ++ edit.$(OBJEXT) enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ + 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 @@ + 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 \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ + 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 @@ + 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 \ +- configure account.h \ ++ configure account.h compress.h \ + 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 @@ + @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@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@ + @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 @@ + # (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): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -609,7 +616,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -617,7 +624,13 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -638,7 +651,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + 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 +@@ -498,6 +498,9 @@ + /* Define to enable Sun mailtool attachments support. */ + #undef SUN_ATTACHMENT + ++/* Define to support compressed folders. */ ++#undef USE_COMPRESSED ++ + /* 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 ++ --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 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -2429,8 +2433,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2488,8 +2491,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2605,8 +2607,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2660,8 +2661,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2706,8 +2706,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2751,8 +2750,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3004,8 +3002,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3059,8 +3056,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3395,8 +3391,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3566,8 +3561,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3642,8 +3636,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4296,8 +4289,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4413,8 +4405,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4496,8 +4487,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4526,8 +4516,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4597,8 +4586,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4650,8 +4638,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4722,8 +4709,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4775,8 +4761,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4999,8 +4984,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5147,8 +5131,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5210,8 +5193,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5273,8 +5255,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5314,8 +5295,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5371,8 +5351,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5412,8 +5391,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5477,8 +5455,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5509,10 +5486,8 @@ + esac + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +@@ -5624,8 +5599,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5687,8 +5661,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5728,8 +5701,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5785,8 +5757,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5826,8 +5797,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5891,8 +5861,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5923,10 +5892,8 @@ + esac + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6038,8 +6005,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6101,8 +6067,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6142,8 +6107,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6199,8 +6163,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6240,8 +6203,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6305,8 +6267,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6337,10 +6298,8 @@ + esac + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +@@ -6452,8 +6411,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6515,8 +6473,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6556,8 +6513,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6613,8 +6569,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6654,8 +6609,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6719,8 +6673,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6751,10 +6704,8 @@ + esac + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 ++echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +@@ -7216,8 +7167,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7303,8 +7253,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7419,8 +7368,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7490,8 +7438,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7560,8 +7507,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7627,8 +7573,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7778,8 +7723,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7962,8 +7906,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8031,8 +7974,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8101,8 +8043,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8173,8 +8114,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8296,8 +8236,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8366,8 +8305,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8444,8 +8382,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8507,8 +8444,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8561,8 +8497,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8605,8 +8540,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8681,8 +8615,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8721,8 +8654,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8818,8 +8750,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8989,8 +8920,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9140,8 +9070,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9290,8 +9219,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9477,8 +9405,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9550,8 +9477,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9658,8 +9584,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9748,8 +9673,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9822,8 +9746,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9888,8 +9811,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9996,8 +9918,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10100,8 +10021,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10209,8 +10129,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10270,8 +10189,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10459,8 +10377,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10563,8 +10480,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10678,8 +10594,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10748,8 +10663,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10856,8 +10770,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10926,8 +10839,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11034,8 +10946,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11145,8 +11056,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11645,8 +11555,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11712,8 +11621,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11814,8 +11722,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11881,8 +11788,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11987,8 +11893,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12149,8 +12054,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12223,8 +12127,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12299,8 +12202,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12493,8 +12395,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12571,8 +12472,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12681,8 +12581,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12982,8 +12881,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13156,8 +13054,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13268,8 +13165,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13392,8 +13288,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13515,8 +13410,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13620,8 +13514,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13723,8 +13616,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13826,8 +13718,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13978,6 +13869,18 @@ + fi + fi; + ++# Check whether --enable-compressed or --disable-compressed was given. ++if test "${enable_compressed+set}" = set; then ++ enableval="$enable_compressed" ++ if test x$enableval = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define USE_COMPRESSED 1 ++_ACEOF ++ ++ fi ++fi; ++ + + # Check whether --with-exec-shell or --without-exec-shell was given. + if test "${with_exec_shell+set}" = set; then +@@ -14070,8 +13973,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14156,8 +14058,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14273,8 +14174,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14339,8 +14239,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14404,8 +14303,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14486,8 +14384,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14628,8 +14525,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14767,8 +14663,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14952,8 +14847,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15243,8 +15137,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15450,8 +15343,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15533,8 +15425,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15584,8 +15475,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15660,8 +15550,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15731,8 +15620,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15795,8 +15683,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15901,8 +15788,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16040,8 +15926,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16100,8 +15985,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16212,8 +16096,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16698,8 +16581,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17053,8 +16935,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17125,8 +17006,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17277,8 +17157,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17345,8 +17224,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17412,8 +17290,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17600,8 +17477,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17707,8 +17583,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17811,8 +17686,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17880,8 +17754,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17962,8 +17835,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18026,8 +17898,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18088,8 +17959,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19082,11 +18952,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # 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 @@ + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _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 +@@ -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. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # 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 +@@ -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. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # 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. +@@ -217,9 +217,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign m4/Makefile ++ $(AUTOMAKE) --gnu m4/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ diff --git a/debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname b/debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname new file mode 100644 index 0000000..5889f4f --- /dev/null +++ b/debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname @@ -0,0 +1,74 @@ +diff -u mutt-1.5.3.orig/PATCHES mutt-1.5.3/PATCHES +--- mutt-1.5.3.orig/PATCHES 2002-12-17 10:47:20.000000000 +0100 ++++ mutt-1.5.3/PATCHES 2003-01-14 18:21:16.000000000 +0100 +@@ -1,0 +1 @@ ++Debian.Md.etc_mailname_gethostbyname +diff -u mutt-1.5.3.orig/init.c mutt-1.5.3/init.c +--- mutt-1.5.3.orig/init.c 2002-12-11 16:13:49.000000000 +0100 ++++ mutt-1.5.3/init.c 2003-01-14 18:27:54.000000000 +0100 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -1748,6 +1749,31 @@ + return 0; + } + ++int getmailname(char *s, size_t l) ++{ ++ FILE *f; ++ char tmp[512]; ++ char *p = tmp; ++ ++ if ((f = fopen ("/etc/mailname", "r")) == NULL) ++ return (-1); ++ ++ if (fgets (tmp, 510, f) != NULL) { ++ while (*p && !ISSPACE(*p) && l > 0) { ++ *s++ = *p++; ++ l--; ++ } ++ if (*(s-1) == '.') ++ s--; ++ *s = 0; ++ ++ fclose (f); ++ return 0; ++ } ++ fclose (f); ++ return (-1); ++} ++ + void mutt_init (int skip_sys_rc, LIST *commands) + { + struct passwd *pw; +@@ -1816,10 +1842,25 @@ + Hostname = mutt_substrdup (utsname.nodename, p); + p++; + strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ ++ Fqdn = safe_strdup (utsname.nodename); + } + else + Hostname = safe_strdup (utsname.nodename); + ++ /* if /etc/mailname exists use it and ignore everything else */ ++ if (getmailname(buffer, sizeof (buffer)) != -1) ++ Fqdn = safe_strdup(buffer); ++ ++ /* try gethostbyname(3) if /etc/mailname does not exists */ ++ if (!Fqdn) { ++ struct hostent *hp; ++ ++ if ((hp = gethostbyname(Hostname))) ++ Fqdn = safe_strdup(hp->h_name); ++ } ++ ++ if (Fqdn) { ++ } else + #ifndef DOMAIN + #define DOMAIN buffer + if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1) diff --git a/debian/patches/patch-1.5.4.Md.sasl2-1arc b/debian/patches/patch-1.5.4.Md.sasl2-1arc new file mode 100644 index 0000000..2de233c --- /dev/null +++ b/debian/patches/patch-1.5.4.Md.sasl2-1arc @@ -0,0 +1,19 @@ +diff -ruN mutt-1.5.6.orig/configure mutt-1.5.6/configure +--- mutt-1.5.6.orig/configure 2004-02-01 19:22:06.000000000 +0100 ++++ mutt-1.5.6/configure 2004-04-04 10:48:08.000000000 +0200 +@@ -5684,6 +5684,7 @@ + EOF + + need_sasl=yes ++ need_md5=yes + fi + + fi +@@ -5778,6 +5779,7 @@ + EOF + + need_sasl=yes ++ need_md5=yes + fi + + fi diff --git a/debian/patches/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/patch-1.5.4.vk.pgp_verbose_mime new file mode 100644 index 0000000..07feee8 --- /dev/null +++ b/debian/patches/patch-1.5.4.vk.pgp_verbose_mime @@ -0,0 +1,51 @@ +diff -ruN mutt.orig/PATCHES mutt/PATCHES +--- mutt.orig/PATCHES 2003-09-13 16:23:24.000000000 +0200 ++++ mutt/PATCHES 2003-09-13 16:21:53.000000000 +0200 +@@ -1,0 +1 @@ ++patch-1.5.4.vk.pgp_verbose_mime +diff -ruN mutt.orig/globals.h mutt/globals.h +--- mutt.orig/globals.h 2003-09-13 16:23:24.000000000 +0200 ++++ mutt/globals.h 2003-09-13 16:23:18.000000000 +0200 +@@ -195,6 +195,8 @@ + WHERE char *PgpListSecringCommand; + WHERE char *PgpListPubringCommand; + WHERE char *PgpGetkeysCommand; ++WHERE char *PgpMimeSignatureFilename; ++WHERE char *PgpMimeSignatureDescription; + + /*-- formerly in smime.h --*/ + WHERE char *SmimeDefaultKey; +diff -ruN mutt.orig/init.h mutt/init.h +--- mutt.orig/init.h 2003-09-13 16:23:24.000000000 +0200 ++++ mutt/init.h 2003-09-13 16:21:53.000000000 +0200 +@@ -1458,6 +1458,18 @@ + ** This option overrides ``$$pgp_create_traditional'' + ** (PGP only) + */ ++ { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"}, ++ /* ++ ** .pp ++ ** This option sets the filename used for signature parts in PGP/MIME ++ ** signed messages. ++ */ ++ { "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"}, ++ /* ++ ** .pp ++ ** This option sets the Content-Description used for signature parts in ++ ** PGP/MIME signed messages. ++ */ + + /* XXX Default values! */ + +diff -ruN mutt.orig/pgp.c mutt/pgp.c +--- mutt.orig/pgp.c 2003-09-13 16:23:24.000000000 +0200 ++++ mutt/pgp.c 2003-09-13 16:21:53.000000000 +0200 +@@ -998,6 +998,8 @@ + t->disposition = DISPINLINE; + t->encoding = ENC7BIT; + t->unlink = 1; /* ok to remove this file after sending. */ ++ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); ++ t->description = safe_strdup (PgpMimeSignatureDescription); + + return (a); + } diff --git a/debian/patches/patch-1.5.5.1.nt.xtitles.3.ab.1 b/debian/patches/patch-1.5.5.1.nt.xtitles.3.ab.1 new file mode 100644 index 0000000..dd38eb5 --- /dev/null +++ b/debian/patches/patch-1.5.5.1.nt.xtitles.3.ab.1 @@ -0,0 +1,152 @@ +diff -ur ../MUTT/mutt/PATCHES mutt/PATCHES +--- ../MUTT/mutt/PATCHES 2002-12-09 18:44:54.000000000 +0100 ++++ mutt/PATCHES 2004-01-19 13:50:52.000000000 +0100 +@@ -1,0 +1 @@ ++patch-1.5.5.1.nt.xtitles.3.ab.1 +diff -ur ../MUTT/mutt/curs_main.c mutt/curs_main.c +--- ../MUTT/mutt/curs_main.c 2003-09-03 19:09:09.000000000 +0200 ++++ mutt/curs_main.c 2004-01-19 13:45:37.000000000 +0100 +@@ -103,6 +103,19 @@ + extern const char *ReleaseDate; + extern size_t UngetCount; + ++#define ASCII_CTRL_G 0x07 ++#define ASCII_CTRL_OPEN_SQUARE_BRAKET 0x1b ++ ++void set_xterm_title_bar(char *title) ++{ ++ fprintf(stderr ,"%c]2;%s%c", ASCII_CTRL_OPEN_SQUARE_BRAKET, title, ASCII_CTRL_G); ++} ++ ++void set_xterm_icon_name(char *name) ++{ ++ fprintf(stderr, "%c]1;%s%c", ASCII_CTRL_OPEN_SQUARE_BRAKET, name, ASCII_CTRL_G); ++} ++ + void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num) + { + format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX; +@@ -562,6 +575,13 @@ + mutt_paddstr (COLS, buf); + SETCOLOR (MT_COLOR_NORMAL); + menu->redraw &= ~REDRAW_STATUS; ++ if (option(OPTXTERMSETTITLES)) ++ { ++ menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle)); ++ set_xterm_title_bar(buf); ++ menu_status_line (buf, sizeof (buf), menu, NONULL (XtermIcon)); ++ set_xterm_icon_name(buf); ++ } + } + + menu->redraw = 0; +diff -ur ../MUTT/mutt/globals.h mutt/globals.h +--- ../MUTT/mutt/globals.h 2003-07-15 13:41:32.000000000 +0200 ++++ mutt/globals.h 2004-01-19 13:45:37.000000000 +0100 +@@ -112,6 +112,8 @@ + WHERE char *Tochars; + WHERE char *Username; + WHERE char *Visual; ++WHERE char *XtermTitle; ++WHERE char *XtermIcon; + + WHERE char *LastFolder; + +diff -ur ../MUTT/mutt/init.c mutt/init.c +--- ../MUTT/mutt/init.c 2004-01-05 19:49:00.000000000 +0100 ++++ mutt/init.c 2004-01-19 13:48:45.000000000 +0100 +@@ -891,6 +891,26 @@ + toggle_option (MuttVars[idx].data); + else + set_option (MuttVars[idx].data); ++ ++ /* sanity check for xterm */ ++ if ((mutt_strcmp (MuttVars[idx].option, "xterm_set_titles") == 0) ++ && option (OPTXTERMSETTITLES)) ++ { ++ char *ep = getenv ("TERM"); ++ /* Make sure that the terminal can take the control codes */ ++ if (ep == NULL) unset_option (MuttVars[idx].data); ++ else if (mutt_strncasecmp (ep, "xterm", 5) && ++ mutt_strncasecmp (ep, "color-xterm", 11) && ++ mutt_strncasecmp (ep, "eterm", 5) && ++ mutt_strncasecmp (ep, "kterm", 5) && ++ mutt_strncasecmp (ep, "nxterm", 6) && ++ mutt_strncasecmp (ep, "putty", 5) && ++ mutt_strncasecmp (ep, "screen", 6) && ++ mutt_strncasecmp (ep, "cygwin", 6) && ++ mutt_strncasecmp (ep, "rxvt", 4) ) ++ unset_option (MuttVars[idx]. data); ++ ++ } + } + else if (DTYPE (MuttVars[idx].type) == DT_STR || + DTYPE (MuttVars[idx].type) == DT_PATH || +diff -ur ../MUTT/mutt/init.h mutt/init.h +--- ../MUTT/mutt/init.h 2004-01-05 19:49:00.000000000 +0100 ++++ mutt/init.h 2004-01-19 13:45:37.000000000 +0100 +@@ -2670,6 +2670,27 @@ + ** Controls whether mutt writes out the Bcc header when preparing + ** messages to be sent. Exim users may wish to use this. + */ ++ {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"}, ++ /* ++ ** .pp ++ ** Controls the format of the icon title, as long as xterm_set_titles ++ ** is enabled. This string is identical in formatting to the one used by ++ ** ``$$status_format''. ++ */ ++ {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, 0}, ++ /* ++ ** .pp ++ ** Controls whether mutt sets the xterm title bar and icon name ++ ** (as long as you're in an appropriate terminal). The default must ++ ** be off to force in the validity checking. ++ */ ++ {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?"}, ++ /* ++ ** .pp ++ ** Controls the format of the title bar of the xterm provided that ++ ** xterm_set_titles has been set. This string is identical in formatting ++ ** to the one used by ``$$status_format''. ++ */ + /*--*/ + { NULL } + }; +diff -ur ../MUTT/mutt/mutt.h mutt/mutt.h +--- ../MUTT/mutt/mutt.h 2004-01-05 19:49:00.000000000 +0100 ++++ mutt/mutt.h 2004-01-19 13:45:37.000000000 +0100 +@@ -424,6 +424,7 @@ + OPTWRAPSEARCH, + OPTWRITEBCC, /* write out a bcc header? */ + OPTXMAILER, ++ OPTXTERMSETTITLES, + + /* PGP options */ + +diff -ur ../MUTT/mutt/pager.c mutt/pager.c +--- ../MUTT/mutt/pager.c 2004-01-05 19:49:00.000000000 +0100 ++++ mutt/pager.c 2004-01-19 13:45:37.000000000 +0100 +@@ -26,6 +26,8 @@ + #include "pager.h" + #include "attach.h" + #include "mbyte.h" ++void set_xterm_title_bar(char *title); ++void set_xterm_icon_name(char *name); + + #include "mx.h" + +@@ -1740,6 +1742,13 @@ + SETCOLOR (MT_COLOR_STATUS); + mutt_paddstr (COLS, buffer); + SETCOLOR (MT_COLOR_NORMAL); ++ if (option(OPTXTERMSETTITLES)) ++ { ++ menu_status_line (buffer, sizeof (buffer), index, NONULL (XtermTitle)); ++ set_xterm_title_bar(buffer); ++ menu_status_line (buffer, sizeof (buffer), index, NONULL (XtermIcon)); ++ set_xterm_icon_name(buffer); ++ } + } + + redraw = 0; diff --git a/debian/patches/patch.asp.fix-bug-266493.1 b/debian/patches/patch.asp.fix-bug-266493.1 new file mode 100644 index 0000000..8a19135 --- /dev/null +++ b/debian/patches/patch.asp.fix-bug-266493.1 @@ -0,0 +1,24 @@ +--- a/curs_main.c 2004-06-28 04:57:39.000000000 +0200 ++++ b/curs_main.c 2004-06-28 04:57:49.000000000 +0200 +@@ -576,10 +576,6 @@ + move (menu->current - menu->top + menu->offset, COLS - 1); + mutt_refresh (); + +- op = km_dokey (MENU_MAIN); +- +- dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op)); +- + #if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM) + if (SigWinch) + { +@@ -598,6 +594,10 @@ + } + #endif + ++ op = km_dokey (MENU_MAIN); ++ ++ dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op)); ++ + if (op == -1) + continue; /* either user abort or timeout */ + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..af1b4a2 --- /dev/null +++ b/debian/rules @@ -0,0 +1,138 @@ +#!/usr/bin/make -f +SHELL+= -e + +export LC_ALL=C +include debian/scripts/vars + +BUILD_DIR := $(SOURCE_DIR)/$(TAR_DIR) +B := $(BUILD_DIR) +D := $(CURDIR)/debian/mutt + +# Comment this line if you want the header cache with gdbm +HCACHE_WITH_DB := --without-gdbm + +clean: + $(MAKE) -f debian/sys-build.mk source.clean + dh_clean + +# target used by the maintainer +unpack.nopatch: + $(MAKE) -f debian/sys-build.mk source.build + rm -f $B/Muttrc $B/doc/muttrc.man \ + $B/doc/manual.sgml $B/doc/manual.txt $B/doc/*.html + +diff: + $(MAKE) -f debian/sys-build.mk make-diff + +unpack: $(STAMP_DIR)/source.make +$(STAMP_DIR)/source.make: + $(MAKE) -f debian/sys-build.mk source.make + + # sort the patches list + sort $B/PATCHES > $B/PATCHES.temp + mv $B/PATCHES.temp $B/PATCHES + + # rebuild these files + rm -f $B/Muttrc $B/doc/muttrc.man \ + $B/doc/manual.sgml $B/doc/manual.txt $B/doc/*.html + + # we include some #defines in debian-config.h + echo '#include "debian-config.h"' >> $B/config.h.in + + # do not rebuild these files + touch $B/configure.in $B/aclocal.m4 $B/Makefile.in $B/configure \ + $B/stamp-h.in $B/config.h.in + touch $@ + +configure: $(STAMP_DIR)/configure +$(STAMP_DIR)/configure: $(STAMP_DIR)/source.make + CC=cc ac_cv_path_ISPELL=ispell \ + SENDMAIL=/usr/sbin/sendmail PERL=/usr/bin/perl \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ + --with-sharedir=/usr/share/mutt --with-docdir=/usr/share/doc \ + --with-mailpath=/var/mail \ + --enable-fcntl --enable-pop --enable-imap \ + --with-mixmaster --with-sasl2 --with-idn \ + --with-curses \ + --with-gnutls \ + --enable-debug \ + --enable-inodesort \ + --enable-compressed \ + --enable-hcache $(HCACHE_WITH_DB) \ + " + touch $@ + +build: $(STAMP_DIR)/build +$(STAMP_DIR)/build: $(STAMP_DIR)/configure $(STAMP_DIR)/source.make + GROFF_NO_SGR=1 \ + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + make keymap_defs.h all CFLAGS=\"-O2 -g\" \ + " + touch $@ + +binary-arch: $(STAMP_DIR)/build checkroot + dh_testdir + dh_clean -k + $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ + $(MAKE) install DESTDIR=$D SUBDIRS=\"intl po\" \ + " + + dh_installdirs -p mutt usr/share/pixmaps usr/lib/mutt/ \ + usr/bin/ usr/share/doc/mutt/html/ + dh_installmenu + dh_installdocs $B/README $B/README.SECURITY $B/README.SSL $B/NEWS \ + $B/doc/manual.txt $B/doc/PGP-Notes.txt extra/README.SMIME + cp $B/doc/*.html $D/usr/share/doc/mutt/html/ + for file in README BUGS TODO; do \ + cp $B/imap/$$file $D/usr/share/doc/mutt/$$file.IMAP; \ + done + # generate README.Patches + for file in $(EXTRA_PATCHES)/*; do \ + mawk -f debian/gen-README.Patches $$file >> \ + $D/usr/share/doc/mutt/README.Patches; \ + done + dh_installexamples \ + $B/contrib/*rc $B/contrib/sample.muttrc-tlr \ + extra/ray.muttrc extra/colors.angdraug + dh_installman \ + $B/doc/mutt.man $B/doc/dotlock.man \ + $B/doc/muttrc.man $B/doc/mbox.man + + install --mode=755 extra/debian-ldap-query extra/mailspell \ + extra/source-muttrc.d $D/usr/lib/mutt/ + cp extra/mutt.xpm $D/usr/share/pixmaps/ + +# some fixes to the package structure + mv $D/usr/bin/pgp* $D/usr/lib/mutt/ + mv $D/usr/share/man/man1/dotlock.1 $D/usr/share/man/man1/mutt_dotlock.1 + rm $D/etc/mime.types $D/usr/bin/muttbug $D/usr/bin/flea + +# I think the default config file with the embedded manual is too big + mv $D/etc/Muttrc $D/usr/share/doc/mutt/examples/ + cp $B/Muttrc.head $D/etc/Muttrc + echo "# GnuPG configuration" >> $D/etc/Muttrc + grep ^set $B/contrib/gpg.rc \ + | sed -e 's#pgpewrap#/usr/lib/mutt/pgpewrap#' \ + | sed -e 's#/usr/bin/gpg#gpg#' \ + >> $D/etc/Muttrc + cat extra/smime-paths.rc extra/source-Muttrc.d.rc >> $D/etc/Muttrc + + dh_installchangelogs $B/ChangeLog + dh_strip + dh_compress + dh_fixperms --exclude=usr/bin/mutt_dotlock + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_builddeb + +binary: binary-arch + +extra-clean: + find -type f \( -name "*.orig" -o -name "*.rej" \) -exec rm -v {} \; + +checkroot: + test root = "`whoami`" + +.PHONY: binary binary-arch build clean configure checkroot extra-clean diff --git a/debian/scripts/Makefile b/debian/scripts/Makefile new file mode 100644 index 0000000..907a3d2 --- /dev/null +++ b/debian/scripts/Makefile @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +all: sh.vars mk.vars + +clean: + rm -f sh.vars mk.vars + +mk.vars: vars.build vars + $(SHELL) vars.build vars make > $@ +sh.vars: vars.build vars + $(SHELL) vars.build vars shell > $@ + diff --git a/debian/scripts/archmap b/debian/scripts/archmap new file mode 100644 index 0000000..22923c1 --- /dev/null +++ b/debian/scripts/archmap @@ -0,0 +1,22 @@ +#!/bin/sh +# i486 i386 i486 i586 pentium pentiumpro +if [ $(basename $0) = archmap ];then + if [ -z $1 ];then + arch=$(dpkg --print-gnu-build-architecture) + else + arch=$1 + fi +else + if [ -z $arch ];then + arch=$(dpkg --print-gnu-build-architecture) + fi +fi +set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap) +if [ -z $2 ];then + arch=$arch +else + arch=$2 +fi +if [ $(basename $0) = archmap ];then + echo $arch +fi diff --git a/debian/scripts/getglibcversion b/debian/scripts/getglibcversion new file mode 100644 index 0000000..26e7b46 --- /dev/null +++ b/debian/scripts/getglibcversion @@ -0,0 +1,56 @@ +#!/bin/sh +# GNU C library version detection shell script. +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# This script probably makes about a billion too many assumptions, but it's +# better than hardcoding the glibc version on a per-architecture basis. + +set -e + +usage () { + echo "Usage: getglibcversion [option]" + echo " Where [option] may be one of:" + echo " --major return major version only" + echo " --minor return minor version only" + echo " --point return ittybitty version only" + echo "With no option, returns major.minor.ittybitty ."; +} + +case $# in + 0) ;; + 1) case $1 in + --help) usage + exit 0 ;; + --major) RETURN=1 ;; + --minor) RETURN=2 ;; + --point) RETURN=3 ;; + *) exec 1>&2 + usage + exit 1 ;; + esac ;; + *) exec 1>&2 + usage + exit 1 ;; +esac + +LIBCLIST=$(cd /lib && ls libc-*.so) + +case $(echo $LIBCLIST | wc -l | awk '{print $1}') in + 0) echo "No GNU C library found! Aborting." >&2 + exit 1 ;; + 1) ;; + *) echo "Multiple versions of GNU C library found! Aborting." >&2 + exit 1 ;; +esac + +LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//') + +if [ -z $RETURN ]; then + echo $LIBCVERSION +else + echo $LIBCVERSION | cut -d. -f$RETURN +fi + +exit 0 diff --git a/debian/scripts/lib b/debian/scripts/lib new file mode 100644 index 0000000..8f1c61e --- /dev/null +++ b/debian/scripts/lib @@ -0,0 +1,198 @@ +#!/bin/sh +if [ $(basename $0) = lib ];then + make -C debian/scripts sh.vars + . debian/scripts/sh.vars +fi +fetchmsg() { + local msg + msg=$1;shift + eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages) +} +START() { + echo -n "$(fetchmsg START "$@") " +} +OK() { + fetchmsg OK "$@" +} +FAILED() { + fetchmsg FAILED "$@" +} +ALREADY_DONE() { + fetchmsg ALREADY_DONE "$@" +} + +BASENAME() { + local base + if [ "$cmd" ];then + base=$cmd + else + base=${0##*/} + fi + if [ x$base = x ];then + echo "Danger, Will Robinson, Danger!" 1>&2 + echo "Bash is very confused." 1>&2 + exit 1 + fi + if [ x$base = xlib ];then + echo "You can't call this directly." 1>&2 + echo "This is a library that should be sourced." 1>&2 + exit 1 + fi + echo $base +} +file2cat() { + $(decompress_prog $1) $1 +} +debug() { + echo "$@" + eval "$@" +} +decompress_prog() { + local which + which="cat" + [ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c" + [ $1 != ${1%.bz2} ] && which="bunzip2 -c" + [ $1 != ${1%.bz} ] && which="bunzip -c" + echo $which +} +compress_ext() { + local which + which="" + [ $1 != ${1%.gz} ] && which=gz + [ $1 != ${1%.Z} ] && which=Z + [ $1 != ${1%.bz2} ] && which=bz2 + [ $1 != ${1%.bz} ] && which=bz + echo $which +} +filetype_detect() { + local which f + which="" + f=$(echo "$1" | sed 's|:::.*||') + [ $f != ${f%.jar} ] && which=jarfile + [ $f != ${f%.zip} ] && which=zipfile + [ $f != ${f%.tgz} ] && which=tarball + [ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball + [ $f != ${f%.tar} ] && which=tarball + [ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch + [ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch + [ $f != ${f%.dsc} ] && which=dsc + echo $which +} +extract_tar() { + local which file dir curd + dir="$1" + shift + curd=$(pwd) + while [ $# -gt 0 ];do + file="$1" + [ "$file" = "${1#/}" ] && file="$curd/$file" + case "$(filetype_detect $file)" in + "jarfile") (cd $dir;fastjar -xf $file);; + "zipfile") (cd $dir;miniunzip -x $file);; + "tarball") $(decompress_prog $file) $file | (cd $dir;tar xvf -);; + *) echo "unsupported tarball";; + esac + shift + done +} + +do.patching() { + filetmpl=\$d/\$f + reversesort="" + reversepatch="" + + case "$cmd" in + source.patch) + mkdir -p $SOURCE_DIR/$TAR_DIR + patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/\$d/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d" + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + patch.apply) + mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches + patch_dirs="$PATCH_DIR $ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/patches/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep=\$STAMP_DIR/log/\$d + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + fix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + ;; + unfix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + reversesort=-r + reversepatch=-R + ;; + esac + for d in $patch_dirs;do + if [ ! -d $d ];then + continue + fi + eval mkdir -p $dirprep + for f in `(cd $d >/dev/null;find -type f ! -name 'chk-*' 2>/dev/null )|sort $reversesort`;do + eval stampfile=$stampfiletmpl + eval log=$logtmpl + eval file=$filetmpl + eval patchapplydir=$patchapplydirtmpl + if [ ! -e $stampfile ];then + START $file + if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then + OK $file + touch $stampfile + else + FAILED $file + exit 1 + fi + else + ALREADY_DONE $file + fi + done + done + +} +# +# External api functions. +# + +source.clean() { + if [ "$DBS_UNIFIED" ];then + exit + fi + rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches + rm -f $STAMP_DIR/{source.{clean,build,make}} + return +if [ x$SOURCE_DIR = x ];then + files=`find -type f -maxdepth 1 -mindepth 1` + dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'` + echo files=\"$files\" + echo dirs=\"$dirs\" +fi + +} +source.patch() { cmd=source.patch; do.patching; } +fix.source.patch() { cmd=fix.source.patch; do.patching; } +unfix.source.patch() { cmd=unfix.source.patch; do.patching; } +patch.apply() { cmd=patch.apply; do.patching; } + +if [ $(basename $0) = lib ];then + $1 +fi diff --git a/debian/scripts/messages b/debian/scripts/messages new file mode 100644 index 0000000..4d35279 --- /dev/null +++ b/debian/scripts/messages @@ -0,0 +1,29 @@ +fix.source.patch:START:"Fixing upstream patch $1" +fix.source.patch:OK:"successful." +fix.source.patch:FAILED:"failed!" +fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!" + +unfix.source.patch:START:"Unfixing upstream patch $1 +unfix.source.patch:OK:"successful." +unfix.source.patch:FAILED:"failed! +unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!" + +patch.unapply:START:"Reversing patch $1" +patch.unapply:OK:"successful." +patch.unapply:FAILED:"failed!" +patch.unapply:ALREADY_DONE:"Patch $1 not applied!" + +patch.apply:START:"Applying patch $1" +patch.apply:OK:"successful." +patch.apply:FAILED:"failed!" +patch.apply:ALREADY_DONE:"Patch $1 already applied!" + +source.patch:START:"Applying upstream patch $1" +source.patch:OK:"successful." +source.patch:FAILED:"failed!" +source.patch:ALREADY_DONE:"upstream patch $1 already applied!" + +source.unpack:START:"Extracting upstream tarball $1" +source.unpack:OK:"successful." +source.unpack:FAILED:"failed!" +source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!" diff --git a/debian/scripts/source.unpack b/debian/scripts/source.unpack new file mode 100644 index 0000000..2bcc6e5 --- /dev/null +++ b/debian/scripts/source.unpack @@ -0,0 +1,32 @@ +#!/bin/sh +make -C debian/scripts sh.vars +. debian/scripts/sh.vars +. debian/scripts/lib + +mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR +if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then + files=$(find $SRC_TAR_DIR -type f|sort) +else + VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1) + SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-) + files=../${SRC}_${VER}.orig.tar.gz +fi +for f in $files;do + stampfile=$STAMP_DIR/upstream/tarballs/`basename $f` + if [ ! -e $stampfile ];then + START $f + if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then + if [ x$SOURCE_DIR = x ];then + mkdir -p $STAMP_DIR/upstream/files/tarballs + cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list + fi + OK $f + touch $stampfile + else + FAILED $f + exit 1 + fi + else + ALREADY_DONE $f + fi +done diff --git a/debian/scripts/vars b/debian/scripts/vars new file mode 100644 index 0000000..19e3da4 --- /dev/null +++ b/debian/scripts/vars @@ -0,0 +1,32 @@ +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (bash) +# + +# Where to cd to to unpack all the tarballs. +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 +# Where to place all the stamp files. This directory can be removed, and +# all the targets will then be rerun. +STAMP_DIR=debian/stampdir +# When sys-build.mk is used to build the source, this is the target(s) to +# run. +BUILD_TARGET= +# When cleaning the source, during diff generation, if this is set, this +# target will be called in debian/rules. This allows for pkgs that have +# complicated cleaning rules. +CLEAN_TARGET_EXTERNAL=extra-clean +# Whether to die if the source cleaning fails. +CLEAN_IGNORE=yes +# The clean target to run. Defaults to clean. +CLEAN_TARGET=maintainer-clean +# Files to exclude from the diff. +DIFF_EXCLUDE="" +# Where the patches are located(duh!). +PATCH_DIR=debian/patches +EXTRA_PATCHES=upstream/extra-patches +SRC_PATCH_DIR="upstream/patches $EXTRA_PATCHES" +SRC_TAR_DIR=upstream/tarballs diff --git a/debian/scripts/vars.build b/debian/scripts/vars.build new file mode 100644 index 0000000..aae43c9 --- /dev/null +++ b/debian/scripts/vars.build @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +sed_cmd='' +cat $1 | while read REPLY; do + case "$REPLY" in + \#*|"") continue;; + *) + var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/') + eval $REPLY + if [ $2 = "make" ]; then + eval echo "$var=\$$var" + else + eval echo "$var=\\\"\$$var\\\"" + fi + ;; + esac +done diff --git a/debian/sys-build.mk b/debian/sys-build.mk new file mode 100644 index 0000000..761df99 --- /dev/null +++ b/debian/sys-build.mk @@ -0,0 +1,167 @@ +#!/usr/bin/make -f +# Separate tarball/patch build system by Adam Heath + +# The magic targets that you need to concern yourself with are: +# +# source.build: Unpacks upstream tarballs, optionally applies patches +# to fix the upstream patches, then applies upstream +# patches. +# source.make: Applies debian patches. +# source.clean: Cleans the build directory, then unfixes the upstream +# patches. +# source.compile: Will compile the source for you. Please check +# debian/scripts/vars. +# source.cmd: When calling this target, if you define a variable +# SOURCE_CMD, it will run that command in the build +# tree. +# make-diff: Generates debian.diff in the current directory which +# contains all edits that are currently in the build +# tree. +# +# Nothing in this file should require any editting. Please look at +# debian/scripts/vars for things to change for the local environment. +# +# debian/rules target command +# ---------------------------------------------------------------- +# clean: $(MAKE) -f debian/sys-build.mk source.clean +# build: $(MAKE) -f debian/sys-build.mk source.compile +# for simple systems. +# build: $(MAKE) -f debian/sys-build.mk source.make +# and, in the rules file, you can +# build the targets you want. +SHELL=/bin/bash +ifndef NOISY +.SILENT: +endif + +include debian/scripts/vars +# remove quotes +DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE))) + +ifdef TAR_DIR +BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR) +else +BUILD_TREE=$(SOURCE_DIR) +endif + +SOURCE_CMD=: + +ifdef CLEAN_IGNORE + CLEAN_CMD=- + CLEAN_SH= +else + CLEAN_CMD= + CLEAN_SH= +endif +ifndef CLEAN_TARGET + CLEAN_TARGET=clean +endif + +foo: + echo $(DIFF_EXCLUDE) + +make-diff: + mv $(BUILD_TREE) bak + $(MAKE) -f debian/sys-build.mk source.clean + $(MAKE) -f debian/sys-build.mk source.make + mv $(BUILD_TREE) $(BUILD_TREE).orig + mv bak $(BUILD_TREE) + +ifdef TAR_DIR +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET) +endif + -(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff +else +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done +endif + -(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff + if [ ! -s debian.diff ];then\ + rm debian.diff;\ + fi +endif + rm -rf $(BUILD_TREE).orig + +patchapply: $(STAMP_DIR)/patchapply +$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.apply + touch $@ + rm -f $(STAMP_DIR)/patchunapply + +patchunapply: $(STAMP_DIR)/patchunapply +$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.unapply + touch $@ + rm -f $(STAMP_DIR)/patchapply + +.export: SOURCE_TREE + +# +# The rules that really do the work all start with $(STAMPDIR) +# This little trick allows us to use stamp files to keep us from +# having to rerun long targets over and over. It also puts +# all stamp files in one place, for easy cleaning. +# +# If a stampdir rule depends on something else, be sure it is +# another stampdir rule. Depending on base rule won't work. +# + +source.build: $(STAMP_DIR)/source.build +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build +$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR) + touch $@ + +source.make: $(STAMP_DIR)/source.make +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make +$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR) + touch $@ + +source.unpack: $(STAMP_DIR)/source.unpack +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack +$(STAMP_DIR)/source.unpack: $(STAMP_DIR) + $(SHELL) debian/scripts/source.unpack + touch $@ + +source.patch: $(STAMP_DIR)/source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch +$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR) + $(SHELL) debian/scripts/lib source.patch + touch $@ + +fix.source.patch: $(STAMP_DIR)/fix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch +$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib fix.source.patch + touch $@ + +unfix.source.patch: $(STAMP_DIR)/unfix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch +$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib unfix.source.patch + touch $@ + +source.compile: $(STAMP_DIR)/source.compile +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile +$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR) + $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET) + touch $@ + +source.command: + (cd $(BUILD_TREE); $(SOURCE_CMD)) + +DIR_TARGETS+=$(STAMP_DIR) +$(STAMP_DIR_TARGETS): $(STAMP_DIR) + +$(DIR_TARGETS)/: + mkdir -p $@ + +source.clean: unfix.source.patch + $(SHELL) debian/scripts/lib source.clean + rm -f $(STAMP_DIR_TARGETS) + rm -rf $(STAMP_DIR) + $(MAKE) -C debian/scripts clean diff --git a/debian/update-autotools.sh b/debian/update-autotools.sh new file mode 100644 index 0000000..4f5fc40 --- /dev/null +++ b/debian/update-autotools.sh @@ -0,0 +1,24 @@ +#! /bin/sh + +set -e + +diff="${1-debian/patches/autotools-update}" +rm -f "$diff" + +dh_testdir +debclean +make -f debian/sys-build.mk source.patch +cd build-tree + +D=`echo *` +cp -al $D $D.orig + +cd $D +aclocal -I m4 +autoheader +(cd m4 && make -f Makefile.am.in ) +automake +autoconf +cd .. + +diff -ru $D.orig $D >"../$diff" diff --git a/extra/README.SMIME b/extra/README.SMIME new file mode 100644 index 0000000..6bd4aa2 --- /dev/null +++ b/extra/README.SMIME @@ -0,0 +1,56 @@ +This file describes how to configure mutt to use S/MIME. + +This file is almost the same as smime-notes.txt available in mutt upstream +sources, but it contains a few modifications about Debian-specific issues. + +Mutt needs some user interaction to get it ready for S/MIME. + +1. Make sure, that openssl (must be) and ca-certificates (recommended) + are installed. If not, ask your administrator to do it. + +2. Run 'smime_keys init'. + +3. If ca-certificates is installed, make a symlink: + ln -s /etc/ssl/certs ~/.smime/ca-bundle.crt + If not, there are some other packages which contain Root CA certificates, + for example: kdelibs-data, libcurl2. + This makes you trust anything that was ultimately signed by one of CA + included in symlinked crt file. + +4. Get yourself a certificate. (You can get one for free from www.thawte.com, + or pay for one from VeriSign or one of its competitors). The way the + process generally works: the certificate will be installed "into" your web + browser. If you are asked what application you wish to use the + certificate with, select Netscape. Strangely enough, "mutt" is usually not + an option. + +5. Assuming you are using Mozilla, follow the instructions at + www.verisignlabs.com/Projects/smime_docs/linux.html to export the + certificate into a file called cert.p12. If you don't use Mozilla, you're on + your own. + +6. Run 'smime_keys add_p12 cert.p12'. + * When the script asks for the "Import password", enter the one you + provided when you exported the certificate + * When it asks for a "PEM pass phrase", make up a new password. Every + time you sign or decrypt a message, mutt will ask for the PEM passphrase + * Finally, when the script asks for a label, enter an easy-to-remember + name for the certificate, such as "me". The script output will include + a line like: + added private key: /home/raldi/.smime/keys/12345678.0 for raldi@verisignlabs.com + The number (including the ".0" at the end) is your keyid. You will + need this number in the next step. + +7. Edit your .muttrc file and add a lines: + set smime_default_key=keyid + set smime_sign_as=keyid + Probably you also want to change default values for smime_timeout + and smime_encrypt_with originally set in global /etc/Muttrc + +8. Optionally, you can add following line to your ~/.mailcap to view certificate + from mutt: + application/x-pkcs7-signature;openssl pkcs7 -in %s -inform der -noout -print_certs -text | pager; needsterminal + +Last updated: Tue, 23 Dec 2003 22:35:40 +0100 +Artur R. Czechowski + diff --git a/extra/colors.angdraug b/extra/colors.angdraug new file mode 100644 index 0000000..b2fc683 --- /dev/null +++ b/extra/colors.angdraug @@ -0,0 +1,91 @@ +# This color scheme aims to highlight as much useful information as +# possible without spoiling user's visual experience by irritating +# contrasts. Optimized for dark or transparent background. +# --Dmitry Borodaenko + +# override defaults, make transparency work +color normal white default +color attachment green default # +color hdrdefault cyan default +color indicator black cyan +color markers brightred default +color quoted green default +color signature brightblue default # +color status brightgreen blue +color tilde brightblue default # +color tree red default + +# paint different quote levels +color quoted green default +color quoted1 cyan default +color quoted2 yellow default +color quoted3 red default + +color body brightred default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # email +color body brightblue default "(http|ftp)://[\-\.\,/+=&%~_:?\#a-zA-Z0-9]+" # URL +color body brightgreen default "(^| |[-.[:alnum:]]+:+)~?\(/[-_.'[:alnum:]]+\)+/?" # Unix file path +color body brightgreen default "(^| +)[[:alpha:]]:[-_.[:alnum:]\]+" # DOS file path +color body brightmagenta default "(^|[ '\"]+)\\$[[:alpha:]][-_[:alpha:]]+" # variable +color body brightred default "(^| )[*_]+[-&[:alnum:]]+[*_]( |$)" # bold/underline +color body yellow default "(^| )[;:8ö][-^o]?[)>(|/\\]+" # smiley +color body red default "[!?]{3,}" # exclamation +color body green default "^ *[-+*o] +" # list item + +# date formats +color body cyan default "[0-9]{1,2}:[0-9]{2}(:[0-9]{2})?( ?(AM|PM|am|pm))?( +[+-][0-9]{4})?" +color body cyan default "(\(19|20\)?[0-9]{2}/[01]?[0-9]/[0123]?[0-9]|[0123]?[0-9][/.][01]?[0-9][/.]\(19|20\)?[0-9]{2})(( at)? +[0-9]{1,2}:[0-9]{2}(:[0-9]{2})?( ?(AM|PM|am|pm))?( +[+-][0-9]{4})?)?" +color body cyan default "((Sun(day)?|Mon(day)?|Tue(sday)?|Wed(nesday)?|Thu(sday)?|Fri(day)?|Sat(urday)?),? +)?(Jan(uary)?|Feb(rary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sep(ember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?)[ .]+[0-9]{1,2}(st|nd|rd|th)?,?( +(19|20)[0-9]{2}(,?( at)? [0-9]{1,2}:[0-9]{2}(:[0-9]{2})?( ?(AM|PM|am|pm))?( +[+-][0-9]{4})?)?)?" +color body cyan default "((Sun(day)?|Mon(day)?|Tue(sday)?|Wed(nesday)?|Thu(sday)?|Fri(day)?|Sat(urday)?),? +)?[0-9]{1,2}(st|nd|rd|th)?[ .]+(Jan(uary)?|Feb(rary)?|Mar(ch)?|Apr(il)?|May|June?|July?|Aug(ust)?|Sep(ember)?|Oct(ober)?|Nov(ember)?|Dec(ember)?),?( +(19|20)?[0-9]{2})?(( at)? [0-9]{1,2}:[0-9]{2}(:[0-9]{2})?( ?(AM|PM|am|pm))?( +[+-][0-9]{4})?)?" + +color header brightgreen default ^From: +color header brightcyan default ^To: +color header brightcyan default ^Reply-To: +color header brightcyan default ^Cc: +color header brightblue default ^Subject: + +color header brightcyan default "^newsgroups: " +color header yellow default "^Delivered-To: " +color header green default "^sender: " +color header green default "^organi[sz]ation: " +color header green default "x-editor: " +color header green default "(x-mailer|user-agent): " +color header green default "X-Operating-System: " +color header green default "X-MimeOLE: " +color header green default "X-Accept-Language: " +color header red default "^message-id:" +color header red default "^in-reply-to: " +color header red default "^references: " +color header cyan default "^followup-to: " +color header cyan default "^mail-followup-to: " +color header cyan default "^reply-to: " +color header magenta default "MIME-Version: " +color header magenta default "Content-Type: " +color header magenta default "Content-Transfer-Encoding: " +color header magenta default "Content-Disposition: " +color header magenta default "Content-Encoding: " +color header magenta default "Content-Language: " + +color status brightwhite blue + +color index brightblue default '~P' # from me +color index cyan default '~p' # personal +color index brightcyan default '~G' # PGP +color index brightred default '~F' # flagged +color index green default '~Q' # replied +color index brightwhite default '~N' # new +color index red default '~D' # deleted + +# threads +#color index brightyellow default "~h 'References: +<.+>'" +#color index yellow default "~h 'References: +<.+> +<.+>'" +#color index brightred default "~h 'References: +<.+> +<.+> +<.+>'" +#color index red default "~h 'References: +<.+> +<.+> +<.+> +<.+>'" +#color index blue default "~h 'References: +<.+> +<.+> +<.+> +<.+> +<.+>'" +#color index green default "~h 'References: +<.+> +<.+> +<.+> +<.+> +<.+> +<.+>'" + +# spam +color index magenta default "\(Resent-\)?Message-Id: <>" +color index magenta default "\(Resent-\)?Message-Id: '<.* .*>'" +color index magenta default "\(Resent-\)?Message-Id: localhost" +color index magenta default "! \(Resent-\)?Message-Id: @" +color index magenta default '~C Undisclosed.*Recipients' diff --git a/extra/debian-ldap-query b/extra/debian-ldap-query new file mode 100644 index 0000000..c30c940 --- /dev/null +++ b/extra/debian-ldap-query @@ -0,0 +1,46 @@ +#!/usr/bin/perl -w +# by Ben Collins , butchered by Marco d'Itri +# to use, add to ~/.muttrc: +# set query_command="/usr/lib/mutt/debian-ldap-query %s" + +use strict; + +my @attrs = qw(sn cn ircnick uid); +my $base = 'ou=users, dc=debian, dc=org'; +my $server = 'db.debian.org'; +my $port = 389; + +die "Usage: $0 [...]\n" if not $ARGV[0]; + +eval 'require Net::LDAP;'; +if ($@) { + $@ =~ s/ in \@INC.*/./; + die "Could not load Net::LDAP: $@\n" . + "(Warning: this script depends on the libnet-ldap-perl (>=0.22-1) package.)\n" +} + +my $ldap = Net::LDAP->new($server, port => $port) or + die "Could not contact LDAP server $server:$port"; +$ldap->bind or die 'Could not bind'; + +my @results; + +foreach my $search (@ARGV) { + my $query = join '', map { "($_=*$search*)" } @attrs; + my $mesg = $ldap->search( + base => $base, filter => "(|$query)", attrs => [ @attrs ] + ) or die 'Failed search'; + foreach my $entry ($mesg->entries) { + my $uid = $entry->get_value('uid') || next; + my $fname = $entry->get_value('cn') || ''; + my $lname = $entry->get_value('sn') || ''; + my $nick = $entry->get_value('ircnick')|| ''; + push @results, "<$uid\@debian.org>\t$fname $lname\t($nick)\n"; + } +} + +$ldap->unbind; + +print 'Debian Developer query: found ', scalar @results, "\n", @results; +exit 1 if not @results; +exit 0; diff --git a/extra/mailspell b/extra/mailspell new file mode 100644 index 0000000..79e0e03 --- /dev/null +++ b/extra/mailspell @@ -0,0 +1,77 @@ +#!/usr/bin/perl +# +# Wrapper to call ispell on mail messages, ignoring quoted portions +# and signatures. +# By Brendan O'Dea , public domain. +# Usage: set ispell = /usr/lib/mutt/mailspell +# + +use IO::File; +use POSIX 'tmpnam'; +use File::Copy 'move'; + +$0 =~ s#.*/##; + +my $ISPELL = 'ispell'; +my $DIFF = 'diff'; +my $ED = 'ed'; + +# make sure that we don't inherit SIGCHLD +$SIG{CHLD} = 'DEFAULT'; + +# ignore -x ispell option +shift if $ARGV[0] eq '-x'; +die "Usage: $0 [-x] FILE\n" unless @ARGV == 1; + +my $msg = $ARGV[0]; + +# create temporary files +my (%orig, %ed); + +END { + unlink $ed{path} if $ed{path}; + unlink $orig{path} if $orig{path}; +} + +foreach (\%orig, \%ed) { + $_->{path} = tmpnam; + $_->{fd} = IO::File->new($_->{path}, O_RDWR|O_CREAT|O_EXCL, 0600) + or die "$0: can't create $_->{path} ($!)"; +} + +while (<>) { + # stop at sigdashes + last if /^-- \n/; + + # drop quoted text and attribution + $orig{fd}->print($_) unless /^>/ or /^On \w{3}, \w{3} \d{2}, \d{4} at \d/; +} + +$orig{fd}->close; + +my $pid = fork; +die "$0: can't fork ($!)\n" unless defined $pid; +unless ($pid) { + open STDOUT, '>&=' . $ed{fd}->fileno + or die "$0: can't dup stdout to ed script ($!)\n"; + $ed{fd}->close; + exec $DIFF, '-e', $orig{path}, $msg; + die "$0: can't exec $DIFF ($!)\n"; +} + +die "$0: can't reap child ($!)\n" unless wait == $pid; +system $ISPELL, '-x', $orig{path} + and die "$0: problem with $ISPELL ($?)\n"; + +$ed{fd}->seek(0, SEEK_END); +$ed{fd}->print("w\nq\n"); +$ed{fd}->seek(0, SEEK_SET); + +open STDIN, '<&=' . $ed{fd}->fileno + or die "$0: can't dup stdin from ed script ($!)\n"; + +system $ED, '-s', $orig{path} and die "$0: problem with $ED ($?)\n"; +move $orig{path}, $msg or die "$0: can't replace $msg ($!)\n"; +delete $orig{path}; + +1; diff --git a/extra/mutt.xpm b/extra/mutt.xpm new file mode 100644 index 0000000..ff7bd9d --- /dev/null +++ b/extra/mutt.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char * mutt_xpm[] = { +"32 32 14 1", +" c None", +". c #CCCCCC", +"+ c #000000", +"@ c #7F7F7F", +"# c #B2B2B2", +"$ c #666667", +"% c #FF0000", +"& c #7F0000", +"* c #999999", +"= c #333333", +"- c #FF00FF", +"; c #FFFFFF", +"> c #7F007F", +", c #7F7F00", +" ", +" == ", +" ++ ", +" +..@@ ", +" +.,.+ ", +" + +.,.+ +++ ", +" + @+.,.+ +@@ ", +" @+ +....+++.@ ", +" +.@ @+.......+ ", +" +.+ +@....+.+ ", +" +.+ @+.....+.+ ", +" +.+@ +@........++++ ", +" +.@+ @+.........+;;> ", +" +..+++++++%@$#.......+.-- ", +" @@.@+&%&+@%%@@.......+>-> ", +" +..@+++@.@%%@$@......+++ ", +" +.........@%%+@$$....+ ", +" @@$.........@%%++@$..$+ ", +" +@@..........*%%++@@$+ ", +" +@@...........@%%++++ ", +" +@$............@+ ", +" +@@...#.......@+ ", +" @+@.#$+@@@...$++ ", +" +..$+@*@+..$+@+ ", +" @@.@++++++$.+@*+ ", +" @+..+*@@+=+@.+@.+ ", +" +@..+++@+++@..++@@+@ ", +" +@.....+@@+@.....+@.@ ", +" +$.....+@*+$.....+@.+ ", +" +@@.$..+@@+@@.$..+@.+ ", +" @++++++@++@++++++@++@ ", +" "}; diff --git a/extra/ray.muttrc b/extra/ray.muttrc new file mode 100644 index 0000000..e05c22e --- /dev/null +++ b/extra/ray.muttrc @@ -0,0 +1,48 @@ +# This configuration file contains the default settings used by old debian +# packages (< 0.94). + +set quote_regexp="^[ \t]*[a-zA-Z\.]*>" # Default: "^([ \t]*[>|#:}])+" + +# +# More header weeding +# +ignore Resent- Precedence In-Reply-To Return-Receipt-To Mailer X400 +ignore Originator X-Loop X-Mailing-List X-Listprocessor X-Face +ignore X-Received X-Mailer X-Envelope-To X-Sender X-Attribution +# Usenet headers can occur for Cc-ed messages; they can still be +# recognized by the Newsgroups header. +ignore Path Lines NNTP-Posting-Host X-Newsreader X-Submitted-Via + +# +# Key bindings +# + +bind editor delete-char + +# Color / video attribute definitions. Not too flashy. +# + +color hdrdefault green black +color header brightyellow black "^from:" +mono header bold "^from:" +color header brightyellow black "^subject:" +mono header bold "^subject:" +color quoted green black +color signature brightred black +color indicator brightyellow red +color error brightred black +mono error bold +color status brightwhite blue +color tree brightmagenta black +color tilde brightmagenta black +# URL highlighting with the same regexp as urlview. +color body brightyellow black (((ht|f)tps?)|mailto):(//)?[^\ "\t]*|www\.[-a-z0-9.]+)[^\ .,;\t>">] +mono body bold (((ht|f)tps?)|mailto):(//)?[^\ "\t]*|www\.[-a-z0-9.]+)[^\ .,;\t>">] +color body brightmagenta black "[-a-z_0-9.]+@[-a-z_0-9.]+" +mono body bold "[-a-z_0-9.]+@[-a-z_0-9.]+" +color body brightyellow black "^Good signature" +mono body bold "^Good signature" +color body brightwhite red "^Bad signature from.*" +mono body bold "^Bad signature from.*" + + diff --git a/extra/smime-paths.rc b/extra/smime-paths.rc new file mode 100644 index 0000000..f60f58c --- /dev/null +++ b/extra/smime-paths.rc @@ -0,0 +1,20 @@ + +# S/MIME configuration +set smime_ca_location="~/.smime/ca-bundle.crt" +set smime_certificates="~/.smime/certificates" +set smime_keys="~/.smime/keys" +set smime_pk7out_command="openssl smime -verify -in %f -noverify -pk7out" +set smime_get_cert_command="openssl pkcs7 -print_certs -in %f" +set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signer %c -out /dev/null" +set smime_get_cert_email_command="openssl x509 -in %f -noout -email" +set smime_import_cert_command="smime_keys add_cert %f" +set smime_encrypt_command="openssl smime -encrypt -%a -outform DER -in %f %c" +set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -certfile %i -outform DER" +# This alternative command does not include the full certificates chain. +# Be sure to understand RFC 2315 section 9.1 before using it. +# set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER" +set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c" +set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f" +set smime_verify_opaque_command="openssl smime -verify -inform DER -in %s %C" + +set mixmaster="mixmaster-filter" diff --git a/extra/source-Muttrc.d.rc b/extra/source-Muttrc.d.rc new file mode 100644 index 0000000..cd8fa37 --- /dev/null +++ b/extra/source-Muttrc.d.rc @@ -0,0 +1,3 @@ + +# See /usr/share/doc/mutt/README.Debian for details. +source /usr/lib/mutt/source-muttrc.d| diff --git a/extra/source-muttrc.d b/extra/source-muttrc.d new file mode 100644 index 0000000..ee177b9 --- /dev/null +++ b/extra/source-muttrc.d @@ -0,0 +1,7 @@ +#!/bin/sh -e + +for rc in /etc/Muttrc.d/*.rc; do + test -r "$rc" && echo "source \"$rc\"" +done + +# vi: ft=sh diff --git a/upstream/extra-patches/assumed-charset b/upstream/extra-patches/assumed-charset new file mode 100644 index 0000000..78b30ef --- /dev/null +++ b/upstream/extra-patches/assumed-charset @@ -0,0 +1,515 @@ +# vi: ft=diff +This is the assumed_charset patch by Takashi TAKIZAWA . + +The home page for this patch is: + + http://www.emaillab.org/mutt/download15.html.en + +* Patch last synced with upstream: + - Date: 2004-07-22 + - File: http://www.emaillab.org/mutt/1.5/patch-1.5.6.tt.assumed_charset.1.gz + +* Changes made: NONE. + +* Notes: + - the adjust_line and adjust_edited_file patches found in the above + page were formerly applied to the debian package too, but as of + 1.5.8 they are merged upstream. + +== END PATCH +diff -uNr mutt-1.5.6.orig/charset.c mutt-1.5.6/charset.c +--- mutt-1.5.6.orig/charset.c Tue Jan 21 21:25:21 2003 ++++ mutt-1.5.6/charset.c Sun Feb 15 15:13:26 2004 +@@ -581,3 +581,86 @@ + iconv_close (fc->cd); + FREE (_fc); + } ++ ++char *mutt_get_first_charset (const char *charset) ++{ ++ static char fcharset[SHORT_STRING]; ++ const char *c, *c1; ++ ++ c = charset; ++ if (!mutt_strlen(c)) ++ return "us-ascii"; ++ if (!(c1 = strchr (c, ':'))) ++ return charset; ++ strfcpy (fcharset, c, c1 - c + 1); ++ return fcharset; ++} ++ ++static size_t convert_string (ICONV_CONST char *f, size_t flen, ++ const char *from, const char *to, ++ char **t, size_t *tlen) ++{ ++ iconv_t cd; ++ char *buf, *ob; ++ size_t obl, n; ++ int e; ++ ++ cd = mutt_iconv_open (to, from, 0); ++ if (cd == (iconv_t)(-1)) ++ return (size_t)(-1); ++ obl = 4 * flen + 1; ++ ob = buf = safe_malloc (obl); ++ n = iconv (cd, &f, &flen, &ob, &obl); ++ if (n == (size_t)(-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t)(-1)) ++ { ++ e = errno; ++ FREE (&buf); ++ iconv_close (cd); ++ errno = e; ++ return (size_t)(-1); ++ } ++ *ob = '\0'; ++ ++ *tlen = ob - buf; ++ ++ safe_realloc ((void **) &buf, ob - buf + 1); ++ *t = buf; ++ iconv_close (cd); ++ ++ return n; ++} ++ ++int mutt_convert_nonmime_string (char **ps) ++{ ++ const char *c, *c1; ++ ++ for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) ++ { ++ char *u = *ps; ++ char *s; ++ char *fromcode; ++ size_t m, n; ++ size_t ulen = mutt_strlen (*ps); ++ size_t slen; ++ ++ if (!u || !*u) ++ return 0; ++ ++ c1 = strchr (c, ':'); ++ n = c1 ? c1 - c : mutt_strlen (c); ++ if (!n) ++ continue; ++ fromcode = safe_malloc (n + 1); ++ strfcpy (fromcode, c, n + 1); ++ m = convert_string (u, ulen, fromcode, Charset, &s, &slen); ++ FREE (&fromcode); ++ if (m != (size_t)(-1)) ++ { ++ FREE (ps); ++ *ps = s; ++ return 0; ++ } ++ } ++ return -1; ++} ++ +diff -uNr mutt-1.5.6.orig/charset.h mutt-1.5.6/charset.h +--- mutt-1.5.6.orig/charset.h Tue Mar 4 16:49:43 2003 ++++ mutt-1.5.6/charset.h Sun Feb 15 15:06:19 2004 +@@ -35,6 +35,8 @@ + #endif + + int mutt_convert_string (char **, const char *, const char *, int); ++char *mutt_get_first_charset (const char *); ++int mutt_convert_nonmime_string (char **); + + iconv_t mutt_iconv_open (const char *, const char *, int); + size_t mutt_iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *, ICONV_CONST char **, const char *); +diff -uNr mutt-1.5.6.orig/globals.h mutt-1.5.6/globals.h +--- mutt-1.5.6.orig/globals.h Mon Feb 2 02:15:17 2004 ++++ mutt-1.5.6/globals.h Sun Feb 15 15:06:19 2004 +@@ -32,6 +32,7 @@ + + WHERE char *AliasFile; + WHERE char *AliasFmt; ++WHERE char *AssumedCharset; + WHERE char *AttachSep; + WHERE char *Attribution; + WHERE char *AttachFormat; +@@ -45,6 +46,7 @@ + WHERE char *DsnReturn; + WHERE char *Editor; + WHERE char *EscChar; ++WHERE char *FileCharset; + WHERE char *FolderFormat; + WHERE char *ForwFmt; + WHERE char *Fqdn; +diff -uNr mutt-1.5.6.orig/handler.c mutt-1.5.6/handler.c +--- mutt-1.5.6.orig/handler.c Wed Nov 5 18:41:31 2003 ++++ mutt-1.5.6/handler.c Sun Feb 15 15:06:19 2004 +@@ -1718,11 +1718,21 @@ + int istext = mutt_is_text_part (b); + iconv_t cd = (iconv_t)(-1); + +- if (istext && s->flags & M_CHARCONV) ++ if (istext) + { +- char *charset = mutt_get_parameter ("charset", b->parameter); +- if (charset && Charset) +- cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); ++ if(s->flags & M_CHARCONV) ++ { ++ char *charset = mutt_get_parameter ("charset", b->parameter); ++ if (!option (OPTSTRICTMIME) && !charset) ++ charset = mutt_get_first_charset (AssumedCharset); ++ if (charset && Charset) ++ cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); ++ } ++ else ++ { ++ if (b->file_charset) ++ cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM); ++ } + } + + fseek (s->fpin, b->offset, 0); +diff -uNr mutt-1.5.6.orig/init.h mutt-1.5.6/init.h +--- mutt-1.5.6.orig/init.h Mon Feb 2 02:15:17 2004 ++++ mutt-1.5.6/init.h Sun Feb 15 15:07:40 2004 +@@ -184,6 +184,23 @@ + ** If set, Mutt will prompt you for carbon-copy (Cc) recipients before + ** editing the body of an outgoing message. + */ ++ { "assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL "us-ascii"}, ++ /* ++ ** .pp ++ ** This variable is a colon-separated list of character encoding ++ ** schemes for messages without character encoding indication. ++ ** Header field values and message body content without character encoding ++ ** indication would be assumed that they are written in one of this list. ++ ** By default, all the header fields and message body without any charset ++ ** indication are assumed to be in "us-ascii". ++ ** .pp ++ ** For example, Japanese users might prefer this: ++ ** .pp ++ ** set assumed_charset="iso-2022-jp:euc-jp:shift_jis:utf-8" ++ ** .pp ++ ** However, only the first content is valid for the message body. ++ ** This variable is valid only if $$strict_mime is unset. ++ */ + { "attach_format", DT_STR, R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] " }, + /* + ** .pp +@@ -532,6 +549,20 @@ + ** signed. + ** (PGP only) + */ ++ { "file_charset", DT_STR, R_NONE, UL &FileCharset, UL 0 }, ++ /* ++ ** .pp ++ ** This variable is a colon-separated list of character encoding ++ ** schemes for text file attatchments. ++ ** If unset, $$charset value will be used instead. ++ ** For example, the following configuration would work for Japanese ++ ** text handling: ++ ** .pp ++ ** set file_charset="iso-2022-jp:euc-jp:shift_jis:utf-8" ++ ** .pp ++ ** Note: "iso-2022-*" must be put at the head of the value as shown above ++ ** if included. ++ */ + { "folder", DT_PATH, R_NONE, UL &Maildir, UL "~/Mail" }, + /* + ** .pp +@@ -2476,6 +2507,19 @@ + ** Setting this variable causes the ``status bar'' to be displayed on + ** the first line of the screen rather than near the bottom. + */ ++ { "strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1 }, ++ /* ++ ** .pp ++ ** When unset, non MIME-compliant messages that doesn't have any ++ ** charset indication in ``Content-Type'' field can be displayed ++ ** (non MIME-compliant messages are often generated by old mailers ++ ** or buggy mailers like MS Outlook Express). ++ ** See also $$assumed_charset. ++ ** .pp ++ ** This option also replaces linear-white-space between encoded-word ++ ** and *text to a single space to prevent the display of MIME-encoded ++ ** ``Subject'' field from being devided into multiple lines. ++ */ + { "strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0 }, + /* + ** .pp +diff -uNr mutt-1.5.6.orig/mutt.h mutt-1.5.6/mutt.h +--- mutt-1.5.6.orig/mutt.h Mon Feb 2 02:15:17 2004 ++++ mutt-1.5.6/mutt.h Sun Feb 15 15:06:19 2004 +@@ -406,6 +406,7 @@ + OPTSIGONTOP, + OPTSORTRE, + OPTSTATUSONTOP, ++ OPTSTRICTMIME, + OPTSTRICTTHREADS, + OPTSUSPEND, + OPTTEXTFLOWED, +@@ -599,6 +600,7 @@ + * If NULL, filename is used + * instead. + */ ++ char *file_charset; /* charset of attached file */ + CONTENT *content; /* structure used to store detailed info about + * the content of the attachment. this is used + * to determine what content-transfer-encoding +diff -uNr mutt-1.5.6.orig/parse.c mutt-1.5.6/parse.c +--- mutt-1.5.6.orig/parse.c Wed Nov 5 18:41:33 2003 ++++ mutt-1.5.6/parse.c Sun Feb 15 15:06:19 2004 +@@ -208,9 +208,23 @@ + + if (*s == '"') + { ++ int state_ascii = 1; + s++; +- for (i=0; *s && *s != '"' && i < sizeof (buffer) - 1; i++, s++) ++ for (i=0; *s && i < sizeof (buffer) - 1; i++, s++) + { ++ if (!option (OPTSTRICTMIME)) { ++ /* As iso-2022-* has a characer of '"' with non-ascii state, ++ * ignore it. */ ++ if (*s == 0x1b && i < sizeof (buffer) - 2) ++ { ++ if (s[1] == '(' && (s[2] == 'B' || s[2] == 'J')) ++ state_ascii = 1; ++ else ++ state_ascii = 0; ++ } ++ } ++ if (state_ascii && *s == '"') ++ break; + if (*s == '\\') + { + /* Quote the next character */ +@@ -379,7 +393,9 @@ + if (ct->type == TYPETEXT) + { + if (!(pc = mutt_get_parameter ("charset", ct->parameter))) +- mutt_set_parameter ("charset", "us-ascii", &ct->parameter); ++ mutt_set_parameter ("charset", option (OPTSTRICTMIME) ? "us-ascii" : ++ (const char *) mutt_get_first_charset (AssumedCharset), ++ &ct->parameter); + } + + } +diff -uNr mutt-1.5.6.orig/rfc2047.c mutt-1.5.6/rfc2047.c +--- mutt-1.5.6.orig/rfc2047.c Wed Nov 5 18:41:33 2003 ++++ mutt-1.5.6/rfc2047.c Sun Feb 15 15:13:58 2004 +@@ -706,13 +706,54 @@ + return 0; + } + ++/* return length of linear white space */ ++static size_t lwslen (const char *s, size_t n) ++{ ++ const char *p = s; ++ size_t len = n; ++ ++ if (n <= 0) ++ return 0; ++ ++ for (; p < s + n; p++) ++ if (!strchr (" \t\r\n", *p)) ++ { ++ len = (size_t)(p - s); ++ break; ++ } ++ if (strchr ("\r\n", *(p-1))) /* LWS doesn't end with CRLF */ ++ len = (size_t)0; ++ return len; ++} ++ ++/* return length of linear white space : reverse */ ++static size_t lwsrlen (const char *s, size_t n) ++{ ++ const char *p = s + n - 1; ++ size_t len = n; ++ ++ if (n <= 0) ++ return 0; ++ ++ if (strchr ("\r\n", *p)) /* LWS doesn't end with CRLF */ ++ return (size_t)0; ++ ++ for (; p >= s; p--) ++ if (!strchr (" \t\r\n", *p)) ++ { ++ len = (size_t)(s + n - 1 - p); ++ break; ++ } ++ return len; ++} ++ + /* try to decode anything that looks like a valid RFC2047 encoded + * header field, ignoring RFC822 parsing rules + */ + void rfc2047_decode (char **pd) + { + const char *p, *q; +- size_t n; ++ size_t m, n; + int found_encoded = 0; + char *d0, *d; + const char *s = *pd; +@@ -729,6 +770,37 @@ + if (!(p = find_encoded_word (s, &q))) + { + /* no encoded words */ ++ if (!option (OPTSTRICTMIME)) ++ { ++ n = mutt_strlen (s); ++ if (found_encoded && (m = lwslen (s, n)) != 0) ++ { ++ if (m != n) ++ *d = ' ', d++, dlen--; ++ n -= m, s += m; ++ } ++ if (ascii_strcasecmp (AssumedCharset, "us-ascii")) ++ { ++ char *t; ++ size_t tlen; ++ ++ t = safe_malloc (n + 1); ++ strfcpy (t, s, n + 1); ++ if (mutt_convert_nonmime_string (&t) == 0) ++ { ++ tlen = mutt_strlen (t); ++ strncpy (d, t, tlen); ++ d += tlen; ++ } ++ else ++ { ++ strncpy (d, s, n); ++ d += n; ++ } ++ FREE (&t); ++ break; ++ } ++ } + strncpy (d, s, dlen); + d += dlen; + break; +@@ -737,15 +809,37 @@ + if (p != s) + { + n = (size_t) (p - s); +- /* ignore spaces between encoded words */ +- if (!found_encoded || strspn (s, " \t\r\n") != n) ++ /* ignore spaces between encoded words ++ * and linear white spaces between encoded word and *text */ ++ if (!option (OPTSTRICTMIME)) + { +- if (n > dlen) +- n = dlen; +- memcpy (d, s, n); +- d += n; +- dlen -= n; ++ if (found_encoded && (m = lwslen (s, n)) != 0) ++ { ++ if (m != n) ++ *d = ' ', d++, dlen--; ++ n -= m, s += m; ++ } ++ ++ if ((m = n - lwsrlen (s, n)) != 0) ++ { ++ if (m > dlen) ++ m = dlen; ++ memcpy (d, s, m); ++ d += m; ++ dlen -= m; ++ if (m != n) ++ *d = ' ', d++, dlen--; ++ } + } ++ else if (!found_encoded || strspn (s, " \t\r\n") != n) ++ { ++ if (n > dlen) ++ n = dlen; ++ memcpy (d, s, n); ++ d += n; ++ dlen -= n; ++ } ++ + } + + rfc2047_decode_word (d, p, dlen); +@@ -766,7 +860,7 @@ + { + while (a) + { +- if (a->personal && strstr (a->personal, "=?") != NULL) ++ if (a->personal) + rfc2047_decode (&a->personal); + #ifdef EXACT_ADDRESS + if (a->val && strstr (a->val, "=?") != NULL) +diff -uNr mutt-1.5.6.orig/rfc2231.c mutt-1.5.6/rfc2231.c +--- mutt-1.5.6.orig/rfc2231.c Wed Nov 5 18:41:33 2003 ++++ mutt-1.5.6/rfc2231.c Sun Feb 15 15:06:19 2004 +@@ -113,6 +113,11 @@ + + if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?")) + rfc2047_decode (&p->value); ++ else if (!option (OPTSTRICTMIME)) ++ { ++ if (ascii_strcasecmp (AssumedCharset, "us-ascii")) ++ mutt_convert_nonmime_string (&p->value); ++ } + + *last = p; + last = &p->next; +diff -uNr mutt-1.5.6.orig/sendlib.c mutt-1.5.6/sendlib.c +--- mutt-1.5.6.orig/sendlib.c Wed Nov 5 18:41:33 2003 ++++ mutt-1.5.6/sendlib.c Sun Feb 15 15:11:33 2004 +@@ -496,7 +496,7 @@ + } + + if (a->type == TYPETEXT && (!a->noconv)) +- fc = fgetconv_open (fpin, Charset, ++ fc = fgetconv_open (fpin, a->file_charset, + mutt_get_body_charset (send_charset, sizeof (send_charset), a), + 0); + else +@@ -896,6 +896,7 @@ + CONTENT *info; + CONTENT_STATE state; + FILE *fp = NULL; ++ char *fromcode; + char *tocode; + char buffer[100]; + char chsbuf[STRING]; +@@ -930,15 +931,18 @@ + if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) + { + char *chs = mutt_get_parameter ("charset", b->parameter); ++ char *fchs = b->use_disp ? ((FileCharset && *FileCharset) ? ++ FileCharset : Charset) : Charset; + if (Charset && (chs || SendCharset) && +- convert_file_from_to (fp, Charset, chs ? chs : SendCharset, +- 0, &tocode, info) != (size_t)(-1)) ++ convert_file_from_to (fp, fchs, chs ? chs : SendCharset, ++ &fromcode, &tocode, info) != (size_t)(-1)) + { + if (!chs) + { + mutt_canonical_charset (chsbuf, sizeof (chsbuf), tocode); + mutt_set_parameter ("charset", chsbuf, &b->parameter); + } ++ b->file_charset = fromcode; + FREE (&tocode); + safe_fclose (&fp); + return info; +@@ -1318,6 +1322,7 @@ + body->unlink = 1; + body->use_disp = 0; + body->disposition = DISPINLINE; ++ body->noconv = 1; + + mutt_parse_mime_message (ctx, hdr); + +diff -uNr mutt-1.5.6.orig/PATCHES mutt-1.5.6/PATCHES +--- mutt-1.5.6.orig/PATCHES Mon Feb 2 02:42:47 2004 ++++ mutt-1.5.6/PATCHES Sun Feb 15 15:14:55 2004 +@@ -0,0 +1 @@ ++patch-1.5.6.tt.assumed_charset.1 diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders new file mode 100644 index 0000000..f12621e --- /dev/null +++ b/upstream/extra-patches/compressed-folders @@ -0,0 +1,1213 @@ +# vi: ft=diff +This is the compressed folders patch by Roland Rosenfeld +. + +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 + +* Changes made: + - filterdiff -p1 \ + $(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 +@@ -0,0 +1,487 @@ ++/* ++ * Copyright (C) 1997 Alain Penders ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#if HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#include "mutt.h" ++ ++#ifdef USE_COMPRESSED ++ ++#include "mx.h" ++#include "mailbox.h" ++#include "mutt_curses.h" ++ ++#include ++#include ++#include ++#include ++ ++typedef struct ++{ ++ const char *close; /* close-hook command */ ++ const char *open; /* open-hook command */ ++ const char *append; /* append-hook command */ ++ off_t size; /* size of real folder */ ++} COMPRESS_INFO; ++ ++ ++/* ++ * ctx - context to lock ++ * excl - exclusive lock? ++ * retry - should retry if unable to lock? ++ */ ++int mbox_lock_compressed (CONTEXT *ctx, FILE *fp, int excl, int retry) ++{ ++ int r; ++ ++ if ((r = mx_lock_file (ctx->realpath, fileno (fp), excl, 1, retry)) == 0) ++ ctx->locked = 1; ++ else if (retry && !excl) ++ { ++ ctx->readonly = 1; ++ return 0; ++ } ++ ++ return (r); ++} ++ ++void mbox_unlock_compressed (CONTEXT *ctx, FILE *fp) ++{ ++ if (ctx->locked) ++ { ++ fflush (fp); ++ ++ mx_unlock_file (ctx->realpath, fileno (fp), 1); ++ ctx->locked = 0; ++ } ++} ++ ++static int is_new (const char *path) ++{ ++ return (access (path, W_OK) != 0 && errno == ENOENT) ? 1 : 0; ++} ++ ++static const char* find_compress_hook (int type, const char *path) ++{ ++ const char* c = mutt_find_hook (type, path); ++ return (!c || !*c) ? NULL : c; ++} ++ ++int mutt_can_read_compressed (const char *path) ++{ ++ return find_compress_hook (M_OPENHOOK, path) ? 1 : 0; ++} ++ ++/* ++ * if the file is new, we really do not append, but create, and so use ++ * close-hook, and not append-hook ++ */ ++static const char* get_append_command (const char *path, const CONTEXT* ctx) ++{ ++ COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; ++ return (is_new (path)) ? ci->close : ci->append; ++} ++ ++int mutt_can_append_compressed (const char *path) ++{ ++ int magic; ++ ++ if (is_new (path)) ++ return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); ++ ++ magic = mx_get_magic (path); ++ ++ if (magic != 0 && magic != M_COMPRESSED) ++ return 0; ++ ++ return (find_compress_hook (M_APPENDHOOK, path) ++ || (find_compress_hook (M_OPENHOOK, path) ++ && find_compress_hook (M_CLOSEHOOK, path))) ? 1 : 0; ++} ++ ++/* open a compressed mailbox */ ++static COMPRESS_INFO *set_compress_info (CONTEXT *ctx) ++{ ++ COMPRESS_INFO *ci; ++ ++ /* Now lets uncompress this thing */ ++ ci = safe_malloc (sizeof (COMPRESS_INFO)); ++ ctx->compressinfo = (void*) ci; ++ ci->append = find_compress_hook (M_APPENDHOOK, ctx->path); ++ ci->open = find_compress_hook (M_OPENHOOK, ctx->path); ++ ci->close = find_compress_hook (M_CLOSEHOOK, ctx->path); ++ return ci; ++} ++ ++static void set_path (CONTEXT* ctx) ++{ ++ char tmppath[_POSIX_PATH_MAX]; ++ ++ /* Setup the right paths */ ++ ctx->realpath = ctx->path; ++ ++ /* Uncompress to /tmp */ ++ mutt_mktemp (tmppath); ++ ctx->path = safe_malloc (strlen (tmppath) + 1); ++ strcpy (ctx->path, tmppath); ++} ++ ++static int get_size (const char* path) ++{ ++ struct stat sb; ++ if (stat (path, &sb) != 0) ++ return 0; ++ return (sb.st_size); ++} ++ ++static void store_size (CONTEXT* ctx) ++{ ++ COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; ++ ci->size = get_size (ctx->realpath); ++} ++ ++static const char * ++compresshook_format_str (char *dest, size_t destlen, char op, const char *src, ++ const char *fmt, const char *ifstring, ++ const char *elsestring, unsigned long data, ++ format_flag flags) ++{ ++ char tmp[SHORT_STRING]; ++ ++ CONTEXT *ctx = (CONTEXT *) data; ++ switch (op) ++ { ++ case 'f': ++ snprintf (tmp, sizeof (tmp), "%%%ss", fmt); ++ snprintf (dest, destlen, tmp, ctx->realpath); ++ break; ++ case 't': ++ snprintf (tmp, sizeof (tmp), "%%%ss", fmt); ++ snprintf (dest, destlen, tmp, ctx->path); ++ break; ++ } ++ return (src); ++} ++ ++/* ++ * check that the command has both %f and %t ++ * 0 means OK, -1 means error ++ */ ++int mutt_test_compress_command (const char* cmd) ++{ ++ return (strstr (cmd, "%f") && strstr (cmd, "%t")) ? 0 : -1; ++} ++ ++static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx) ++{ ++ char expanded[_POSIX_PATH_MAX]; ++ mutt_FormatString (expanded, sizeof (expanded), cmd, compresshook_format_str, ++ (unsigned long) ctx, 0); ++ return safe_strdup (expanded); ++} ++ ++int mutt_check_mailbox_compressed (CONTEXT* ctx) ++{ ++ COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; ++ if (ci->size != get_size (ctx->realpath)) ++ { ++ FREE (&ctx->compressinfo); ++ FREE (&ctx->realpath); ++ mutt_error _("Mailbox was corrupted!"); ++ return (-1); ++ } ++ return (0); ++} ++ ++int mutt_open_read_compressed (CONTEXT *ctx) ++{ ++ char *cmd; ++ FILE *fp; ++ int rc; ++ ++ COMPRESS_INFO *ci = set_compress_info (ctx); ++ if (!ci->open) { ++ ctx->magic = 0; ++ FREE (ctx->compressinfo); ++ return (-1); ++ } ++ if (!ci->close || access (ctx->path, W_OK) != 0) ++ ctx->readonly = 1; ++ ++ set_path (ctx); ++ store_size (ctx); ++ ++ if (!ctx->quiet) ++ mutt_message (_("Decompressing %s..."), ctx->realpath); ++ ++ cmd = get_compression_cmd (ci->open, ctx); ++ if (cmd == NULL) ++ return (-1); ++ dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd)); ++ ++ if ((fp = fopen (ctx->realpath, "r")) == NULL) ++ { ++ mutt_perror (ctx->realpath); ++ FREE (&cmd); ++ return (-1); ++ } ++ mutt_block_signals (); ++ if (mbox_lock_compressed (ctx, fp, 0, 1) == -1) ++ { ++ fclose (fp); ++ mutt_unblock_signals (); ++ mutt_error _("Unable to lock mailbox!"); ++ FREE (&cmd); ++ return (-1); ++ } ++ ++ endwin (); ++ fflush (stdout); ++ fprintf (stderr, _("Decompressing %s...\n"),ctx->realpath); ++ rc = mutt_system (cmd); ++ mbox_unlock_compressed (ctx, fp); ++ mutt_unblock_signals (); ++ fclose (fp); ++ ++ if (rc) ++ { ++ mutt_any_key_to_continue (NULL); ++ ctx->magic = 0; ++ FREE (ctx->compressinfo); ++ mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd); ++ } ++ FREE (&cmd); ++ if (rc) ++ return (-1); ++ ++ if (mutt_check_mailbox_compressed (ctx)) ++ return (-1); ++ ++ ctx->magic = mx_get_magic (ctx->path); ++ ++ return (0); ++} ++ ++void restore_path (CONTEXT* ctx) ++{ ++ FREE (&ctx->path); ++ ctx->path = ctx->realpath; ++} ++ ++/* remove the temporary mailbox */ ++void remove_file (CONTEXT* ctx) ++{ ++ if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) ++ remove (ctx->path); ++} ++ ++int mutt_open_append_compressed (CONTEXT *ctx) ++{ ++ FILE *fh; ++ COMPRESS_INFO *ci = set_compress_info (ctx); ++ ++ if (!get_append_command (ctx->path, ctx)) ++ { ++ if (ci->open && ci->close) ++ return (mutt_open_read_compressed (ctx)); ++ ++ ctx->magic = 0; ++ FREE (&ctx->compressinfo); ++ return (-1); ++ } ++ ++ set_path (ctx); ++ ++ ctx->magic = DefaultMagic; ++ ++ if (!is_new (ctx->realpath)) ++ if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) ++ if ((fh = fopen (ctx->path, "w"))) ++ fclose (fh); ++ /* No error checking - the parent function will catch it */ ++ ++ return (0); ++} ++ ++/* close a compressed mailbox */ ++void mutt_fast_close_compressed (CONTEXT *ctx) ++{ ++ dprint (2, (debugfile, "mutt_fast_close_compressed called on '%s'\n", ++ ctx->path)); ++ ++ if (ctx->compressinfo) ++ { ++ if (ctx->fp) ++ fclose (ctx->fp); ++ ctx->fp = NULL; ++ /* if the folder was removed, remove the gzipped folder too */ ++ if ((ctx->magic > 0) ++ && (access (ctx->path, F_OK) != 0) ++ && ! option (OPTSAVEEMPTY)) ++ remove (ctx->realpath); ++ else ++ remove_file (ctx); ++ ++ restore_path (ctx); ++ FREE (&ctx->compressinfo); ++ } ++} ++ ++/* return 0 on success, -1 on failure */ ++int mutt_sync_compressed (CONTEXT* ctx) ++{ ++ char *cmd; ++ int rc = 0; ++ FILE *fp; ++ COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; ++ ++ if (!ctx->quiet) ++ mutt_message (_("Compressing %s..."), ctx->realpath); ++ ++ cmd = get_compression_cmd (ci->close, ctx); ++ if (cmd == NULL) ++ return (-1); ++ ++ if ((fp = fopen (ctx->realpath, "a")) == NULL) ++ { ++ mutt_perror (ctx->realpath); ++ FREE (&cmd); ++ return (-1); ++ } ++ mutt_block_signals (); ++ if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) ++ { ++ fclose (fp); ++ mutt_unblock_signals (); ++ mutt_error _("Unable to lock mailbox!"); ++ store_size (ctx); ++ FREE (&cmd); ++ return (-1); ++ } ++ ++ dprint (2, (debugfile, "CompressCommand: '%s'\n", cmd)); ++ ++ endwin (); ++ fflush (stdout); ++ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ if (mutt_system (cmd)) ++ { ++ mutt_any_key_to_continue (NULL); ++ mutt_error (_("%s: Error compressing mailbox! Original mailbox deleted, uncompressed one kept!\n"), ctx->path); ++ rc = -1; ++ } ++ ++ mbox_unlock_compressed (ctx, fp); ++ mutt_unblock_signals (); ++ fclose (fp); ++ ++ FREE (&cmd); ++ ++ store_size (ctx); ++ ++ return (rc); ++} ++ ++int mutt_slow_close_compressed (CONTEXT *ctx) ++{ ++ FILE *fp; ++ const char *append; ++ char *cmd; ++ COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; ++ ++ dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", ++ ctx->path)); ++ ++ if (! (ctx->append ++ && ((append = get_append_command (ctx->realpath, ctx)) ++ || (append = ci->close)))) ++ { ++ /* if we can not or should not append, we only have to remove the */ ++ /* compressed info, because sync was already called */ ++ mutt_fast_close_compressed (ctx); ++ return (0); ++ } ++ ++ if (ctx->fp) ++ fclose (ctx->fp); ++ ctx->fp = NULL; ++ ++ if (!ctx->quiet) ++ { ++ if (append == ci->close) ++ mutt_message (_("Compressing %s..."), ctx->realpath); ++ else ++ mutt_message (_("Compressed-appending to %s..."), ctx->realpath); ++ } ++ ++ cmd = get_compression_cmd (append, ctx); ++ if (cmd == NULL) ++ return (-1); ++ ++ if ((fp = fopen (ctx->realpath, "a")) == NULL) ++ { ++ mutt_perror (ctx->realpath); ++ FREE (&cmd); ++ return (-1); ++ } ++ mutt_block_signals (); ++ if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) ++ { ++ fclose (fp); ++ mutt_unblock_signals (); ++ mutt_error _("Unable to lock mailbox!"); ++ FREE (&cmd); ++ return (-1); ++ } ++ ++ dprint (2, (debugfile, "CompressCmd: '%s'\n", cmd)); ++ ++ endwin (); ++ fflush (stdout); ++ ++ if (append == ci->close) ++ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ else ++ fprintf (stderr, _("Compressed-appending to %s...\n"), ctx->realpath); ++ ++ if (mutt_system (cmd)) ++ { ++ mutt_any_key_to_continue (NULL); ++ mutt_error (_(" %s: Error compressing mailbox! Uncompressed one kept!\n"), ++ ctx->path); ++ FREE (&cmd); ++ mbox_unlock_compressed (ctx, fp); ++ mutt_unblock_signals (); ++ fclose (fp); ++ return (-1); ++ } ++ ++ mbox_unlock_compressed (ctx, fp); ++ mutt_unblock_signals (); ++ fclose (fp); ++ remove_file (ctx); ++ restore_path (ctx); ++ FREE (&cmd); ++ FREE (&ctx->compressinfo); ++ ++ return (0); ++} ++ ++#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 +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 1997 Alain Penders ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++int mutt_can_read_compressed (const char *); ++int mutt_can_append_compressed (const char *); ++int mutt_open_read_compressed (CONTEXT *); ++int mutt_open_append_compressed (CONTEXT *); ++int mutt_slow_close_compressed (CONTEXT *); ++int mutt_sync_compressed (CONTEXT *); ++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 @@ + AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) + fi]) + ++AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]), ++ [if test x$enableval = xyes; then ++ AC_DEFINE(USE_COMPRESSED,1, [ Define to support compressed folders. ]) ++ fi]) ++ + 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 +@@ -1076,6 +1076,11 @@ + { + int check; + ++#ifdef USE_COMPRESSED ++ if (Context->compressinfo && Context->realpath) ++ mutt_str_replace (&LastFolder, Context->realpath); ++ else ++#endif + 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 @@ + macro pager \cb |urlview\n + + ++Compressed folders Support (OPTIONAL) ++

++ ++If Mutt was compiled with compressed folders support (by running the ++, ++ and ) which define commands to uncompress and compress ++a folder and to append messages to an existing compressed folder ++respectively. ++ ++For example: ++ ++ ++open-hook \\.gz$ "gzip -cd %f > %t" ++close-hook \\.gz$ "gzip -c %t > %f" ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++You do not have to specify all of the commands. If you omit , the folder will be open and ++closed again each time you will add to it. If you omit (or give empty command) , the ++folder will be open in the mode. If you specify though you'll be able to append ++to the folder. ++ ++Note that Mutt will only try to use hooks if the file is not in one of ++the accepted formats. In particular, if the file is empty, mutt ++supposes it is not compressed. This is important because it allows the ++use of programs that do not have well defined extensions. Just use ++&dquot;.&dquot; as a regexp. But this may be surprising if your ++compressing script produces empty files. In this situation, unset , so that the compressed file ++will be removed if you delete all of the messages. ++ ++Open a compressed mailbox for reading

++Usage: ++open-hook \\.gz$ "gzip -cd %f > %t" ++ ++ ++If the Write a compressed mailbox

++Usage: command after some changes were made to it. ++ ++The command. Temporary folder ++in this case is the folder previously produced by the command. ++ ++The ++close-hook \\.gz$ "gzip -c %t > %f" ++ ++ ++If the is not called when you exit ++from the folder if the folder was not changed. ++ ++Append a message to a compressed mailbox

++Usage: command. ++The temporary folder in this case contains the messages that are being ++appended. ++ ++The ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++When is used, the folder is ++not opened, which saves time, but this means that we can not find out ++what the folder type is. Thus the default () type is always supposed (i.e. ++this is the format used for the temporary folder). ++ ++If the file does not exist when you save to it, is called, and not . is only ++for appending to existing folders. ++ ++If the and respectively) each time you will add to it. ++ ++Encrypted folders ++

++The compressed folders support can also be used to handle encrypted ++folders. If you want to encrypt a folder with PGP, you may want to use ++the following hooks: ++ ++ ++open-hook \\.pgp$ "pgp -f < %f > %t" ++close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" ++ ++ ++Please note, that PGP does not support appending to an encrypted ++folder, so there is no append-hook defined. ++ ++If you are using GnuPG instead of PGP, you may use the following hooks ++instead: ++ ++ ++open-hook \\.gpg$ "gpg --decrypt < %f > %t" ++close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId < %t > %f" ++ ++ ++Mutt's MIME Support +

+ Quite a bit of effort has been made to make Mutt the premier text-mode +@@ -3116,6 +3286,8 @@ + + ++ + + + ++ + + + ++ + + + #include + #include +@@ -92,6 +96,16 @@ + memset (&pattern, 0, sizeof (pattern)); + pattern.data = safe_strdup (path); + } ++#ifdef USE_COMPRESSED ++ else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) ++ { ++ if (mutt_test_compress_command (command.data)) ++ { ++ strfcpy (err->data, _("bad formatted command string"), err->dsize); ++ return (-1); ++ } ++ } ++#endif + else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) + && (!WithCrypto || !(data & M_CRYPTHOOK)) + ) +diff -urN mutt-1.5.8/init.h mutt-1.5.8-ro/init.h +--- mutt-1.5.8/init.h 2005-02-12 21:01:10.000000000 +0100 ++++ mutt-1.5.8-ro/init.h 2005-02-13 18:54:39.000000000 +0100 +@@ -2926,6 +2926,11 @@ + { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, + { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, + { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, ++#ifdef USE_COMPRESSED ++ { "open-hook", mutt_parse_hook, M_OPENHOOK }, ++ { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, ++ { "append-hook", mutt_parse_hook, M_APPENDHOOK }, ++#endif + { "hdr_order", parse_list, UL &HeaderOrderList }, + #ifdef HAVE_ICONV + { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, +diff -urN mutt-1.5.8/main.c mutt-1.5.8-ro/main.c +--- mutt-1.5.8/main.c 2005-02-12 20:41:32.000000000 +0100 ++++ mutt-1.5.8-ro/main.c 2005-02-13 18:54:40.000000000 +0100 +@@ -376,6 +376,12 @@ + #else + "-LOCALES_HACK " + #endif ++ ++#ifdef USE_COMPRESSED ++ "+COMPRESSED " ++#else ++ "-COMPRESSED " ++#endif + + #ifdef HAVE_WC_FUNCS + "+HAVE_WC_FUNCS " +diff -urN mutt-1.5.8/Makefile.am mutt-1.5.8-ro/Makefile.am +--- mutt-1.5.8/Makefile.am 2005-02-12 21:54:39.000000000 +0100 ++++ mutt-1.5.8-ro/Makefile.am 2005-02-13 18:54:40.000000000 +0100 +@@ -18,7 +18,7 @@ + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + mutt_SOURCES = $(BUILT_SOURCES) \ + addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ + 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 \ +@@ -67,7 +67,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 \ +- configure account.h \ ++ configure account.h compress.h \ + 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 \ +diff -urN mutt-1.5.8/Makefile.in mutt-1.5.8-ro/Makefile.in +diff -urN mutt-1.5.8/mbox.c mutt-1.5.8-ro/mbox.c +--- mutt-1.5.8/mbox.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.8-ro/mbox.c 2005-02-13 18:54:40.000000000 +0100 +@@ -28,6 +28,10 @@ + #include "sort.h" + #include "copy.h" + ++#ifdef USE_COMPRESSED ++#include "compress.h" ++#endif ++ + #include + #include + #include +@@ -1020,6 +1024,12 @@ + int mbox_close_mailbox (CONTEXT *ctx) + { + mx_unlock_file (ctx->path, fileno (ctx->fp), 1); ++ ++#ifdef USE_COMPRESSED ++ if (ctx->compressinfo) ++ mutt_slow_close_compressed (ctx); ++#endif ++ + mutt_unblock_signals (); + mx_fastclose_mailbox (ctx); + return 0; +diff -urN mutt-1.5.8/mutt.h mutt-1.5.8-ro/mutt.h +--- mutt-1.5.8/mutt.h 2005-02-12 21:01:20.000000000 +0100 ++++ mutt-1.5.8-ro/mutt.h 2005-02-13 18:54:40.000000000 +0100 +@@ -159,6 +159,11 @@ + #define M_ACCOUNTHOOK (1<<9) + #define M_REPLYHOOK (1<<10) + #define M_SEND2HOOK (1<<11) ++#ifdef USE_COMPRESSED ++#define M_OPENHOOK (1<<12) ++#define M_APPENDHOOK (1<<13) ++#define M_CLOSEHOOK (1<<14) ++#endif + + /* tree characters for linearize_tree and print_enriched_string */ + #define M_TREE_LLCORNER 1 +@@ -823,6 +828,11 @@ + void *data; /* driver specific data */ + #endif /* USE_IMAP */ + ++#ifdef USE_COMPRESSED ++ void *compressinfo; /* compressed mbox module private data */ ++ char *realpath; /* path to compressed mailbox */ ++#endif /* USE_COMPRESSED */ ++ + short magic; /* mailbox type */ + + unsigned int locked : 1; /* is the mailbox locked? */ +diff -urN mutt-1.5.8/Muttrc mutt-1.5.8-ro/Muttrc +diff -urN mutt-1.5.8/Muttrc.head mutt-1.5.8-ro/Muttrc.head +--- mutt-1.5.8/Muttrc.head 2005-02-12 21:57:45.000000000 +0100 ++++ mutt-1.5.8-ro/Muttrc.head 2005-02-13 18:54:40.000000000 +0100 +@@ -19,6 +19,11 @@ + macro index "!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 +@@ -30,6 +30,10 @@ + #include "keymap.h" + #include "url.h" + ++#ifdef USE_COMPRESSED ++#include "compress.h" ++#endif ++ + #ifdef USE_IMAP + #include "imap.h" + #endif +@@ -454,6 +458,10 @@ + return (-1); + } + ++#ifdef USE_COMPRESSED ++ if (magic == 0 && mutt_can_read_compressed (path)) ++ return M_COMPRESSED; ++#endif + return (magic); + } + +@@ -493,6 +501,13 @@ + { + struct stat sb; + ++#ifdef USE_COMPRESSED ++ /* special case for appending to compressed folders - ++ * even if we can not open them for reading */ ++ if (mutt_can_append_compressed (ctx->path)) ++ mutt_open_append_compressed (ctx); ++#endif ++ + ctx->append = 1; + + #ifdef USE_IMAP +@@ -653,7 +668,12 @@ + } + + ctx->magic = mx_get_magic (path); +- ++ ++#ifdef USE_COMPRESSED ++ if (ctx->magic == M_COMPRESSED) ++ mutt_open_read_compressed (ctx); ++#endif ++ + if(ctx->magic == 0) + mutt_error (_("%s is not a mailbox."), path); + +@@ -759,6 +779,10 @@ + mutt_free_header (&ctx->hdrs[i]); + FREE (&ctx->hdrs); + FREE (&ctx->v2r); ++#ifdef USE_COMPRESSED ++ if (ctx->compressinfo) ++ mutt_fast_close_compressed (ctx); ++#endif + FREE (&ctx->path); + FREE (&ctx->pattern); + if (ctx->limit_pattern) +@@ -816,6 +840,12 @@ + if (tmp && tmp->new == 0) + mutt_update_mailbox (tmp); + #endif ++ ++#ifdef USE_COMPRESSED ++ if (rc == 0 && ctx->compressinfo) ++ return mutt_sync_compressed (ctx); ++#endif ++ + return rc; + } + +@@ -1021,6 +1051,11 @@ + !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) + mx_unlink_empty (ctx->path); + ++#ifdef USE_COMPRESSED ++ if (ctx->compressinfo && mutt_slow_close_compressed (ctx)) ++ return (-1); ++#endif ++ + mx_fastclose_mailbox (ctx); + + return 0; +@@ -1325,6 +1360,11 @@ + { + int rc; + ++#ifdef USE_COMPRESSED ++ if (ctx->compressinfo) ++ return mutt_check_mailbox_compressed (ctx); ++#endif ++ + 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 +@@ -40,6 +40,9 @@ + #ifdef USE_POP + , M_POP + #endif ++#ifdef USE_COMPRESSED ++ , M_COMPRESSED ++#endif + }; + + 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 +@@ -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 @@ + msgid "PGP already selected. Clear & continue ? " + msgstr "PGP bereits ausgewählt. Löschen und weiter?" + ++#: compress.c:203 mbox.c:661 ++msgid "Mailbox was corrupted!" ++msgstr "Mailbox wurde zerstört!" ++ ++#: compress.c:228 compress.c:253 ++#, c-format ++msgid "Decompressing %s...\n" ++msgstr "Entpacke %s...\n" ++ ++#: compress.c:246 compress.c:367 compress.c:443 mbox.c:706 ++msgid "Unable to lock mailbox!" ++msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" ++ ++#: compress.c:264 ++#, c-format ++msgid "Error executing: %s : unable to open the mailbox!\n" ++msgstr "Fehler beim Ausführen von %s : Kann die Mailbox nicht öffnen!\n" ++ ++#: compress.c:350 compress.c:377 compress.c:423 compress.c:454 ++#, c-format ++msgid "Compressing %s...\n" ++msgstr "Komprimiere %s...\n" ++ ++#: compress.c:381 ++#, c-format ++msgid "" ++"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one " ++"kept!\n" ++msgstr "" ++"%s: Fehler beim Komprimieren der Mailbox! Ursprüngliche Mailbox gelöscht, " ++"entpackte gespeichert!\n" ++ ++#: compress.c:425 compress.c:456 ++#, c-format ++msgid "Compressed-appending to %s...\n" ++msgstr "Hänge komprimiert an %s... an\n" ++ ++#: compress.c:461 ++#, c-format ++msgid " %s: Error compressing mailbox! Uncompressed one kept!\n" ++msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n" ++ + #: crypt.c:69 + #, c-format + msgid " (current time: %c)" +@@ -1300,6 +1342,10 @@ + msgid "Help for %s" + msgstr "Hilfe für %s" + ++#: hook.c:96 ++msgid "bad formatted command string" ++msgstr "Hook enthält nicht die Muster %f und %t" ++ + #: hook.c:246 + #, c-format + msgid "unhook: Can't do unhook * from within a hook." +@@ -2713,18 +2759,10 @@ + msgid "Mailbox is corrupt!" + msgstr "Mailbox fehlerhaft!" + +-#: mbox.c:662 +-msgid "Mailbox was corrupted!" +-msgstr "Mailbox wurde zerstört!" +- + #: mbox.c:699 mbox.c:953 + msgid "Fatal error! Could not reopen mailbox!" + msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" + +-#: mbox.c:708 +-msgid "Unable to lock mailbox!" +-msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" +- + #. 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 +@@ -8,6 +8,7 @@ + color.c + commands.c + compose.c ++compress.c + 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 +@@ -97,6 +97,14 @@ + + case 'f': + snprintf (fmt, sizeof(fmt), "%%%ss", prefix); ++#ifdef USE_COMPRESSED ++ if (Context && Context->compressinfo && Context->realpath) ++ { ++ strfcpy (tmp, Context->realpath, sizeof (tmp)); ++ mutt_pretty_mailbox (tmp); ++ } ++ else ++#endif + if (Context && Context->path) + { + strfcpy (tmp, Context->path, sizeof (tmp)); diff --git a/upstream/extra-patches/compressed-folders.debian b/upstream/extra-patches/compressed-folders.debian new file mode 100644 index 0000000..617c991 --- /dev/null +++ b/upstream/extra-patches/compressed-folders.debian @@ -0,0 +1,7 @@ +--- a/debian-config.h ++++ b/debian-config.h +@@ -0,0 +1,4 @@ ++#ifndef USE_COMPRESSED ++#error "You forgot to update debian/patches/autotools-update." ++#error "Run sh debian/update-autotools.sh" ++#endif diff --git a/upstream/extra-patches/compressed-folders.ranty-fix b/upstream/extra-patches/compressed-folders.ranty-fix new file mode 100644 index 0000000..854ede1 --- /dev/null +++ b/upstream/extra-patches/compressed-folders.ranty-fix @@ -0,0 +1,41 @@ +# vi: ft=diff +This patch by Manuel Estrada Sainz is an improvement +to the compressed folder patch. + +It was received at Debian's BTS, Bug#210429. + +* Patch last synced with upstream: + - Date: unknown (mutt_1.5.6-20040523+1) + - File: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=210429&msg=11 + +* Changes made: NONE. + +== END PATCH +--- mutt.orig/compress.c 2003-09-11 19:26:34.000000000 +0200 ++++ mutt/compress.c 2003-09-11 19:58:05.000000000 +0200 +@@ -98,11 +98,23 @@ + int mutt_can_append_compressed (const char *path) + { + int magic; + + if (is_new (path)) +- return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); ++ { ++ char *dir_path = safe_strdup(path); ++ char *aux = strrchr(dir_path, '/'); ++ int dir_valid = 1; ++ if (aux) ++ { ++ *aux='\0'; ++ if (access(dir_path, W_OK|X_OK)) ++ dir_valid = 0; ++ } ++ safe_free((void**)&dir_path); ++ return dir_valid && (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); ++ } + + magic = mx_get_magic (path); + + if (magic != 0 && magic != M_COMPRESSED) + return 0; + diff --git a/upstream/extra-patches/current-shortcut b/upstream/extra-patches/current-shortcut new file mode 100644 index 0000000..83b0b57 --- /dev/null +++ b/upstream/extra-patches/current-shortcut @@ -0,0 +1,82 @@ +# vi: ft=diff +This is the current shortcut patch patch by Byrial Ole Jensen +, updated by Christoph Berg . + +The home page for this patch is: + + http://home.worldonline.dk/byrial/mutt/patches/ (original version) + http://www.df7cb.de/projects/mutt/current_shortcut/ (.2 and above) + +* Patch last synced with upstream: + - Date: 2004-10-02 + - File: http://www.df7cb.de/projects/mutt/current_shortcut/current-shortcut.2 + +* Changes made: NONE. + +== END PATCH +diff -urp ../MUTT/mutt/PATCHES mutt/PATCHES +--- ../MUTT/mutt/PATCHES 2002-12-09 18:44:54.000000000 +0100 ++++ mutt/PATCHES 2004-10-02 16:30:07.000000000 +0200 +@@ -0,0 +1 @@ ++patch-1.5.6.cb.current_shortcut.2 +diff -urp ../MUTT/mutt/curs_main.c mutt/curs_main.c +--- ../MUTT/mutt/curs_main.c 2004-04-12 23:51:07.000000000 +0200 ++++ mutt/curs_main.c 2004-10-02 16:12:33.000000000 +0200 +@@ -1064,6 +1064,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); + mutt_error (_("%s is not a mailbox."), buf); + break; + } ++ mutt_str_replace (&CurrentFolder, buf); + + if (Context) + { +diff -urp ../MUTT/mutt/doc/manual.sgml.head mutt/doc/manual.sgml.head +--- ../MUTT/mutt/doc/manual.sgml.head 2004-07-21 13:33:04.000000000 +0200 ++++ mutt/doc/manual.sgml.head 2004-10-02 16:29:24.000000000 +0200 +@@ -2216,6 +2216,7 @@ path. + ! -- refers to your (incoming) mailbox + > -- refers to your file + < -- refers to your file ++^ -- refers to the current mailbox + - or !! -- refers to the file you've last visited + ˜ -- refers to your home directory + = or + -- refers to your directory +diff -urp ../MUTT/mutt/globals.h mutt/globals.h +--- ../MUTT/mutt/globals.h 2004-09-04 13:31:21.000000000 +0200 ++++ mutt/globals.h 2004-10-02 16:03:23.000000000 +0200 +@@ -117,6 +117,7 @@ WHERE char *Tochars; + WHERE char *Username; + WHERE char *Visual; + ++WHERE char *CurrentFolder; + WHERE char *LastFolder; + + WHERE LIST *AutoViewList INITVAL(0); +diff -urp ../MUTT/mutt/main.c mutt/main.c +--- ../MUTT/mutt/main.c 2004-06-18 17:24:22.000000000 +0200 ++++ mutt/main.c 2004-10-02 16:12:33.000000000 +0200 +@@ -887,6 +887,7 @@ int main (int argc, char **argv) + strfcpy (folder, NONULL(Spoolfile), sizeof (folder)); + mutt_expand_path (folder, sizeof (folder)); + ++ mutt_str_replace (&CurrentFolder, folder); + mutt_str_replace (&LastFolder, folder); + + if (flags & M_IGNORE) +diff -urp ../MUTT/mutt/muttlib.c mutt/muttlib.c +--- ../MUTT/mutt/muttlib.c 2004-09-04 13:31:22.000000000 +0200 ++++ mutt/muttlib.c 2004-10-02 16:16:12.000000000 +0200 +@@ -452,6 +452,13 @@ char *_mutt_expand_path (char *s, size_t + } + break; + ++ case '^': ++ { ++ strfcpy (p, NONULL(CurrentFolder), sizeof (p)); ++ tail = s + 1; ++ } ++ break; ++ + default: + { + *p = '\0'; diff --git a/upstream/extra-patches/edit-threads b/upstream/extra-patches/edit-threads new file mode 100644 index 0000000..ca39078 --- /dev/null +++ b/upstream/extra-patches/edit-threads @@ -0,0 +1,596 @@ +# vi: ft=diff +This is the edit threads patch by Cedric Duval . + +The home page for this patch is: + + http://cedricduval.free.fr/mutt/patches/#threads + +* Patch last synced with upstream: + - Date: 2004-08-10 + - File: http://cedricduval.free.fr/mutt/patches/download/patch-1.5.5.1.cd.edit_threads.9.5 + +* Changes made: + - modified mutt.h part to apply cleanly. + - removed diffs for the following files: acconfig.h, configure, + configure.in, config.h.in. + +== END PATCH +diff -pruN mutt-1.5.5.1-orig/OPS mutt-1.5.5.1/OPS +--- mutt-1.5.5.1-orig/OPS Wed Nov 5 10:41:31 2003 ++++ mutt-1.5.5.1/OPS Tue Nov 11 02:52:33 2003 +@@ -96,6 +96,7 @@ OP_LAST_ENTRY "move to the last entry" + OP_LIST_REPLY "reply to specified mailing list" + OP_MACRO "execute a macro" + OP_MAIL "compose a new mail message" ++OP_MAIN_BREAK_THREAD "break the thread in two" + OP_MAIN_CHANGE_FOLDER "open a different folder" + OP_MAIN_CHANGE_FOLDER_READONLY "open a different folder in read only mode" + OP_MAIN_CLEAR_FLAG "clear a status flag from a message" +@@ -105,6 +106,7 @@ OP_MAIN_FETCH_MAIL "retrieve mail from P + OP_MAIN_FIRST_MESSAGE "move to the first message" + OP_MAIN_LAST_MESSAGE "move to the last message" + OP_MAIN_LIMIT "show only messages matching a pattern" ++OP_MAIN_LINK_THREADS "link tagged message to the current one" + OP_MAIN_NEXT_NEW "jump to the next new message" + OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message" + OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread" +diff -pruN mutt-1.5.5.1-orig/copy.c mutt-1.5.5.1/copy.c +--- mutt-1.5.5.1-orig/copy.c Wed Nov 5 10:41:31 2003 ++++ mutt-1.5.5.1/copy.c Tue Nov 11 02:52:33 2003 +@@ -95,6 +95,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long + (ascii_strncasecmp ("Content-Length:", buf, 15) == 0 || + ascii_strncasecmp ("Lines:", buf, 6) == 0)) + continue; ++ if ((flags & CH_UPDATE_REFS) && ++ ascii_strncasecmp ("References:", buf, 11) == 0) ++ continue; ++ if ((flags & CH_UPDATE_IRT) && ++ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0) ++ continue; + ignore = 0; + } + +@@ -193,6 +199,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long + ascii_strncasecmp ("type:", buf + 8, 5) == 0)) || + ascii_strncasecmp ("mime-version:", buf, 13) == 0)) + continue; ++ if ((flags & CH_UPDATE_REFS) && ++ ascii_strncasecmp ("References:", buf, 11) == 0) ++ continue; ++ if ((flags & CH_UPDATE_IRT) && ++ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0) ++ continue; + + /* Find x -- the array entry where this header is to be saved */ + if (flags & CH_REORDER) +@@ -326,6 +338,8 @@ mutt_copy_hdr (FILE *in, FILE *out, long + CH_XMIT ignore Lines: and Content-Length: + CH_WEED do header weeding + CH_NOQFROM ignore ">From " line ++ CH_UPDATE_IRT update the In-Reply-To: header ++ CH_UPDATE_REFS update the References: header + + prefix + string to use if CH_PREFIX is set +@@ -335,6 +349,9 @@ int + mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix) + { + char buffer[SHORT_STRING]; ++ ++ flags |= (h->irt_changed ? CH_UPDATE_IRT : 0) ++ | (h->refs_changed ? CH_UPDATE_REFS : 0); + + if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1) + return (-1); +@@ -358,7 +375,56 @@ mutt_copy_header (FILE *in, HEADER *h, F + if (flags & CH_UPDATE) + { + if ((flags & CH_NOSTATUS) == 0) ++#ifdef IMAP_EDIT_THREADS ++#define NEW_ENV new_env ++#else ++#define NEW_ENV env ++#endif + { ++ if (h->irt_changed && h->NEW_ENV->in_reply_to) ++ { ++ LIST *listp = h->NEW_ENV->in_reply_to; ++ ++ if (fputs ("In-Reply-To: ", out) == EOF) ++ return (-1); ++ ++ for (; listp; listp = listp->next) ++ if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF)) ++ return (-1); ++ ++ if (fputc ('\n', out) == EOF) ++ return (-1); ++ } ++ ++ if (h->refs_changed && h->NEW_ENV->references) ++ { ++ LIST *listp = h->NEW_ENV->references, *refs = NULL, *t; ++ ++ if (fputs ("References: ", out) == EOF) ++ return (-1); ++ ++ /* Mutt stores references in reverse order, thus we create ++ * a reordered refs list that we can put in the headers */ ++ for (; listp; listp = listp->next, refs = t) ++ { ++ t = (LIST *)safe_malloc (sizeof (LIST)); ++ t->data = listp->data; ++ t->next = refs; ++ } ++ ++ for (; refs; refs = refs->next) ++ if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF)) ++ return (-1); ++ ++ /* clearing refs from memory */ ++ for (t = refs; refs; refs = t->next, t = refs) ++ safe_free ((void **)&refs); ++ ++ if (fputc ('\n', out) == EOF) ++ return (-1); ++ } ++#undef NEW_ENV ++ + if (h->old || h->read) + { + if (fputs ("Status: ", out) == EOF) +diff -pruN mutt-1.5.5.1-orig/curs_main.c mutt-1.5.5.1/curs_main.c +--- mutt-1.5.5.1-orig/curs_main.c Wed Nov 5 10:41:31 2003 ++++ mutt-1.5.5.1/curs_main.c Tue Nov 11 02:52:33 2003 +@@ -930,6 +930,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); + else + { + mutt_set_flag (Context, CURHDR, M_TAG, !CURHDR->tagged); ++ ++ Context->last_tag = CURHDR->tagged ? CURHDR : ++ ((Context->last_tag == CURHDR && !CURHDR->tagged) ++ ? NULL : Context->last_tag); ++ + menu->redraw = REDRAW_STATUS; + if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) + { +@@ -1162,6 +1167,89 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); + } + done = 1; + } ++ break; ++ ++ case OP_MAIN_BREAK_THREAD: ++ ++ CHECK_MSGCOUNT; ++ CHECK_VISIBLE; ++ CHECK_READONLY; ++ ++ if ((Sort & SORT_MASK) != SORT_THREADS) ++ mutt_error _("Threading is not enabled."); ++ ++#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS) ++ else if (Context->magic == M_IMAP) ++ mutt_error _("Compile Mutt with --enable-imap-edit-threads for break-thread support"); ++#endif ++ ++ else ++ { ++ { ++ HEADER *oldcur = CURHDR; ++ ++ mutt_break_thread (CURHDR); ++ mutt_sort_headers (Context, 1); ++ menu->current = oldcur->virtual; ++ } ++ ++ Context->changed = 1; ++ mutt_message _("Thread broken"); ++ ++ if (menu->menu == MENU_PAGER) ++ { ++ op = OP_DISPLAY_MESSAGE; ++ continue; ++ } ++ else ++ menu->redraw |= REDRAW_INDEX; ++ } ++ ++ break; ++ ++ case OP_MAIN_LINK_THREADS: ++ ++ CHECK_MSGCOUNT; ++ CHECK_VISIBLE; ++ CHECK_READONLY; ++ ++ if ((Sort & SORT_MASK) != SORT_THREADS) ++ mutt_error _("Threading is not enabled."); ++ ++#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS) ++ else if (Context->magic == M_IMAP) ++ mutt_error _("Compile Mutt with --enable-imap-edit-threads for link-threads support"); ++#endif ++ ++ else if (!CURHDR->env->message_id) ++ mutt_error _("No Message-ID: header available to link thread"); ++ else if (!tag && (!Context->last_tag || !Context->last_tag->tagged)) ++ mutt_error _("First, please tag a message to be linked here"); ++ else ++ { ++ HEADER *oldcur = CURHDR; ++ ++ if (mutt_link_threads (CURHDR, tag ? NULL : Context->last_tag, ++ Context)) ++ { ++ mutt_sort_headers (Context, 1); ++ menu->current = oldcur->virtual; ++ ++ Context->changed = 1; ++ mutt_message _("Threads linked"); ++ } ++ else ++ mutt_error _("No thread linked"); ++ } ++ ++ if (menu->menu == MENU_PAGER) ++ { ++ op = OP_DISPLAY_MESSAGE; ++ continue; ++ } ++ else ++ menu->redraw |= REDRAW_STATUS | REDRAW_INDEX; ++ + break; + + case OP_EDIT_TYPE: +diff -pruN mutt-1.5.5.1-orig/doc/manual.sgml.head mutt-1.5.5.1/doc/manual.sgml.head +--- mutt-1.5.5.1-orig/doc/manual.sgml.head Wed Nov 5 10:41:34 2003 ++++ mutt-1.5.5.1/doc/manual.sgml.head Tue Nov 11 02:52:33 2003 +@@ -2170,8 +2170,43 @@ used a threaded news client, this is the + with large volume mailing lists easier because you can easily delete + uninteresting threads and quickly find topics of value. + ++Editing threads ++

++Mutt has the ability to dynamically restructure threads that are broken ++either by misconfigured software or bad behaviour from some ++correspondents. This allows to clean your mailboxes formats) from these ++annoyances which make it hard to follow a discussion. ++ ++If you want to use these functions with IMAP, you need to compile Mutt ++with the Linking threads ++

++ ++Some mailers tend to "forget" to correctly set the "In-Reply-To:" and ++"References:" headers when replying to a message. This results in broken ++discussions because Mutt has not enough information to guess the correct ++threading. ++You can fix this by tagging the reply, then moving to the parent message ++and using the ``link-threads'' function (bound to & by default). The ++reply will then be connected to this "parent" message. ++ ++You can also connect multiple childs at once, tagging them and using the ++tag-prefix command (';') or the auto_tag option. ++ ++Breaking threads ++

++ ++On mailing lists, some people are in the bad habit of starting a new ++discussion by hitting "reply" to any message from the list and changing ++the subject to a totally unrelated one. ++You can fix such threads by using the ``break-thread'' function (bound ++by default to #), which will turn the subthread starting from the ++current message into a whole different thread. ++ + Delivery Status Notification (DSN) Support +

++ + RFC1894 defines a set of MIME content types for relaying information + about the status of electronic mail messages. These can be thought of as + ``return receipts.'' Berkeley sendmail 8.8.x currently has some command +diff -pruN mutt-1.5.5.1-orig/functions.h mutt-1.5.5.1/functions.h +--- mutt-1.5.5.1-orig/functions.h Wed Nov 5 10:41:31 2003 ++++ mutt-1.5.5.1/functions.h Tue Nov 11 02:52:33 2003 +@@ -69,6 +69,7 @@ struct binding_t OpGeneric[] = { + struct binding_t OpMain[] = { + { "create-alias", OP_CREATE_ALIAS, "a" }, + { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, ++ { "break-thread", OP_MAIN_BREAK_THREAD, "#" }, + { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" }, + { "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" }, + { "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" }, +@@ -95,6 +96,7 @@ struct binding_t OpMain[] = { + { "next-undeleted", OP_MAIN_NEXT_UNDELETED, "j" }, + { "previous-undeleted", OP_MAIN_PREV_UNDELETED, "k" }, + { "limit", OP_MAIN_LIMIT, "l" }, ++ { "link-threads", OP_MAIN_LINK_THREADS, "&" }, + { "list-reply", OP_LIST_REPLY, "L" }, + { "mail", OP_MAIL, "m" }, + { "toggle-new", OP_TOGGLE_NEW, "N" }, +@@ -153,6 +155,7 @@ struct binding_t OpMain[] = { + }; + + struct binding_t OpPager[] = { ++ { "break-thread", OP_MAIN_BREAK_THREAD, "#" }, + { "create-alias", OP_CREATE_ALIAS, "a" }, + { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, + { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" }, +@@ -175,6 +178,7 @@ struct binding_t OpPager[] = { + { "next-entry", OP_NEXT_ENTRY, "J" }, + { "previous-undeleted",OP_MAIN_PREV_UNDELETED, "k" }, + { "previous-entry", OP_PREV_ENTRY, "K" }, ++ { "link-threads", OP_MAIN_LINK_THREADS, "&" }, + { "list-reply", OP_LIST_REPLY, "L" }, + { "redraw-screen", OP_REDRAW, "\014" }, + { "mail", OP_MAIL, "m" }, +diff -pruN mutt-1.5.5.1-orig/imap/imap.c mutt-1.5.5.1/imap/imap.c +--- mutt-1.5.5.1-orig/imap/imap.c Wed Nov 5 10:41:36 2003 ++++ mutt-1.5.5.1/imap/imap.c Tue Nov 11 02:52:33 2003 +@@ -980,9 +980,11 @@ int imap_sync_mailbox (CONTEXT* ctx, int + 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) ++ /* if the message has been rethreaded or attachments have been deleted ++ * we delete the message and reupload it. ++ * This works better if we're expunging, of course. */ ++ if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed || ++ ctx->hdrs[n]->attach_del) + { + dprint (3, (debugfile, "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n")); + if (!appendctx) +diff -pruN mutt-1.5.5.1-orig/main.c mutt-1.5.5.1/main.c +--- mutt-1.5.5.1-orig/main.c Tue Mar 4 08:49:48 2003 ++++ mutt-1.5.5.1/main.c Tue Nov 11 02:52:33 2003 +@@ -228,6 +228,12 @@ static void show_version (void) + "-USE_IMAP " + #endif + ++#ifdef IMAP_EDIT_THREADS ++ "+IMAP_EDIT_THREADS " ++#else ++ "-IMAP_EDIT_THREADS " ++#endif ++ + #ifdef USE_GSS + "+USE_GSS " + #else +diff -pruN mutt-1.5.5.1-orig/mh.c mutt-1.5.5.1/mh.c +--- mutt-1.5.5.1-orig/mh.c Wed Nov 5 10:41:32 2003 ++++ mutt-1.5.5.1/mh.c Tue Nov 11 02:52:33 2003 +@@ -1220,7 +1220,7 @@ static int mh_sync_message (CONTEXT * ct + { + HEADER *h = ctx->hdrs[msgno]; + +- if (h->attach_del) ++ if (h->attach_del || h->refs_changed || h->irt_changed) + if (mh_rewrite_message (ctx, msgno) != 0) + return -1; + +@@ -1231,9 +1231,9 @@ static int maildir_sync_message (CONTEXT + { + HEADER *h = ctx->hdrs[msgno]; + +- if (h->attach_del) ++ if (h->attach_del || h->refs_changed || h->irt_changed) + { +- /* when doing attachment deletion, fall back to the MH case. */ ++ /* when doing attachment deletion/rethreading, fall back to the MH case. */ + if (mh_rewrite_message (ctx, msgno) != 0) + return (-1); + } +diff -pruN mutt-1.5.5.1-orig/mutt.h mutt-1.5.5.1/mutt.h +--- mutt-1.5.5.1-orig/mutt.h Wed Nov 5 10:41:32 2003 ++++ mutt-1.5.5.1/mutt.h Tue Nov 11 02:52:33 2003 +@@ -92,6 +92,8 @@ + #define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */ + #define CH_FORCE_FROM (1<<14) /* give CH_FROM precedence over CH_WEED? */ + #define CH_NOQFROM (1<<15) /* give CH_FROM precedence over CH_WEED? */ ++#define CH_UPDATE_IRT (1<<16) /* update In-Reply-To: */ ++#define CH_UPDATE_REFS (1<<17) /* update References: */ + + /* flags for mutt_enter_string() */ + #define M_ALIAS 1 /* do alias "completion" by calling up the alias-menu */ +@@ -506,8 +508,9 @@ typedef struct list_t + + #define mutt_new_list() safe_calloc (1, sizeof (LIST)) + void mutt_free_list (LIST **); + void mutt_free_rx_list (RX_LIST **); + void mutt_free_spam_list (SPAM_LIST **); ++LIST *mutt_copy_list (LIST *); + int mutt_matches_ignore (const char *, LIST *); + + /* add an element to a list */ +@@ -647,6 +650,8 @@ typedef struct header + unsigned int subject_changed : 1; /* used for threading */ + unsigned int threaded : 1; /* used for threading */ + unsigned int display_subject : 1; /* used for threading */ ++ unsigned int irt_changed : 1; /* In-Reply-To changed to link/break threads */ ++ unsigned int refs_changed : 1; /* References changed to break thread */ + unsigned int recip_valid : 1; /* is_recipient is valid */ + unsigned int active : 1; /* message is not to be removed */ + unsigned int trash : 1; /* message is marked as trashed on disk. +@@ -687,6 +692,10 @@ typedef struct header + char *tree; /* character string to print thread tree */ + struct thread *thread; + ++#ifdef IMAP_EDIT_THREADS ++ ENVELOPE *new_env; /* envelope information for rethreading */ ++#endif ++ + #ifdef MIXMASTER + LIST *chain; + #endif +@@ -752,6 +761,7 @@ typedef struct + char *pattern; /* limit pattern string */ + pattern_t *limit_pattern; /* compiled limit pattern */ + HEADER **hdrs; ++ HEADER *last_tag; /* last tagged msg. used to link threads */ + THREAD *tree; /* top of thread tree */ + HASH *id_hash; /* hash table by msg id */ + HASH *subj_hash; /* hash table by subject */ +diff -pruN mutt-1.5.5.1-orig/mx.c mutt-1.5.5.1/mx.c +--- mutt-1.5.5.1-orig/mx.c Wed Nov 5 10:41:32 2003 ++++ mutt-1.5.5.1/mx.c Tue Nov 11 02:52:33 2003 +@@ -1161,6 +1161,8 @@ int mx_sync_mailbox (CONTEXT *ctx, int * + ctx->deleted = 0; + } + } ++ else if (ctx->last_tag && ctx->last_tag->deleted) ++ ctx->last_tag = NULL; /* reset last tagged msg now useless */ + } + + /* really only for IMAP - imap_sync_mailbox results in a call to +diff -pruN mutt-1.5.5.1-orig/pager.c mutt-1.5.5.1/pager.c +--- mutt-1.5.5.1-orig/pager.c Wed Nov 5 10:41:32 2003 ++++ mutt-1.5.5.1/pager.c Tue Nov 11 02:52:33 2003 +@@ -2481,6 +2481,11 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE); + case OP_TAG: + CHECK_MODE(IsHeader (extra)); + mutt_set_flag (Context, extra->hdr, M_TAG, !extra->hdr->tagged); ++ ++ Context->last_tag = extra->hdr->tagged ? extra->hdr : ++ ((Context->last_tag == extra->hdr && !extra->hdr->tagged) ++ ? NULL : Context->last_tag); ++ + redraw = REDRAW_STATUS | REDRAW_INDEX; + if (option (OPTRESOLVE)) + { +diff -pruN mutt-1.5.5.1-orig/protos.h mutt-1.5.5.1/protos.h +--- mutt-1.5.5.1-orig/protos.h Wed Nov 5 10:41:33 2003 ++++ mutt-1.5.5.1/protos.h Tue Nov 11 02:52:33 2003 +@@ -146,6 +146,7 @@ void mutt_block_signals (void); + void mutt_block_signals_system (void); + void mutt_body_handler (BODY *, STATE *); + int mutt_bounce_message (FILE *fp, HEADER *, ADDRESS *); ++void mutt_break_thread (HEADER *); + void mutt_buffy (char *, size_t); + int mutt_buffy_list (void); + void mutt_canonical_charset (char *, size_t, const char *); +@@ -286,6 +287,7 @@ int mutt_is_list_recipient (int, ADDRESS + int mutt_is_subscribed_list (ADDRESS *); + int mutt_is_text_part (BODY *); + int mutt_is_valid_mailbox (const char *); ++int mutt_link_threads (HEADER *, HEADER *, CONTEXT *); + int mutt_lookup_mime_type (BODY *, const char *); + int mutt_messages_in_thread (CONTEXT *, HEADER *, int); + int mutt_multi_choice (char *prompt, char *letters); +diff -pruN mutt-1.5.5.1-orig/thread.c mutt-1.5.5.1/thread.c +--- mutt-1.5.5.1-orig/thread.c Wed Nov 5 10:41:34 2003 ++++ mutt-1.5.5.1/thread.c Tue Nov 11 02:52:33 2003 +@@ -1333,3 +1333,105 @@ HASH *mutt_make_subj_hash (CONTEXT *ctx) + + return hash; + } ++ ++static void clean_references (THREAD *brk, THREAD *cur) ++{ ++ THREAD *p; ++ LIST *ref = NULL; ++ int done = 0; ++ ++ for (; cur; cur = cur->next, done = 0) ++ { ++ /* parse subthread recursively */ ++ clean_references (brk, cur->child); ++ ++ if (!cur->message) ++ break; /* skip pseudo-message */ ++ ++ /* Looking for the first bad reference according to the new threading. ++ * Optimal since Mutt stores the references in reverse order, and the ++ * first loop should match immediatly for mails respecting RFC2822. */ ++ for (p = brk; !done && p; p = p->parent) ++ for (ref = cur->message->env->references; p->message && ref; ref = ref->next) ++ if (!mutt_strcasecmp (ref->data, p->message->env->message_id)) ++ { ++ done = 1; ++ break; ++ } ++ ++ if (done) ++ { ++ HEADER *h = cur->message; ++ ++ /* clearing the References: header from obsolete Message-Id(s) */ ++ mutt_free_list (&ref->next); ++ ++#ifdef IMAP_EDIT_THREADS ++ if (h->new_env) ++ mutt_free_list (&h->new_env->references); ++ else ++ h->new_env = mutt_new_envelope (); ++ ++ h->new_env->references = mutt_copy_list (h->env->references); ++#endif ++ ++ h->refs_changed = h->changed = 1; ++ } ++ } ++} ++ ++void mutt_break_thread (HEADER *hdr) ++{ ++ mutt_free_list (&hdr->env->in_reply_to); ++ mutt_free_list (&hdr->env->references); ++ hdr->irt_changed = hdr->refs_changed = hdr->changed = 1; ++ ++#ifdef IMAP_EDIT_THREADS ++ if (hdr->new_env) ++ { ++ mutt_free_list (&hdr->new_env->in_reply_to); ++ mutt_free_list (&hdr->new_env->references); ++ } ++ else ++ hdr->new_env = mutt_new_envelope (); ++#endif ++ ++ clean_references (hdr->thread, hdr->thread->child); ++} ++ ++static int link_threads (HEADER *parent, HEADER *child, CONTEXT *ctx) ++{ ++ if (child == parent) ++ return 0; ++ ++ mutt_break_thread (child); ++ ++ child->env->in_reply_to = mutt_new_list (); ++ child->env->in_reply_to->data = safe_strdup (parent->env->message_id); ++ ++#ifdef IMAP_EDIT_THREADS ++ child->new_env->in_reply_to = mutt_new_list (); ++ child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id); ++#endif ++ ++ mutt_set_flag (ctx, child, M_TAG, 0); ++ ++ child->irt_changed = child->changed = 1; ++ return 1; ++} ++ ++int mutt_link_threads (HEADER *cur, HEADER *last, CONTEXT *ctx) ++{ ++ int i, changed = 0; ++ ++ if (!last) ++ { ++ for (i = 0; i < ctx->vcount; i++) ++ if (ctx->hdrs[Context->v2r[i]]->tagged) ++ changed |= link_threads (cur, ctx->hdrs[Context->v2r[i]], ctx); ++ } ++ else ++ changed = link_threads (cur, last, ctx); ++ ++ return changed; ++} +diff -pruN mutt-1.5.5.1-orig/PATCHES mutt-1.5.5.1/PATCHES +--- mutt-1.5.5.1-orig/PATCHES Tue Apr 15 15:18:34 2003 ++++ mutt-1.5.5.1/PATCHES Tue Nov 11 02:52:33 2003 +@@ -1,0 +1 @@ ++patch-1.5.5.1.cd.edit_threads.9.5 diff --git a/upstream/extra-patches/edit-threads.debian b/upstream/extra-patches/edit-threads.debian new file mode 100644 index 0000000..ef1ade8 --- /dev/null +++ b/upstream/extra-patches/edit-threads.debian @@ -0,0 +1,4 @@ +--- a/debian-config.h ++++ b/debian-config.h +@@ -0,0 +1 @@ ++#define IMAP_EDIT_THREADS 1 diff --git a/upstream/extra-patches/header-cache b/upstream/extra-patches/header-cache new file mode 100644 index 0000000..69ee997 --- /dev/null +++ b/upstream/extra-patches/header-cache @@ -0,0 +1,222 @@ +# 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/extra-patches/incomplete-mbyte b/upstream/extra-patches/incomplete-mbyte new file mode 100644 index 0000000..7517fa4 --- /dev/null +++ b/upstream/extra-patches/incomplete-mbyte @@ -0,0 +1,55 @@ +# vi: ft=diff +This is the incomplete multibyte patch by Anders Helmersson +. + +It was received at Debian's BTS, Bug#260623. + +* Patch last synced with upstream: + - Date: 2004-07-22 + - File: http://bugs.debian.org/cgi-bin/bugreport.cgi/patch-incomplete_multibyte-2?bug=260623&msg=3&att=1 + +* Changes made: + - 2004-07-22: added entry to PATCHES file. + - 2004-07-22: adjusted paths in the diff (to apply with patch -p1). + +== END PATCH +Index: pager.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/pager.c,v +retrieving revision 3.16 +diff -u -r3.16 pager.c +--- a/pager.c 12 Jul 2004 13:35:27 -0000 3.16 ++++ b/pager.c 21 Jul 2004 08:10:06 -0000 +@@ -972,6 +972,9 @@ + unsigned char *p; + static int b_read; + ++ size_t k, n; ++ wchar_t wc; ++ + if (*buf_ready == 0) + { + buf[blen - 1] = 0; +@@ -986,6 +989,18 @@ + b_read = (int) (*last_pos - offset); + *buf_ready = 1; + ++ /* trim tail of buf so that it contains complete multibyte characters */ ++ for (n = b_read, p = buf; n > 0; p += k, n -= k) ++ { ++ k = mbrtowc (&wc, (char *) p, n, NULL); ++ if (k == -2) ++ break; ++ else if (k == -1 || k == 0) ++ k = 1; ++ } ++ b_read -= n; ++ buf[b_read] = 0; ++ + /* copy "buf" to "fmt", but without bold and underline controls */ + p = buf; + while (*p) +--- mutt.orig/PATCHES 1970-01-01 01:00:00.000000000 +0100 ++++ mutt/PATCHES 2003-08-09 15:51:11.000000000 +0200 +@@ -1,0 +1 @@ ++patch.helmersson.incomplete-mbyte.2 diff --git a/upstream/extra-patches/maildir-mtime b/upstream/extra-patches/maildir-mtime new file mode 100644 index 0000000..92e5654 --- /dev/null +++ b/upstream/extra-patches/maildir-mtime @@ -0,0 +1,140 @@ +# vi: ft=diff +This is the maildir mtime patch by Dale Woolridge. + +The home page for this patch is: + + http://www.mutt.ca/maildir-mtime.html + +* Patch last synced with upstream: + - Date: 2004-08-10 + - File: http://www.mutt.ca/patches/patch-1.5.6.dw.maildir-mtime.1 + +* Changes made: + - removed a spurious const in add_folder() definition. + - added a $maildir_mtime option to allow this patch to be disabled at + runtime (see Bug#253261, comments from Zephaniah E. Hull). + +== END PATCH +--- maildir-mtime/PATCHES Dec 2002 17:44:54 -0000 3.6 ++++ maildir-mtime/PATCHES Feb 2004 13:19:42 -0000 +@@ -0,0 +1 @@ ++patch-1.5.6.dw.maildir-mtime.1 +--- maildir-mtime/browser.c Sep 2003 13:03:25 -0000 3.9 ++++ maildir-mtime/browser.c Feb 2004 13:19:42 -0000 +@@ -29,2 +29,3 @@ + #endif ++#include "mx.h" + +@@ -304,4 +305,6 @@ folder_format_str (char *dest, size_t de + static void add_folder (MUTTMENU *m, struct browser_state *state, +- const char *name, const struct stat *s, int new) ++ const char *name, /*DEB const IAN*/ struct stat *s, BUFFY *mbuf) + { ++ int new = (mbuf) ? mbuf->new : 0; ++ + if (state->entrylen == state->entrymax) +@@ -317,2 +320,5 @@ static void add_folder (MUTTMENU *m, str + ++ if (mbuf && mbuf->magic == M_MAILDIR && mbuf->mtime) ++ s->st_mtime = mbuf->mtime; ++ + if (s != NULL) +@@ -411,3 +417,3 @@ static int examine_directory (MUTTMENU * + tmp = tmp->next; +- add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0); ++ add_folder (menu, state, de->d_name, &s, tmp); + } +@@ -435,3 +441,3 @@ static int examine_mailboxes (MUTTMENU * + { +- add_folder (menu, state, tmp->path, NULL, tmp->new); ++ add_folder (menu, state, tmp->path, NULL, tmp); + continue; +@@ -442,3 +448,3 @@ static int examine_mailboxes (MUTTMENU * + { +- add_folder (menu, state, tmp->path, NULL, tmp->new); ++ add_folder (menu, state, tmp->path, NULL, tmp); + continue; +@@ -456,3 +462,3 @@ static int examine_mailboxes (MUTTMENU * + +- add_folder (menu, state, buffer, &s, tmp->new); ++ add_folder (menu, state, buffer, &s, tmp); + } +--- maildir-mtime/buffy.c Feb 2004 17:50:43 -0000 3.9 ++++ maildir-mtime/buffy.c Feb 2004 13:19:42 -0000 +@@ -229,2 +229,3 @@ int mutt_parse_mailboxes (BUFFER *path, + (*tmp)->newly_created = 0; ++ (*tmp)->mtime = 0; + +@@ -260,2 +261,3 @@ int mutt_buffy_check (int force) + struct stat sb; ++ struct stat smd; + struct dirent *de; +@@ -299,2 +301,3 @@ int mutt_buffy_check (int force) + tmp->new = 0; ++ tmp->mtime = 0; + +@@ -383,6 +386,13 @@ int mutt_buffy_check (int force) + { +- /* one new and undeleted message is enough */ +- BuffyCount++; +- tmp->new = 1; +- break; ++ if (!tmp->new) ++ { ++ /* one new and undeleted message is enough */ ++ BuffyCount++; ++ tmp->new = 1; ++ } ++ snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name); ++ if (!stat (path, &smd) && smd.st_mtime > tmp->mtime) ++ { ++ tmp->mtime = smd.st_mtime; ++ } + } +--- maildir-mtime/buffy.h Dec 2002 11:19:39 -0000 3.2 ++++ maildir-mtime/buffy.h Feb 2004 13:19:42 -0000 +@@ -29,2 +29,3 @@ typedef struct buffy_t + struct buffy_t *next; ++ time_t mtime; /* for maildirs...time of newest entry */ + short new; /* mailbox has new mail */ +--- DEBIAN/buffy.c ++++ DEBIAN/buffy.c.new +@@ -389,6 +389,9 @@ + /* one new and undeleted message is enough */ + BuffyCount++; + tmp->new = 1; ++ ++ if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */ ++ break; + } + snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name); + if (!stat (path, &smd) && smd.st_mtime > tmp->mtime) +--- DEBIAN/init.h ++++ DEBIAN/init.h.new +@@ -1022,6 +1022,16 @@ + ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE + ** DOING!\fP + */ ++ { "maildir_mtime", DT_BOOL, R_NONE, OPTMAILDIRMTIME, 0 }, ++ /* ++ ** .pp ++ ** If set, the sort-by-date option in the browser will sort maildirs ++ ** smartly, not using the mtime of the maildir itself but that of the ++ ** newest message in the new subdirectory, making the sorting by ++ ** reverse date much more useful. People with maildirs over NFS may ++ ** wish to leave this option unset. ++ ** ++ */ + #if USE_HCACHE + + { "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 }, +--- DEBIAN/mutt.h ++++ DEBIAN/mutt.h.new +@@ -396,6 +396,7 @@ + OPTINCLUDEONLYFIRST, + OPTKEEPFLAGGED, + OPTMAILCAPSANITIZE, ++ OPTMAILDIRMTIME, + OPTMAILDIRTRASH, + OPTMARKERS, + OPTMARKOLD, diff --git a/upstream/patches/cvs_2005-03-09 b/upstream/patches/cvs_2005-03-09 new file mode 100644 index 0000000..c023d47 --- /dev/null +++ b/upstream/patches/cvs_2005-03-09 @@ -0,0 +1,10526 @@ +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"