Synch with No Gnus (not translated yet, 201008292242).

diff --git a/emacs-mime-ja.texi b/emacs-mime-ja.texi
index 527d980..6730295 100644 (file)
--- a/emacs-mime-ja.texi
+++ b/emacs-mime-ja.texi
@@ -419,13 +419,13 @@ Spammers \e$B$O\e(B @samp{multipart/alternative} \e$B%a%C%;!<%8$NM%@h$5$l$kB&$G2hA|
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 @acronym{HTML} \e$B$rIA2h$9$k$?$a$K;H$&4X?t$rA*Br$7$^$9!#$9$G$KMQ0U$7$F$"$k\e(B
-\e$BIA2h%W%m%0%i%`$O!"\e(B@code{w3}, @code{w3m}@footnote{emacs-w3m \e$B$K$D$$$F$N>\\e(B
-\e$B:Y$O\e(B @uref{http://emacs-w3m.namazu.org/} \e$B$r8+$F$/$@$5$$!#\e(B},
-@code{links}, @code{lynx}, @code{w3m-standalone} \e$B$^$?\e(B
-\e$B$O\e(B @code{html2text} \e$B$N%7%s%\%k72$N$&$A$N0l$D$r;XDj$9$k$3$H$K$h$C$FA*Br$7\e(B
-\e$B$^$9!#$b$7\e(B @code{nil} \e$B$@$C$?$i!"30It%S%e!<%o!<$r;H$$$^$9!#$5$i$K4X?t\e(B (\e$B0z\e(B
-\e$B?t$H$7$F\e(B @acronym{MIME} \e$B%O%s%I%k$,M?$($i$l$F8F$P$l$k\e(B) \e$B$r@_Dj$9$k$3$H$b$G\e(B
-\e$B$-$^$9!#\e(B
+\e$BIA2h%W%m%0%i%`$O!"\e(B@code{gnus-article-html}, @code{w3},
+@code{w3m}@footnote{emacs-w3m \e$B$K$D$$$F$N>\:Y\e(B
+\e$B$O\e(B @uref{http://emacs-w3m.namazu.org/} \e$B$r8+$F$/$@$5$$!#\e(B}, @code{links},
+@code{lynx}, @code{w3m-standalone} \e$B$^$?$O\e(B @code{html2text} \e$B$N%7%s%\%k72\e(B
+\e$B$N$&$A$N0l$D$r;XDj$9$k$3$H$K$h$C$FA*Br$7$^$9!#$b$7\e(B @code{nil} \e$B$@$C$?$i!"\e(B
+\e$B30It%S%e!<%o!<$r;H$$$^$9!#$5$i$K4X?t\e(B (\e$B0z?t$H$7$F\e(B @acronym{MIME} \e$B%O%s%I%k\e(B
+\e$B$,M?$($i$l$F8F$P$l$k\e(B) \e$B$r@_Dj$9$k$3$H$b$G$-$^$9!#\e(B
 
 @item mm-inline-text-html-with-images
 @vindex mm-inline-text-html-with-images

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 8ee21a8..c02d09f 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -613,6 +613,8 @@ Article Buffer
 
 * Hiding Headers::              \e$B$I$N%X%C%@!<$rI=<($9$k$+$r7h$a$k\e(B
 * Using MIME::                  \e$BFI$`A0$K5-;v$r\e(B @acronym{MIME} \e$B$KDL$9\e(B
+@c TRANSLATEME
+* HTML::                        Reading @acronym{HTML} messages.
 * Customizing Articles::        \e$B5-;v$N8+1I$($r;EN)$F$k\e(B
 * Article Keymap::              \e$B5-;v%P%C%U%!!<$G;H$($k%-!<A`:n\e(B
 * Misc Article::                \e$B$=$NB>\e(B
@@ -5929,6 +5931,12 @@ Gnus \e$B$,<!$N%0%k!<%W0\F0$9$k$3$H$r3NG'$9$k$?$a$K%-!<F~NO$r5a$a$?>l9g!"\e(B
 
 \e$B$3$NJQ?t$O?tCM$G$b9=$$$^$;$s!#$=$N>l9g$O!"%&%#%s%I%&$N@hF,$+$i$=$N?t$N9T\e(B
 \e$B$@$12<$,$C$?0LCV$K>o$K%]%$%s%H$,$"$k$h$&$K@)8f$5$l$^$9!#\e(B
+
+@c TRANSLATEME
+@item gnus-summary-stop-at-end-of-message
+@vindex gnus-summary-stop-at-end-of-message
+If non-@code{nil}, don't go to the next article when hitting
+@kbd{SPC}, and you're at the end of the article.
 @end table
 
 @node Choosing Articles
@@ -6616,6 +6624,13 @@ Gnus \e$B$O\e(B @code{Cancel-Lock} \e$B%X%C%@!<\e(B (@pxref{Canceling News,
 \e$B$9$k$3$H$rK:$l$J$$$G$/$@$5$$$M!#\e(B:-)
 @end table
 
+@c TRANSLATEME
+When delaying an article with @kbd{C-c C-j}, Message mode will
+automatically add a @code{"Date"} header with the current time.  In
+many cases you probably want the @code{"Date"} header to reflect the
+time the message is sent instead.  To do this, you have to delete
+@code{Date} from @code{message-draft-headers}.
+
 @node Marking Articles
 @section \e$B5-;v$K0u$rIU$1$k\e(B
 @cindex article marking
@@ -8071,6 +8086,17 @@ Gnus \e$B$O$"$J$?$,FI$`$G$"$m$&5-;v$h$j$b$?$/$5$s$N5-;v$r<hF@$7$^$9!#$3$l$O\e(B
 \e$B$/4J7i$G$"$k$N$,9%$^$7$$$G$9!#$3$N$h$&$J$b$N$r%P%$%H%3%s%Q%$%k$9$k$N$O!"\e(B
 \e$B$*$=$i$/NI$$CeA[$G$7$g$&!#\e(B
 
+@c TRANSLATEME
+@vindex gnus-async-post-fetch-function
+@findex gnus-html-prefetch-images
+After an article has been prefetched, this
+@code{gnus-async-post-fetch-function} will be called.  The buffer will
+be narrowed to the region of the article that was fetched.  A useful
+value would be @code{gnus-html-prefetch-images}, which will prefetch
+and store images referenced in the article, so that you don't have to
+wait for them to be fetched when you read the article.  This is useful
+for @acronym{HTML} messages that have external images.
+
 @vindex gnus-prefetched-article-deletion-strategy
 \e$B5-;v$OHsF14|%P%C%U%!!<$+$iCY$+$lAa$+$l:o=|$5$l$J$1$l$P$J$j$^$;$s!#\e(B
 @code{gnus-prefetched-article-deletion-strategy} \e$B$O$$$D5-;v$r:o=|$9$k$+\e(B
@@ -11972,6 +11998,8 @@ List-Archive \e$B%U%#!<%k%I$,$"$C$?$i!"%a!<%j%s%0%j%9%H$N%"!<%+%$%V$r1\Mw$7\e(B
 @menu
 * Hiding Headers::              \e$B$I$N%X%C%@!<$rI=<($9$k$+$r7h$a$k\e(B
 * Using MIME::                  \e$BFI$`A0$K5-;v$r\e(B @acronym{MIME} \e$B$KDL$9\e(B
+@c TRANSLATEME
+* HTML::                        Reading @acronym{HTML} messages.
 * Customizing Articles::        \e$B5-;v$N8+1I$($r;EN)$F$k\e(B
 * Article Keymap::              \e$B5-;v%P%C%U%!!<$G;H$($k%-!<A`:n\e(B
 * Misc Article::                \e$B$=$NB>\e(B
@@ -12265,6 +12293,46 @@ Emacs @acronym{MIME} \e$B%^%K%e%"%k$G=R$Y$i$l$F$$$^$9!#\e(B
 
 @ref{MIME Commands} \e$B$b8+$F$/$@$5$$!#\e(B
 
+@c TRANSLATEME
+@node HTML
+@section @acronym{HTML}
+@cindex @acronym{HTML}
+
+If you have @code{w3m} installed on your system, Gnus can display
+@acronym{HTML} articles in the article buffer.  There are many Gnus
+add-ons for doing this, using various approaches, but there's one
+(sort of) built-in method that's used by default.
+
+For a complete overview, consult @xref{Display Customization,
+,Display Customization, emacs-mime, The Emacs MIME Manual}.  This
+section only describes the default method.
+
+@table @code
+@item mm-text-html-renderer
+@vindex mm-text-html-renderer
+If set to @code{gnus-article-html}, Gnus will use the built-in method,
+that's based on @code{curl} and @code{w3m}.
+
+@item gnus-html-cache-directory
+@vindex gnus-html-cache-directory
+Gnus will download and cache images according to how
+@code{mm-w3m-safe-url-regexp} is set.  These images will be stored in
+this directory.
+
+@item gnus-html-cache-size
+@vindex gnus-html-cache-size
+When @code{gnus-html-cache-size} bytes have been used in that
+directory, the oldest files will be deleted.  The default is 500MB.
+
+@item gnus-html-frame-width
+@vindex gnus-html-frame-width
+The width to use when rendering HTML.  The default is 70.
+@end table
+
+To use this, make sure that you have @code{w3m} and @code{curl}
+installed.  If you have, then Gnus should display @acronym{HTML}
+automatically.
+
 @node Customizing Articles
 @section \e$B5-;v$N%+%9%?%^%$%:\e(B
 @cindex article customization
@@ -13344,6 +13412,10 @@ Headers, ,\e$B%a%C%;!<%8%X%C%@!<\e(B, message-ja, The Message Manual}.
 \e$BNa\e(B (@code{gnus-draft-toggle-sending}) \e$B$r;H$C$F%a%C%;!<%8$KAw?.IT2D$N0u$r\e(B
 \e$BIU$1$k$3$H$,$G$-$^$9!#$3$l$O@Z$jBX$(L?Na$G$9!#\e(B
 
+@c TRANSLATEME
+Finally, if you want to delete a draft, use the normal @kbd{B DEL}
+command (@pxref{Mail Group Commands}).
+
 @node Rejected Articles
 @section \e$B5qH]$5$l$?5-;v\e(B
 @cindex rejected articles

diff --git a/message-ja.texi b/message-ja.texi
index fc0cf10..ea2688d 100644 (file)
--- a/message-ja.texi
+++ b/message-ja.texi
@@ -1670,7 +1670,7 @@ sendmail \e$B$N%G%#%U%)%k%H$NF0:n$G$O!"$=$l$r;XDj$5$l$k$H!V??$NAw?.<T$,=q$-\e(B
 message/partial \e$B$H$7$FAw?.$5$l$k%a%C%;!<%8$N%5%$%:$N@)8B$G$9!#$=$l$r1[$(\e(B
 \e$B$?$i%a%C%;!<%8$rJ,3d$7$FAw$k$Y$-%a%C%;!<%8$NBg$-$5$N2<8B$r!"J8;z?t$G49;;\e(B
 \e$B$7$?CM$G$9\e(B (\e$BLuCm\e(B: \e$BF|K\8lE*$K$O!V2<8B!W$G$O$J$/!V>e8B!W\e(B)\e$B!#\e(B@code{nil} \e$B$@$C\e(B
-\e$B$?$i!"%5%$%:$OL5@)8B$K$J$j$^$9!#\e(B
+\e$B$?$i\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9\e(B)\e$B!"%5%$%:$OL5@)8B$K$J$j$^$9!#\e(B
 @end table
 
 @node News Headers