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/numberson.svg')

diff --git a/images/fr/palette/numberson.svg b/images/fr/palette/numberson.svg
index 2f83bd8..9f5a033 100644
--- a/images/fr/palette/numberson.svg
+++ b/images/fr/palette/numberson.svg
@@ -1,90 +1,40 @@
 <?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="numberson.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="13.946903"
-     inkscape:cx="21.875"
-     inkscape:cy="28"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="g2392" />
+     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" />
+     style="fill:#ffe000;fill-opacity:1;stroke:#a06400;stroke-width:1.5;stroke-dasharray:none;stroke-opacity:1" />
   <g
-     id="g2392"
-     transform="translate(0,-1.1740561)">
+     transform="translate(0.25,-0.9240561)"
+     id="g2392">
     <text
-       id="text2384"
-       y="26.866751"
        x="4.5171318"
-       style="font-size:12px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       xml:space="preserve"><tspan
-         style="font-size:18px;fill:#a06400;fill-opacity:1"
-         y="26.866751"
+       y="26.866751"
+       id="text2384"
+       xml:space="preserve"
+       style="font-size:12px;fill:#a000a0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
          x="4.5171318"
+         y="26.866751"
          id="tspan2386"
-         sodipodi:role="line">123</tspan></text>
+         style="font-size:18px;fill:#a000a0;fill-opacity:1">123</tspan></text>
     <text
-       id="text2388"
-       y="44.840736"
        x="1.8153553"
-       style="font-size:12px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       xml:space="preserve"><tspan
-         style="font-size:18px;fill:#a06400;fill-opacity:1"
-         y="44.840736"
+       y="44.840736"
+       id="text2388"
+       xml:space="preserve"
+       style="font-size:12px;fill:#a000a0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
          x="1.8153553"
+         y="44.840736"
          id="tspan2390"
-         sodipodi:role="line">+–=</tspan></text>
+         style="font-size:18px;fill:#a000a0;fill-opacity:1">+–=</tspan></text>
   </g>
 </svg>
--
cgit v0.9.1