# HG changeset patch
# User Javier Rojas <jerojasro@devnull.li>
# Date 1225652082 18000
# Node ID 0abd3d78172ebb4b6ccb18e7557b087c4acbda6e
# Parent  7f1572c365d2a28d70b386637154a566e0af4219
finished translation of a figure

translated a few paragraphs of tour-merge

diff -r 7f1572c365d2 -r 0abd3d78172e es/tour-merge-merge.svg
--- a/es/tour-merge-merge.svg	Fri Oct 31 00:19:04 2008 -0500
+++ b/es/tour-merge-merge.svg	Sun Nov 02 13:54:42 2008 -0500
@@ -66,10 +66,10 @@
      inkscape:cy="790.24518"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:window-width="906"
-     inkscape:window-height="659"
-     inkscape:window-x="38"
-     inkscape:window-y="95"
+     inkscape:window-width="1278"
+     inkscape:window-height="756"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showgrid="false" />
   <metadata
      id="metadata7">
@@ -185,25 +185,24 @@
        inkscape:connection-start="#rect2830" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"
        x="295.28571"
        y="217.56711"
-       id="text2871"><tspan
+       id="text2871"
+       sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
-         id="tspan2873"
-         x="295.28571"
-         y="217.56711">tip (and head)</tspan></text>
+         id="tspan2441">punta (y frente)</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="76"
-       y="264.91769"
-       id="text2875"><tspan
+       style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
+       x="57.817253"
+       y="263.90753"
+       id="text2875"
+       sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
-         id="tspan2877"
-         x="76"
-         y="264.91769"
-         style="text-align:end;text-anchor:end">principal</tspan></text>
+         id="tspan2439"
+         x="57.817253"
+         y="263.90753">frente</tspan></text>
     <rect
        style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1"
        id="rect1913"
@@ -329,14 +328,15 @@
        inkscape:connector-type="polyline" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
-       x="463.11224"
-       y="169.78796"
-       id="text2846"><tspan
+       style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
+       x="452.00058"
+       y="167.76765"
+       id="text2846"
+       sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
-         id="tspan2848"
-         x="463.11224"
-         y="169.78796">tip</tspan></text>
+         id="tspan2443"
+         x="452.00058"
+         y="167.76765">punta</tspan></text>
     <path
        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
        d="M 489.37034,249.47656 L 524.65575,178.26229"
diff -r 7f1572c365d2 -r 0abd3d78172e es/tour-merge.tex
--- a/es/tour-merge.tex	Fri Oct 31 00:19:04 2008 -0500
+++ b/es/tour-merge.tex	Sun Nov 02 13:54:42 2008 -0500
@@ -77,31 +77,33 @@
 repositorio usando el comando \hgcmd{heads}\ndt{Frentes.}.
 \interaction{tour.merge.heads}
 
-\subsection{Performing the merge}
+\subsection{Hacer la fusión}
 
-What happens if we try to use the normal \hgcmd{update} command to
-update to the new tip?
+% TODO poner interrogante de apertura
+Qué pasa si tratamos de usar el comando usual, \hgcmd{update}, para
+actualizar el nuevo frente?
 \interaction{tour.merge.update}
-Mercurial is telling us that the \hgcmd{update} command won't do a
-merge; it won't update the working directory when it thinks we might
-be wanting to do a merge, unless we force it to do so.  Instead, we
-use the \hgcmd{merge} command to merge the two heads.
+Mercurial nos indica que el comando \hgcmd{update} no hará la fusión;
+no actualizará el directorio de trabajo cuando considera que lo que
+deseamos hacer es una fusión, a menos que lo obliguemos a hacerlo.
+En vez de \hgcmd{update}, usamos el comando \hgcmd{merge} para hacer
+la fusión entre los dos frentes.
 \interaction{tour.merge.merge}
 
 \begin{figure}[ht]
   \centering
   \grafix{tour-merge-merge}
-  \caption{Working directory and repository during merge, and
-    following commit}
+  \caption{Directorio de trabajo y repositorio durante la fusión, y
+  consignación consecuente}
   \label{fig:tour-merge:merge}
 \end{figure}
 
-This updates the working directory so that it contains changes from
-\emph{both} heads, which is reflected in both the output of
-\hgcmd{parents} and the contents of \filename{hello.c}.
+Esto actualiza el directorio de trabajo, de tal forma que contenga los
+cambios de \emph{ambos} frentes, lo que se ve reflejado tanto en la
+salida de \hgcmd{parents} como en los contenidos de \filename{hello.c}.
 \interaction{tour.merge.parents}
 
-\subsection{Committing the results of the merge}
+\subsection{Consignar los resultados de la fusión}
 
 Whenever we've done a merge, \hgcmd{parents} will display two parents
 until we \hgcmd{commit} the results of the merge.