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/fr/palette/penoff.svg')

diff --git a/images/fr/palette/penoff.svg b/images/fr/palette/penoff.svg
index e41874e..6f5494b 100644
--- a/images/fr/palette/penoff.svg
+++ b/images/fr/palette/penoff.svg
@@ -1,110 +1,52 @@
 <?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="penoff.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" />
-    <inkscape:perspective
-       id="perspective2465"
-       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" />
-  </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="13.946903"
-     inkscape:cx="21.5"
-     inkscape:cy="30.86802"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
+     id="defs5" />
   <path
-     style="fill:#e0e0e0;stroke:#a0a0a0;stroke-width:1.50000000000000000;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
-     style="fill:none;stroke:#808080;stroke-width:3;stroke-linecap:round;stroke-opacity:1;stroke-dasharray:none"
-     d="M 5.4492386,40.369289 C 6.8832487,41.157995 10.689009,41.771717 12.977792,41.659898 C 14.603959,41.580451 16.892721,41.180049 18.211929,40.225888 C 20.450052,38.60709 21.244624,34.396261 23.302665,32.553934 C 24.528366,31.456705 26.534509,30.109299 28.178299,30.044416 C 30.18215,29.965321 32.646467,31.558765 34.344543,32.625635 C 35.634759,33.436254 38.14467,35.995558 38.14467,35.995558"
-     id="path2471"
-     sodipodi:nodetypes="cssssss" />
-  <path
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:1px;stroke-opacity:1;fill-opacity:1"
-     d="M 7.2417513,38.935279 L 8.3889594,34.274746 L 10.324873,34.633249 L 11.543782,35.708756 L 11.830584,37.788071 L 7.2417513,38.935279 z"
-     id="path3245"
-     sodipodi:nodetypes="cccccc" />
-  <path
-     style="fill:none;stroke:#606060;stroke-width:2;stroke-linecap:round;stroke-opacity:1;stroke-dasharray:none"
-     d="M 5.8077411,40.154188 C 7.5285533,38.289975 7.6719543,38.433376 7.6719543,38.433376"
-     id="path3243"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:1"
-     d="M 8.8908629,33.557742 L 27.246192,15.489214 L 28.680203,16.851523 L 10.683375,34.418148 L 8.8908629,33.557742 z"
-     id="path3247"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:1px;stroke-opacity:1"
-     d="M 12.117386,35.421955 L 29.970812,18.213833 L 31.404823,19.576142 L 12.475887,37.644671 L 12.117386,35.421955 z"
-     id="path3249"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#c4c4c4;stroke:#c4c4c4;stroke-width:1px;stroke-opacity:1;fill-opacity:1"
-     d="M 10.253173,34.346447 L 11.902284,35.995558 L 30.185914,18.213832 L 28.680203,16.42132 L 10.253173,34.346447 z"
-     id="path3251" />
-  <path
-     style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:1px;stroke-opacity:1"
-     d="M 29.863261,12.011739 L 32.301079,9.6456219 L 33.502063,10.488102 L 34.918148,11.689086 L 35.90403,12.96177 L 36.818211,14.449556 L 34.452094,16.959075 L 33.555837,15.453364 L 31.368971,13.087247 L 29.863261,12.011739 z"
-     id="path3255"
-     sodipodi:nodetypes="cccccccccc" />
-  <path
-     style="fill:#c4c4c4;stroke:#c4c4c4;stroke-width:1px;stroke-opacity:1;fill-opacity:1"
-     d="M 27.174492,14.772208 L 29.468909,12.692893 L 30.669893,13.535373 L 32.085978,14.736357 L 33.07186,16.009041 L 33.986041,17.496827 L 31.906726,19.361041 L 30.938769,18.213833 L 28.608502,15.991117 L 27.174492,14.772208 z"
-     id="path3253"
-     sodipodi:nodetypes="cccccccccc" />
+     style="fill:#e0e0e0;fill-opacity:1;stroke:#a0a0a0;stroke-width:1.5;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="translate(-31.525379,-20.795051)"
+     id="g2431">
+    <path
+       d="M 37.427664,63.254986 C 38.861674,64.043692 42.667434,64.657414 44.956217,64.545595 C 46.582384,64.466148 48.871146,64.065746 50.190354,63.111585 C 52.428477,61.492787 53.223049,57.281958 55.28109,55.439631 C 56.506791,54.342402 58.512934,52.994996 60.156724,52.930113 C 62.160575,52.851018 64.624892,54.444462 66.322968,55.511332 C 67.613184,56.321951 70.123095,58.881255 70.123095,58.881255"
+       id="path2471"
+       style="fill:none;stroke:#0080ff;stroke-width:3;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 39.220176,61.820976 L 40.367384,57.160443 L 42.303298,57.518946 L 43.522207,58.594453 L 43.809009,60.673768 L 39.220176,61.820976 z"
+       id="path3245"
+       style="fill:#e0e0e0;fill-opacity:1;stroke:#e0e0e0;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="M 37.786166,63.039885 C 39.506978,61.175672 39.650379,61.319073 39.650379,61.319073"
+       id="path3243"
+       style="fill:none;stroke:#0060ff;stroke-width:2;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 40.869288,56.443439 L 59.224617,38.374911 L 60.658628,39.73722 L 42.6618,57.303845 L 40.869288,56.443439 z"
+       id="path3247"
+       style="fill:#a0a0ff;fill-opacity:1;stroke:#a0a0ff;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="M 44.095811,58.307652 L 61.949237,41.09953 L 63.383248,42.461839 L 44.454312,60.530368 L 44.095811,58.307652 z"
+       id="path3249"
+       style="fill:#8080ff;fill-opacity:1;stroke:#8080ff;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="M 42.231598,57.232144 L 43.880709,58.881255 L 62.164339,41.099529 L 60.658628,39.307017 L 42.231598,57.232144 z"
+       id="path3251"
+       style="fill:#c4c4ff;fill-opacity:1;stroke:#c4c4ff;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="M 61.841686,34.897436 L 64.279504,32.531319 L 65.480488,33.373799 L 66.896573,34.574783 L 67.882455,35.847467 L 68.796636,37.335253 L 66.430519,39.844772 L 65.534262,38.339061 L 63.347396,35.972944 L 61.841686,34.897436 z"
+       id="path3255"
+       style="fill:#e0a040;fill-opacity:1;stroke:#e0a040;stroke-width:1px;stroke-opacity:1" />
+    <path
+       d="M 59.152917,37.657905 L 61.447334,35.57859 L 62.648318,36.42107 L 64.064403,37.622054 L 65.050285,38.894738 L 65.964466,40.382524 L 63.885151,42.246738 L 62.917194,41.09953 L 60.586927,38.876814 L 59.152917,37.657905 z"
+       id="path3253"
+       style="fill:#e0e0e0;fill-opacity:1;stroke:#c4c4c4;stroke-width:1px;stroke-opacity:1" />
+  </g>
 </svg>
--
cgit v0.9.1