From 8f715ebd18e6403bdcc81811660bf6cfba9e0adf Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Sun, 15 Feb 2009 18:17:06 +0000
Subject: Fix conflicts

---
(limited to 'images/fi/palette/flowon.svg')

diff --git a/images/fi/palette/flowon.svg b/images/fi/palette/flowon.svg
index 1402413..a6033eb 100644
--- a/images/fi/palette/flowon.svg
+++ b/images/fi/palette/flowon.svg
@@ -1,106 +1,37 @@
 <?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"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   width="44"
-   height="56"
    version="1.0"
-   sodipodi:docname="flowon.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <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>
+   width="43.5"
+   height="56.5"
+   id="svg2">
   <defs
-     id="defs5">
-    <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="perspective9" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="1000"
-     inkscape:window-width="1679"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10"
-     inkscape:cx="3.3882353"
-     inkscape:cy="21.901201"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+     id="defs5" />
   <path
-     style="fill:#ffe000;stroke:#a06400;stroke-width:1.5;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
-     d="M 0.5,0.5 L 34.368627,0.5 C 34.368627,0.5 38.114227,1.7321101 39.419608,2.745098 C 40.606507,3.6661424 42.5,6.6980392 42.5,6.6980392 L 42.5,48.972549 C 42.5,48.972549 40.664623,52.23677 39.858824,53.035295 C 38.435367,54.4459 34.588235,55.5 34.588235,55.5 L 0.5,55.5 L 0.5,0.5 z"
+     d="M 0.75,0.75 L 34.618627,0.75 C 34.618627,0.75 38.364227,1.9821101 39.669608,2.995098 C 40.856507,3.9161424 42.75,6.9480392 42.75,6.9480392 L 42.75,49.222549 C 42.75,49.222549 40.914623,52.48677 40.108824,53.285295 C 38.685367,54.6959 34.838235,55.75 34.838235,55.75 L 0.75,55.75 L 0.75,0.75 z"
      id="path2384"
-     sodipodi:nodetypes="ccsccsccc" />
-  <path
-     sodipodi:type="star"
-     style="opacity:1;fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1"
-     id="path2386"
-     sodipodi:sides="3"
-     sodipodi:cx="23.827452"
-     sodipodi:cy="21.192158"
-     sodipodi:r1="6.019218"
-     sodipodi:r2="3.009609"
-     sodipodi:arg1="-0.90175333"
-     sodipodi:arg2="0.14544422"
-     inkscape:flatsided="true"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="M 27.560785,16.470589 L 26.049783,26.786103 L 17.871787,20.319781 L 27.560785,16.470589 z"
-     transform="translate(7.9058824,0.8784313)" />
-  <path
-     sodipodi:type="star"
-     style="opacity:1;fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1"
-     id="path2388"
-     sodipodi:sides="3"
-     sodipodi:cx="23.827452"
-     sodipodi:cy="21.192158"
-     sodipodi:r1="6.019218"
-     sodipodi:r2="3.009609"
-     sodipodi:arg1="-0.90175333"
-     sodipodi:arg2="0.14544422"
-     inkscape:flatsided="true"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="M 27.560785,16.470589 L 26.049783,26.786103 L 17.871787,20.319781 L 27.560785,16.470589 z"
-     transform="matrix(-0.9848078,-0.1736482,-0.1736482,0.9848078,39.492987,16.877786)" />
-  <path
-     style="fill:none;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-opacity:1;fill-opacity:1"
-     d="M 14.27451,37.223529 C 14.27451,37.32492 16.344566,38.720174 18.647855,39.476087 C 20.253989,40.003202 22.029944,39.993789 23.058823,39.968628 C 24.810658,39.925788 26.821133,38.886817 28.544961,37.673833 C 30.918917,36.003381 32.749242,34.00291 32.611765,33.819608 L 32.611765,33.819608 L 32.721569,33.819608"
-     id="path2390"
-     sodipodi:nodetypes="csssccc" />
-  <path
-     style="fill:none;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-opacity:1;fill-opacity:1"
-     d="M 29.866667,17.353553 C 29.866667,17.252162 27.796611,15.856908 25.493322,15.100995 C 23.887188,14.57388 22.111233,14.583293 21.082354,14.608454 C 19.330519,14.651294 17.320044,15.690265 15.596216,16.903249 C 13.22226,18.573701 11.391935,20.574172 11.529412,20.757474 L 11.529412,20.757474 L 11.419608,20.757474"
-     id="path3162"
-     sodipodi:nodetypes="csssccc" />
+     style="fill:#ffe000;fill-opacity:1;stroke:#a06400;stroke-width:1.5;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g3163">
+    <path
+       d="M 27.560785,16.470589 L 26.049783,26.786103 L 17.871787,20.319781 L 27.560785,16.470589 z"
+       transform="translate(8.1558824,1.1284313)"
+       id="path2386"
+       style="opacity:1;fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1" />
+    <path
+       d="M 27.560785,16.470589 L 26.049783,26.786103 L 17.871787,20.319781 L 27.560785,16.470589 z"
+       transform="matrix(-0.9848078,-0.1736482,-0.1736482,0.9848078,39.742987,17.127786)"
+       id="path2388"
+       style="opacity:1;fill:#a06400;fill-opacity:1;stroke:#a06400;stroke-width:3;stroke-opacity:1" />
+    <path
+       d="M 14.52451,37.473529 C 14.52451,37.57492 16.594566,38.970174 18.897855,39.726087 C 20.503989,40.253202 22.279944,40.243789 23.308823,40.218628 C 25.060658,40.175788 27.071133,39.136817 28.794961,37.923833 C 31.168917,36.253381 32.999242,34.25291 32.861765,34.069608 L 32.861765,34.069608 L 32.971569,34.069608"
+       id="path2390"
+       style="fill:none;fill-opacity:1;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="M 30.716667,18.403553 C 30.716667,18.302162 25.524507,14.824454 21.332354,14.858454 C 17.140201,14.892454 11.631102,20.824172 11.779412,21.007474 C 11.779412,21.007474 11.779412,21.007474 11.779412,21.007474 C 11.742811,21.007474 11.706209,21.007474 11.669608,21.007474"
+       id="path3162"
+       style="fill:none;fill-opacity:1;stroke:#a06400;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
 </svg>
--
cgit v0.9.1