# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1206637862 -32400
# Node ID a8269a1b91647c029546aa1e7364ec949504a604
# Parent  7dc8a24c70f4b7101f690234d9af21ef0d18f6c3
more mq.tex

diff -r 7dc8a24c70f4 -r a8269a1b9164 ja/mq.tex
--- a/ja/mq.tex	Fri Mar 28 01:13:26 2008 +0900
+++ b/ja/mq.tex	Fri Mar 28 02:11:02 2008 +0900
@@ -241,19 +241,28 @@
 \section{パッチとは何か}
 \label{sec:mq:patch}
 
-Because MQ doesn't hide its patch-oriented nature, it is helpful to
-understand what patches are, and a little about the tools that work
-with them.
+%Because MQ doesn't hide its patch-oriented nature, it is helpful to
+%understand what patches are, and a little about the tools that work
+%with them.
+
+MQはパッチ指向である性質を隠蔽していないので，パッチが何であるか，ツール
+がパッチをどう扱うかを理解するのはたやすい．
 
-The traditional Unix \command{diff} command compares two files, and
-prints a list of differences between them. The \command{patch} command
-understands these differences as \emph{modifications} to make to a
-file.  Take a look at figure~\ref{ex:mq:diff} for a simple example of
-these commands in action.
+%The traditional Unix \command{diff} command compares two files, and
+%prints a list of differences between them. The \command{patch} command
+%understands these differences as \emph{modifications} to make to a
+%file.  Take a look at figure~\ref{ex:mq:diff} for a simple example of
+%these commands in action.
+
+Unixの伝統的な\command{diff}コマンドは2つのファイルを比較し，差分のリス
+トを出力する．\command{patch}コマンドはこの差分を変更と解釈し，ファイル
+に及ぼす．図~\ref{ex:mq:diff}にこれらのコマンドの動作を示す．
 
 \begin{figure}[ht]
   \interaction{mq.dodiff.diff}
-  \caption{Simple uses of the \command{diff} and \command{patch} commands}
+%  \caption{Simple uses of the \command{diff} and \command{patch}
+ %  commands}
+  \caption{\command{diff}コマンドと\command{patch}コマンドの単純な使用例}
   \label{ex:mq:diff}
 \end{figure}
 
@@ -262,6 +271,9 @@
 difference between a patch and a diff.  (We'll use the term ``patch'',
 since it's more commonly used.)
 
+
+
+
 A patch file can start with arbitrary text; the \command{patch}
 command ignores this text, but MQ uses it as the commit message when
 creating changesets.  To find the beginning of the patch content,
@@ -1141,17 +1153,27 @@
 section~\ref{sec:mq:combine}.
 
 %\section{Differences between quilt and MQ}
-\section{キルトとMQの違い}
+\section{quiltとMQの違い}
 
-If you are already familiar with quilt, MQ provides a similar command
-set.  There are a few differences in the way that it works.
+%If you are already familiar with quilt, MQ provides a similar command
+%set.  There are a few differences in the way that it works.
+
+すでにquiltに馴染んでいるユーザのために，MQは同様のコマンドセットを用意
+している．コマンドの挙動には何点か違いがある．
 
-You will already have noticed that most quilt commands have MQ
-counterparts that simply begin with a ``\texttt{q}''.  The exceptions
-are quilt's \texttt{add} and \texttt{remove} commands, the
-counterparts for which are the normal Mercurial \hgcmd{add} and
-\hgcmd{remove} commands.  There is no MQ equivalent of the quilt
-\texttt{edit} command.
+%You will already have noticed that most quilt commands have MQ
+%counterparts that simply begin with a ``\texttt{q}''.  The exceptions
+%are quilt's \texttt{add} and \texttt{remove} commands, the
+%counterparts for which are the normal Mercurial \hgcmd{add} and
+%\hgcmd{remove} commands.  There is no MQ equivalent of the quilt
+%\texttt{edit} command.
+
+すでにほとんどのquiltコマンドには，対応する``\texttt{q}''で始まるMQコマン
+ドがあることに気づいていることと思う．例外は，quiltの\texttt{add}コマンド
+と\texttt{remove}コマンドで，これらにはそれぞれ通常のMercurialコマンドの
+\hgcmd{add}と\hgcmd{remove}が対応する．また，quiltの\texttt{edit}コマンド
+に対応するMQコマンドはない．
+
 
 %%% Local Variables: 
 %%% mode: yatex