Index: /trunk/images/data/changeset.svg
===================================================================
--- /trunk/images/data/changeset.svg	(revision 8032)
+++ /trunk/images/data/changeset.svg	(revision 8032)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="changeset.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.5-ws\JOSM\images\data\changeset.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="6.0763858"
+     inkscape:cy="7.0568375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1028"
+     inkscape:window-height="805"
+     inkscape:window-x="253"
+     inkscape:window-y="91" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2383"
+       width="2.9223115"
+       height="2.5651686"
+       x="3.4495585"
+       y="3.7799156" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#474948;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.7518036,1.7459841 C 2.5591291,1.7890139 2.2220869,1.8999966 1.9453595,2.0298922 C 1.7173071,2.1369396 1.5900033,2.1742278 1.3909292,2.3611182 C 1.2345581,2.507919 1.0923035,2.6414673 0.93730438,2.7869801 C 0.75448272,2.9586125 0.68529046,3.14799 0.68529046,3.402114 C 0.68529046,3.6544767 0.68529046,3.9068394 0.68529046,4.1592021 C 0.68529046,4.4926097 0.80647576,4.6615941 0.8869016,4.9636081 C 0.95340729,5.2133495 1.2208624,5.4960154 1.3405264,5.7206962 C 1.4780217,5.9788566 1.6075266,6.1273786 1.7437485,6.3831481 C 1.8829899,6.644587 1.8949568,6.7771193 1.8949568,7.0929181 C 1.8949568,7.368452 1.8879144,7.6342889 1.9453595,7.8500059 C 1.9975221,8.0458864 1.7883711,8.3976364 1.7437485,8.6070939 C 1.6968692,8.8271443 1.6429431,9.0149648 1.6429431,9.2695461 C 1.6429431,9.5274839 1.5925402,9.7541296 1.5925402,10.026633 C 1.5925402,10.358017 1.6429431,10.543538 1.6429431,10.878358 C 1.6429431,11.149818 1.5731159,11.373232 1.6429431,11.635446 C 1.7085357,11.88176 1.7745647,12.166486 1.8949568,12.392534 C 2.0311878,12.648321 2.1846542,12.88915 2.2981789,13.102305 C 2.4470984,13.381915 2.7585283,13.612551 3.0038175,13.67012 C 3.3912838,13.761059 3.7965207,14.062288 4.3142893,14.1433 C 4.7641484,14.213688 5.3127863,14.414155 5.7255666,14.569163 C 6.091902,14.706728 6.6600424,14.62287 7.0360384,14.711116 C 7.3844438,14.792887 7.7786133,14.805752 8.1448992,14.805752 C 8.4708377,14.805752 8.7919757,14.816748 9.1025515,14.758434 C 9.186556,14.742662 9.2705603,14.726888 9.3545656,14.711116 C 9.4385699,14.695343 9.5225742,14.679571 9.6065795,14.663798 C 10.042945,14.581867 10.709643,14.630439 11.118662,14.758434 C 11.56922,14.899429 12.081949,14.984517 12.52994,15.08966 C 12.872207,15.16999 13.054107,15.09914 13.336384,14.900389 C 13.700558,14.643973 13.886515,14.512799 14.092426,14.190619 C 14.268569,13.915013 14.247478,13.568268 14.394842,13.291575 C 14.538357,13.022111 14.445246,12.463883 14.445246,12.155944 C 14.445246,11.841688 14.374254,11.558131 14.294036,11.256903 C 14.20087,10.907047 14.017149,10.572329 13.941217,10.215906 C 13.861977,9.8439517 13.688832,9.5047428 13.588397,9.127592 C 13.460274,8.6464651 13.386787,8.2127334 13.386787,7.7080521 C 13.386787,7.1948167 13.332004,6.6402965 13.437189,6.146558 C 13.516397,5.7747612 13.539136,5.3851863 13.6388,5.0109261 C 13.758741,4.5605257 13.72344,4.0779546 13.840411,3.6387041 C 13.955787,3.2054477 14.060049,2.7127168 13.941217,2.2664821 C 13.924416,2.2033915 13.907615,2.1403009 13.890814,2.0772101 C 13.798373,1.730078 13.566746,1.6462664 13.185175,1.5567121 C 12.816746,1.470242 12.411037,1.4620762 12.025911,1.4620762 C 11.590833,1.4620762 11.189142,1.7129007 10.816246,1.8879382 C 10.393621,2.0863183 10.193904,2.2983595 9.7577878,2.5030722 C 9.373047,2.6836687 8.9214072,2.6450261 8.4977185,2.6450261 C 8.127918,2.6450261 8.000631,2.4337239 7.6912742,2.3611182 C 7.3085439,2.2712915 6.9489456,2.1040875 6.6328163,2.0298922 C 6.2338855,1.9362633 5.8717315,1.8394365 5.4735528,1.7459841 C 5.1084937,1.660305 4.6390148,1.6513481 4.2638865,1.6513481 C 3.9110671,1.6513481 3.5582479,1.6513481 3.2054285,1.6513481 C 3.0001056,1.6513481 2.9812323,1.6598293 2.7518036,1.7459841 z"
+       id="path3165" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3187"
+       width="2.9223115"
+       height="2.5651686"
+       x="8.6727724"
+       y="5.3870583" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3189"
+       width="2.9223115"
+       height="2.5651686"
+       x="5.0120592"
+       y="10.029915" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/activate.svg
===================================================================
--- /trunk/images/dialogs/activate.svg	(revision 8032)
+++ /trunk/images/dialogs/activate.svg	(revision 8032)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   inkscape:export-filename="C:\data\eclipse-ws\eclipse-3.5\JOSM\images\dialogs\activate.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="Neues Dokument 1">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3650"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3672"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3672-4"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3703"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3747"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="9.1091631"
+     inkscape:cy="9.0998065"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1094"
+     inkscape:window-height="741"
+     inkscape:window-x="165"
+     inkscape:window-y="163"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 1.1887976,1048.7981 5.7614909,-5.8419 14.9487355,0 -4.415101,5.8527 -16.2951254,-0.011 z"
+       id="path2816-6-3"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 1.07869,1043.8267 5.7614916,-5.8418 14.9487324,0 -4.415101,5.8527 -16.295123,-0.011 z"
+       id="path2816-6"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 1.21211,1038.9234 5.7614908,-5.8418 14.9487352,0 -4.415106,5.8527 -16.29512,-0.011 z"
+       id="path2816"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#189f5c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path3761"
+       sodipodi:cx="310.11682"
+       sodipodi:cy="757.39764"
+       sodipodi:rx="79.802048"
+       sodipodi:ry="72.73098"
+       d="m 389.91887,757.39764 a 79.802048,72.73098 0 1 1 -159.6041,0 79.802048,72.73098 0 1 1 159.6041,0 z"
+       transform="matrix(0.05915865,0,0,0.07067087,-0.08694729,980.72553)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.963287,1035.182 2.183922,1.5692 2.582129,-4.934"
+       id="path3771"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/changesetdialog.svg
===================================================================
--- /trunk/images/dialogs/changesetdialog.svg	(revision 8032)
+++ /trunk/images/dialogs/changesetdialog.svg	(revision 8032)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   version="1.0"
+   sodipodi:docname="changesetdialog.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.5-ws\JOSM\images\dialogs\changesetdialog.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient1400">
+      <stop
+         id="stop1401"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.67843139;" />
+      <stop
+         id="stop1403"
+         offset="0.56999999"
+         style="stop-color:#000000;stop-opacity:0.32941177;" />
+      <stop
+         id="stop1402"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1400"
+       id="linearGradient17450"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1148815,0,0,0.111489,-49.944348,-46.709945)"
+       x1="537.42401"
+       y1="580.16663"
+       x2="539.39642"
+       y2="510.39194" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3269"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4004"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4054"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4104"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5972"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="12.328623"
+     inkscape:cy="-6.4865044"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1025"
+     inkscape:window-height="824"
+     inkscape:window-x="215"
+     inkscape:window-y="180"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="4.5834389"
+       inkscape:original="M 547.25 494.90625 C 547.15581 494.91224 547.06196 494.92267 546.96875 494.9375 C 546.73282 494.97719 546.68628 494.99521 546.84375 494.96875 C 524.84282 498.66333 486.64226 504.70723 464.125 512.78125 C 463.15567 513.13537 462.43455 513.95957 462.21875 514.96875 C 462.15787 515.25343 462.16594 515.52974 462.1875 515.8125 C 462.05699 516.6851 462.30033 517.57519 462.90625 518.25 C 470.3466 526.58465 475.04831 536.96666 477.65625 546.5625 C 480.26419 556.15834 480.71815 565.04611 480 569.8125 C 479.30782 574.40653 476.22839 582.0513 474.59375 588.9375 C 473.77643 592.3806 473.25435 595.69511 473.90625 598.84375 C 474.55815 601.99239 477.07104 604.95638 480.71875 605.78125 C 480.7809 605.79364 480.84344 605.80407 480.90625 605.8125 C 502.83748 609.49724 508.3071 611.152 530.28125 619.03125 C 531.00412 619.2851 531.77801 619.24067 532.46875 618.9375 C 532.87181 618.81636 533.26667 618.66906 533.71875 618.53125 C 555.08828 610.94998 576.58139 605.04634 597.875 601.46875 C 597.95919 601.45151 598.0426 601.43065 598.125 601.40625 C 601.50992 600.51027 603.68441 597.45149 604.21875 594.40625 C 604.75309 591.36101 604.30268 588.11024 603.59375 584.6875 C 602.17588 577.84201 599.46382 570.20636 598.75 565.46875 C 598.03185 560.70236 598.51706 551.81459 601.125 542.21875 C 603.73294 532.62291 608.43467 522.24088 615.875 513.90625 C 616.46759 513.24343 616.73797 512.38142 616.625 511.53125 C 616.62371 511.52157 616.62638 511.50967 616.625 511.5 C 616.65564 511.14932 616.62753 510.78679 616.53125 510.4375 C 616.25916 509.45037 615.50959 508.67713 614.53125 508.375 C 592.67011 501.65325 570.38545 497.83074 547.875 494.9375 C 547.66833 494.90533 547.45885 494.89485 547.25 494.90625 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
+       id="path2509"
+       d="m 546.96875,490.34375 c -0.23806,0.0151 -0.48339,0.0251 -0.71875,0.0625 a 4.5838972,4.5838972 0 0 0 -0.0312,0 c -0.0317,0.005 -0.11088,0.0312 -0.125,0.0312 -0.0108,3e-5 -0.0855,0.0319 -0.0937,0.0312 -21.96366,3.68725 -60.08126,9.62515 -83.4375,18 -2.43418,0.88927 -4.2668,2.9793 -4.8125,5.53125 -0.10696,0.50016 -0.0565,0.7502 -0.0625,1.125 l -0.0312,0 c -0.0108,0.072 0.009,0.14644 0,0.21875 0.003,0.24894 -0.0434,0.65366 -0.0312,0.8125 l 0.0937,0 c -0.0183,1.83625 0.48802,3.71599 1.78125,5.15625 6.81992,7.63965 11.25702,17.37965 13.71875,26.4375 2.45539,9.03454 2.80069,17.72005 2.25,21.375 -0.5054,3.35438 -3.58641,11.3469 -5.34375,18.75 -0.86868,3.65948 -1.59862,7.65653 -0.71875,11.90625 1.01022,4.87929 4.80257,9.22277 10.3125,10.46875 a 4.5838972,4.5838972 0 0 0 0.0937,0.0312 c 0.11424,0.0228 0.22811,0.0137 0.34375,0.0312 l 0,0.0312 c 21.83291,3.66822 26.6239,5.1335 48.5625,13 a 4.5838972,4.5838972 0 0 0 0.0312,0 c 1.65543,0.58134 3.42716,0.45744 5,-0.0937 l 0.0312,0.0625 c 0.2487,-0.0747 0.34809,-0.12637 0.53125,-0.1875 0.25406,-0.0848 0.57988,-0.16689 0.75,-0.21875 a 4.5838972,4.5838972 0 0 0 0.1875,-0.0625 C 556.41348,615.33558 577.64691,609.52458 598.625,606 a 4.5838972,4.5838972 0 0 0 0.15625,-0.0312 c 0.17246,-0.0353 0.36217,-0.0779 0.53125,-0.125 0.0399,-0.0111 0.0853,-0.0195 0.125,-0.0312 l 0,-0.0312 c 5.32424,-1.47423 8.47849,-6.01878 9.28125,-10.59375 0.70608,-4.02399 0.12263,-7.82792 -0.625,-11.4375 -1.51601,-7.31931 -4.24541,-15.20497 -4.8125,-18.96875 -0.54777,-3.63558 -0.17657,-12.33151 2.28125,-21.375 2.46172,-9.05784 6.89885,-18.79788 13.71875,-26.4375 1.22901,-1.37466 1.77551,-3.20261 1.78125,-5.0625 l 0.125,0 c 0.0185,-0.21144 -0.0635,-0.44091 -0.0625,-0.65625 -0.009,-0.10683 0.0454,-0.20569 0.0312,-0.3125 0.17307,1.29873 0.1925,1.25512 0,-0.0937 l -0.0625,0 c -0.0259,-0.53834 -0.004,-1.07327 -0.15625,-1.625 -0.68218,-2.47491 -2.6082,-4.46081 -5.0625,-5.21875 -22.18929,-6.82265 -44.6866,-10.65484 -67.28125,-13.5625 -0.001,-1.8e-4 0.001,-0.0311 0,-0.0312 -0.0409,-0.006 -0.084,0.006 -0.125,0 -0.48237,-0.067 -0.98206,-0.0891 -1.46875,-0.0625 a 4.5838972,4.5838972 0 0 0 -0.0312,0 z"
+       transform="matrix(0.13029953,0,0,0.13105457,-58.548126,-58.336584)" />
+    <path
+       style="fill:#a55959;fill-opacity:1;stroke:none;display:inline"
+       d="m 12.894304,6.3883119 c -0.01249,7.847e-4 -0.02479,0.00211 -0.03709,0.00407 -0.03109,0.00512 -0.03725,0.00753 -0.01652,0.00407 -0.104921,0.017893 -0.198145,0.077084 -0.258618,0.1641728 -0.06046,0.0871 -0.08307,0.1947413 -0.06271,0.2986131 0.534472,2.7164778 -0.05564,5.3560911 -0.214215,6.8476011 -0.04856,0.456619 -0.197022,1.059336 -0.325435,1.675041 -0.12842,0.615708 -0.239388,1.243489 -0.17714,1.814289 0.01601,0.135868 0.101714,0.253745 0.226569,0.311254 l 0,0.04914 c 0.04365,-0.0014 0.09804,-0.0024 0.164784,-0.0083 l 0,-0.0042 c 0.01376,7.14e-4 0.02747,7.14e-4 0.04119,0 1.214317,-0.123774 2.367608,-0.940817 3.851726,-2.383552 1.484109,-1.442738 3.315507,-3.543302 5.853802,-6.3684364 0.09035,-0.099691 0.123311,-0.2383136 0.08745,-0.3676767 C 21.992235,8.2950333 21.892479,8.1927745 21.763519,8.1531843 18.881699,7.2722678 15.944052,6.771309 12.976635,6.3921375 c -0.02725,-0.00422 -0.05486,-0.00557 -0.08239,-0.00407 z"
+       id="path2444" />
+    <path
+       style="fill:#aa6262;fill-opacity:1;stroke:none;display:inline"
+       d="m 12.861345,6.3924071 c -0.0068,0.00119 -0.01376,0.00256 -0.0206,0.00407 C 9.9405042,6.8806722 4.9047593,7.6727526 1.9364485,8.7308896 1.808667,8.7772935 1.7138448,8.8857379 1.6853966,9.0179943 1.6569598,9.1502477 1.6988772,9.287762 1.7963912,9.3820654 4.5989466,12.096987 6.5375832,14.165317 8.099217,15.54982 c 1.5616353,1.384505 2.796871,2.130977 4.135972,1.994487 0.105106,-0.01024 0.201709,-0.06202 0.26826,-0.14355 0.06654,-0.08154 0.09751,-0.186166 0.08602,-0.290553 -0.04315,-0.39564 0.04067,-0.973503 0.164767,-1.568558 0.12412,-0.595049 0.279705,-1.20639 0.337802,-1.752852 0.146391,-1.376798 0.779778,-4.1646798 0.205979,-7.0810407 C 13.258427,6.504894 13.067641,6.3671191 12.861349,6.3924026 z"
+       id="path2453" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3807-82"
+       width="5.1445017"
+       height="5.0294647"
+       x="4.5450468"
+       y="5.0911288" />
+    <path
+       style="fill:#c08a8a;fill-opacity:1;stroke:none;display:inline"
+       d="M 2.0476729,8.7923412 C 1.8958621,8.8009262 1.7624302,8.895225 1.7044468,9.0349759 1.6464662,9.1747148 1.6741936,9.3351388 1.7757944,9.4476137 2.756608,10.53991 3.3764026,11.900518 3.7201949,13.158099 c 0.3437853,1.257579 0.403629,2.422363 0.3089572,3.047021 -0.091242,0.602068 -0.4971825,1.603947 -0.7126713,2.506417 -0.1077309,0.451234 -0.1765682,0.885615 -0.090632,1.298255 0.085935,0.412647 0.4171932,0.801092 0.8980515,0.909194 0.00823,0.0017 0.016432,0.0029 0.024719,0.0042 2.8910616,0.482901 3.6120838,0.699763 6.5088014,1.732377 0.115493,0.04032 0.243286,0.0252 0.346039,-0.04095 1.867459,-1.200803 3.109542,-1.915459 3.946472,-2.551469 0.836935,-0.636008 1.293815,-1.267731 1.384154,-2.117348 0.05629,-0.529568 -0.185784,-1.053729 -0.535538,-1.638287 C 15.448796,15.722965 14.963523,15.084414 14.418519,14.427712 13.328501,13.114311 11.99954,11.729767 11.089969,10.680368 11.024042,10.603947 10.931164,10.55557 10.83044,10.545223 7.7227506,10.244419 5.0625669,9.8358793 2.2042233,8.8169409 2.1542459,8.7983401 2.1009907,8.7899811 2.0476772,8.7923759 z"
+       id="path2442" />
+    <path
+       style="fill:#c08a8a;fill-opacity:1;stroke:none;display:inline"
+       d="m 21.644105,8.2230734 c -0.05386,2.078e-4 -0.107149,0.011446 -0.15654,0.032758 -2.701575,1.1727791 -7.70298,2.1051133 -10.731283,2.2852633 -0.179967,0.0119 -0.329082,0.143248 -0.362515,0.319444 -0.576099,2.91892 0.05538,5.707525 0.201856,7.085143 0.08656,0.814103 0.330842,1.803241 0.48198,2.596516 0.10082,0.529206 0.310189,2.121858 -0.42019,2.113257 0.177706,0.04689 0.294223,-0.01735 0.453146,-0.06553 2.817012,-0.993562 5.650313,-1.76726 8.45732,-2.236123 0.01107,-0.0021 0.02209,-0.0048 0.03295,-0.0083 0.446211,-0.117418 0.73286,-0.518291 0.803299,-0.917383 0.07044,-0.399093 0.01107,-0.82512 -0.08239,-1.273685 -0.186909,-0.897134 -0.544423,-1.897819 -0.638523,-2.518706 -0.09468,-0.62466 -0.03071,-1.789442 0.313084,-3.047023 0.343788,-1.257575 0.963588,-2.6181871 1.9444,-3.7104786 0.104155,-0.1158215 0.130038,-0.2801555 0.06591,-0.4218357 C 21.942489,8.314738 21.800373,8.2222796 21.644097,8.2229664 z"
+       id="path2440"
+       sodipodi:nodetypes="csccsscccsssssssc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
+       d="m 10.179702,10.820213 c -0.103304,2.626417 0.142422,4.907255 0.193609,6.23519 0.04328,1.122294 0.237098,2.486802 0.346037,3.580383 0.05313,0.53342 0.132492,1.851703 -0.114017,2.517291 l 0.530081,-0.05648 c -0.158925,0.06517 -0.275438,0.152122 -0.453146,0.08868 0.73038,0.0116 0.521015,-2.1437 0.420191,-2.859874 -0.151143,-1.07354 -0.395418,-2.412144 -0.481978,-3.513872 -0.100693,-1.281729 -0.431612,-3.467713 -0.440786,-5.991323 z"
+       id="path2495"
+       sodipodi:nodetypes="csssccssc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 1.915572,9.1197 2.6381692,0.6559668 2.3308099,0.4722972 3.2272749,0.419819 1.511181,-0.05247 2.817466,-0.39358 3.867607,-0.8658767 1.459958,-0.3935806 0.947692,-0.2623862 1.075758,-0.2623876"
+       id="path3664"
+       sodipodi:nodetypes="cccccccccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3807-82-2"
+       width="5.1445017"
+       height="5.0294647"
+       x="13.676021"
+       y="2.111794" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copyaftercurrentleft.svg
===================================================================
--- /trunk/images/dialogs/conflict/copyaftercurrentleft.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copyaftercurrentleft.svg	(revision 8032)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copyaftercurrentleft.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copybeforecurrentleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="10.519533"
+       y="2.4570346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 10.3125,4.375 L 17.0625,4.3125"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.07251,9.54126 L 21.67749,9.58374"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="9.8710909"
+       height="2.6210914"
+       x="11.251954"
+       y="10.064454" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.072632"
+       height="2.3851323"
+       x="11.119932"
+       y="13.651184" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.01001,13.10376 L 21.61499,13.14624"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copyaftercurrentright.svg
===================================================================
--- /trunk/images/dialogs/conflict/copyaftercurrentright.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copyaftercurrentright.svg	(revision 8032)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copyaftercurrentright.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copybeforecurrentleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="10.589584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="1.9570332"
+       y="2.4570346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 1.75,4.375 L 8.5,4.3125"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.51001,9.54126 L 13.11499,9.58374"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="9.8710909"
+       height="2.6210914"
+       x="2.6894541"
+       y="10.064454" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.072632"
+       height="2.3851323"
+       x="2.5574322"
+       y="13.651184" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.44751,13.10376 L 13.05249,13.14624"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.162974,19.787973 L 22.162974,5.712027 L 16.212026,12.734943 L 22.162974,19.787973 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.819224,18.694223 L 21.819224,4.6182769 L 15.868276,11.641193 L 21.819224,18.694223 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copybeforecurrentleft.svg
===================================================================
--- /trunk/images/dialogs/conflict/copybeforecurrentleft.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copybeforecurrentleft.svg	(revision 8032)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copybeforecurrentleft.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="10.519533"
+       y="2.4570346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 10.3125,4.375 L 17.0625,4.3125"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.07251,9.54126 L 21.67749,9.58374"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="9.8710909"
+       height="2.6210914"
+       x="11.251954"
+       y="10.064454" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.072632"
+       height="2.3851323"
+       x="11.182432"
+       y="6.6511846" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.01001,13.10376 L 21.61499,13.14624"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copybeforecurrentright.svg
===================================================================
--- /trunk/images/dialogs/conflict/copybeforecurrentright.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copybeforecurrentright.svg	(revision 8032)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copybeforecurrentrightsvg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.034962"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="2.0195312"
+       y="2.3945346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 1.8125,4.3125 L 8.5625,4.25"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.57251,9.47876 L 13.17749,9.52124"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="9.8710909"
+       height="2.6210914"
+       x="2.7519531"
+       y="10.001954" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.072632"
+       height="2.3851323"
+       x="2.6824341"
+       y="6.5886846" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.51001,13.04126 L 13.11499,13.08374"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.225474,20.287973 L 22.225474,6.212027 L 16.274526,13.234943 L 22.225474,20.287973 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.881724,19.194223 L 21.881724,5.1182769 L 15.930776,12.141193 L 21.881724,19.194223 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copyendleft.svg
===================================================================
--- /trunk/images/dialogs/conflict/copyendleft.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copyendleft.svg	(revision 8032)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copyendleft.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="10.519533"
+       y="2.4570346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 10.3125,4.375 L 17.0625,4.3125"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 10.76001,6.4787601 L 21.36499,6.5212399"
+       id="path3165" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 10.94751,11.22876 L 21.55249,11.27124"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="7.375"
+       height="3.4375"
+       x="29.4375"
+       y="-1.1875" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.46301931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="9.9814806"
+       height="3.7314808"
+       x="11.22801"
+       y="17.25926" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.01001,16.66626 L 21.61499,16.70874"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copyendright.svg
===================================================================
--- /trunk/images/dialogs/conflict/copyendright.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copyendright.svg	(revision 8032)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copyendright.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="22.04221"
+     inkscape:cy="13.219415"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="2.1445332"
+       y="2.3945346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 1.9375,4.3125 L 8.6875,4.25"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.38501,6.4162601 L 12.98999,6.45874"
+       id="path3165" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.57251,11.16626 L 13.17749,11.20874"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="7.375"
+       height="3.4375"
+       x="29.4375"
+       y="-1.1875" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.46301931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="9.9814806"
+       height="3.7314808"
+       x="2.8530102"
+       y="17.19676" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.63501,16.60376 L 13.23999,16.64624"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.037974,19.787973 L 22.037974,5.712027 L 16.087026,12.734943 L 22.037974,19.787973 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.694224,18.694223 L 21.694224,4.618277 L 15.743276,11.641193 L 21.694224,18.694223 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copystartleft.svg
===================================================================
--- /trunk/images/dialogs/conflict/copystartleft.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copystartleft.svg	(revision 8032)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copystartleft.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="10.519533"
+       y="2.4570346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 10.3125,4.375 L 17.0625,4.3125"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 10.76001,6.4787601 L 21.36499,6.5212399"
+       id="path3165" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 10.94751,11.22876 L 21.55249,11.27124"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="7.375"
+       height="3.4375"
+       x="29.4375"
+       y="-1.1875" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.40588695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.038613"
+       height="2.8511131"
+       x="11.199444"
+       y="3.1056933" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 11.01001,16.66626 L 21.61499,16.70874"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/copystartright.svg
===================================================================
--- /trunk/images/dialogs/conflict/copystartright.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/copystartright.svg	(revision 8032)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="copystartright.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1390"
+     inkscape:window-height="787"
+     inkscape:window-x="94"
+     inkscape:window-y="95" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.335931"
+       height="19.273432"
+       x="1.8320332"
+       y="2.5195346" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 1.625,4.4375 L 8.375,4.375"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.07251,6.5412601 L 12.67749,6.5837399"
+       id="path3165" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.26001,11.29126 L 12.86499,11.33374"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="7.375"
+       height="3.4375"
+       x="29.4375"
+       y="-1.1875" />
+    <rect
+       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.40588695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3175"
+       width="10.038613"
+       height="2.8511131"
+       x="2.5119438"
+       y="3.1681933" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 2.32251,16.72876 L 12.92749,16.77124"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.537974,20.162973 L 21.537974,6.087027 L 15.587026,13.109943 L 21.537974,20.162973 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.194224,19.069223 L 21.194224,4.993277 L 15.243276,12.016193 L 21.194224,19.069223 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/mergeincomplete.svg
===================================================================
--- /trunk/images/dialogs/conflict/mergeincomplete.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/mergeincomplete.svg	(revision 8032)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="mergeincomplete.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\mergecomplete.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="1.7844983"
+     inkscape:cy="13.711502"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="994"
+     inkscape:window-height="764"
+     inkscape:window-x="115"
+     inkscape:window-y="115" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3177"
+       width="9.7858524"
+       height="8.5231619"
+       x="3.1567266"
+       y="3.8150349" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/movedown.svg
===================================================================
--- /trunk/images/dialogs/conflict/movedown.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/movedown.svg	(revision 8032)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="movedown.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\moveup.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="10.589584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.606307"
+       height="10.106308"
+       x="5.9468451"
+       y="2.4468467" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 5.875,4.5 L 12.625,4.4375"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="10.546526"
+       height="2.609026"
+       x="6.5079861"
+       y="5.7579865" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 19.412973,16.087026 L 5.337027,16.087026 L 12.359943,22.037974 L 19.412973,16.087026 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 19.069223,14.993276 L 4.993277,14.993276 L 12.016193,20.944224 L 19.069223,14.993276 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/moveup.svg
===================================================================
--- /trunk/images/dialogs/conflict/moveup.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/moveup.svg	(revision 8032)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="moveup.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyaftercurrentright.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="10.589584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.606307"
+       height="10.106308"
+       x="5.9468451"
+       y="2.4468467" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 5.875,4.5 L 12.625,4.4375"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="10.546526"
+       height="2.609026"
+       x="6.5079861"
+       y="5.7579865" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
+       id="path3219" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5.337027,22.037974 L 19.412973,22.037974 L 12.390057,16.087026 L 5.337027,22.037974 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.993277,20.944224 L 19.069223,20.944224 L 12.046307,14.993276 L 4.993277,20.944224 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/remove.svg
===================================================================
--- /trunk/images/dialogs/conflict/remove.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/remove.svg	(revision 8032)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="remove.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\remove.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="10.014144"
+     inkscape:cy="10.589584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2383"
+       width="11.606307"
+       height="10.106308"
+       x="5.9468451"
+       y="2.4468467" />
+    <path
+       style="fill:none;fill-rule:evenodd"
+       d="M 5.875,4.5 L 12.625,4.4375"
+       id="path3157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
+       id="path3167" />
+    <rect
+       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3173"
+       width="10.546526"
+       height="2.609026"
+       x="6.5079861"
+       y="5.7579865" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
+       id="path3219" />
+    <path
+       style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 6,14.375 C 18.125,22.3125 18.125,22.3125 18.125,22.3125"
+       id="path3767"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 5.8125,22.75 C 17.75,14 17.375,14.375 17.375,14.375"
+       id="path4278"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/tagkeepmine.svg
===================================================================
--- /trunk/images/dialogs/conflict/tagkeepmine.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/tagkeepmine.svg	(revision 8032)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tagkeepmine.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.5739"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.149526,5.6495268 L 10.149526,19.725473 L 16.100474,12.702557 L 10.149526,5.6495268 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.8057764,4.5557765 L 9.8057764,18.631723 L 15.756724,11.608807 L 9.8057764,4.5557765 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/tagkeeptheir.svg
===================================================================
--- /trunk/images/dialogs/conflict/tagkeeptheir.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/tagkeeptheir.svg	(revision 8032)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tagkeeptheir.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\tagkeepmine.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.801115"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.975474,19.725473 L 14.975474,5.6495269 L 9.024526,12.672443 L 14.975474,19.725473 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.631724,18.631723 L 14.631724,4.5557769 L 8.6807759,11.578693 L 14.631724,18.631723 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/dialogs/conflict/tagundecide.svg
===================================================================
--- /trunk/images/dialogs/conflict/tagundecide.svg	(revision 8032)
+++ /trunk/images/dialogs/conflict/tagundecide.svg	(revision 8032)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tagundecide.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\tagundecide.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="21.982894"
+     inkscape:cy="11.801115"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:window-width="1348"
+     inkscape:window-height="669"
+     inkscape:window-x="169"
+     inkscape:window-y="85" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.287974,19.850473 L 8.287974,5.7745269 L 2.337026,12.797443 L 8.287974,19.850473 z"
+       id="path3221"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.944224,18.756723 L 7.944224,4.6807769 L 1.9932759,11.703693 L 7.944224,18.756723 z"
+       id="path3171"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.258901,5.696402 L 16.258901,19.772348 L 22.209849,12.749432 L 16.258901,5.696402 z"
+       id="path2508"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.915151,4.602652 L 15.915151,18.678598 L 21.866099,11.655682 L 15.915151,4.602652 z"
+       id="path2510"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: unk/images_nodist/activate.svg
===================================================================
--- /trunk/images_nodist/activate.svg	(revision 8031)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   inkscape:export-filename="C:\data\eclipse-ws\eclipse-3.5\JOSM\images\dialogs\activate.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docname="Neues Dokument 1">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3650"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3672"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3672-4"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3703"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3747"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="9.1091631"
-     inkscape:cy="9.0998065"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1094"
-     inkscape:window-height="741"
-     inkscape:window-x="165"
-     inkscape:window-y="163"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <path
-       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 1.1887976,1048.7981 5.7614909,-5.8419 14.9487355,0 -4.415101,5.8527 -16.2951254,-0.011 z"
-       id="path2816-6-3"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 1.07869,1043.8267 5.7614916,-5.8418 14.9487324,0 -4.415101,5.8527 -16.295123,-0.011 z"
-       id="path2816-6"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ae8f8f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 1.21211,1038.9234 5.7614908,-5.8418 14.9487352,0 -4.415106,5.8527 -16.29512,-0.011 z"
-       id="path2816"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#189f5c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3761"
-       sodipodi:cx="310.11682"
-       sodipodi:cy="757.39764"
-       sodipodi:rx="79.802048"
-       sodipodi:ry="72.73098"
-       d="m 389.91887,757.39764 a 79.802048,72.73098 0 1 1 -159.6041,0 79.802048,72.73098 0 1 1 159.6041,0 z"
-       transform="matrix(0.05915865,0,0,0.07067087,-0.08694729,980.72553)" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 15.963287,1035.182 2.183922,1.5692 2.582129,-4.934"
-       id="path3771"
-       sodipodi:nodetypes="ccc" />
-  </g>
-</svg>
Index: unk/images_nodist/changeset.svg
===================================================================
--- /trunk/images_nodist/changeset.svg	(revision 8031)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="changeset.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.5-ws\JOSM\images\data\changeset.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="6.0763858"
-     inkscape:cy="7.0568375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1028"
-     inkscape:window-height="805"
-     inkscape:window-x="253"
-     inkscape:window-y="91" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2383"
-       width="2.9223115"
-       height="2.5651686"
-       x="3.4495585"
-       y="3.7799156" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#474948;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.7518036,1.7459841 C 2.5591291,1.7890139 2.2220869,1.8999966 1.9453595,2.0298922 C 1.7173071,2.1369396 1.5900033,2.1742278 1.3909292,2.3611182 C 1.2345581,2.507919 1.0923035,2.6414673 0.93730438,2.7869801 C 0.75448272,2.9586125 0.68529046,3.14799 0.68529046,3.402114 C 0.68529046,3.6544767 0.68529046,3.9068394 0.68529046,4.1592021 C 0.68529046,4.4926097 0.80647576,4.6615941 0.8869016,4.9636081 C 0.95340729,5.2133495 1.2208624,5.4960154 1.3405264,5.7206962 C 1.4780217,5.9788566 1.6075266,6.1273786 1.7437485,6.3831481 C 1.8829899,6.644587 1.8949568,6.7771193 1.8949568,7.0929181 C 1.8949568,7.368452 1.8879144,7.6342889 1.9453595,7.8500059 C 1.9975221,8.0458864 1.7883711,8.3976364 1.7437485,8.6070939 C 1.6968692,8.8271443 1.6429431,9.0149648 1.6429431,9.2695461 C 1.6429431,9.5274839 1.5925402,9.7541296 1.5925402,10.026633 C 1.5925402,10.358017 1.6429431,10.543538 1.6429431,10.878358 C 1.6429431,11.149818 1.5731159,11.373232 1.6429431,11.635446 C 1.7085357,11.88176 1.7745647,12.166486 1.8949568,12.392534 C 2.0311878,12.648321 2.1846542,12.88915 2.2981789,13.102305 C 2.4470984,13.381915 2.7585283,13.612551 3.0038175,13.67012 C 3.3912838,13.761059 3.7965207,14.062288 4.3142893,14.1433 C 4.7641484,14.213688 5.3127863,14.414155 5.7255666,14.569163 C 6.091902,14.706728 6.6600424,14.62287 7.0360384,14.711116 C 7.3844438,14.792887 7.7786133,14.805752 8.1448992,14.805752 C 8.4708377,14.805752 8.7919757,14.816748 9.1025515,14.758434 C 9.186556,14.742662 9.2705603,14.726888 9.3545656,14.711116 C 9.4385699,14.695343 9.5225742,14.679571 9.6065795,14.663798 C 10.042945,14.581867 10.709643,14.630439 11.118662,14.758434 C 11.56922,14.899429 12.081949,14.984517 12.52994,15.08966 C 12.872207,15.16999 13.054107,15.09914 13.336384,14.900389 C 13.700558,14.643973 13.886515,14.512799 14.092426,14.190619 C 14.268569,13.915013 14.247478,13.568268 14.394842,13.291575 C 14.538357,13.022111 14.445246,12.463883 14.445246,12.155944 C 14.445246,11.841688 14.374254,11.558131 14.294036,11.256903 C 14.20087,10.907047 14.017149,10.572329 13.941217,10.215906 C 13.861977,9.8439517 13.688832,9.5047428 13.588397,9.127592 C 13.460274,8.6464651 13.386787,8.2127334 13.386787,7.7080521 C 13.386787,7.1948167 13.332004,6.6402965 13.437189,6.146558 C 13.516397,5.7747612 13.539136,5.3851863 13.6388,5.0109261 C 13.758741,4.5605257 13.72344,4.0779546 13.840411,3.6387041 C 13.955787,3.2054477 14.060049,2.7127168 13.941217,2.2664821 C 13.924416,2.2033915 13.907615,2.1403009 13.890814,2.0772101 C 13.798373,1.730078 13.566746,1.6462664 13.185175,1.5567121 C 12.816746,1.470242 12.411037,1.4620762 12.025911,1.4620762 C 11.590833,1.4620762 11.189142,1.7129007 10.816246,1.8879382 C 10.393621,2.0863183 10.193904,2.2983595 9.7577878,2.5030722 C 9.373047,2.6836687 8.9214072,2.6450261 8.4977185,2.6450261 C 8.127918,2.6450261 8.000631,2.4337239 7.6912742,2.3611182 C 7.3085439,2.2712915 6.9489456,2.1040875 6.6328163,2.0298922 C 6.2338855,1.9362633 5.8717315,1.8394365 5.4735528,1.7459841 C 5.1084937,1.660305 4.6390148,1.6513481 4.2638865,1.6513481 C 3.9110671,1.6513481 3.5582479,1.6513481 3.2054285,1.6513481 C 3.0001056,1.6513481 2.9812323,1.6598293 2.7518036,1.7459841 z"
-       id="path3165" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3187"
-       width="2.9223115"
-       height="2.5651686"
-       x="8.6727724"
-       y="5.3870583" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#bf0000;stroke-width:0.68144977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3189"
-       width="2.9223115"
-       height="2.5651686"
-       x="5.0120592"
-       y="10.029915" />
-  </g>
-</svg>
Index: unk/images_nodist/changesetdialog.svg
===================================================================
--- /trunk/images_nodist/changesetdialog.svg	(revision 8031)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   version="1.0"
-   sodipodi:docname="changesetdialog.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.5-ws\JOSM\images\dialogs\changesetdialog.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1400">
-      <stop
-         id="stop1401"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.67843139;" />
-      <stop
-         id="stop1403"
-         offset="0.56999999"
-         style="stop-color:#000000;stop-opacity:0.32941177;" />
-      <stop
-         id="stop1402"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:0.00000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1400"
-       id="linearGradient17450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1148815,0,0,0.111489,-49.944348,-46.709945)"
-       x1="537.42401"
-       y1="580.16663"
-       x2="539.39642"
-       y2="510.39194" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3269"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4004"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4054"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4104"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5972"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="12.328623"
-     inkscape:cy="-6.4865044"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1025"
-     inkscape:window-height="824"
-     inkscape:window-x="215"
-     inkscape:window-y="180"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="4.5834389"
-       inkscape:original="M 547.25 494.90625 C 547.15581 494.91224 547.06196 494.92267 546.96875 494.9375 C 546.73282 494.97719 546.68628 494.99521 546.84375 494.96875 C 524.84282 498.66333 486.64226 504.70723 464.125 512.78125 C 463.15567 513.13537 462.43455 513.95957 462.21875 514.96875 C 462.15787 515.25343 462.16594 515.52974 462.1875 515.8125 C 462.05699 516.6851 462.30033 517.57519 462.90625 518.25 C 470.3466 526.58465 475.04831 536.96666 477.65625 546.5625 C 480.26419 556.15834 480.71815 565.04611 480 569.8125 C 479.30782 574.40653 476.22839 582.0513 474.59375 588.9375 C 473.77643 592.3806 473.25435 595.69511 473.90625 598.84375 C 474.55815 601.99239 477.07104 604.95638 480.71875 605.78125 C 480.7809 605.79364 480.84344 605.80407 480.90625 605.8125 C 502.83748 609.49724 508.3071 611.152 530.28125 619.03125 C 531.00412 619.2851 531.77801 619.24067 532.46875 618.9375 C 532.87181 618.81636 533.26667 618.66906 533.71875 618.53125 C 555.08828 610.94998 576.58139 605.04634 597.875 601.46875 C 597.95919 601.45151 598.0426 601.43065 598.125 601.40625 C 601.50992 600.51027 603.68441 597.45149 604.21875 594.40625 C 604.75309 591.36101 604.30268 588.11024 603.59375 584.6875 C 602.17588 577.84201 599.46382 570.20636 598.75 565.46875 C 598.03185 560.70236 598.51706 551.81459 601.125 542.21875 C 603.73294 532.62291 608.43467 522.24088 615.875 513.90625 C 616.46759 513.24343 616.73797 512.38142 616.625 511.53125 C 616.62371 511.52157 616.62638 511.50967 616.625 511.5 C 616.65564 511.14932 616.62753 510.78679 616.53125 510.4375 C 616.25916 509.45037 615.50959 508.67713 614.53125 508.375 C 592.67011 501.65325 570.38545 497.83074 547.875 494.9375 C 547.66833 494.90533 547.45885 494.89485 547.25 494.90625 z "
-       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
-       id="path2509"
-       d="m 546.96875,490.34375 c -0.23806,0.0151 -0.48339,0.0251 -0.71875,0.0625 a 4.5838972,4.5838972 0 0 0 -0.0312,0 c -0.0317,0.005 -0.11088,0.0312 -0.125,0.0312 -0.0108,3e-5 -0.0855,0.0319 -0.0937,0.0312 -21.96366,3.68725 -60.08126,9.62515 -83.4375,18 -2.43418,0.88927 -4.2668,2.9793 -4.8125,5.53125 -0.10696,0.50016 -0.0565,0.7502 -0.0625,1.125 l -0.0312,0 c -0.0108,0.072 0.009,0.14644 0,0.21875 0.003,0.24894 -0.0434,0.65366 -0.0312,0.8125 l 0.0937,0 c -0.0183,1.83625 0.48802,3.71599 1.78125,5.15625 6.81992,7.63965 11.25702,17.37965 13.71875,26.4375 2.45539,9.03454 2.80069,17.72005 2.25,21.375 -0.5054,3.35438 -3.58641,11.3469 -5.34375,18.75 -0.86868,3.65948 -1.59862,7.65653 -0.71875,11.90625 1.01022,4.87929 4.80257,9.22277 10.3125,10.46875 a 4.5838972,4.5838972 0 0 0 0.0937,0.0312 c 0.11424,0.0228 0.22811,0.0137 0.34375,0.0312 l 0,0.0312 c 21.83291,3.66822 26.6239,5.1335 48.5625,13 a 4.5838972,4.5838972 0 0 0 0.0312,0 c 1.65543,0.58134 3.42716,0.45744 5,-0.0937 l 0.0312,0.0625 c 0.2487,-0.0747 0.34809,-0.12637 0.53125,-0.1875 0.25406,-0.0848 0.57988,-0.16689 0.75,-0.21875 a 4.5838972,4.5838972 0 0 0 0.1875,-0.0625 C 556.41348,615.33558 577.64691,609.52458 598.625,606 a 4.5838972,4.5838972 0 0 0 0.15625,-0.0312 c 0.17246,-0.0353 0.36217,-0.0779 0.53125,-0.125 0.0399,-0.0111 0.0853,-0.0195 0.125,-0.0312 l 0,-0.0312 c 5.32424,-1.47423 8.47849,-6.01878 9.28125,-10.59375 0.70608,-4.02399 0.12263,-7.82792 -0.625,-11.4375 -1.51601,-7.31931 -4.24541,-15.20497 -4.8125,-18.96875 -0.54777,-3.63558 -0.17657,-12.33151 2.28125,-21.375 2.46172,-9.05784 6.89885,-18.79788 13.71875,-26.4375 1.22901,-1.37466 1.77551,-3.20261 1.78125,-5.0625 l 0.125,0 c 0.0185,-0.21144 -0.0635,-0.44091 -0.0625,-0.65625 -0.009,-0.10683 0.0454,-0.20569 0.0312,-0.3125 0.17307,1.29873 0.1925,1.25512 0,-0.0937 l -0.0625,0 c -0.0259,-0.53834 -0.004,-1.07327 -0.15625,-1.625 -0.68218,-2.47491 -2.6082,-4.46081 -5.0625,-5.21875 -22.18929,-6.82265 -44.6866,-10.65484 -67.28125,-13.5625 -0.001,-1.8e-4 0.001,-0.0311 0,-0.0312 -0.0409,-0.006 -0.084,0.006 -0.125,0 -0.48237,-0.067 -0.98206,-0.0891 -1.46875,-0.0625 a 4.5838972,4.5838972 0 0 0 -0.0312,0 z"
-       transform="matrix(0.13029953,0,0,0.13105457,-58.548126,-58.336584)" />
-    <path
-       style="fill:#a55959;fill-opacity:1;stroke:none;display:inline"
-       d="m 12.894304,6.3883119 c -0.01249,7.847e-4 -0.02479,0.00211 -0.03709,0.00407 -0.03109,0.00512 -0.03725,0.00753 -0.01652,0.00407 -0.104921,0.017893 -0.198145,0.077084 -0.258618,0.1641728 -0.06046,0.0871 -0.08307,0.1947413 -0.06271,0.2986131 0.534472,2.7164778 -0.05564,5.3560911 -0.214215,6.8476011 -0.04856,0.456619 -0.197022,1.059336 -0.325435,1.675041 -0.12842,0.615708 -0.239388,1.243489 -0.17714,1.814289 0.01601,0.135868 0.101714,0.253745 0.226569,0.311254 l 0,0.04914 c 0.04365,-0.0014 0.09804,-0.0024 0.164784,-0.0083 l 0,-0.0042 c 0.01376,7.14e-4 0.02747,7.14e-4 0.04119,0 1.214317,-0.123774 2.367608,-0.940817 3.851726,-2.383552 1.484109,-1.442738 3.315507,-3.543302 5.853802,-6.3684364 0.09035,-0.099691 0.123311,-0.2383136 0.08745,-0.3676767 C 21.992235,8.2950333 21.892479,8.1927745 21.763519,8.1531843 18.881699,7.2722678 15.944052,6.771309 12.976635,6.3921375 c -0.02725,-0.00422 -0.05486,-0.00557 -0.08239,-0.00407 z"
-       id="path2444" />
-    <path
-       style="fill:#aa6262;fill-opacity:1;stroke:none;display:inline"
-       d="m 12.861345,6.3924071 c -0.0068,0.00119 -0.01376,0.00256 -0.0206,0.00407 C 9.9405042,6.8806722 4.9047593,7.6727526 1.9364485,8.7308896 1.808667,8.7772935 1.7138448,8.8857379 1.6853966,9.0179943 1.6569598,9.1502477 1.6988772,9.287762 1.7963912,9.3820654 4.5989466,12.096987 6.5375832,14.165317 8.099217,15.54982 c 1.5616353,1.384505 2.796871,2.130977 4.135972,1.994487 0.105106,-0.01024 0.201709,-0.06202 0.26826,-0.14355 0.06654,-0.08154 0.09751,-0.186166 0.08602,-0.290553 -0.04315,-0.39564 0.04067,-0.973503 0.164767,-1.568558 0.12412,-0.595049 0.279705,-1.20639 0.337802,-1.752852 0.146391,-1.376798 0.779778,-4.1646798 0.205979,-7.0810407 C 13.258427,6.504894 13.067641,6.3671191 12.861349,6.3924026 z"
-       id="path2453" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3807-82"
-       width="5.1445017"
-       height="5.0294647"
-       x="4.5450468"
-       y="5.0911288" />
-    <path
-       style="fill:#c08a8a;fill-opacity:1;stroke:none;display:inline"
-       d="M 2.0476729,8.7923412 C 1.8958621,8.8009262 1.7624302,8.895225 1.7044468,9.0349759 1.6464662,9.1747148 1.6741936,9.3351388 1.7757944,9.4476137 2.756608,10.53991 3.3764026,11.900518 3.7201949,13.158099 c 0.3437853,1.257579 0.403629,2.422363 0.3089572,3.047021 -0.091242,0.602068 -0.4971825,1.603947 -0.7126713,2.506417 -0.1077309,0.451234 -0.1765682,0.885615 -0.090632,1.298255 0.085935,0.412647 0.4171932,0.801092 0.8980515,0.909194 0.00823,0.0017 0.016432,0.0029 0.024719,0.0042 2.8910616,0.482901 3.6120838,0.699763 6.5088014,1.732377 0.115493,0.04032 0.243286,0.0252 0.346039,-0.04095 1.867459,-1.200803 3.109542,-1.915459 3.946472,-2.551469 0.836935,-0.636008 1.293815,-1.267731 1.384154,-2.117348 0.05629,-0.529568 -0.185784,-1.053729 -0.535538,-1.638287 C 15.448796,15.722965 14.963523,15.084414 14.418519,14.427712 13.328501,13.114311 11.99954,11.729767 11.089969,10.680368 11.024042,10.603947 10.931164,10.55557 10.83044,10.545223 7.7227506,10.244419 5.0625669,9.8358793 2.2042233,8.8169409 2.1542459,8.7983401 2.1009907,8.7899811 2.0476772,8.7923759 z"
-       id="path2442" />
-    <path
-       style="fill:#c08a8a;fill-opacity:1;stroke:none;display:inline"
-       d="m 21.644105,8.2230734 c -0.05386,2.078e-4 -0.107149,0.011446 -0.15654,0.032758 -2.701575,1.1727791 -7.70298,2.1051133 -10.731283,2.2852633 -0.179967,0.0119 -0.329082,0.143248 -0.362515,0.319444 -0.576099,2.91892 0.05538,5.707525 0.201856,7.085143 0.08656,0.814103 0.330842,1.803241 0.48198,2.596516 0.10082,0.529206 0.310189,2.121858 -0.42019,2.113257 0.177706,0.04689 0.294223,-0.01735 0.453146,-0.06553 2.817012,-0.993562 5.650313,-1.76726 8.45732,-2.236123 0.01107,-0.0021 0.02209,-0.0048 0.03295,-0.0083 0.446211,-0.117418 0.73286,-0.518291 0.803299,-0.917383 0.07044,-0.399093 0.01107,-0.82512 -0.08239,-1.273685 -0.186909,-0.897134 -0.544423,-1.897819 -0.638523,-2.518706 -0.09468,-0.62466 -0.03071,-1.789442 0.313084,-3.047023 0.343788,-1.257575 0.963588,-2.6181871 1.9444,-3.7104786 0.104155,-0.1158215 0.130038,-0.2801555 0.06591,-0.4218357 C 21.942489,8.314738 21.800373,8.2222796 21.644097,8.2229664 z"
-       id="path2440"
-       sodipodi:nodetypes="csccsscccsssssssc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
-       d="m 10.179702,10.820213 c -0.103304,2.626417 0.142422,4.907255 0.193609,6.23519 0.04328,1.122294 0.237098,2.486802 0.346037,3.580383 0.05313,0.53342 0.132492,1.851703 -0.114017,2.517291 l 0.530081,-0.05648 c -0.158925,0.06517 -0.275438,0.152122 -0.453146,0.08868 0.73038,0.0116 0.521015,-2.1437 0.420191,-2.859874 -0.151143,-1.07354 -0.395418,-2.412144 -0.481978,-3.513872 -0.100693,-1.281729 -0.431612,-3.467713 -0.440786,-5.991323 z"
-       id="path2495"
-       sodipodi:nodetypes="csssccssc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 1.915572,9.1197 2.6381692,0.6559668 2.3308099,0.4722972 3.2272749,0.419819 1.511181,-0.05247 2.817466,-0.39358 3.867607,-0.8658767 1.459958,-0.3935806 0.947692,-0.2623862 1.075758,-0.2623876"
-       id="path3664"
-       sodipodi:nodetypes="cccccccccc" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3807-82-2"
-       width="5.1445017"
-       height="5.0294647"
-       x="13.676021"
-       y="2.111794" />
-  </g>
-</svg>
Index: unk/images_nodist/copyaftercurrentleft.svg
===================================================================
--- /trunk/images_nodist/copyaftercurrentleft.svg	(revision 8031)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copyaftercurrentleft.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copybeforecurrentleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="10.519533"
-       y="2.4570346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 10.3125,4.375 L 17.0625,4.3125"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.07251,9.54126 L 21.67749,9.58374"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="9.8710909"
-       height="2.6210914"
-       x="11.251954"
-       y="10.064454" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.072632"
-       height="2.3851323"
-       x="11.119932"
-       y="13.651184" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.01001,13.10376 L 21.61499,13.14624"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copyaftercurrentright.svg
===================================================================
--- /trunk/images_nodist/copyaftercurrentright.svg	(revision 8031)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copyaftercurrentright.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copybeforecurrentleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="10.589584"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="1.9570332"
-       y="2.4570346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 1.75,4.375 L 8.5,4.3125"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.51001,9.54126 L 13.11499,9.58374"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="9.8710909"
-       height="2.6210914"
-       x="2.6894541"
-       y="10.064454" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.072632"
-       height="2.3851323"
-       x="2.5574322"
-       y="13.651184" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.44751,13.10376 L 13.05249,13.14624"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 22.162974,19.787973 L 22.162974,5.712027 L 16.212026,12.734943 L 22.162974,19.787973 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 21.819224,18.694223 L 21.819224,4.6182769 L 15.868276,11.641193 L 21.819224,18.694223 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copybeforecurrentleft.svg
===================================================================
--- /trunk/images_nodist/copybeforecurrentleft.svg	(revision 8031)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copybeforecurrentleft.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="10.519533"
-       y="2.4570346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 10.3125,4.375 L 17.0625,4.3125"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.07251,9.54126 L 21.67749,9.58374"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="9.8710909"
-       height="2.6210914"
-       x="11.251954"
-       y="10.064454" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.072632"
-       height="2.3851323"
-       x="11.182432"
-       y="6.6511846" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.01001,13.10376 L 21.61499,13.14624"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copybeforecurrentright.svg
===================================================================
--- /trunk/images_nodist/copybeforecurrentright.svg	(revision 8031)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copybeforecurrentrightsvg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.034962"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="2.0195312"
-       y="2.3945346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 1.8125,4.3125 L 8.5625,4.25"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.57251,9.47876 L 13.17749,9.52124"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.38590878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="9.8710909"
-       height="2.6210914"
-       x="2.7519531"
-       y="10.001954" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.37186792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.072632"
-       height="2.3851323"
-       x="2.6824341"
-       y="6.5886846" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.51001,13.04126 L 13.11499,13.08374"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 22.225474,20.287973 L 22.225474,6.212027 L 16.274526,13.234943 L 22.225474,20.287973 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 21.881724,19.194223 L 21.881724,5.1182769 L 15.930776,12.141193 L 21.881724,19.194223 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copyendleft.svg
===================================================================
--- /trunk/images_nodist/copyendleft.svg	(revision 8031)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copyendleft.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="10.519533"
-       y="2.4570346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 10.3125,4.375 L 17.0625,4.3125"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 10.76001,6.4787601 L 21.36499,6.5212399"
-       id="path3165" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 10.94751,11.22876 L 21.55249,11.27124"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="7.375"
-       height="3.4375"
-       x="29.4375"
-       y="-1.1875" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.46301931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="9.9814806"
-       height="3.7314808"
-       x="11.22801"
-       y="17.25926" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.01001,16.66626 L 21.61499,16.70874"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copyendright.svg
===================================================================
--- /trunk/images_nodist/copyendright.svg	(revision 8031)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copyendright.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="22.04221"
-     inkscape:cy="13.219415"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="2.1445332"
-       y="2.3945346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 1.9375,4.3125 L 8.6875,4.25"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.38501,6.4162601 L 12.98999,6.45874"
-       id="path3165" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.57251,11.16626 L 13.17749,11.20874"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="7.375"
-       height="3.4375"
-       x="29.4375"
-       y="-1.1875" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.46301931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="9.9814806"
-       height="3.7314808"
-       x="2.8530102"
-       y="17.19676" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.63501,16.60376 L 13.23999,16.64624"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 22.037974,19.787973 L 22.037974,5.712027 L 16.087026,12.734943 L 22.037974,19.787973 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 21.694224,18.694223 L 21.694224,4.618277 L 15.743276,11.641193 L 21.694224,18.694223 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copystartleft.svg
===================================================================
--- /trunk/images_nodist/copystartleft.svg	(revision 8031)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copystartleft.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="10.519533"
-       y="2.4570346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 10.3125,4.375 L 17.0625,4.3125"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 10.76001,6.4787601 L 21.36499,6.5212399"
-       id="path3165" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 10.94751,11.22876 L 21.55249,11.27124"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="7.375"
-       height="3.4375"
-       x="29.4375"
-       y="-1.1875" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.40588695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.038613"
-       height="2.8511131"
-       x="11.199444"
-       y="3.1056933" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 11.01001,16.66626 L 21.61499,16.70874"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.3995261,5.4620268 L 2.3995261,19.537973 L 8.350474,12.515057 L 2.3995261,5.4620268 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.0557764,4.3682765 L 2.0557764,18.444223 L 8.006724,11.421307 L 2.0557764,4.3682765 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/copystartright.svg
===================================================================
--- /trunk/images_nodist/copystartright.svg	(revision 8031)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="copystartright.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copystartleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1390"
-     inkscape:window-height="787"
-     inkscape:window-x="94"
-     inkscape:window-y="95" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:1.01156402;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.335931"
-       height="19.273432"
-       x="1.8320332"
-       y="2.5195346" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 1.625,4.4375 L 8.375,4.375"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002021;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.07251,6.5412601 L 12.67749,6.5837399"
-       id="path3165" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.26001,11.29126 L 12.86499,11.33374"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="7.375"
-       height="3.4375"
-       x="29.4375"
-       y="-1.1875" />
-    <rect
-       style="fill:#ffaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#ffaaaa;stroke-width:0.40588695;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3175"
-       width="10.038613"
-       height="2.8511131"
-       x="2.5119438"
-       y="3.1681933" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62002015;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 2.32251,16.72876 L 12.92749,16.77124"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 21.537974,20.162973 L 21.537974,6.087027 L 15.587026,13.109943 L 21.537974,20.162973 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 21.194224,19.069223 L 21.194224,4.993277 L 15.243276,12.016193 L 21.194224,19.069223 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: /trunk/images_nodist/mapmode/parallel.svg
===================================================================
--- /trunk/images_nodist/mapmode/parallel.svg	(revision 8031)
+++ /trunk/images_nodist/mapmode/parallel.svg	(revision 8032)
@@ -14,73 +14,8 @@
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="parallel.svg"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Mend"
-       style="overflow:visible;">
-      <path
-         id="path3715"
-         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 "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.4) rotate(180) translate(10,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2824"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2840"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2854"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2868"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2882"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2896"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="base"
@@ -91,6 +26,6 @@
      inkscape:pageshadow="2"
      inkscape:zoom="13.437814"
-     inkscape:cx="5.2811711"
-     inkscape:cy="9.8423034"
+     inkscape:cx="5.5587093"
+     inkscape:cy="15.784313"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -102,11 +37,76 @@
      inkscape:window-maximized="0">
     <inkscape:grid
-       type="xygrid"
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       visible="true"
+       empspacing="5"
        id="grid2830"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
+       type="xygrid" />
   </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
+      <path
+         transform="scale(0.4) rotate(180) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         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 "
+         id="path3715" />
+    </marker>
+    <inkscape:perspective
+       id="perspective10"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2824" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2840" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2854" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2868" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2882" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2896" />
+  </defs>
   <metadata
      id="metadata7">
@@ -117,67 +117,74 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
+     id="layer1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
+     inkscape:label="Layer 1">
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19.999715,1036.3622 -6,6 0,7"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
        id="path2906"
+       d="M19.5 8.5L13.5 14.5000000572L13.5 21.5000000072"
+       style="stroke-linejoin:miter;stroke-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-width:1.0;fill:none" />
+    <path
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 14.999715,1031.3622 -9.0000013,10 0,8"
        id="path2904"
-       sodipodi:nodetypes="ccc"
-       inkscape:connector-curvature="0" />
+       d="M14.50000013 3.5L5.5 13.5000000473L5.5 21.5000000052"
+       style="stroke-linejoin:miter;stroke-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-width:1.0;fill:none" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="19.5"
+       x="12.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4-52"
-       width="2.9996338"
-       height="2.9996338"
-       x="12.500183"
-       y="1047.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="12.5"
+       x="12.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4-4"
-       width="2.9996338"
-       height="2.9996338"
-       x="12.500183"
-       y="1040.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="6.5"
+       x="18.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4-7"
-       width="2.9996338"
-       height="2.9996338"
-       x="18.500183"
-       y="1034.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="1.5"
+       x="13.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4-5"
-       width="2.9996338"
-       height="2.9996338"
-       x="13.500183"
-       y="1029.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="11.5"
+       x="4.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4"
-       width="2.9996338"
-       height="2.9996338"
-       x="4.5001831"
-       y="1039.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#df421e;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.000000,0.000000,0.000000,1.000000,0.000000,0.000000)"
+       y="19.5"
+       x="4.5"
+       height="3.0"
+       width="3.0"
        id="rect2826-54-4-54"
-       width="2.9996338"
-       height="2.9996338"
-       x="4.5001831"
-       y="1047.8492" />
+       style="stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke:#df421e;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:1.0;fill:#ffffff" />
   </g>
 </svg>
Index: unk/images_nodist/mergeincomplete.svg
===================================================================
--- /trunk/images_nodist/mergeincomplete.svg	(revision 8031)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="mergeincomplete.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\mergecomplete.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="1.7844983"
-     inkscape:cy="13.711502"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="994"
-     inkscape:window-height="764"
-     inkscape:window-x="115"
-     inkscape:window-y="115" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3177"
-       width="9.7858524"
-       height="8.5231619"
-       x="3.1567266"
-       y="3.8150349" />
-  </g>
-</svg>
Index: unk/images_nodist/movedown.svg
===================================================================
--- /trunk/images_nodist/movedown.svg	(revision 8031)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="movedown.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\moveup.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="10.589584"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.606307"
-       height="10.106308"
-       x="5.9468451"
-       y="2.4468467" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 5.875,4.5 L 12.625,4.4375"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="10.546526"
-       height="2.609026"
-       x="6.5079861"
-       y="5.7579865" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 19.412973,16.087026 L 5.337027,16.087026 L 12.359943,22.037974 L 19.412973,16.087026 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 19.069223,14.993276 L 4.993277,14.993276 L 12.016193,20.944224 L 19.069223,14.993276 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/moveup.svg
===================================================================
--- /trunk/images_nodist/moveup.svg	(revision 8031)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="moveup.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyaftercurrentright.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="10.589584"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.606307"
-       height="10.106308"
-       x="5.9468451"
-       y="2.4468467" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 5.875,4.5 L 12.625,4.4375"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="10.546526"
-       height="2.609026"
-       x="6.5079861"
-       y="5.7579865" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
-       id="path3219" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 5.337027,22.037974 L 19.412973,22.037974 L 12.390057,16.087026 L 5.337027,22.037974 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 4.993277,20.944224 L 19.069223,20.944224 L 12.046307,14.993276 L 4.993277,20.944224 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/remove.svg
===================================================================
--- /trunk/images_nodist/remove.svg	(revision 8031)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="remove.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\remove.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="10.014144"
-     inkscape:cy="10.589584"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#646464;stroke-width:0.74118823;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2383"
-       width="11.606307"
-       height="10.106308"
-       x="5.9468451"
-       y="2.4468467" />
-    <path
-       style="fill:none;fill-rule:evenodd"
-       d="M 5.875,4.5 L 12.625,4.4375"
-       id="path3157" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.62108958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3230447,5.2917947 L 17.239455,5.3332053"
-       id="path3167" />
-    <rect
-       style="fill:#8faaff;fill-opacity:1;fill-rule:nonzero;stroke:#8faaff;stroke-width:0.39797419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3173"
-       width="10.546526"
-       height="2.609026"
-       x="6.5079861"
-       y="5.7579865" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#646464;stroke-width:0.621297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.3856484,8.6043984 L 17.364352,8.6456016"
-       id="path3219" />
-    <path
-       style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 6,14.375 C 18.125,22.3125 18.125,22.3125 18.125,22.3125"
-       id="path3767"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 5.8125,22.75 C 17.75,14 17.375,14.375 17.375,14.375"
-       id="path4278"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
Index: unk/images_nodist/tagkeepmine.svg
===================================================================
--- /trunk/images_nodist/tagkeepmine.svg	(revision 8031)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="tagkeepmine.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\copyendleft.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.5739"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10.149526,5.6495268 L 10.149526,19.725473 L 16.100474,12.702557 L 10.149526,5.6495268 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.8057764,4.5557765 L 9.8057764,18.631723 L 15.756724,11.608807 L 9.8057764,4.5557765 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/tagkeeptheir.svg
===================================================================
--- /trunk/images_nodist/tagkeeptheir.svg	(revision 8031)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="tagkeeptheir.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\tagkeepmine.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.801115"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.975474,19.725473 L 14.975474,5.6495269 L 9.024526,12.672443 L 14.975474,19.725473 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.631724,18.631723 L 14.631724,4.5557769 L 8.6807759,11.578693 L 14.631724,18.631723 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Index: unk/images_nodist/tagundecide.svg
===================================================================
--- /trunk/images_nodist/tagundecide.svg	(revision 8031)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="tagundecide.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\tagundecide.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="21.982894"
-     inkscape:cy="11.801115"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     inkscape:window-width="1348"
-     inkscape:window-height="669"
-     inkscape:window-x="169"
-     inkscape:window-y="85" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 8.287974,19.850473 L 8.287974,5.7745269 L 2.337026,12.797443 L 8.287974,19.850473 z"
-       id="path3221"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 7.944224,18.756723 L 7.944224,4.6807769 L 1.9932759,11.703693 L 7.944224,18.756723 z"
-       id="path3171"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#c8c8c8;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.258901,5.696402 L 16.258901,19.772348 L 22.209849,12.749432 L 16.258901,5.696402 z"
-       id="path2508"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000080;fill-rule:evenodd;stroke:#000080;stroke-width:1.98654306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15.915151,4.602652 L 15.915151,18.678598 L 21.866099,11.655682 L 15.915151,4.602652 z"
-       id="path2510"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>