hgbook
diff es/tour-merge-merge.svg @ 362:90b67ac5862b
translated up to section 1.4.1
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Sat Oct 25 15:01:39 2008 -0500 (2008-10-25) |
parents | |
children | 0abd3d78172e |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/es/tour-merge-merge.svg Sat Oct 25 15:01:39 2008 -0500 1.3 @@ -0,0 +1,389 @@ 1.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 1.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 1.6 +<svg 1.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 1.8 + xmlns:cc="http://creativecommons.org/ns#" 1.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 1.10 + xmlns:svg="http://www.w3.org/2000/svg" 1.11 + xmlns="http://www.w3.org/2000/svg" 1.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 1.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 1.14 + width="744.09448819" 1.15 + height="1052.3622047" 1.16 + id="svg2" 1.17 + sodipodi:version="0.32" 1.18 + inkscape:version="0.46" 1.19 + sodipodi:docname="tour-merge-merge.svg" 1.20 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 1.21 + <defs 1.22 + id="defs4"> 1.23 + <inkscape:perspective 1.24 + sodipodi:type="inkscape:persp3d" 1.25 + inkscape:vp_x="0 : 526.18109 : 1" 1.26 + inkscape:vp_y="0 : 1000 : 0" 1.27 + inkscape:vp_z="744.09448 : 526.18109 : 1" 1.28 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 1.29 + id="perspective2928" /> 1.30 + <marker 1.31 + inkscape:stockid="Arrow1Mstart" 1.32 + orient="auto" 1.33 + refY="0.0" 1.34 + refX="0.0" 1.35 + id="Arrow1Mstart" 1.36 + style="overflow:visible"> 1.37 + <path 1.38 + id="path2973" 1.39 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 1.40 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 1.41 + transform="scale(0.4) translate(10,0)" /> 1.42 + </marker> 1.43 + <marker 1.44 + inkscape:stockid="Arrow1Mend" 1.45 + orient="auto" 1.46 + refY="0.0" 1.47 + refX="0.0" 1.48 + id="Arrow1Mend" 1.49 + style="overflow:visible;"> 1.50 + <path 1.51 + id="path3066" 1.52 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 1.53 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 1.54 + transform="scale(0.4) rotate(180) translate(10,0)" /> 1.55 + </marker> 1.56 + </defs> 1.57 + <sodipodi:namedview 1.58 + id="base" 1.59 + pagecolor="#ffffff" 1.60 + bordercolor="#666666" 1.61 + borderopacity="1.0" 1.62 + gridtolerance="10000" 1.63 + guidetolerance="10" 1.64 + objecttolerance="10" 1.65 + inkscape:pageopacity="0.0" 1.66 + inkscape:pageshadow="2" 1.67 + inkscape:zoom="0.98994949" 1.68 + inkscape:cx="328.35015" 1.69 + inkscape:cy="790.24518" 1.70 + inkscape:document-units="px" 1.71 + inkscape:current-layer="layer1" 1.72 + inkscape:window-width="906" 1.73 + inkscape:window-height="659" 1.74 + inkscape:window-x="38" 1.75 + inkscape:window-y="95" 1.76 + showgrid="false" /> 1.77 + <metadata 1.78 + id="metadata7"> 1.79 + <rdf:RDF> 1.80 + <cc:Work 1.81 + rdf:about=""> 1.82 + <dc:format>image/svg+xml</dc:format> 1.83 + <dc:type 1.84 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 1.85 + </cc:Work> 1.86 + </rdf:RDF> 1.87 + </metadata> 1.88 + <g 1.89 + inkscape:label="Layer 1" 1.90 + inkscape:groupmode="layer" 1.91 + id="layer1"> 1.92 + <rect 1.93 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.94 + id="rect2995" 1.95 + width="94.285713" 1.96 + height="20.714285" 1.97 + x="532.85718" 1.98 + y="203.0479" /> 1.99 + <text 1.100 + xml:space="preserve" 1.101 + 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:Courier" 1.102 + x="173.57143" 1.103 + y="443.79074" 1.104 + id="text2832"><tspan 1.105 + sodipodi:role="line" 1.106 + id="tspan2834" 1.107 + x="173.57143" 1.108 + y="443.79074" /></text> 1.109 + <rect 1.110 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.111 + id="rect2830" 1.112 + width="94.285713" 1.113 + height="20.714285" 1.114 + x="138" 1.115 + y="297.76227" /> 1.116 + <text 1.117 + xml:space="preserve" 1.118 + 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:Courier" 1.119 + x="162.09892" 1.120 + y="311.38342" 1.121 + id="text2824"><tspan 1.122 + sodipodi:role="line" 1.123 + id="tspan2826" 1.124 + x="162.09892" 1.125 + y="311.38342" 1.126 + style="font-family:Courier"><tspan 1.127 + style="font-weight:bold" 1.128 + id="tspan2862">4</tspan>: REV4</tspan></text> 1.129 + <path 1.130 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.131 + d="M 185.14286,343.63731 L 185.14286,319.47656" 1.132 + id="path2900" 1.133 + inkscape:connector-type="polyline" /> 1.134 + <rect 1.135 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.136 + id="rect2863" 1.137 + width="94.285713" 1.138 + height="20.714285" 1.139 + x="91.428574" 1.140 + y="250.47656" /> 1.141 + <text 1.142 + xml:space="preserve" 1.143 + style="font-size:12.00001812px;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:Courier" 1.144 + x="116.09886" 1.145 + y="264.56592" 1.146 + id="text1965" 1.147 + transform="scale(1.000002,0.999998)"><tspan 1.148 + sodipodi:role="line" 1.149 + id="tspan1967" 1.150 + x="116.09886" 1.151 + y="264.56592" 1.152 + style="font-family:Courier"><tspan 1.153 + style="font-weight:bold" 1.154 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 1.155 + <path 1.156 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.157 + d="M 173.95727,296.76228 L 149.75702,272.19085" 1.158 + id="path1971" 1.159 + inkscape:connector-type="polyline" 1.160 + inkscape:connection-end="#rect2863" 1.161 + inkscape:connection-start="#rect2830" /> 1.162 + <rect 1.163 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.164 + id="rect2911" 1.165 + width="94.285995" 1.166 + height="20.714283" 1.167 + x="186.71414" 1.168 + y="204.40514" /> 1.169 + <text 1.170 + xml:space="preserve" 1.171 + style="font-size:12.00001812px;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:Courier" 1.172 + x="210.81311" 1.173 + y="218.02673" 1.174 + id="text2913" 1.175 + transform="scale(1.000002,0.999998)"><tspan 1.176 + sodipodi:role="line" 1.177 + id="tspan2915" 1.178 + x="210.81311" 1.179 + y="218.02673" 1.180 + style="font-family:Courier"><tspan 1.181 + id="tspan1966" 1.182 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 1.183 + <path 1.184 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.185 + d="M 191.06908,296.76228 L 227.93092,226.11942" 1.186 + id="path2919" 1.187 + inkscape:connector-type="polyline" 1.188 + inkscape:connection-start="#rect2830" /> 1.189 + <text 1.190 + xml:space="preserve" 1.191 + 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" 1.192 + x="295.28571" 1.193 + y="217.56711" 1.194 + id="text2871"><tspan 1.195 + sodipodi:role="line" 1.196 + id="tspan2873" 1.197 + x="295.28571" 1.198 + y="217.56711">tip (and head)</tspan></text> 1.199 + <text 1.200 + xml:space="preserve" 1.201 + 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" 1.202 + x="76" 1.203 + y="264.91769" 1.204 + id="text2875"><tspan 1.205 + sodipodi:role="line" 1.206 + id="tspan2877" 1.207 + x="76" 1.208 + y="264.91769" 1.209 + style="text-align:end;text-anchor:end">principal</tspan></text> 1.210 + <rect 1.211 + 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" 1.212 + id="rect1913" 1.213 + width="94.285713" 1.214 + height="20.714285" 1.215 + x="138" 1.216 + y="156.90514" /> 1.217 + <path 1.218 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 1.219 + d="M 144.22399,249.47657 L 179.49029,178.61943" 1.220 + id="path1915" 1.221 + inkscape:connector-type="polyline" 1.222 + inkscape:connection-start="#rect2863" 1.223 + inkscape:connection-end="#rect1913" /> 1.224 + <path 1.225 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 1.226 + d="M 222.20966,203.40514 L 196.79033,178.61943" 1.227 + id="path1917" 1.228 + inkscape:connector-type="polyline" 1.229 + inkscape:connection-start="#rect2911" 1.230 + inkscape:connection-end="#rect1913" /> 1.231 + <text 1.232 + xml:space="preserve" 1.233 + 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" 1.234 + x="166.16823" 1.235 + y="168.52228" 1.236 + id="text2806"><tspan 1.237 + sodipodi:role="line" 1.238 + id="tspan2808" 1.239 + x="166.16823" 1.240 + y="168.52228" 1.241 + style="font-family:Courier">fusión</tspan></text> 1.242 + <text 1.243 + xml:space="preserve" 1.244 + 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" 1.245 + x="246" 1.246 + y="162.63338" 1.247 + id="text2810"><tspan 1.248 + sodipodi:role="line" 1.249 + x="246" 1.250 + y="162.63338" 1.251 + id="tspan2814">directorio de trabajo</tspan><tspan 1.252 + sodipodi:role="line" 1.253 + x="246" 1.254 + y="177.63338" 1.255 + id="tspan3538">durante la fusión</tspan></text> 1.256 + <rect 1.257 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.258 + id="rect2816" 1.259 + width="94.285713" 1.260 + height="20.714285" 1.261 + x="483.14636" 1.262 + y="297.76227" /> 1.263 + <text 1.264 + xml:space="preserve" 1.265 + 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:Courier" 1.266 + x="507.24527" 1.267 + y="311.38342" 1.268 + id="text2818"><tspan 1.269 + sodipodi:role="line" 1.270 + id="tspan2820" 1.271 + x="507.24527" 1.272 + y="311.38342" 1.273 + style="font-family:Courier"><tspan 1.274 + style="font-weight:bold" 1.275 + id="tspan2822">4</tspan>: REV4</tspan></text> 1.276 + <path 1.277 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 1.278 + d="M 530.28921,343.6373 L 530.28921,319.47655" 1.279 + id="path2824" 1.280 + inkscape:connector-type="polyline" /> 1.281 + <rect 1.282 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.283 + id="rect2826" 1.284 + width="94.285713" 1.285 + height="20.714285" 1.286 + x="436.57492" 1.287 + y="250.47656" /> 1.288 + <text 1.289 + xml:space="preserve" 1.290 + style="font-size:12.00001812px;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:Courier" 1.291 + x="461.24484" 1.292 + y="264.56613" 1.293 + id="text2828" 1.294 + transform="scale(1.000002,0.999998)"><tspan 1.295 + sodipodi:role="line" 1.296 + id="tspan2830" 1.297 + x="461.24484" 1.298 + y="264.56613" 1.299 + style="font-family:Courier"><tspan 1.300 + style="font-weight:bold" 1.301 + id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 1.302 + <path 1.303 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.304 + d="M 519.10362,296.76227 L 494.90337,272.19084" 1.305 + id="path2834" 1.306 + inkscape:connector-type="polyline" /> 1.307 + <rect 1.308 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 1.309 + id="rect2836" 1.310 + width="94.285995" 1.311 + height="20.714283" 1.312 + x="483.14001" 1.313 + y="156.548" /> 1.314 + <text 1.315 + xml:space="preserve" 1.316 + style="font-size:12.00001812px;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:Courier" 1.317 + x="555.95911" 1.318 + y="218.02698" 1.319 + id="text2838" 1.320 + transform="scale(1.000002,0.999998)"><tspan 1.321 + sodipodi:role="line" 1.322 + id="tspan2840" 1.323 + x="555.95911" 1.324 + y="218.02698" 1.325 + style="font-family:Courier"><tspan 1.326 + id="tspan2842" 1.327 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 1.328 + <path 1.329 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 1.330 + d="M 536.21543,296.76227 L 574.03453,224.76218" 1.331 + id="path2844" 1.332 + inkscape:connector-type="polyline" /> 1.333 + <text 1.334 + xml:space="preserve" 1.335 + 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" 1.336 + x="463.11224" 1.337 + y="169.78796" 1.338 + id="text2846"><tspan 1.339 + sodipodi:role="line" 1.340 + id="tspan2848" 1.341 + x="463.11224" 1.342 + y="169.78796">tip</tspan></text> 1.343 + <path 1.344 + 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" 1.345 + d="M 489.37034,249.47656 L 524.65575,178.26229" 1.346 + id="path2856" 1.347 + inkscape:connector-type="polyline" 1.348 + inkscape:connection-end="#rect2836" /> 1.349 + <path 1.350 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" 1.351 + d="M 567.85714,202.0479 L 542.42591,178.26229" 1.352 + id="path2858" 1.353 + inkscape:connector-type="polyline" 1.354 + inkscape:connection-end="#rect2836" 1.355 + inkscape:connection-start="#rect2995" /> 1.356 + <text 1.357 + xml:space="preserve" 1.358 + 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" 1.359 + x="490.40295" 1.360 + y="170.39714" 1.361 + id="text2860"><tspan 1.362 + sodipodi:role="line" 1.363 + id="tspan2863" 1.364 + x="490.40295" 1.365 + y="170.39714" 1.366 + style="font-family:Courier"><tspan 1.367 + style="font-weight:bold" 1.368 + id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 1.369 + <text 1.370 + xml:space="preserve" 1.371 + 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" 1.372 + x="90.323105" 1.373 + y="120.21933" 1.374 + id="text2929"><tspan 1.375 + sodipodi:role="line" 1.376 + id="tspan2931" 1.377 + x="90.323105" 1.378 + y="120.21933" 1.379 + style="font-weight:bold">Directorio de trabajo durante la fusión</tspan></text> 1.380 + <text 1.381 + xml:space="preserve" 1.382 + 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" 1.383 + x="435.35226" 1.384 + y="120.21933" 1.385 + id="text2937"><tspan 1.386 + sodipodi:role="line" 1.387 + id="tspan2939" 1.388 + x="435.35226" 1.389 + y="120.21933" 1.390 + style="font-weight:bold">Repositorio después de consignar la fusión</tspan></text> 1.391 + </g> 1.392 +</svg>