1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/es/tour-merge-conflict.svg	Sat Aug 15 15:15:39 2009 +0200
     1.3 @@ -0,0 +1,219 @@
     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-conflict.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="perspective2861" />
    1.30 +    <marker
    1.31 +       inkscape:stockid="Arrow1Mend"
    1.32 +       orient="auto"
    1.33 +       refY="0.0"
    1.34 +       refX="0.0"
    1.35 +       id="Arrow1Mend"
    1.36 +       style="overflow:visible;">
    1.37 +      <path
    1.38 +         id="path3053"
    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) rotate(180) translate(10,0)" />
    1.42 +    </marker>
    1.43 +  </defs>
    1.44 +  <sodipodi:namedview
    1.45 +     id="base"
    1.46 +     pagecolor="#ffffff"
    1.47 +     bordercolor="#666666"
    1.48 +     borderopacity="1.0"
    1.49 +     gridtolerance="10000"
    1.50 +     guidetolerance="10"
    1.51 +     objecttolerance="10"
    1.52 +     inkscape:pageopacity="0.0"
    1.53 +     inkscape:pageshadow="2"
    1.54 +     inkscape:zoom="1.4"
    1.55 +     inkscape:cx="251.65243"
    1.56 +     inkscape:cy="733.42197"
    1.57 +     inkscape:document-units="px"
    1.58 +     inkscape:current-layer="layer1"
    1.59 +     inkscape:window-width="906"
    1.60 +     inkscape:window-height="659"
    1.61 +     inkscape:window-x="5"
    1.62 +     inkscape:window-y="49"
    1.63 +     showgrid="false" />
    1.64 +  <metadata
    1.65 +     id="metadata7">
    1.66 +    <rdf:RDF>
    1.67 +      <cc:Work
    1.68 +         rdf:about="">
    1.69 +        <dc:format>image/svg+xml</dc:format>
    1.70 +        <dc:type
    1.71 +           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    1.72 +      </cc:Work>
    1.73 +    </rdf:RDF>
    1.74 +  </metadata>
    1.75 +  <g
    1.76 +     inkscape:label="Layer 1"
    1.77 +     inkscape:groupmode="layer"
    1.78 +     id="layer1">
    1.79 +    <g
    1.80 +       id="g1988"
    1.81 +       transform="translate(84.85711,0)">
    1.82 +      <g
    1.83 +         id="g1876">
    1.84 +        <path
    1.85 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    1.86 +           d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
    1.87 +           id="path1872"
    1.88 +           sodipodi:nodetypes="cccccc" />
    1.89 +        <path
    1.90 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    1.91 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
    1.92 +           id="path1874"
    1.93 +           sodipodi:nodetypes="cccc" />
    1.94 +      </g>
    1.95 +      <flowRoot
    1.96 +         style="font-size:8px;font-family:Times New Roman"
    1.97 +         id="flowRoot1898"
    1.98 +         xml:space="preserve"><flowRegion
    1.99 +           id="flowRegion1900"><rect
   1.100 +             style="font-size:8px;font-family:Times New Roman"
   1.101 +             y="464.50504"
   1.102 +             x="122.85714"
   1.103 +             height="93.571426"
   1.104 +             width="76.428574"
   1.105 +             id="rect1902" /></flowRegion><flowPara
   1.106 +           id="flowPara1904">Saludos!</flowPara><flowPara
   1.107 +           id="flowPara1906" /><flowPara
   1.108 +           id="flowPara1908">Soy Mariam Abacha, la esposa del anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
   1.109 +    <g
   1.110 +       id="g1966"
   1.111 +       transform="translate(82,0.35715)">
   1.112 +      <g
   1.113 +         transform="translate(-77.85718,-140.0714)"
   1.114 +         id="g1910">
   1.115 +        <path
   1.116 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.117 +           d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
   1.118 +           id="path1912"
   1.119 +           sodipodi:nodetypes="cccccc" />
   1.120 +        <path
   1.121 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.122 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
   1.123 +           id="path1914"
   1.124 +           sodipodi:nodetypes="cccc" />
   1.125 +      </g>
   1.126 +      <flowRoot
   1.127 +         transform="translate(-77.85718,-140.0714)"
   1.128 +         style="font-size:8px;font-family:Times New Roman"
   1.129 +         id="flowRoot1916"
   1.130 +         xml:space="preserve"><flowRegion
   1.131 +           id="flowRegion1918"><rect
   1.132 +             style="font-size:8px;font-family:Times New Roman"
   1.133 +             y="464.50504"
   1.134 +             x="122.85714"
   1.135 +             height="93.571426"
   1.136 +             width="76.428574"
   1.137 +             id="rect1920" /></flowRegion><flowPara
   1.138 +           id="flowPara1922">Saludos!</flowPara><flowPara
   1.139 +           id="flowPara1924" /><flowPara
   1.140 +           id="flowPara1926">Soy <flowSpan
   1.141 +   style="font-style:italic;fill:#ff0000"
   1.142 +   id="flowSpan3094">Shehu Musa Abacha, sobrina del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
   1.143 +    <g
   1.144 +       id="g1977"
   1.145 +       transform="translate(81.99999,-0.35715)">
   1.146 +      <g
   1.147 +         transform="translate(83.57141,-139.3571)"
   1.148 +         id="g1932">
   1.149 +        <path
   1.150 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.151 +           d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
   1.152 +           id="path1934"
   1.153 +           sodipodi:nodetypes="cccccc" />
   1.154 +        <path
   1.155 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.156 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
   1.157 +           id="path1936"
   1.158 +           sodipodi:nodetypes="cccc" />
   1.159 +      </g>
   1.160 +      <flowRoot
   1.161 +         transform="translate(83.57141,-139.3571)"
   1.162 +         style="font-size:8px;font-family:Times New Roman"
   1.163 +         id="flowRoot1938"
   1.164 +         xml:space="preserve"><flowRegion
   1.165 +           id="flowRegion1940"><rect
   1.166 +             style="font-size:8px;font-family:Times New Roman"
   1.167 +             y="464.50504"
   1.168 +             x="122.85714"
   1.169 +             height="93.571426"
   1.170 +             width="76.428574"
   1.171 +             id="rect1942" /></flowRegion><flowPara
   1.172 +           id="flowPara1944">Saludos!</flowPara><flowPara
   1.173 +           id="flowPara1946" /><flowPara
   1.174 +           id="flowPara1948">Soy <flowSpan
   1.175 +   style="font-style:italic;fill:#ff0000"
   1.176 +   id="flowSpan3096">Alhaji Abba Abacha, hijo del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
   1.177 +    <path
   1.178 +       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.179 +       d="M 215.502,457.71933 L 196.35507,424.5765"
   1.180 +       id="path1999"
   1.181 +       inkscape:connector-type="polyline"
   1.182 +       inkscape:connection-start="#g1988"
   1.183 +       inkscape:connection-end="#g1966" />
   1.184 +    <path
   1.185 +       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.186 +       d="M 277.06936,457.71933 L 296.21629,424.5765"
   1.187 +       id="path2001"
   1.188 +       inkscape:connector-type="polyline"
   1.189 +       inkscape:connection-start="#g1988"
   1.190 +       inkscape:connection-end="#g1977" />
   1.191 +    <text
   1.192 +       xml:space="preserve"
   1.193 +       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.194 +       x="302.42859"
   1.195 +       y="515.08905"
   1.196 +       id="text1905"><tspan
   1.197 +         sodipodi:role="line"
   1.198 +         id="tspan1907"
   1.199 +         x="302.42859"
   1.200 +         y="515.08905">Versión inicial</tspan></text>
   1.201 +    <text
   1.202 +       xml:space="preserve"
   1.203 +       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.204 +       x="30.57143"
   1.205 +       y="374.1619"
   1.206 +       id="text1917"><tspan
   1.207 +         sodipodi:role="line"
   1.208 +         id="tspan1919"
   1.209 +         x="30.57143"
   1.210 +         y="374.1619">Nuestros cambios</tspan></text>
   1.211 +    <text
   1.212 +       xml:space="preserve"
   1.213 +       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.214 +       x="385.71429"
   1.215 +       y="374.1619"
   1.216 +       id="text1921"><tspan
   1.217 +         sodipodi:role="line"
   1.218 +         id="tspan1923"
   1.219 +         x="385.71429"
   1.220 +         y="374.1619">Sus cambios</tspan></text>
   1.221 +  </g>
   1.222 +</svg>