[svnbook commit] r1255 - trunk/src/es/book
gradha
svnbook-dev at red-bean.com
Sat Apr 30 07:48:22 CDT 2005
Author: gradha
Date: Sat Apr 30 07:48:21 2005
New Revision: 1255
Modified:
trunk/src/es/book/ch09.xml
Log:
Book Spanish. Translated two paragraphs. Removed TODO.
Modified: trunk/src/es/book/ch09.xml
==============================================================================
--- trunk/src/es/book/ch09.xml (original)
+++ trunk/src/es/book/ch09.xml Sat Apr 30 07:48:21 2005
@@ -58,8 +58,7 @@
<varlistentry>
<term><option>--auto-props</option></term>
<listitem>
- <para>Activa auto propiedades, ignorando <!-- TODO
- override != ignorar -->el valor de la directiva
+ <para>Activa auto propiedades, reemplazando la directiva
<literal>enable-auto-props</literal> del fichero
<filename>config</filename>.</para>
</listitem>
@@ -80,14 +79,16 @@
<term><option>--diff-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies an external program to use to show
- differences between files. When <command>svn
- diff</command> is invoked, it uses Subversion's internal
- diff engine, which provides unified diffs by default. If
- you want to use an external diff program, use
- <option>--diff-cmd</option>. You can pass switches to the
- diff program with the <option>--extensions</option>
- switch (more on that later in this section).</para>
+ <para>Especifica el programa externo que desea usar para
+ mostrar las diferencias entre ficheros. Cuando invoca
+ <command>svn diff</command>, usa el motor diferencial
+ interno de Subversion, el cual genera ficheros
+ diferenciales en formato unificado por defecto. Si
+ quiere usar un programa de diferenciación externo, use
+ <option>--diff-cmd</option>. Puede pasar parámetros
+ a su programa de diferenciación con el parámetro
+ <option>--extensions</option> (más sobre esto adelante
+ en esta sección).</para>
</listitem>
</varlistentry>
@@ -95,7 +96,8 @@
<term><option>--diff3-cmd</option>
<replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies an external program to use to merge files.</para>
+ <para>Especifica el programa externo que desea usar para
+ fusionar los ficheros.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list