changeset 453:11d7896cd2ac

Merging changes from jerojasro

--- a/en/99defs.tex	Wed Oct 22 01:45:32 2008 -0500
+++ b/en/99defs.tex	Wed Oct 22 01:51:33 2008 -0500
@@ -136,6 +136,10 @@
 % Reference entry for a command option with only long form.
 \newcommand{\loptref}[2]{\subsubsection{\hgopt{#1}{--#2} option}}
 
+% command to generate a footnote to be used as a translator's note
+\newcommand{\ndt}[1]{\footnote{\textbf{N. del T.} #1}}
+
+
 %%% Local Variables: 
 %%% mode: latex
 %%% TeX-master: "00book"

--- a/es/00book.tex	Wed Oct 22 01:45:32 2008 -0500
+++ b/es/00book.tex	Wed Oct 22 01:51:33 2008 -0500
@@ -1,6 +1,7 @@
 % The use of oneside here is a temporary hack; \marginpar entries
 % don't show up on odd pages of PDF output without it.  Sigh.
 \documentclass[oneside]{book}
+\usepackage[spanish]{babel}
 \usepackage{enumerate}
 \usepackage{fullpage}
 \usepackage{makeidx}
@@ -31,10 +32,10 @@
 \makeindex
 
 \begin{document}
-
+\spanishdeactivate{<>"~}
 \maketitle
 
-\addcontentsline{toc}{chapter}{Contents}
+\addcontentsline{toc}{chapter}{Índice general}
 \pagenumbering{roman}
 \tableofcontents
 \listoffigures

--- a/es/99defs.tex	Wed Oct 22 01:45:32 2008 -0500
+++ b/es/99defs.tex	Wed Oct 22 01:51:33 2008 -0500
@@ -1,1 +1,146 @@
-../en/99defs.tex
\ No newline at end of file
+% Bug ID.
+\newcommand{\bug}[1]{\index{Mercurial bug
+    database!\href{http://www.selenic.com/mercurial/bts/issue#1}{bug
+      ~#1}}\href{http://www.selenic.com/mercurial/bts/issue#1}{Mercurial
+    bug no.~#1}}
+
+% File name in the user's home directory.
+\newcommand{\tildefile}[1]{\texttt{\~{}/#1}}
+
+% File name.
+\newcommand{\filename}[1]{\texttt{#1}}
+
+% Directory name.
+\newcommand{\dirname}[1]{\texttt{#1}}
+
+% File name, with index entry.
+% The ``s'' prefix comes from ``special''.
+\newcommand{\sfilename}[1]{\index{\texttt{#1} file}\texttt{#1}}
+
+% Directory name, with index entry.
+\newcommand{\sdirname}[1]{\index{\texttt{#1} directory}\texttt{#1}}
+
+% Mercurial extension.
+\newcommand{\hgext}[1]{\index{\texttt{#1} extension}\texttt{#1}}
+
+% Command provided by a Mercurial extension.
+\newcommand{\hgxcmd}[2]{\index{\texttt{#2} command (\texttt{#1}
+      extension)}\index{\texttt{#1} extension!\texttt{#2} command}``\texttt{hg #2}''}
+
+% Mercurial command.
+\newcommand{\hgcmd}[1]{\index{\texttt{#1} command}``\texttt{hg #1}''}
+
+% Mercurial command, with arguments.
+\newcommand{\hgcmdargs}[2]{\index{\texttt{#1} command}``\texttt{hg #1 #2}''}
+
+\newcommand{\tplkword}[1]{\index{\texttt{#1} template keyword}\index{template keywords!\texttt{#1}}\texttt{#1}}
+
+\newcommand{\tplkwfilt}[2]{\index{\texttt{#1} template keyword!\texttt{#2}
+    filter}\index{template filters!\texttt{#2}}\index{\texttt{#2}
+    template filter}\texttt{#2}}
+
+\newcommand{\tplfilter}[1]{\index{template
+    filters!\texttt{#1}}\index{\texttt{#1} template
+    filter}\texttt{#1}}
+
+% Shell/system command.
+\newcommand{\command}[1]{\index{\texttt{#1} system command}\texttt{#1}}
+
+% Shell/system command, with arguments.
+\newcommand{\cmdargs}[2]{\index{\texttt{#1} system command}``\texttt{#1 #2}''}
+
+% Mercurial command option.
+\newcommand{\hgopt}[2]{\index{\texttt{#1} command!\texttt{#2} option}\texttt{#2}}
+
+% Mercurial command option, provided by an extension command.
+\newcommand{\hgxopt}[3]{\index{\texttt{#2} command (\texttt{#1} extension)!\texttt{#3} option}\index{\texttt{#1} extension!\texttt{#2} command!\texttt{#3} option}\texttt{#3}}
+
+% Mercurial global option.
+\newcommand{\hggopt}[1]{\index{global options!\texttt{#1} option}\texttt{#1}}
+
+% Shell/system command option.
+\newcommand{\cmdopt}[2]{\index{\texttt{#1} command!\texttt{#2} option}\texttt{#2}}
+
+% Command option.
+\newcommand{\option}[1]{\texttt{#1}}
+
+% Software package.
+\newcommand{\package}[1]{\index{\texttt{#1} package}\texttt{#1}}
+
+% Section name from a hgrc file.
+\newcommand{\rcsection}[1]{\index{\texttt{hgrc} file!\texttt{#1} section}\texttt{[#1]}}
+
+% Named item in a hgrc file section.
+\newcommand{\rcitem}[2]{\index{\texttt{hgrc} file!\texttt{#1}
+    section!\texttt{#2} entry}\texttt{#2}}
+
+% hgrc file.
+\newcommand{\hgrc}{\index{configuration file!\texttt{hgrc}
+    (Linux/Unix)}\index{\texttt{hgrc} configuration file}\texttt{hgrc}}
+
+% Mercurial.ini file.
+\newcommand{\hgini}{\index{configuration file!\texttt{Mercurial.ini}
+    (Windows)}\index{\texttt{Mercurial.ini} configuration file}\texttt{Mercurial.ini}}
+
+% Hook name.
+\newcommand{\hook}[1]{\index{\texttt{#1} hook}\index{hooks!\texttt{#1}}\texttt{#1}}
+
+% Environment variable.
+\newcommand{\envar}[1]{\index{\texttt{#1} environment
+    variable}\index{environment variables!\texttt{#1}}\texttt{#1}}
+
+% Python module.
+\newcommand{\pymod}[1]{\index{\texttt{#1} module}\texttt{#1}}
+
+% Python class in a module.
+\newcommand{\pymodclass}[2]{\index{\texttt{#1} module!\texttt{#2}
+    class}\texttt{#1.#2}}
+
+% Python function in a module.
+\newcommand{\pymodfunc}[2]{\index{\texttt{#1} module!\texttt{#2}
+    function}\texttt{#1.#2}}
+
+% Note: blah blah.
+\newsavebox{\notebox}
+\newenvironment{note}%
+  {\begin{lrbox}{\notebox}\begin{minipage}{0.7\textwidth}\textbf{Nota:}\space}%
+  {\end{minipage}\end{lrbox}\fbox{\usebox{\notebox}}}
+\newenvironment{caution}%
+  {\begin{lrbox}{\notebox}\begin{minipage}{0.7\textwidth}\textbf{Precaución:}\space}%
+  {\end{minipage}\end{lrbox}\fbox{\usebox{\notebox}}}
+
+% Code sample, eating 4 characters of leading space.
+\DefineVerbatimEnvironment{codesample4}{Verbatim}{frame=single,gobble=4,numbers=left,commandchars=\\\{\}}
+
+% Code sample, eating 2 characters of leading space.
+\DefineVerbatimEnvironment{codesample2}{Verbatim}{frame=single,gobble=2,numbers=left,commandchars=\\\{\}}
+
+% Interaction from the examples directory.
+\newcommand{\interaction}[1]{\VerbatimInput[frame=single,numbers=left,commandchars=\\\{\}]{examples/#1.lxo}}
+% Example code from the examples directory.
+\newcommand{\excode}[1]{\VerbatimInput[frame=single,numbers=left,commandchars=\\\{\}]{../examples/#1}}
+
+% Graphics inclusion.
+\ifpdf
+  \newcommand{\grafix}[1]{\includegraphics{#1}}
+\else
+  \newcommand{\grafix}[1]{\includegraphics{#1.png}}
+\fi
+
+% Reference entry for a command.
+\newcommand{\cmdref}[2]{\section{\hgcmd{#1}---#2}\label{cmdref:#1}\index{\texttt{#1} command}}
+
+% Reference entry for a command option with long and short forms.
+\newcommand{\optref}[3]{\subsubsection{\hgopt{#1}{--#3}, also \hgopt{#1}{-#2}}}
+
+% Reference entry for a command option with only long form.
+\newcommand{\loptref}[2]{\subsubsection{\hgopt{#1}{--#2} option}}
+
+% command to generate a footnote to be used as a translator's note
+\newcommand{\ndt}[1]{\footnote{\textbf{N. del T.} #1}}
+
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "00book"
+%%% End: 

--- a/es/Leame.1st	Wed Oct 22 01:45:32 2008 -0500
+++ b/es/Leame.1st	Wed Oct 22 01:51:33 2008 -0500
@@ -97,7 +97,7 @@
 || 00book.tex      || Igor Támara   ||    100%    || 16/10/2008 ||  16/10/2008 ||
 || branch.tex      || Igor Támara   ||    100%    || 16/10/2008 ||  19/10/2008 ||
 || preface.tex     || Javier Rojas  ||    100%    || 18/10/2008 ||  19/10/2008 ||
-|| tour-basic.tex  || Javier Rojas  ||    34%     || 19/10/2008 ||             ||
+|| tour-basic.tex  || Javier Rojas  ||    24%     || 19/10/2008 ||             ||
 ||      daily.tex  || Igor Támara   ||    19%     || 19/10/2008 ||             ||
 
 == Archivos en proceso de revisión ==
@@ -376,6 +376,18 @@
     Traducción similar a la de "commit data" (razonamiento
     cliente-servidor).
 
+= Términos a no-usar =
+Evite el uso de estos términos en la traducción aún si son de uso
+común para usted; el consenso general de la comunidad hispana puede
+ser diferente del que usted tenga ;)
+
+  * "archivo". Use "fichero" en su lugar.
+  * "carpeta". Use "directorio".
+
+= Notas del traductor =
+Por favor use el comando \ndt para insertar notas del traductor. Este
+comando requiere un argumento. Por ejemplo: \ndt{Del inglés del original.}
+
 = Para compilar =
 He aquí algunas dependencias para Debian:
 

--- a/es/daily.tex	Wed Oct 22 01:45:32 2008 -0500
+++ b/es/daily.tex	Wed Oct 22 01:51:33 2008 -0500
@@ -123,7 +123,7 @@
 sido eliminado, Mercurial lo eliminará de nuevo del directorio de
 trabajo.
 
-\subsection{Missing files}
+\subsection{Archivos perdidos}
 
 Mercurial considera como \emph{perdido} un archivo que usted borró,
 pero para el que no se usó \hgcmd{remove}.  Los archivos perdidos se

--- a/es/tour-basic.tex	Wed Oct 22 01:45:32 2008 -0500
+++ b/es/tour-basic.tex	Wed Oct 22 01:51:33 2008 -0500
@@ -115,36 +115,43 @@
 \hggopt{-v} es la abreviación para \hggopt{--verbose}, y le indica a
 Mercurial que imprima más información de lo que haría usualmente.
 
-\section{Working with a repository}
+\section{Trabajar con un repositorio}
 
-In Mercurial, everything happens inside a \emph{repository}.  The
-repository for a project contains all of the files that ``belong to''
-that project, along with a historical record of the project's files.
+En Mercurial, todo sucede dentro de un \emph{repositorio}. El
+repositorio para un proyecto contiene todos los archivos que
+``pertenecen a'' ése proyecto, junto con un registro histórico de los
+archivos de ese proyecto.
 
-There's nothing particularly magical about a repository; it is simply
-a directory tree in your filesystem that Mercurial treats as special.
-You can rename or delete a repository any time you like, using either the
-command line or your file browser.
+No hay nada particularmente mágico acerca de un repositorio; es
+simplemente un árbol de directorios en su sistema de archivos que
+Mercurial trata como especial. Usted puede renombrar o borrar un
+repositorio en el momento que lo desee, usando bien sea la línea de
+comandos o su explorador de ficheros.
 
-\subsection{Making a local copy of a repository}
+\subsection{Hacer una copia local de un repositorio}
 
-\emph{Copying} a repository is just a little bit special.  While you
-could use a normal file copying command to make a copy of a
-repository, it's best to use a built-in command that Mercurial
-provides.  This command is called \hgcmd{clone}, because it creates an
-identical copy of an existing repository.
+\emph{Copiar} un repositorio es sólo ligeramente especial. Aunque
+usted podría usar un programa normal de copia de archivos para hacer
+una copia del repositorio, es mejor usar el comando integrado que
+Mercurial ofrece. Este comando se llama \hgcmd{clone}\ndt{Del término
+``clonar'' en inglés.}, porque crea una copia idéntica de un
+repositorio existente.
 \interaction{tour.clone}
-If our clone succeeded, we should now have a local directory called
-\dirname{hello}.  This directory will contain some files.
+Si nuestro clonado tiene éxito, deberíamos tener un directorio local
+llamado \dirname{hello}. Este directorio contendrá algunos archivos.
 \interaction{tour.ls}
-These files have the same contents and history in our repository as
-they do in the repository we cloned.
+Estos archivos tienen el mismo contenido e historial en nuestro
+repositorio y en el repositorio que clonamos.
 
-Every Mercurial repository is complete, self-contained, and
-independent.  It contains its own private copy of a project's files
-and history.  A cloned repository remembers the location of the
-repository it was cloned from, but it does not communicate with that
-repository, or any other, unless you tell it to.
+Cada repositorio Mercurial está completo, es autocontenido e
+independiente. Contiene su propia copia de los archivos y la historia
+de un proyecto. Un repositorio clonado recuerda la ubicación de la que
+fue clonado, pero no se comunica con ese repositorio, ni con ningún
+otro, a menos que usted le indique que lo haga.
+
+Lo que esto significa por ahora es que somos libres de experimentar
+con nuestro repositorio, con la tranquilidad de saber que es 
+% TODO finish paragraph, figure out what to say instead of sandbox
 
 What this means for now is that we're free to experiment with our
 repository, safe in the knowledge that it's a private ``sandbox'' that