Sync with gorg.

1 files changed, 269 insertions, 623 deletions

diff --git a/doc/gettext/ru/guide-to-mutt.xml.po b/doc/gettext/ru/guide-to-mutt.xml.po
index d58141c..b73f317 100644
--- a/doc/gettext/ru/guide-to-mutt.xml.po
+++ b/doc/gettext/ru/guide-to-mutt.xml.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-09-05 14:12+0600\n"
 "PO-Revision-Date: 2010-02-09 01:00+0500\n"
 "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
 "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -14,10 +14,6 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(guide:link):6
-msgid "/doc/en/guide-to-mutt.xml"
-msgstr ""
-
 #: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):8
 msgid "QuickStart Guide to Mutt E-Mail"
 msgstr ""
@@ -27,716 +23,366 @@ msgid "Author"
 msgstr "автор"
 
 #: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):11
-msgid "mikpolniak@adelphia.net"
-msgstr "mikpolniak@adelphia.net"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):11
-msgid "Mike Polniak"
-msgstr "Mike Polniak"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(author:title):13
-msgid "Editor"
-msgstr "редактор"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):14
-msgid "antifa@gentoo.org"
+#, fuzzy
+msgid "grobian@gentoo.org"
 msgstr "antifa@gentoo.org"
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):14
-msgid "Ken Nowack"
-msgstr "Ken Nowack"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(author:title):16
-msgid "Contributor"
-msgstr "участник"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):17
-msgid "hitch17@gmail.com"
-msgstr "hitch17@gmail.com"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):17
-msgid "John Hitchings"
-msgstr "John Hitchings"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(abstract):20
-msgid ""
-"This guide shows you how to begin using the powerful command line tools for "
-"e-mail: fetchmail, procmail, mutt, nbsmtp, msmtp."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(version):29
-msgid "1.7"
-msgstr "1.7"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(date):30
-msgid "2006-09-17"
-msgstr "2006-09-17"
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):33
-msgid "Introduction to E-Mail"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):37
-msgid ""
-"If you're not a fan of e-mail clients with fancy graphical user interfaces, "
-"or if you would just like to experiment with other mail clients before "
-"deciding which is best for you, here is the easy way to begin using these "
-"powerful command line tools:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):48
-msgid ""
-"These programs are not only powerful and highly customizable but also small "
-"and efficient. Once you are up and running with this e-mail system you will "
-"be amazed at what you can do with it."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):54
-msgid ""
-"Because this is a quick start guide, we will eliminate the Mail Transfer "
-"Agent (MTA) such as sendmail, postfix or exim. This means no complex MTA "
-"configuration. It also eliminates using port 25 for mail service."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):60
-msgid ""
-"We can do this because fetchmail can force the mail it retrieves directly to "
-"a Mail Delivery Agent (MDA) rather than forwarding to port 25. And we don't "
-"need to use a complex MTA for plain old outgoing mail delivery."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):66
-msgid "These are the programs you will need to get your e-mail running."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):70
-msgid "Getting needed programs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):70
-#, no-wrap
-msgid ""
-"\n"
-"# <i>emerge fetchmail nbsmtp procmail mutt</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):74
-msgid ""
-"Then just four quick steps to configure files and you will be up and running "
-"a brand new e-mail system."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(impo):79
-msgid ""
-"After each step you can run a test to make sure the setup is correct. This "
-"means you will have a complete working e-mail system when you are done."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):89
-msgid "Fetchmail"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):93
-msgid ""
-"Fetchmail fetches mail from remote servers and forwards it to your local "
-"machines delivery system. To use it you need to set up a <path>.fetchmailrc</"
-"path> file in your home directory like this example:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):99
-msgid "Sample .fetchmailrc"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):103
-msgid ""
-"Once you have created a <path>.fetchmailrc</path> file, you have to change "
-"the permissions on the file using the chmod command. The file must be "
-"readable only by the file owner. Set the permissions with the following "
-"command:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):109
-msgid "Changing Permissions"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):109
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>chmod 600 .fetchmailrc</i>\n"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):11
+msgid "Fabian Groffen"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):113
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(abstract):14
 msgid ""
-"To see fetchmail in action, use the verbose mode (-v). To fetch all messages "
-"use -a. And you must use the option -m to tell fetchmail to send the mail to "
-"procmail."
+"This guide shows you how to begin using the powerful command line e-mail "
+"client mutt."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(warn):119
-msgid ""
-"While testing, it's a good idea to tell fetchmail to keep (-k) the mail on "
-"the remote server in case something goes wrong and you need to fetch it "
-"again."
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(version):23
+msgid "3"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):124
-msgid "Run it now to see fetchmail in action!"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(date):24
+msgid "2011-08-18"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):128
-msgid "Fetchmail test #1"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):27
+msgid "The Mutt e-mail client"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):128
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):250
-#, no-wrap
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):31
 msgid ""
-"\n"
-"$ <i>fetchmail -akv -m \"/usr/bin/procmail -d %T\"</i>\n"
+"If you're not a fan of e-mail clients with fancy graphical user interfaces, "
+"or you just like to be able to quickly read some mail over an SSH "
+"connection, the class of console-based mail clients might be for you."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):132
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):37
 msgid ""
-"Once you have a working mail system you can set this as a cron job or put it "
-"in a monitor like gkrellm. Fetchmail can also run in a daemon mode for which "
-"you specify a polling interval in seconds."
+"Mutt is one of the current console-based mail clients that's still under "
+"active development and has a vast crowd of active supporters (and users). It "
+"is powerful, highly customisable, small and efficient."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):143
-msgid "Procmail"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):147
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):43
 msgid ""
-"Procmail is the processor that filters the mail that is forwarded to it by "
-"fetchmail. It also acts as the MDA to deliver mail to your mailboxes where "
-"mutt (your e-mail client) can read it."
+"While Mutt was originally designed to read mail from the local mbox mail "
+"spool (e.g. <path>/var/spool/mail/</path>), nowadays it comes with full "
+"support for Maildir stored folders, remote fetching from POP3 servers and "
+"complete management of IMAP accounts. For a full description of what Mutt "
+"can do, please read the Mutt manual and Mutt website at <uri>http://www.mutt."
+"org/</uri>."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):153
-msgid ""
-"To use procmail you need to create a <path>.procmailrc</path> file in your "
-"home directory. For our quickstart purposes we will use a very simple <path>."
-"procmailrc</path> that will filter mail from three gentoo mailing lists into "
-"these mailboxes:<e>gentoo-dev, gentoo-user</e> and <e>gentoo-announce</e>"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):56
+msgid "Acquiring Mutt"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):160
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):60
 msgid ""
-"The procmail filter rules are called recipes, and I have also included "
-"recipes to filter out some spam."
+"Starting your Mutt adventure simply requires you to emerge it. "
+"Unfortunately, Mutt has a lots of options, which enable or disable certain "
+"functionalities of Mutt. We now briefly discuss the most important USE-flags "
+"that you may want to enable based on your intended usage of Mutt. Please "
+"note that enabling most of them won't harm your Mutt, but may make it do "
+"more than an experienced Mutt user would like."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):165
-msgid "Sample .procmailrc"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):69
+msgid "Mutt's USE-flags"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):165
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):69
 #, no-wrap
 msgid ""
 "\n"
-"MAILDIR=$HOME/MuttMail                ##you better make sure it exists\n"
-"LOGFILE=$HOME/.procmaillog\n"
-"LOGABSTRACT=no\n"
-"#VERBOSE=on...is only used for debugging\n"
-"VERBOSE=off\n"
-"FORMAIL=/usr/bin/formail\n"
-"NL=\"\n"
-"\"\n"
-"##recipe lines begin with :0\n"
-"##dont put comments on recipe lines\n"
-"##disable a recipe with the false condition !\n"
-"##condition lines begin with * and regex is your friend\n"
-"##conditions are anded and everything after * is fed straight into egrep\n"
-"##one action line follows the conditions, in this case it is a mailbox name\n"
-"\n"
-"#catch duplicates using formail\n"
-":0 Whc: .msgid.lock\n"
-"| $FORMAIL -D 16384 .msgid.cache\n"
-"\n"
-":0 a\n"
-"$MAILDIR/duplicates\n"
-"\n"
-"#people we always allow mail from\n"
-":0\n"
-"* ^From:.*(craig\\@hotmail|renee\\@local.com)\n"
-"$MAILDIR/friends\n"
-"\n"
-"#now flush some spam out\n"
-":0\n"
-"* ^Subject:.*(credit|cash|money|debt|sex|sale|loan)\n"
-"$MAILDIR/spam\n"
-"\n"
-"#no more html messages\n"
-":0\n"
-"* ^Content-Type:.*html\n"
-"$MAILDIR/junk\n"
-"\n"
-"#now put my mail lists into mailboxes\n"
-":0\n"
-"* ^List-Id:.*gentoo-user\n"
-"gentoo-user\n"
-"\n"
-":0\n"
-"* ^List-Id:.*gentoo-dev\n"
-"gentoo-dev\n"
-"\n"
-":0\n"
-"* ^List-Id:.*gentoo-announce\n"
-"gentoo-announce\n"
-"\n"
-"#catch any other gentoo mail\n"
-":0\n"
-"* ^From:.*gentoo.org\n"
-"gentoo\n"
-"\n"
-":0\n"
-"* ^From:.*@freshmeat\\.net\n"
-"freshmeat\n"
-"\n"
-"################################\n"
-"# Last rule: mail that gets    #\n"
-"# this far goes in default box #\n"
-"################################\n"
-":0\n"
-"* .*\n"
-"default\n"
-"\n"
-"# End of file\n"
+"% <i>emerge -pv mutt</i>\n"
+"[ebuild     N ] mail-client/mutt-1.5.21-r1 USE=\"gdbm gpg imap mbox nls nntp \\\n"
+"                  sidebar smime smtp ssl -berkdb -crypt -debug -doc -gnutls \\\n"
+"                  -idn -pop -qdbm -sasl -tokyocabinet\"\n"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):236
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):76
 msgid ""
-"It is only required to make the MAILDIR <path>$HOME/MuttMail</path> as "
-"Procmail will create all the mailbox files as needed in this directory using "
-"the names on the action lines. For some useful links visit <uri>http://www."
-"procmail.org/</uri>"
+"First off, for newcomers, the <c>imap</c> USE-flag is most probably the most "
+"important one. Enabling it won't hurt anything, so if you're unsure what "
+"account you're going to use Mutt with, just enable it. Most email providers, "
+"even free ones such as GMail, use IMAP these days, for it is the most "
+"convenient way to store email that is accessed from multiple clients at the "
+"same time and/or different locations. Because IMAP keeps all mail at the "
+"server, Mutt just downloads the messages that you want to view."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):243
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):86
 msgid ""
-"You can now test <path>.procmailrc</path> by re-running the fetchmail "
-"command we tested in the first step. Remember the -k option to keep all mail "
-"on the remote server so we have it if we need to rerun it."
+"Often you happen to jump through a couple of messages a couple of times "
+"shortly after each other, which would require to download the same message "
+"over and over again. Since this simply is a waste, Mutt uses a so-called "
+"header cache (hcache) to keep the most important bits of messages that it "
+"needs. This hcache is backed by a db-library, of which four flavours exist: "
+"<c>gdbm</c>, <c>berkdb</c>, <c>qdbm</c> and <c>tokyocabinet</c>. If you "
+"don't have any preference yourself, pick gdbm or berkdb. Most likely you "
+"will have both already installed on your system. Enabling the USE-flags for "
+"more than one hcache backend will make Mutt choose one it likes best. It "
+"will always use at most one."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):250
-msgid "Procmail test #1"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):254
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):99
 msgid ""
-"Now that fetchmail and procmail have run, go to <path>$HOME/MuttMail</path> "
-"and read your messages with <c>less</c> or your file manager."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):264
-msgid "Mutt e-mail client"
+"While IMAP is important for reading mail, sending mail requires a mail "
+"server. Mutt can talk to a mail server that exists on the local system, but "
+"often that's not the case, or simply not a good solution for e.g. laptop "
+"users that often travel around. Mutt comes with SMTP support which gets "
+"enabled by the <c>smtp</c> USE-flag. Again, enabling it if you're not sure "
+"doesn't harm. Mutt's SMTP support allows you just to send mail over a mail "
+"server of your choice; usually the one that you are given by your email "
+"provider."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):268
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):109
 msgid ""
-"Mutt is used to read and compose e-mail. It is powerful and highly "
-"customizable but also small and efficient."
+"Both IMAP and SMTP mostly go over encrypted channels these days, hence if "
+"you enabled any of both, it is wise to also enable either of the <c>ssl</c> "
+"or <c>gnutls</c> USE-flags. Both just add the secure variants (imaps and "
+"smtps) to Mutt's list of supported protocols using either OpenSSL's or "
+"GNUTLS' implementation. If you don't have a strong preference for either, "
+"just go for <c>ssl</c>. Most likely this is in your global USE already "
+"anyway. If you intend to authenticate yourself when sending e-mail, be sure "
+"to also include <c>sasl</c> in your USE-flags, since that's a prerequisite "
+"for that."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):273
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):120
 msgid ""
-"Mutt supports reading and writing of four different mailbox formats: mbox, "
-"MMDF, MH and Maildir. The mailbox type is autodetected. In our case we are "
-"using the mbox format, where all messages of a mailbox are stored in a "
-"single file."
+"Last but not least, there is the <c>sidebar</c> USE-flag. It enables an "
+"extension to Mutt that can show a navigation pane of available mailboxes on "
+"the left hand side of the screen. While this is not a recommended feature "
+"for absolute newcomers (it is nowhere mentioned in any official docs, since "
+"it simply isn't official), more experienced users might like its "
+"functionality. Luckily, just enabling the USE-flag doesn't make it visible "
+"at all, meaning you don't even notice it's enabled."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):280
-msgid ""
-"Mutt also has the ability to work with folders located on a remote IMAP "
-"server. See IMAP Support in section 4.11 of the Mutt manual and the Mutt web "
-"site <uri>http://www.mutt.org/</uri>"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):135
+msgid "Configuring Mutt"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):286
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):139
 msgid ""
-"When you emerged mutt in the first step it installed a configuration file in "
-"<path>/etc/mutt/Muttrc</path>. You also need to create a <path>.muttrc</"
-"path> file in your home directory."
+"After you emerged mutt with your USE-flags of choice, the only necessary "
+"step is to create a <path>.muttrc</path> file in your home directory. "
+"Muttrc's are to be found in many places on the web and in Mutt's "
+"documentation. In <path>/usr/share/doc/mutt-&lt;version&gt;/samples</path> "
+"you can find some muttrc samples that are from the official distribution. We "
+"discuss a very minimal <path>.muttrc</path> for an IMAP based account with "
+"SMTP mail delivery below."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):292
-msgid "Sample .muttrc"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):149
+msgid "A .muttrc example file"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):292
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):149
 #, no-wrap
 msgid ""
 "\n"
-"<comment>(Be sure to read the fine Mutt manual in /usr/share/doc/mutt*)\n"
-"(Any settings here override the system settings in /etc/mutt/Muttrc)</comment>\n"
-"\n"
-"# <i>cp /etc/mutt/Muttrc ~/.muttrc</i>\n"
-"# <i>nano -w .muttrc</i>\n"
-"set pager_context=1\n"
-"set pager_index_lines=6                 #show a mini-index in pager\n"
-"set menu_scroll\n"
-"set pgp_verify_sig=no                   #dont show pgp in pager\n"
-"set status_on_top                       #put status line at top\n"
-"set sort=threads                        #sort by message threads in index\n"
-"\n"
-"set status_format=\" %r %b %f %n      Del %d      Msgs %m %l %&gt; (%P)\"\n"
-"set pager_format=\"%-10.10i %[!%a %b %d %R]\"\n"
-"set date_format=\"!%H:%M %a %d %b     \"\n"
-"set index_format=\"%4C %Z %[%b%d] %-15.15F %s\"\n"
-"set folder_format=\"%2C %t %8s %d %N %f\"\n"
-"\n"
-"#set sendmail=\"/usr/bin/nbsmtp -d isp.net -h smtp.isp.net -f yourname@isp.net\"\n"
-"\n"
-"#set from=\"default-mailaddress\"         #set to your from address\n"
-"#set realname=\"myname\"\n"
-"\n"
-"set record=\"$HOME/MuttMail/sent\"        #sent mail is saved here\n"
-"set delete=yes                          #delete without prompting\n"
-"set include=yes                         #quote msg in reply\n"
-"set fast_reply=yes                      #no prompting on reply\n"
-"set beep=no                             #no noise\n"
-"set markers=no                          #no + on wrapped lines\n"
-"set confirmappend=no                    #no prompt for save to =keep\n"
-"set to_chars=\" +TCF\"                    #no L for mail_list\n"
-"\n"
-"set folder = $HOME/MuttMail\n"
-"mailboxes =gentoo-user\n"
-"mailboxes =gentoo-dev\n"
-"mailboxes =gentoo-announce\n"
-"mailboxes =gentoo\n"
-"mailboxes =freshmeat\n"
-"mailboxes =duplicates\n"
-"mailboxes =default\n"
-"mailboxes =friends\n"
-"mailboxes =junk\n"
-"mailboxes =spam\n"
-"mailboxes =keep\n"
-"\n"
-"save-hook .* =keep                      #default mbox to (s)ave mail is =keep\n"
-"subscribe gentoo-user gentoo-dev        #subscribed to these lists\n"
-"\n"
-"bind pager h display-toggle-weed        #toggle headers with h key\n"
-"\n"
-"# simulate the old url menu\n"
-"macro index \\cb |urlview\\n 'call urlview to extract URLs out of a message'\n"
-"macro pager \\cb |urlview\\n 'call urlview to extract URLs out of a message'\n"
-"\n"
-"#run fetchmail by hitting key of G\n"
-"macro index G \"!fetchmail -a -m 'procmail -d %T'\\r\"\n"
-"macro pager G \"!fetchmail -a -m 'procmail -d %T'\\r\"\n"
-"\n"
-"#use to edit .muttrc and then source it...no restart necessary\n"
-"macro generic ,sm \":source $HOME/.muttrc\\r\"\n"
-"macro generic \\cj \"!rxvt -bg wheat -e joe $HOME/.muttrc\\r\"\n"
-"\n"
-"# default list of header fields to weed out when displaying mail\n"
-"#ignore them all and then unignore what you want to see\n"
-"ignore *\n"
-"unignore  Date To From: Subject X-Mailer Organization User-Agent\n"
-"hdr_order Date From To Subject X-Mailer User-Agent Organization\n"
-"\n"
-"##your Mutt has to have some colors\n"
-"##these are for four levels of quoted text\n"
-"##they override the system settings in /etc/mutt/Muttrc\n"
-"\n"
-"#color quoted green  default\n"
-"color quoted1 magenta blue\n"
-"#color quoted2 yellow default\n"
-"#color quoted3 red default\n"
-"#color signature cyan cyan\n"
+"# character set on messages that we send\n"
+"set send_charset=\"utf-8\"\n"
+"# if there is no character set given on incoming messages, it is probably windows\n"
+"set assumed_charset=\"iso-8859-1\"\n"
+"\n"
+"# make sure Vim knows mutt is a mail client and that we compose an UTF-8 encoded message\n"
+"set editor=\"vim -c 'set syntax=mail ft=mail enc=utf-8'\"\n"
+"\n"
+"# just scroll one line instead of full page\n"
+"set menu_scroll=yes\n"
+"\n"
+"# we want to see some MIME types inline, see below this code listing for explanation\n"
+"auto_view application/msword\n"
+"auto_view application/pdf\n"
+"\n"
+"# make default search pattern to search in To, Cc and Subject\n"
+"set simple_search=\"~f %s | ~C %s | ~s %s\"\n"
+"\n"
+"# threading preferences, sort by threads\n"
+"set sort=threads\n"
+"set strict_threads=yes\n"
+"\n"
+"# show spam score (from SpamAssassin only) when reading a message\n"
+"spam \"X-Spam-Score: ([0-9\\\\.]+).*\" \"SA: %1\"\n"
+"set pager_format = \" %C - %[%H:%M] %.20v, %s%* %?H? [%H] ?\"\n"
+"\n"
+"# do not show all headers, just a few\n"
+"ignore          *\n"
+"unignore        From To Cc Bcc Date Subject\n"
+"# and in this order\n"
+"unhdr_order     *\n"
+"hdr_order       From: To: Cc: Bcc: Date: Subject:\n"
 "\n"
+"# brighten up stuff with colours, for more colouring examples see:\n"
+"# http://aperiodic.net/phil/configs/mutt/colors\n"
+"color normal      white          black\n"
+"color hdrdefault  green          default\n"
+"color quoted      green          default\n"
+"color quoted1     yellow         default\n"
+"color quoted2     red            default\n"
+"color signature   cyan           default\n"
+"color indicator   brightyellow   red\n"
+"color error       brightred      default\n"
+"color status      brightwhite    blue\n"
+"color tree        brightmagenta  black\n"
+"color tilde       blue           default\n"
+"color attachment  brightyellow   default\n"
+"color markers     brightred      default\n"
+"color message     white          black\n"
+"color search      brightwhite    magenta\n"
+"color bold        brightyellow   default\n"
+"# if you don't like the black progress bar at the bottom of the screen,\n"
+"# comment out the following line\n"
+"color progress    white          black\n"
+"\n"
+"# personality settings\n"
+"set realname = \"Andrew Dalziel\"\n"
+"set from = \"andy@mail.server\"\n"
+"alternates \"andrew@mail.server|andrew.dalziel@mail.server\"\n"
+"# this file must exist, and contains your signature, comment it out if\n"
+"# you don't want a signature to be used\n"
+"set signature = ~/.signature\n"
 "\n"
-"#this color setup is copied from /etc/mutt/Muttrc.color\n"
-"#comment it out if you want the default colors in /etc/mutt/Muttrc\n"
-"# Je vois la vie en rose :-)\n"
-"color   hdrdefault      brightcyan      blue\n"
-"color   header          brightwhite     blue \"^from:\"\n"
-"color   header          brightwhite     blue   \"^subject:\"\n"
+"# aliases (sort of address book)\n"
+"source ~/.aliases\n"
 "\n"
-"color   quoted          brightgreen     blue\n"
-"color   signature       brightwhite     blue\n"
+"# IMAP connection settings\n"
+"set mail_check=60\n"
+"set imap_keepalive=300\n"
 "\n"
-"color   indicator       blue            green\n"
+"# IMAP account settings\n"
+"set folder=imaps://andy@imap.mail.server/\n"
+"set spoolfile=imaps://andy@imap.mail.server/\n"
+"set record=imaps://andy@imap.mail.server/Sent\n"
+"set postponed=imaps://andy@imap.mail.server/Drafts\n"
 "\n"
-"color   error           red             black\n"
-"mono    error           bold\n"
-"color   status          black cyan\n"
-"mono    status          bold\n"
-"color   tree            yellow          blue\n"
+"# use headercache for IMAP (make sure this is a directory for performance!)\n"
+"set header_cache=/var/tmp/.mutt\n"
 "\n"
-"color   tilde           brightmagenta   blue\n"
-"color   body            brightwhite     blue    \"[-a-z_0-9.]+@[-a-z_0-9.]+\"\n"
-"mono    body            bold                    \"[-a-z_0-9.]+@[-a-z_0-9.]+\"\n"
-"color   body            brightyellow    black   \"^Good signature\"\n"
-"mono    body            bold                    \"^Good signature\"\n"
-"color   body            brightwhite     red     \"^Bad signature from.*\"\n"
-"mono    body            bold                    \"^Bad signature from.*\"\n"
-"color   normal          white           blue\n"
-"color   message         green           black\n"
-"color   attachment      brightgreen     blue\n"
+"# mailboxes we want to monitor for new mail\n"
+"mailboxes \"=\"\n"
+"mailboxes \"=Lists\"\n"
 "\n"
-"# End of file...but it can go on and on and on....:)\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):404
-msgid ""
-"For the record, this is just a sample <path>.muttrc</path>. There are many "
-"more options that you can configure, such as integration with GPG. Have a "
-"look at <uri>http://www.dotfiles.com/index.php?app_id=27</uri> for more "
-"examples and help."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):411
-msgid "You are now ready to test your <path>.muttrc</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):415
-msgid "Testing .muttrc"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):415
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>mutt -y</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):419
-msgid ""
-"This should open Mutt with a menu showing the Mutt mailboxes that you "
-"created in Test 2 when you ran the fetchmail command."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):424
-msgid "Type the ? for help in navigating the Mutt Mailboxes."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):433
-msgid "SMTP"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):437
-msgid ""
-"The final step is setting up nbsmtp the 'No-Brainer SMTP' used to send mail "
-"to your SMTP server. This setup is the easiest of all, as it only requires "
-"adding an entry in your <path>.muttrc</path> file."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):443
-msgid ""
-"domain: The domain you want nbsmtp to say it belongs to. This will almost "
-"invariably be the same as the domain in your e-mail address."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):448
-msgid ""
-"from@addr: This is the address you want nbsmtp to say the message is from. "
-"Note that this can be different than the \"From:\" line in your MUA."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):453
-msgid "host: This is the smtp server you are sending to."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):457
-msgid "Adding SMTP support"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):457
-#, no-wrap
-msgid ""
+"# mailing lists we are on (these are regexps!)\n"
+"subscribe \"gentoo-.*@gentoo\\\\.org\"\n"
 "\n"
-"$ <i>nano -w .muttrc</i>\n"
-"set sendmail=\"/usr/bin/nbsmtp -d isp.net -h smtp.isp.net -f urname@isp.net\"\n"
+"# SMTP mailing configuration (for sending mail)\n"
+"set smtp_url=smtp://mail.server/\n"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):462
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):240
 msgid ""
-"You are now ready to send a message. So in the Mutt pager or index hit the "
-"<c>m</c> key to compose a test message to send to your e-mail address. Mutt "
-"will use the value of the EDITOR or VISUAL for the composition editor unless "
-"you set <c>editor=</c> in the <path>.muttrc</path>. When you are done "
-"composing hit <c>y</c> to send your message. If there are no errors you will "
-"see 'sending mail' followed by 'Mail sent.'"
+"It is good practice to review all settings from the example above. There are "
+"many more, and some preferences may actually not match yours. Keep that in "
+"mind when you feel that Mutt at first doesn't really work the way you like."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):471
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):246
 msgid ""
-"Remember in <path>.muttrc</path> we have set where to save sent mail with "
-"<c>set record=\"$HOME/MuttMail/sent\"</c>"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):476
+"The example <path>.muttrc</path> above sets up an IMAP account, uses an SMTP "
+"server to send mail, stores its cache in <path>/var/tmp/.mutt</path>, reads "
+"the known address aliases (think of it as an address book) from <path>~/."
+"aliases</path> and appends the signature from <path>~/.signature</path> when "
+"composing new mail. For some IMAP servers it may be necessary to change the "
+"spool, record and postponed directories, as the folders <path>Sent</path> "
+"and <path>Drafts</path> may be under a folder called <path>INBOX</path>. "
+"Simply trying this out with Mutt is the simplest way to figure this out."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):257
+msgid ""
+"Once your <path>.muttrc</path> is setup, you are ready to launch Mutt by "
+"just running <c>mutt</c>. If you entered a valid IMAP server url, Mutt will "
+"prompt you for your password and afterwards load all messages for you. Note "
+"that the first time entering your mailbox may take a while if you have quite "
+"some messages, since Mutt's header cache is still empty. If this succeeds "
+"you're in your IMAP mailbox ready to go."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):266
+msgid ""
+"Navigation is intuitive, as is reading messages by just pressing the enter "
+"key or space bar. Mutt is quite Vim alike in that it uses key strokes to "
+"perform most of its actions. You best read Mutt's manual on the web to get "
+"yourself known with all existing functions (or press ? in Mutt) and what key "
+"they are bound to, or better, what key you like it to be bound to. Some "
+"essential keys are <c>m</c> (for message) to start composing a new message, "
+"<c>q</c> for quit, <c>r</c> for reply, <c>s</c> for save and <c>p</c> for "
+"print."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):276
 msgid ""
-"Now to complete the test, run fetchmail again to get all your mail and "
-"verify you have received the message you sent to your e-mail address. When "
-"you find your test message, hit the <c>h</c> key to toggle a view of all the "
-"headers and see the complete mail transfer path."
+"One of the features that Mutt has that is still not in today's most savvy "
+"email clients is the ability to display attachments inline through some "
+"viewer. The auto_view directive in the .muttrc file tells Mutt which "
+"attachments (based on their MIME-type) it should view inline. To figure out "
+"how to do that, Mutt uses mailcap files to lookup how to display a certain "
+"MIME-type. Usually the system wide mailcap file isn't sufficient here, so "
+"you better start a <path>~/.mailcap</path> file to put items in there for "
+"<c>copiousoutput</c> that Mutt can display inline."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):483
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):287
 msgid ""
-"There is one more program you probably want to add called urlview. This "
-"extracts the urls in message texts and sends them to your browser."
+"In the example <path>.muttrc</path> above <c>auto_view</c> is enabled for "
+"<c>application/msword</c> and <c>application/pdf</c> files. These two show "
+"the extreme usefulness of this capability, because it means meeting notes "
+"sent as doc file now are perfectly fine readable without having to save the "
+"attachment and open it in OpenOffice. Instead the text just shows up in the "
+"message reader, that is, if you have a matching entry in your <path>~/."
+"mailcap</path> file."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):488
-msgid "Getting urlview"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):297
+msgid "Example .mailcap file"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):488
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):297
 #, no-wrap
 msgid ""
 "\n"
-"# <i>emerge urlview</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):492
-msgid ""
-"Then create <path>~/.urlview</path> by copying the configuration file from "
-"<path>/usr/share/doc/urlview*/</path> and setting your browser command."
+"application/msword; antiword '%s'; copiousoutput; description=Word Document;\n"
+"nametemplate=%s.doc\n"
+"application/pdf; pdftotext '%s' -; copiousoutput; description=PDF Document;\n"
+"nametemplate=%s.pdf\n"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):497
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):304
 msgid ""
-"You now have a powerful and highly customizable mail system. To take "
-"advantage of its flexibility, read all the manuals and docs and find the "
-"many user configuration files available on the web: search for "
-"<path>procmailrc</path> and <path>muttrc</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):509
-msgid "Authenticated SMTP"
+"The above <path>.mailcap</path> example tells mutt what to do to \"view\" "
+"<c>msword</c> and <c>pdf</c> files. For the former it should run a program "
+"called <c>antiword</c> (emerge <c>app-text/antiword</c>), for the latter the "
+"program <c>pdftotext</c> (emerge <c>app-text/poppler</c>). You can go wild "
+"with these to for example display rendered HTML (give <c>app-text/"
+"vilistextum</c> a try), render vcards, or show ASCII representation of "
+"attached images. All you need to do is define how to call the program in "
+"your <path>.mailcap</path>, and tell Mutt to try to view it inline using the "
+"<c>auto_view</c> directive."
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):511
-msgid "Using nbSMTP"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):514
-msgid ""
-"If you need to pass a username and password to your SMTP server, you can "
-"edit the <c>set sendmail</c> command in your <path>.muttrc</path> to include "
-"<c>-U &lt;username&gt; -P &lt;password&gt;</c>, like this:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):520
-msgid "Setting username and password for SMTP"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):520
-#, no-wrap
-msgid ""
-"\n"
-"set sendmail=\"/usr/bin/nbsmtp -U <i>username</i> -P <i>password</i> -d isp.net -h smtp.isp.net -f urname@isp.net\"\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):524
-msgid ""
-"If you do not want this information to be present in your <path>.muttrc</"
-"path> file, you can also create a <path>.nbsmtprc</path> file in which you "
-"include all information:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):530
-msgid "~/.nbsmtprc example"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):530
-#, no-wrap
-msgid ""
-"\n"
-"auth_user = <i>username</i>\n"
-"auth_pass = <i>password</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):538
-msgid "Alternative: Using msmtp"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):541
-msgid ""
-"<c>msmtp</c> is a simple alternative to <c>nbsmtp</c> with similar "
-"possibilities."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):546
-msgid "Installing msmtp"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):546
-#, no-wrap
-msgid ""
-"\n"
-"# <i>emerge msmtp</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):550
-msgid ""
-"Now login as a normal user and configure msmtp by creating a <path>~/."
-"msmtprc</path> file, filling in your SMTP server's information. Remember to "
-"set the permissions to a secure value!"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):556
-msgid "Configuring msmtp"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):556
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>nano -w .msmtprc</i>\n"
-"account default\n"
-"host <i>smtp.your_provider.net</i>\n"
-"from <i>your_username@provider1.net</i>\n"
-"<comment>#see man page for more auth options</comment>\n"
-"auth login\n"
-"user <i>your_username</i>\n"
-"password <i>your_password</i>\n"
-"<comment>#If your SMTP Server supports TLS encryption, uncomment the next line\n"
-"#tls</comment>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):569
-msgid "Now set the permissions of the file to a secure value:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):573
-msgid "Setting the permissions for the configuration file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):573
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>chmod 600 .msmtprc</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):577
-msgid "Finally, edit or add the following line to <path>.muttrc</path>"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):581
-msgid "Using msmtp with Mutt"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):581
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>nano -w .muttrc</i>\n"
-"set sendmail=\"/usr/bin/msmtp\"\n"
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):320
+msgid "Conclusions"
 msgstr ""
 
-#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):586
+#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):324
 msgid ""
-"Fire up <c>mutt</c> and send yourself a test email to see if it worked! See "
-"the msmtp man page for more options and another example."
+"Mutt is a very versatile console email client. If you like the concept, Mutt "
+"can be altered to behave in nearly any way through its configuration. Search "
+"the web to find others explaining how they did \"it\", or find one of the "
+"many patches that exist to make Mutt do even more. Gentoo applies a couple "
+"of very popular patches to Mutt, so make sure to check <c>mutt -v</c> if you "
+"want something more to make sure it is not yet already at your disposal. "
+"While learning Mutt is not necessarily easy, once it is in your fingers, it "
+"can make your mail experience much faster and efficient than with other "
+"clients. Searching for example is quite powerful if you know how to hit the "
+"right flags and know which regular expression narrows your search down. "
+"Enjoy Mutting!"
 msgstr ""
 
 #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL