# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1235021870 -32400
# Node ID 38f034c1da539e98dc7e44465883afe4a5451b9e
# Parent  beab196f78da13932eba8291dc0023436e869f44
finished daily.tex

diff -r beab196f78da -r 38f034c1da53 ja/daily.tex
--- a/ja/daily.tex	Thu Jan 15 16:34:43 2009 +0900
+++ b/ja/daily.tex	Thu Feb 19 14:37:50 2009 +0900
@@ -93,7 +93,7 @@
 通している．
 
 %\subsection{Aside: Mercurial tracks files, not directories}
-\subsection{余談: Mercurialはディレクトリではなくファイルを追跡する}
+\subsection{こぼれ話: Mercurialはディレクトリではなくファイルを追跡する}
 
 %Mercurial does not track directory information.  Instead, it tracks
 %the path to a file.  Before creating a file, it first creates any
@@ -150,80 +150,131 @@
 %\section{How to stop tracking a file}
 \section{ファイル追跡の停止}
 
-Once you decide that a file no longer belongs in your repository, use
-the \hgcmd{remove} command; this deletes the file, and tells Mercurial
-to stop tracking it.  A removed file is represented in the output of
-\hgcmd{status} with a ``\texttt{R}''.
+%Once you decide that a file no longer belongs in your repository, use
+%the \hgcmd{remove} command; this deletes the file, and tells Mercurial
+%to stop tracking it.  A removed file is represented in the output of
+%\hgcmd{status} with a ``\texttt{R}''.
+%\interaction{daily.files.remove}
+
+ファイルがリポジトリに必要なくなった時は\hgcmd{remove}コマンドを実行す
+る．このコマンドはファイルを削除した上でMercurialにファイル追跡の停止を指
+示する．削除されたファイルは\hgcmd{status}コマンドの出力で``\texttt{R}''
+と表示される．
 \interaction{daily.files.remove}
 
-After you \hgcmd{remove} a file, Mercurial will no longer track
-changes to that file, even if you recreate a file with the same name
-in your working directory.  If you do recreate a file with the same
-name and want Mercurial to track the new file, simply \hgcmd{add} it.
-Mercurial will know that the newly added file is not related to the
-old file of the same name.
+%After you \hgcmd{remove} a file, Mercurial will no longer track
+%changes to that file, even if you recreate a file with the same name
+%in your working directory.  If you do recreate a file with the same
+%name and want Mercurial to track the new file, simply \hgcmd{add} it.
+%Mercurial will know that the newly added file is not related to the
+%old file of the same name.
+
+一度ファイルを\hgcmd{remove}した後では，Mercurialはワーキングディレクトリ
+内にたとえ同じ名前でファイルが再生成されてもファイルへの変更を追跡しない．
+ファイルを再生成し，Mercurialに追跡させたいのであれば，\hgcmd{add}を行う．
+Mercurialは，新規に追加されたファイルを同名の古いファイルと関係なく扱う．
 
 %\subsection{Removing a file does not affect its history}
 \subsection{ファイル削除は履歴に影響を与えない}
 
-It is important to understand that removing a file has only two
-effects.
+%It is important to understand that removing a file has only two
+%effects.
+ファイルの削除がリポジトリに与える影響は2つのみである．
 \begin{itemize}
-\item It removes the current version of the file from the working
-  directory.
-\item It stops Mercurial from tracking changes to the file, from the
-  time of the next commit.
+%\item It removes the current version of the file from the working
+%  directory.
+ \item ワーキングディレクトリから原稿のバージョンのファイルを消去する．
+%\item It stops Mercurial from tracking changes to the file, from the
+%  time of the next commit.
+ \item 削除するファイルへの変更を次回のコミットからMercurialが追跡しない
+       ようにする．
 \end{itemize}
-Removing a file \emph{does not} in any way alter the \emph{history} of
-the file.
+%Removing a file \emph{does not} in any way alter the \emph{history} of
+%the file.
+ファイルをどのように削除してもファイルの\emph{履歴}は変更\emph{されない}．
 
-If you update the working directory to a changeset in which a file
-that you have removed was still tracked, it will reappear in the
-working directory, with the contents it had when you committed that
-changeset.  If you then update the working directory to a later
-changeset, in which the file had been removed, Mercurial will once
-again remove the file from the working directory.
+%If you update the working directory to a changeset in which a file
+%that you have removed was still tracked, it will reappear in the
+%working directory, with the contents it had when you committed that
+%changeset.  If you then update the working directory to a later
+%changeset, in which the file had been removed, Mercurial will once
+%again remove the file from the working directory.
+
+ワーキングディレクトリを，消去したファイルを含むチェンジセットに更新する
+と，ファイルはそのチェンジセットでの内容で再びワーキングディレクトリに現
+れる．そこでファイルが消去されている後のチェンジセットに更新する
+と，Mercurialはファイルを再びワーキングディレクトリから消去する．
 
 %\subsection{Missing files}
 \subsection{欠落したファイル}
 
-Mercurial considers a file that you have deleted, but not used
-\hgcmd{remove} to delete, to be \emph{missing}.  A missing file is
-represented with ``\texttt{!}'' in the output of \hgcmd{status}.
-Mercurial commands will not generally do anything with missing files.
+%Mercurial considers a file that you have deleted, but not used
+%\hgcmd{remove} to delete, to be \emph{missing}.  A missing file is
+%represented with ``\texttt{!}'' in the output of \hgcmd{status}.
+%Mercurial commands will not generally do anything with missing files.
+%\interaction{daily.files.missing}
+
+Mercurialは，\hgcmd{remove}を使わずに消去されたファイルを\emph{欠落}した
+ファイルとして扱う．欠落ファイルは\hgcmd{status}コマンドの出力で
+``\texttt{!}''と表示される．Mercurialのコマンドは，通常，欠落したファイ
+ルには何も行わない．
 \interaction{daily.files.missing}
 
-If your repository contains a file that \hgcmd{status} reports as
-missing, and you want the file to stay gone, you can run
-\hgcmdargs{remove}{\hgopt{remove}{--after}} at any time later on, to
-tell Mercurial that you really did mean to remove the file.
+%If your repository contains a file that \hgcmd{status} reports as
+%missing, and you want the file to stay gone, you can run
+%\hgcmdargs{remove}{\hgopt{remove}{--after}} at any time later on, to
+%tell Mercurial that you really did mean to remove the file.
+%\interaction{daily.files.remove-after}
+
+リポジトリ内で\hgcmd{status}コマンドが欠落とリポートするファイルがある場
+合，\hgcmdargs{remove}{\hgopt{remove}{--after}}を実行して，Mercurialに欠
+落ファイルが消去されたものであることを指示することができる．
 \interaction{daily.files.remove-after}
 
-On the other hand, if you deleted the missing file by accident, use
-\hgcmdargs{revert}{\emph{filename}} to recover the file.  It will
-reappear, in unmodified form.
+%On the other hand, if you deleted the missing file by accident, use
+%\hgcmdargs{revert}{\emph{filename}} to recover the file.  It will
+%reappear, in unmodified form.
+%\interaction{daily.files.recover-missing}
+
+一方で，誤ってファイルを消去した場合，\hgcmdargs{revert}{\emph{filename}}を
+実行することでファイルを修復することができる．ファイルは何も変更されない状態
+で修復される．
 \interaction{daily.files.recover-missing}
 
 %\subsection{Aside: why tell Mercurial explicitly to remove a file?}
 \subsection{こぼれ話: なぜMercurialへファイルの削除を明示的に指示しなけ
   ればならないか}
 
-You might wonder why Mercurial requires you to explicitly tell it that
-you are deleting a file.  Early during the development of Mercurial,
-it let you delete a file however you pleased; Mercurial would notice
-the absence of the file automatically when you next ran a
-\hgcmd{commit}, and stop tracking the file.  In practice, this made it
-too easy to accidentally remove a file without noticing.
+%You might wonder why Mercurial requires you to explicitly tell it that
+%you are deleting a file.  Early during the development of Mercurial,
+%it let you delete a file however you pleased; Mercurial would notice
+%the absence of the file automatically when you next ran a
+%\hgcmd{commit}, and stop tracking the file.  In practice, this made it
+%too easy to accidentally remove a file without noticing.
+
+なぜMercurialにファイルの削除を明示的に指示しなければならないのだろうか？
+Mercurialの開発の初期には，ファイルがないことを検知すると，次に
+\hgcmd{commit}が実行される時に自動的にファイルの追跡をやめていた．実際に
+使ってみるとこの動作ではファイルを知らずのうちに失うことが頻発したのであ
+る．
 
 %\subsection{Useful shorthand---adding and removing files in one step}
 \subsection{役に立つ簡略法---ファイルの追加と削除を1ステップで行う}
 
-Mercurial offers a combination command, \hgcmd{addremove}, that adds
-untracked files and marks missing files as removed.
+%Mercurial offers a combination command, \hgcmd{addremove}, that adds
+%untracked files and marks missing files as removed.
+%\interaction{daily.files.addremove}
+%The \hgcmd{commit} command also provides a \hgopt{commit}{-A} option
+%that performs this same add-and-remove, immediately followed by a
+%commit.
+%\interaction{daily.files.commit-addremove}
+
+Mercurialは\hgcmd{addremove}という組み合わせコマンドを持っている．このコ
+マンドは追跡されていないファイル群を追加し，欠落しているファイルを消去さ
+れたとマークする．
 \interaction{daily.files.addremove}
-The \hgcmd{commit} command also provides a \hgopt{commit}{-A} option
-that performs this same add-and-remove, immediately followed by a
-commit.
+\hgcmd{commit}コマンドには\hgopt{commit}{-A}オプションがあり，同じ追加と
+削除の操作をコミット直後に行う．
 \interaction{daily.files.commit-addremove}
 
 %\section{Copying files}
@@ -243,141 +294,256 @@
 %\subsection{The results of copying during a merge}
 \subsection{マージ中のコピーの結果}
 
-What happens during a merge is that changes ``follow'' a copy.  To
-best illustrate what this means, let's create an example.  We'll start
-with the usual tiny repository that contains a single file.
+%What happens during a merge is that changes ``follow'' a copy.  To
+%best illustrate what this means, let's create an example.  We'll start
+%with the usual tiny repository that contains a single file.
+%\interaction{daily.copy.init}
+%We need to do some work in parallel, so that we'll have something to
+%merge.  So let's clone our repository.
+%\interaction{daily.copy.clone}
+%Back in our initial repository, let's use the \hgcmd{copy} command to
+%make a copy of the first file we created.
+%\interaction{daily.copy.copy}
+
+マージ中には，コピーに``従う''ことが起きる．これの意味するところを示すた
+めに，例を挙げることにする．いつものように，ファイル1つだけを含む小さなリ
+ポジトリを作成する．
 \interaction{daily.copy.init}
-We need to do some work in parallel, so that we'll have something to
-merge.  So let's clone our repository.
+マージすべき内容を作るために並行していくつかの作業を行う必要があるので，
+リポジトリのクローンを行う．
 \interaction{daily.copy.clone}
-Back in our initial repository, let's use the \hgcmd{copy} command to
-make a copy of the first file we created.
+最初のリポジトリに戻って，\hgcmd{copy}コマンドを使って，作成したファイル
+のコピーを行う．
 \interaction{daily.copy.copy}
 
-If we look at the output of the \hgcmd{status} command afterwards, the
-copied file looks just like a normal added file.
+%If we look at the output of the \hgcmd{status} command afterwards, the
+%copied file looks just like a normal added file.
+%\interaction{daily.copy.status}
+%But if we pass the \hgopt{status}{-C} option to \hgcmd{status}, it
+%prints another line of output: this is the file that our newly-added
+%file was copied \emph{from}.
+%\interaction{daily.copy.status-copy}
+
+その後で\hgcmd{status}コマンドの出力を見るとコピーされたファイルは通常通
+りに追加されたファイルとして見える．
 \interaction{daily.copy.status}
-But if we pass the \hgopt{status}{-C} option to \hgcmd{status}, it
-prints another line of output: this is the file that our newly-added
-file was copied \emph{from}.
+しかし\hgcmd{status}コマンドに\hgopt{status}{-C}オプションを渡すと，新た
+に追加されたファイルが\emph{どの}ファイルからコピーされたのかを示す行が
+出力される．
 \interaction{daily.copy.status-copy}
 
-Now, back in the repository we cloned, let's make a change in
-parallel.  We'll add a line of content to the original file that we
-created.
+%Now, back in the repository we cloned, let's make a change in
+%parallel.  We'll add a line of content to the original file that we
+%created.
+%\interaction{daily.copy.other}
+%Now we have a modified \filename{file} in this repository.  When we
+%pull the changes from the first repository, and merge the two heads,
+%Mercurial will propagate the changes that we made locally to
+%\filename{file} into its copy, \filename{new-file}.
+%\interaction{daily.copy.merge}
+
+ここでクローンしたリポジトリにも変更を加える．作成したファイルに一行を追
+加する．
 \interaction{daily.copy.other}
-Now we have a modified \filename{file} in this repository.  When we
-pull the changes from the first repository, and merge the two heads,
-Mercurial will propagate the changes that we made locally to
-\filename{file} into its copy, \filename{new-file}.
+これでこのリポジトリにも変更された\filename{file}が存在することにな
+る．ここで最初のリポジトリから変更をpullし，2つのheadをマージすると
+Mercurialはローカルな\filename{file}に対する変更をそのコピー
+\filename{new-file}に波及させる．
 \interaction{daily.copy.merge}
 
 %\subsection{Why should changes follow copies?}
 \subsection{変更はなぜコピーに従わなければならないか}
 \label{sec:daily:why-copy}
 
-This behaviour, of changes to a file propagating out to copies of the
-file, might seem esoteric, but in most cases it's highly desirable.
+%This behaviour, of changes to a file propagating out to copies of the
+%file, might seem esoteric, but in most cases it's highly desirable.
+
+ファイルへの変更がそのコピーへ波及する動作は難解に思えるかもしないが，多
+くの場合は非常に望ましい動作である．
+
+%First of all, remember that this propagation \emph{only} happens when
+%you merge.  So if you \hgcmd{copy} a file, and subsequently modify the
+%original file during the normal course of your work, nothing will
+%happen.
 
-First of all, remember that this propagation \emph{only} happens when
-you merge.  So if you \hgcmd{copy} a file, and subsequently modify the
-original file during the normal course of your work, nothing will
-happen.
+まず第一にこの波及はマージを行うときに\emph{のみ}発生する．従ってファイル
+を\hgcmd{copy}する場合や，通常の作業でオリジナルファイルを変更する場合は
+何も起きない．
+
+%The second thing to know is thatmodifications will only propagate
+%across a copy as long as the repository that you're pulling changes
+%from \emph{doesn't know} about the copy.
 
-The second thing to know is that modifications will only propagate
-across a copy as long as the repository that you're pulling changes
-from \emph{doesn't know} about the copy.
+知っておくべき点の2つ目は，変更をpullするリポジトリが，コピーについて
+\emph{関知しない}限り，変更は波及するということである．
+
+%The reason that Mercurial does this is as follows.  Let's say I make
+%an important bug fix in a source file, and commit my changes.
+%Meanwhile, you've decided to \hgcmd{copy} the file in your repository,
+%without knowing about the bug or having seen the fix, and you have
+%started hacking on your copy of the file.
 
-The reason that Mercurial does this is as follows.  Let's say I make
-an important bug fix in a source file, and commit my changes.
-Meanwhile, you've decided to \hgcmd{copy} the file in your repository,
-without knowing about the bug or having seen the fix, and you have
-started hacking on your copy of the file.
+Mercurialがこのように動作する理由を説明する．今，私が重要なバグ修正を1つ
+のソースファイルについて行い，変更をコミットしたとする．その間，あなたは
+自分のリポジトリの中で，そのバグあるいは修正を知らず，そのファイルの
+\hgcmd{copy}を行い，ファイルの変更を始めたとする．
 
-If you pulled and merged my changes, and Mercurial \emph{didn't}
-propagate changes across copies, your source file would now contain
-the bug, and unless you remembered to propagate the bug fix by hand,
-the bug would \emph{remain} in your copy of the file.
+%If you pulled and merged my changes, and Mercurial \emph{didn't}
+%propagate changes across copies, your source file would now contain
+%the bug, and unless you remembered to propagate the bug fix by hand,
+%the bug would \emph{remain} in your copy of the file.
+
+あなたが私の行った変更をpullし，mergeした場合，Mercurialは変更をコピー間
+で波及させない．あなたのソースファイル今バグを持っているかもしれないが，
+バグ修正を手で波及させなければバグはファイルのコピーに\emph{残る}．
 
-By automatically propagating the change that fixed the bug from the
-original file to the copy, Mercurial prevents this class of problem.
-To my knowledge, Mercurial is the \emph{only} revision control system
-that propagates changes across copies like this.
+%By automatically propagating the change that fixed the bug from the
+%original file to the copy, Mercurial prevents this class of problem.
+%To my knowledge, Mercurial is the \emph{only} revision control system
+%that propagates changes across copies like this.
+
+バグを修正する変更を自動的にオリジナルファイルからコピーへ波及させること
+によって，Mercurialはこの類の問題を避けている．私の知る限
+り，Mercurialは，このようなコピー間で変更を波及させる唯一のリビジョンコン
+トロールシステムである．
 
-Once your change history has a record that the copy and subsequent
-merge occurred, there's usually no further need to propagate changes
-from the original file to the copied file, and that's why Mercurial
-only propagates changes across copies until this point, and no
-further.
+%Once your change history has a record that the copy and subsequent
+%merge occurred, there's usually no further need to propagate changes
+%from the original file to the copied file, and that's why Mercurial
+%only propagates changes across copies until this point, and no
+%further.
+
+コピーと後続のマージが起こったことが更新履歴に含まれる場合，変更をオリジ
+ナルファイルからコピーされたファイルへさらに波及させる必要はない．これが
+Mercurialがこの時点までのみ変更をコピー間で波及させ，その後では行わない理
+由である．
 
 %\subsection{How to make changes \emph{not} follow a copy}
-\subsection{変更がコピーにし側内容にする方法}
+\subsection{変更がコピーに従わないようにする方法}
 
-If, for some reason, you decide that this business of automatically
-propagating changes across copies is not for you, simply use your
-system's normal file copy command (on Unix-like systems, that's
-\command{cp}) to make a copy of a file, then \hgcmd{add} the new copy
-by hand.  Before you do so, though, please do reread
-section~\ref{sec:daily:why-copy}, and make an informed decision that
-this behaviour is not appropriate to your specific case.
+%If, for some reason, you decide that this business of automatically
+%propagating changes across copies is not for you, simply use your
+%system's normal file copy command (on Unix-like systems, that's
+%\command{cp}) to make a copy of a file, then \hgcmd{add} the new copy
+%by hand.  Before you do so, though, please do reread
+%section~\ref{sec:daily:why-copy}, and make an informed decision that
+%this behaviour is not appropriate to your specific case.
+
+何らかの理由でこのように変更が自動的に波及するやり方が好ましくないと思わ
+れる場合は，システム標準のあファイルコピーコマンド（UNIX系システムでは
+\command{cp}）を使ってファイルのコピーを行い，\hgcmd{add}で新しいコピーを
+手動で追加することができる．これを実際に行う前
+に，~\ref{sec:daily:why-copy}節を再読し，このやり方の詳細を踏まえた上で，
+あなたのケースに適しているか判断してほしい．
 
 %\subsection{Behaviour of the \hgcmd{copy} command}
 \subsection{\hgcmd{copy}コマンドの挙動}
 
-When you use the \hgcmd{copy} command, Mercurial makes a copy of each
-source file as it currently stands in the working directory.  This
-means that if you make some modifications to a file, then \hgcmd{copy}
-it without first having committed those changes, the new copy will
-also contain the modifications you have made up until that point.  (I
-find this behaviour a little counterintuitive, which is why I mention
-it here.)
+%When you use the \hgcmd{copy} command, Mercurial makes a copy of each
+%source file as it currently stands in the working directory.  This
+%means that if you make some modifications to a file, then \hgcmd{copy}
+%it without first having committed those changes, the new copy will
+%also contain the modifications you have made up until that point.  (I
+%find this behaviour a little counterintuitive, which is why I mention
+%it here.)
+
+\hgcmd{copy}コマンドを使う時，Mercurialはワーキングディレクトリ内のファイ
+ルをその時点の状態でコピーする．すなわち，ファイルに何らかの変更を加え，
+変更のコミットをせずに\hgcmd{copy}を行うと，新たなコピーもその時点までに
+加えた変更を含んでいる． （筆者はこの挙動はやや直観に反すると考えているた
+め，敢えてここで言及した．）
 
-The \hgcmd{copy} command acts similarly to the Unix \command{cp}
-command (you can use the \hgcmd{cp} alias if you prefer).  The last
-argument is the \emph{destination}, and all prior arguments are
-\emph{sources}.  If you pass it a single file as the source, and the
-destination does not exist, it creates a new file with that name.
+%The \hgcmd{copy} command acts similarly to the Unix \command{cp}
+%command (you can use the \hgcmd{cp} alias if you prefer).  The last
+%argument is the \emph{destination}, and all prior arguments are
+%\emph{sources}.  If you pass it a single file as the source, and the
+%destination does not exist, it creates a new file with that name.
+%\interaction{daily.copy.simple}
+%If the destination is a directory, Mercurial copies its sources into
+%that directory.
+%\interaction{daily.copy.dir-dest}
+%Copying a directory is recursive, and preserves the directory
+%structure of the source.
+%\interaction{daily.copy.dir-src}
+%If the source and destination are both directories, the source tree is
+%recreated in the destination directory.
+%\interaction{daily.copy.dir-src-dest}
+
+\hgcmd{copy}コマンドはUnixの\command{cp}と同様に振舞う．（\hgcmd{cp}エイ
+リアスを定義して使うことも可能だ．）引数の最後は\emph{コピー先}で，それ以
+前の引数は\emph{コピー元}である．コピー元として単一のファイルを指定し，コ
+ピー先ファイルが存在しない場合，コマンドはコピー先ファイルを新規に作成す
+る．
 \interaction{daily.copy.simple}
-If the destination is a directory, Mercurial copies its sources into
-that directory.
+コピー先がディレクトリの場合，Mercurialはコピー元をコピー先ディレクトリ
+の中にコピーする．
 \interaction{daily.copy.dir-dest}
-Copying a directory is recursive, and preserves the directory
-structure of the source.
+ディレクトリのコピーは再帰的で，コピー元のディレクトリ構造を保つ．
 \interaction{daily.copy.dir-src}
-If the source and destination are both directories, the source tree is
-recreated in the destination directory.
+コピー元とコピー先が共にディレクトリの場合，コピー元のツリー構造がコピー
+先のディレクトリの中に再現される．
 \interaction{daily.copy.dir-src-dest}
 
-As with the \hgcmd{rename} command, if you copy a file manually and
-then want Mercurial to know that you've copied the file, simply use
-the \hgopt{copy}{--after} option to \hgcmd{copy}.
+%As with the \hgcmd{rename} command, if you copy a file manually and
+%then want Mercurial to know that you've copied the file, simply use
+%the \hgopt{copy}{--after} option to \hgcmd{copy}.
+%\interaction{daily.copy.after}
+
+\hgcmd{rename}コマンドと同様に，ファイルを手動でコピーした後で，Mercurialに
+操作を通知したい場合は，\hgcmd{copy}コマンドに\hgopt{copy}{--after}オプ
+ションを付ければよい．
 \interaction{daily.copy.after}
 
 %\section{Renaming files}
 \section{ファイルのリネーム}
 
-It's rather more common to need to rename a file than to make a copy
-of it.  The reason I discussed the \hgcmd{copy} command before talking
-about renaming files is that Mercurial treats a rename in essentially
-the same way as a copy.  Therefore, knowing what Mercurial does when
-you copy a file tells you what to expect when you rename a file.
+%It's rather more common to need to rename a file than to make a copy
+%of it.  The reason I discussed the \hgcmd{copy} command before talking
+%about renaming files is that Mercurial treats a rename in essentially
+%the same way as a copy.  Therefore, knowing what Mercurial does when
+%you copy a file tells you what to expect when you rename a file.
+
+ファイルをリネームすることはファイルのコピーよりもよく行われる．ファイル
+のリネームよりも前に\hgcmd{copy}について述べた理由は， Mercurialが本質的
+にリネームをコピーと同様に扱うからである．従って，ファイルをコピーする時
+にMercurialが行うことを知ることは，リネームの際に起こることを知ることにな
+る．
 
-When you use the \hgcmd{rename} command, Mercurial makes a copy of
-each source file, then deletes it and marks the file as removed.
+%When you use the \hgcmd{rename} command, Mercurial makes a copy of
+%each source file, then deletes it and marks the file as removed.
+%\interaction{daily.rename.rename}
+%The \hgcmd{status} command shows the newly copied file as added, and
+%the copied-from file as removed.
+%\interaction{daily.rename.status}
+
+\hgcmd{rename}コマンドを使う時，Mercurialは各々のソースファイルをコピー
+し，元のファイルを削除して，消去済みとマークする．
 \interaction{daily.rename.rename}
-The \hgcmd{status} command shows the newly copied file as added, and
-the copied-from file as removed.
+\hgcmd{status}コマンドは新たにコピーされたファイルを追加されたファイルと
+して表示し，コピーされたファイルを消去されたファイルと表示する．
 \interaction{daily.rename.status}
-As with the results of a \hgcmd{copy}, we must use the
-\hgopt{status}{-C} option to \hgcmd{status} to see that the added file
-is really being tracked by Mercurial as a copy of the original, now
-removed, file.
+
+%As with the results of a \hgcmd{copy}, we must use the
+%\hgopt{status}{-C} option to \hgcmd{status} to see that the added file
+%is really being tracked by Mercurial as a copy of the original, now
+%removed, file.
+%\interaction{daily.rename.status-copy}
+
+\hgcmd{copy}コマンドの場合と同様に， \hgcmd{status}コマンドに
+\hgopt{status}{-C}オプションを用いて，追加されたファイルが消去されたオリ
+ジナルファイルのコピーとしてMercurialに追跡されているのかを調べることがで
+きる．
 \interaction{daily.rename.status-copy}
 
-As with \hgcmd{remove} and \hgcmd{copy}, you can tell Mercurial about
-a rename after the fact using the \hgopt{rename}{--after} option.  In
-most other respects, the behaviour of the \hgcmd{rename} command, and
-the options it accepts, are similar to the \hgcmd{copy} command.
+%As with \hgcmd{remove} and \hgcmd{copy}, you can tell Mercurial about
+%a rename after the fact using the \hgopt{rename}{--after} option.  In
+%most other respects, the behaviour of the \hgcmd{rename} command, and
+%the options it accepts, are similar to the \hgcmd{copy} command.
+
+\hgcmd{remove}と\hgcmd{copy}のように，\hgopt{rename}{--after}オプションを
+使うことで，事後にリネームをすることができる．多くの点で\hgcmd{rename}コ
+マンドの挙動と，このコマンドが受け入れるオプションは\hgcmd{copy}コマンド
+と類似している．
 
 %\subsection{Renaming files and merging changes}
 \subsection{ファイルのリネームと変更のマージ}
diff -r beab196f78da -r 38f034c1da53 ja/todo.txt
--- a/ja/todo.txt	Thu Jan 15 16:34:43 2009 +0900
+++ b/ja/todo.txt	Thu Feb 19 14:37:50 2009 +0900
@@ -3,7 +3,7 @@
 branch.tex	100%
 collab.tex	100%
 concepts.tex
-daily.tex	5%
+daily.tex	100%
 filenames.tex	100%
 hg_id.tex	noneed
 hgext.tex	100%