Andreas Krennmair:

	merged latest changes from mutt
	moved stuff_quoted to the f=f-related variables in UPGRADING
	added missing changelog entry

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@138 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng
index 7f6ef9e..f2d9e2c 100644 (file)
--- a/ChangeLog.mutt-ng
+++ b/ChangeLog.mutt-ng
@@ -8,6 +8,7 @@ Changes specific to mutt-ng:
   * somewhat bigger documentation update; introduce UPGRADING document
   * fixed escape sequence problem in manual.txt
   * fixed bug #3490
+  * added an option to make f=f messages break at a certain column
 
 2005-02-27:
   * integrated patch to highlight the next mailbox which includes new mail in sidebar

diff --git a/UPGRADING b/UPGRADING
index 5a802f4..3eabb7e 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -43,14 +43,14 @@ rev123, please put it "into" init and removes this comment when done!
     sidebar_delim, sidebar_visible, sidebar_width, shorten_hierarchy
 
     Format Flowed Improvements:
-    max_line_length, quote_empty, quote_quoted
+    max_line_length, quote_empty, quote_quoted, stuff_quoted
 
     XTerm-Titles Patch:
     xterm_icon, xterm_set_titles, xterm_title
 
     Misc.
     imap_reconnect, msgid_format, operating_system, shorten_hierarchy,
-    signoff_string, stuff_quoted, umask
+    signoff_string, umask
     
     Trash-Folder Patch:
     trash

diff --git a/init.h b/init.h
index e668e6a..62b5a13 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1220,11 +1220,11 @@ struct option_t MuttVars[] = {
   ** Availability: Header Cache
   **
   ** .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.
   */
   { "maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 },
   /*

diff --git a/po/ru.po b/po/ru.po
index 85656b6..13d4536 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -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 <mutt-ru@woe.spb.ru>\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 <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
@@ -2653,8 +2652,8 @@ msgstr ""
 "ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n"
 "  -f <file>\tÕËÁÚÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÄÌÑ ÒÁÂÏÔÙ\n"
 "  -F <file>\tÕËÁÚÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ muttrc\n"
-"  -H <file>\tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ\n"
-"  -i <file>\tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÏÔ×ÅÔ\n"
+"  -H <file>\tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ É ÔÅÌÁ ÐÉÓØÍÁ\n"
+"  -i <file>\tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÔÅÌÏ ÐÉÓØÍÁ\n"
 "  -m <ÔÉÐ>\tÕËÁÚÁÔØ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
 "  -n\t\tÚÁÐÒÅÔÉÔØ ÞÔÅÎÉÅ ÓÉÓÔÅÍÎÏÇÏ Muttrc\n"
 "  -p\t\tÐÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ\n"