# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1212465790 -32400
# Node ID 12dde4918d247f3525e601944e8fc86948d63908
# Parent  cb130184dd23e492cadb7ca6ce554600a49887ee
more mq-ref.tex

diff -r cb130184dd23 -r 12dde4918d24 ja/mq-ref.tex
--- a/ja/mq-ref.tex	Thu Apr 10 23:41:57 2008 +0900
+++ b/ja/mq-ref.tex	Tue Jun 03 13:03:10 2008 +0900
@@ -1,138 +1,254 @@
-\chapter{Mercurial Queues reference}
+%\chapter{Mercurial Queues reference}
+\chapter{Mercurial Queues リファレンス}
 \label{chap:mqref}
 
-\section{MQ command reference}
+%\section{MQ command reference}
+\section{MQ コマンドリファレンス}
 \label{sec:mqref:cmdref}
 
-For an overview of the commands provided by MQ, use the command
-\hgcmdargs{help}{mq}.
+%For an overview of the commands provided by MQ, use the command
+%\hgcmdargs{help}{mq}.
+
+MQによって提供されるコマンドの概要については\hgcmdargs{help}{mq}を利用さ
+れたい．
 
-\subsection{\hgxcmd{mq}{qapplied}---print applied patches}
+%\subsection{\hgxcmd{mq}{qapplied}---print applied patches}
+\subsection{\hgxcmd{mq}{qapplied}---適用されたパッチの表示}
+
+%The \hgxcmd{mq}{qapplied} command prints the current stack of applied
+%patches.  Patches are printed in oldest-to-newest order, so the last
+%patch in the list is the ``top'' patch.
 
-The \hgxcmd{mq}{qapplied} command prints the current stack of applied
-patches.  Patches are printed in oldest-to-newest order, so the last
-patch in the list is the ``top'' patch.
+\hgxcmd{mq}{qapplied}コマンドは，適用されたパッチの現在のスタックを表示
+する．パッチは古いものから新しいものの順に表示される．そのため，リストの
+最後のパッチは``top''パッチとなる．
 
-\subsection{\hgxcmd{mq}{qcommit}---commit changes in the queue repository}
+%\subsection{\hgxcmd{mq}{qcommit}---commit changes in the queue
+%repository}
+\subsection{\hgxcmd{mq}{qcommit}---キューの中の変更をコミットする
+
+%The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
+%\sdirname{.hg/patches} repository.  This command only works if the
+%\sdirname{.hg/patches} directory is a repository, i.e.~you created the
+%directory using \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} or ran
+%\hgcmd{init} in the directory after running \hgxcmd{mq}{qinit}.
 
-The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
-\sdirname{.hg/patches} repository.  This command only works if the
-\sdirname{.hg/patches} directory is a repository, i.e.~you created the
-directory using \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} or ran
-\hgcmd{init} in the directory after running \hgxcmd{mq}{qinit}.
+\hgxcmd{mq}{qcommit}コマンドは，\sdirname{.hg/patches}ディレクトリにある
+屹立した変更をコミットする．このコマンドは\sdirname{.hg/patches}ディレク
+トリがリポジトリの場合にのみ動作する．例えば
+\hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}}コマンドによってディレクトリを作っ
+たり，\hgxcmd{mq}{qinit}コマンドの後に\hgcmd{init}を実行した場合が相当す
+る．
 
-This command is shorthand for \hgcmdargs{commit}{--cwd .hg/patches}.
+%This command is shorthand for \hgcmdargs{commit}{--cwd .hg/patches}.
+
+このコマンドは\hgcmdargs{commit}{--cwd .hg/patches}の短縮形である．
+
+%\subsection{\hgxcmd{mq}{qdelete}---delete a patch from the
+%  \sfilename{series} file}
+\subsection{\hgxcmd{mq}{qdelete}---\sfilename{series}ファイルからパッチ
+  を消去する}
 
-\subsection{\hgxcmd{mq}{qdelete}---delete a patch from the
-  \sfilename{series} file}
+%The \hgxcmd{mq}{qdelete} command removes the entry for a patch from the
+%\sfilename{series} file in the \sdirname{.hg/patches} directory.  It
+%does not pop the patch if the patch is already applied.  By default,
+%it does not delete the patch file; use the \hgxopt{mq}{qdel}{-f} option to
+%do that.
 
-The \hgxcmd{mq}{qdelete} command removes the entry for a patch from the
-\sfilename{series} file in the \sdirname{.hg/patches} directory.  It
-does not pop the patch if the patch is already applied.  By default,
-it does not delete the patch file; use the \hgxopt{mq}{qdel}{-f} option to
-do that.
+\hgxcmd{mq}{qdelete}コマンドは\sdirname{.hg/patches}ディレクトリの
+\sfilename{series}ファイルからパッチを消去する．パッチが既に適用されてい
+る場合はパッチをポップしない．デフォルトではパッチファイルを消去しないた
+め，その用途では\hgxopt{mq}{qdel}{-f}オプションを使う．
 
-Options:
+%Options:
+オプション:
 \begin{itemize}
-\item[\hgxopt{mq}{qdel}{-f}] Delete the patch file.
+%\item[\hgxopt{mq}{qdel}{-f}] Delete the patch file.
+\item[\hgxopt{mq}{qdel}{-f}] パッチを消去する．
 \end{itemize}
 
-\subsection{\hgxcmd{mq}{qdiff}---print a diff of the topmost applied patch}
+%\subsection{\hgxcmd{mq}{qdiff}---print a diff of the topmost applied
+%patch}
+\subsection{\hgxcmd{mq}{qdiff}---最上位の適用されたパッチのdiffを出力す
+  る}
 
-The \hgxcmd{mq}{qdiff} command prints a diff of the topmost applied patch.
-It is equivalent to \hgcmdargs{diff}{-r-2:-1}.
+%The \hgxcmd{mq}{qdiff} command prints a diff of the topmost applied patch.
+%It is equivalent to \hgcmdargs{diff}{-r-2:-1}.
+
+\hgxcmd{mq}{qdiff}コマンドは最上位の適用されたパッチのdiffを出力する．こ
+れは\hgcmdargs{diff}{-r-2:-1}と等価である．
 
-\subsection{\hgxcmd{mq}{qfold}---merge (``fold'') several patches into one}
+%\subsection{\hgxcmd{mq}{qfold}---merge (``fold'') several patches into
+%one}
+\subsection{\hgxcmd{mq}{qfold}---いくつかのパッチを一つにマージ(または``fold'')する}
+
+%The \hgxcmd{mq}{qfold} command merges multiple patches into the topmost
+%applied patch, so that the topmost applied patch makes the union of
+%all of the changes in the patches in question.
 
-The \hgxcmd{mq}{qfold} command merges multiple patches into the topmost
-applied patch, so that the topmost applied patch makes the union of
-all of the changes in the patches in question.
+\hgxcmd{mq}{qfold}コマンドは複数のパッチを適用された再上位のパッチにマー
+ジする．再上位のパッチは関心のあるパッチ全ての変更の集合になる．
+
+%The patches to fold must not be applied; \hgxcmd{mq}{qfold} will exit with
+%an error if any is.  The order in which patches are folded is
+%significant; \hgcmdargs{qfold}{a b} means ``apply the current topmost
+%patch, followed by \texttt{a}, followed by \texttt{b}''.
 
-The patches to fold must not be applied; \hgxcmd{mq}{qfold} will exit with
-an error if any is.  The order in which patches are folded is
-significant; \hgcmdargs{qfold}{a b} means ``apply the current topmost
-patch, followed by \texttt{a}, followed by \texttt{b}''.
+foldするパッチは適用されていてはならない．\hgxcmd{mq}{qfold}は，どれかが
+適用されている場合はエラーを返して終了する．foldされるパッチの順序は重要
+で，\hgcmdargs{qfold}{a b}は，``\texttt{a}, \texttt{b}が続いている現在の
+再上位のパッチを適用する''という意味になる．
+
+%The comments from the folded patches are appended to the comments of
+%the destination patch, with each block of comments separated by three
+%asterisk (``\texttt{*}'') characters.  Use the \hgxopt{mq}{qfold}{-e}
+%option to edit the commit message for the combined patch/changeset
+%after the folding has completed.
+
+フォールドされたパッチのコメントは，目的のパッチのコメントに追加される．
+各々のコメントブロックは3つのアスタリスクによって分離されている．
+\hgxopt{mq}{qfold}{-e}オプションによって，フォールドが完了した後に結合し
+たパッチ／チェンジセットのコミットメッセージを編集することができる．
 
-The comments from the folded patches are appended to the comments of
-the destination patch, with each block of comments separated by three
-asterisk (``\texttt{*}'') characters.  Use the \hgxopt{mq}{qfold}{-e}
-option to edit the commit message for the combined patch/changeset
-after the folding has completed.
-
-Options:
+%Options:
+オプション:
 \begin{itemize}
-\item[\hgxopt{mq}{qfold}{-e}] Edit the commit message and patch description
-  for the newly folded patch.
-\item[\hgxopt{mq}{qfold}{-l}] Use the contents of the given file as the new
-  commit message and patch description for the folded patch.
-\item[\hgxopt{mq}{qfold}{-m}] Use the given text as the new commit message
-  and patch description for the folded patch.
+%\item[\hgxopt{mq}{qfold}{-e}] Edit the commit message and patch description
+%  for the newly folded patch.
+\item[\hgxopt{mq}{qfold}{-e}] 新たにフォールドされるパッチのコミットメッ
+			      セージとパッチの説明を編集する．
+%\item[\hgxopt{mq}{qfold}{-l}] Use the contents of the given file as the new
+%  commit message and patch description for the folded patch.
+\item[\hgxopt{mq}{qfold}{-l}] フォールドされたパッチの新しいコミットメッ
+			      セージ及びパッチの説明として，与えられたファ
+			      イルを使用する．
+%\item[\hgxopt{mq}{qfold}{-m}] Use the given text as the new commit message
+%  and patch description for the folded patch.
+\item[\hgxopt{mq}{qfold}{-m}] フォールドされたパッチの新しいコミットメッ
+			      セージ及びパッチの説明として，与えられたテ
+			      キストを用いる．
 \end{itemize}
 
-\subsection{\hgxcmd{mq}{qheader}---display the header/description of a patch}
+%\subsection{\hgxcmd{mq}{qheader}---display the header/description of a patch}
+\subsection{\hgxcmd{mq}{qheader}---パッチのヘッダ／説明を表示}
 
-The \hgxcmd{mq}{qheader} command prints the header, or description, of a
-patch.  By default, it prints the header of the topmost applied patch.
-Given an argument, it prints the header of the named patch.
+%The \hgxcmd{mq}{qheader} command prints the header, or description, of a
+%patch.  By default, it prints the header of the topmost applied patch.
+%Given an argument, it prints the header of the named patch.
+
+\hgxcmd{mq}{qheader}コマンドはパッチのヘッダまたは説明を表示する．デフォ
+ルトでは再上位に適用されたパッチのヘッダを表示する．引数が渡されると，指
+定されたパッチのヘッダを表示する
 
-\subsection{\hgxcmd{mq}{qimport}---import a third-party patch into the queue}
+%\subsection{\hgxcmd{mq}{qimport}---import a third-party patch into the
+%queue}
+\subsection{\hgxcmd{mq}{qimport}---サードパーティのパッチをキューへイン
+  ポートする}
 
-The \hgxcmd{mq}{qimport} command adds an entry for an external patch to the
-\sfilename{series} file, and copies the patch into the
-\sdirname{.hg/patches} directory.  It adds the entry immediately after
-the topmost applied patch, but does not push the patch.
+%The \hgxcmd{mq}{qimport} command adds an entry for an external patch to the
+%\sfilename{series} file, and copies the patch into the
+%\sdirname{.hg/patches} directory.  It adds the entry immediately after
+%the topmost applied patch, but does not push the patch.
+
+\hgxcmd{mq}{qimport}コマンドは，\sfilename{series}ファイルに外部のパッチ
+のためのエントリを追加し，パッチを\sdirname{.hg/patches}ディレクトリにコ
+ピーする．追加は再上位の適用済みパッチの直後に行われ，パッチのプッシュは
+行わない．
 
-If the \sdirname{.hg/patches} directory is a repository,
-\hgxcmd{mq}{qimport} automatically does an \hgcmd{add} of the imported
-patch.
+%If the \sdirname{.hg/patches} directory is a repository,
+%\hgxcmd{mq}{qimport} automatically does an \hgcmd{add} of the imported
+%patch.
 
-\subsection{\hgxcmd{mq}{qinit}---prepare a repository to work with MQ}
+\sdirname{.hg/patches}ディレクトリがリポジトリの場
+合，\hgxcmd{mq}{qimport}は自動的にインポートされたパッチに対して
+\hgcmd{add}を行う．
+
+%\subsection{\hgxcmd{mq}{qinit}---prepare a repository to work with MQ}
+\subsection{\hgxcmd{mq}{qinit}---MQで使用するリポジトリを用意する}
+
+%The \hgxcmd{mq}{qinit} command prepares a repository to work with MQ.  It
+%creates a directory called \sdirname{.hg/patches}.
 
-The \hgxcmd{mq}{qinit} command prepares a repository to work with MQ.  It
-creates a directory called \sdirname{.hg/patches}.
+\hgxcmd{mq}{qinit}コマンドはMQで使用するリポジトリを用意す
+る．\sdirname{.hg/patches}というディレクトリが作られる．
 
-Options:
+%Options:
+オプション:
 \begin{itemize}
-\item[\hgxopt{mq}{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
-  in its own right.  Also creates a \sfilename{.hgignore} file that
-  will ignore the \sfilename{status} file.
+%\item[\hgxopt{mq}{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
+%  in its own right.  Also creates a \sfilename{.hgignore} file that
+%  will ignore the \sfilename{status} file.
+\item[\hgxopt{mq}{qinit}{-c}] \sdirname{.hg/patches}をリポジトリとして，
+			      コマンド実行時の権限で作成する．同時に
+			      \sfilename{status}ファイルを無視するために
+			      \sfilename{.hgignore}ファイルを作成する．
 \end{itemize}
 
-When the \sdirname{.hg/patches} directory is a repository, the
-\hgxcmd{mq}{qimport} and \hgxcmd{mq}{qnew} commands automatically \hgcmd{add}
-new patches.
+%When the \sdirname{.hg/patches} directory is a repository, the
+%\hgxcmd{mq}{qimport} and \hgxcmd{mq}{qnew} commands automatically \hgcmd{add}
+%new patches.
 
-\subsection{\hgxcmd{mq}{qnew}---create a new patch}
+\sdirname{.hg/patches}ディレクトリがリポジトリの場
+合，\hgxcmd{mq}{qimport}コマンドと\hgxcmd{mq}{qnew}コマンドは新しいパッ
+チを自動的に\hgcmd{add}する．
+
+%\subsection{\hgxcmd{mq}{qnew}---create a new patch}
+\subsection{\hgxcmd{mq}{qnew}---新しいパッチを作成する}
 
-The \hgxcmd{mq}{qnew} command creates a new patch.  It takes one mandatory
-argument, the name to use for the patch file.  The newly created patch
-is created empty by default.  It is added to the \sfilename{series}
-file after the current topmost applied patch, and is immediately
-pushed on top of that patch.
+%The \hgxcmd{mq}{qnew} command creates a new patch.  It takes one mandatory
+%argument, the name to use for the patch file.  The newly created patch
+%is created empty by default.  It is added to the \sfilename{series}
+%file after the current topmost applied patch, and is immediately
+%pushed on top of that patch.
+
+\hgxcmd{mq}{qnew}コマンドは新しいパッチを作成する．このコマンドは必須の引
+数としてパッチファイルとして使用する名前を取る．新規に作成されたパッチ
+は，デフォルトでは空であり，\sfilename{series}ファイルに，現在の再上位の
+適用されたパッチの直後に追加され，直ちにそのパッチの上にプッシュされる．
 
-If \hgxcmd{mq}{qnew} finds modified files in the working directory, it will
-refuse to create a new patch unless the \hgxopt{mq}{qnew}{-f} option is
-used (see below).  This behaviour allows you to \hgxcmd{mq}{qrefresh} your
-topmost applied patch before you apply a new patch on top of it.
+%If \hgxcmd{mq}{qnew} finds modified files in the working directory, it will
+%refuse to create a new patch unless the \hgxopt{mq}{qnew}{-f} option is
+%used (see below).  This behaviour allows you to \hgxcmd{mq}{qrefresh} your
+%topmost applied patch before you apply a new patch on top of it.
 
-Options:
+\hgxcmd{mq}{qnew}は，ワーキングディレクトリから変更されたファイルを見つけ
+ると，\hgxopt{mq}{qnew}{-f}オプション（下記を参照）が使われない限り新しい
+パッチの作成を拒否する．この挙動のため，再上位の適用されたパッチの上に新
+たなパッチを適用する前に，\hgxcmd{mq}{qrefresh}することができる．
+
+%Options:
+オプション:
 \begin{itemize}
-\item[\hgxopt{mq}{qnew}{-f}] Create a new patch if the contents of the
-  working directory are modified.  Any outstanding modifications are
-  added to the newly created patch, so after this command completes,
-  the working directory will no longer be modified.
-\item[\hgxopt{mq}{qnew}{-m}] Use the given text as the commit message.
-  This text will be stored at the beginning of the patch file, before
-  the patch data.
+%\item[\hgxopt{mq}{qnew}{-f}] Create a new patch if the contents of the
+%  working directory are modified.  Any outstanding modifications are
+%  added to the newly created patch, so after this command completes,
+%  the working directory will no longer be modified.
+\item[\hgxopt{mq}{qnew}{-f}] カレントディレクトリの内容が更新されている
+			     場合，新しいパッチを作成する．孤立した変王
+			     は新規に作成したパッチに追加され，このコマ
+			     ンドが終了するとワーキングディレクトリは変
+			     更なしの状態になる．
+%\item[\hgxopt{mq}{qnew}{-m}] Use the given text as the commit message.
+%  This text will be stored at the beginning of the patch file, before
+%  the patch data.
+\item[\hgxopt{mq}{qnew}{-m}] 与えられたテキストをコミットメッセージとし
+			     て用いる．このテキストはパッチファイルの先
+			     頭でデータの前に記録される．
 \end{itemize}
 
-\subsection{\hgxcmd{mq}{qnext}---print the name of the next patch}
+%\subsection{\hgxcmd{mq}{qnext}---print the name of the next patch}
+\subsection{\hgxcmd{mq}{qnext}---次のパッチの名前を表示する}
+
+%The \hgxcmd{mq}{qnext} command prints the name of the next patch in
+%the \sfilename{series} file after the topmost applied patch.  This
+%patch will become the topmost applied patch if you run \hgxcmd{mq}{qpush}.
 
-The \hgxcmd{mq}{qnext} command prints the name name of the next patch in
-the \sfilename{series} file after the topmost applied patch.  This
-patch will become the topmost applied patch if you run \hgxcmd{mq}{qpush}.
+\hgxcmd{mq}{qnext}コマンドは\sfilename{series}ファイルの次のパッチの名前
+を表示する．このパッチは，\hgxcmd{mq}{qpush}を実行すると最上位の適用済み
+パッチとなる
 
-\subsection{\hgxcmd{mq}{qpop}---pop patches off the stack}
+%\subsection{\hgxcmd{mq}{qpop}---pop patches off the stack}
+\subsection{\hgxcmd{mq}{qpop}---スタックからパッチをポップする}
 
 The \hgxcmd{mq}{qpop} command removes applied patches from the top of the
 stack of applied patches.  By default, it removes only one patch.
@@ -172,13 +288,15 @@
 The \hgxcmd{mq}{qpop} command removes one line from the end of the
 \sfilename{status} file for each patch that it pops.
 
-\subsection{\hgxcmd{mq}{qprev}---print the name of the previous patch}
+%\subsection{\hgxcmd{mq}{qprev}---print the name of the previous patch}
+\subsection{\hgxcmd{mq}{qprev}---以前のパッチの名前を表示する}
 
 The \hgxcmd{mq}{qprev} command prints the name of the patch in the
 \sfilename{series} file that comes before the topmost applied patch.
 This will become the topmost applied patch if you run \hgxcmd{mq}{qpop}.
 
-\subsection{\hgxcmd{mq}{qpush}---push patches onto the stack}
+%\subsection{\hgxcmd{mq}{qpush}---push patches onto the stack}
+\subsection{\hgxcmd{mq}{qpush}---パッチをスタックにプッシュする}
 \label{sec:mqref:cmd:qpush}
 
 The \hgxcmd{mq}{qpush} command adds patches onto the applied stack.  By
@@ -221,7 +339,8 @@
 \sfilename{series} file.  It appends one line to the \hgcmd{status}
 file for each patch that it pushes.
 
-\subsection{\hgxcmd{mq}{qrefresh}---update the topmost applied patch}
+%\subsection{\hgxcmd{mq}{qrefresh}---update the topmost applied patch}
+\subsection{\hgxcmd{mq}{qrefresh}---再上位の適用済みパッチを更新する}
 
 The \hgxcmd{mq}{qrefresh} command updates the topmost applied patch.  It
 modifies the patch, removes the old changeset that represented the
@@ -264,32 +383,38 @@
 patch.  With two arguments, it renames its first argument to its
 second.
 
-\subsection{\hgxcmd{mq}{qrestore}---restore saved queue state}
+%\subsection{\hgxcmd{mq}{qrestore}---restore saved queue state}
+\subsection{\hgxcmd{mq}{qrestore}---セーブされたキュー状態に復元する}
 
 XXX No idea what this does.
 
-\subsection{\hgxcmd{mq}{qsave}---save current queue state}
+%\subsection{\hgxcmd{mq}{qsave}---save current queue state}
+\subsection{\hgxcmd{mq}{qsave}---現在のキュー状態をセーブする}
 
 XXX Likewise.
 
-\subsection{\hgxcmd{mq}{qseries}---print the entire patch series}
+%\subsection{\hgxcmd{mq}{qseries}---print the entire patch series}
+\subsection{\hgxcmd{mq}{qseries}---パッチ系列を全て表示}
 
 The \hgxcmd{mq}{qseries} command prints the entire patch series from the
 \sfilename{series} file.  It prints only patch names, not empty lines
 or comments.  It prints in order from first to be applied to last.
 
-\subsection{\hgxcmd{mq}{qtop}---print the name of the current patch}
+%\subsection{\hgxcmd{mq}{qtop}---print the name of the current patch}
+\subsection{\hgxcmd{mq}{qtop}---現在のパッチの名前を表示}
 
 The \hgxcmd{mq}{qtop} prints the name of the topmost currently applied
 patch.
 
-\subsection{\hgxcmd{mq}{qunapplied}---print patches not yet applied}
+%\subsection{\hgxcmd{mq}{qunapplied}---print patches not yet applied}
+\subsection{\hgxcmd{mq}{qunapplied}---未適用のパッチを表示}
 
 The \hgxcmd{mq}{qunapplied} command prints the names of patches from the
 \sfilename{series} file that are not yet applied.  It prints them in
 order from the next patch that will be pushed to the last.
 
-\subsection{\hgcmd{strip}---remove a revision and descendants}
+%\subsection{\hgcmd{strip}---remove a revision and descendants}
+\subsection{\hgcmd{strip}---リビジョンとその子孫を削除}
 
 The \hgcmd{strip} command removes a revision, and all of its
 descendants, from the repository.  It undoes the effects of the
@@ -309,9 +434,11 @@
 \item[\hgopt{strip}{-n}] Do not save a backup bundle.
 \end{itemize}
 
-\section{MQ file reference}
+%\section{MQ file reference}
+\section{MQ ファイルリファレンス}
 
-\subsection{The \sfilename{series} file}
+%\subsection{The \sfilename{series} file}
+\subsection{\sfilename{series}ファイル}
 
 The \sfilename{series} file contains a list of the names of all
 patches that MQ can apply.  It is represented as a list of names, with
@@ -335,7 +462,8 @@
 directory using the \hgxopt{mq}{qinit}{-c} option to \hgxcmd{mq}{qinit}, this
 will be done for you automatically.
 
-\subsection{The \sfilename{status} file}
+%\subsection{The \sfilename{status} file}
+\subsection{\sfilename{status}ファイル}
 
 The \sfilename{status} file contains the names and changeset hashes of
 all patches that MQ currently has applied.  Unlike the