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

diff --git a/images/fr/toolbar/hideshowoff.svg b/images/fr/toolbar/hideshowoff.svg
deleted file mode 100644
index 19b49a3..0000000
--- a/images/fr/toolbar/hideshowoff.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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="53"
-   height="43"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="hideshowoff.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <metadata
-     id="metadata28">
-    <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>
-  <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="1"
-     inkscape:cx="44.444505"
-     inkscape:cy="21.242368"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs5">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="87 : 22 : 1"
-       inkscape:persp3d-origin="43.5 : 14.666667 : 1"
-       id="perspective30" />
-    <linearGradient
-       id="linearGradient3166">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3168" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="1"
-         id="stop3170" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3166"
-       id="linearGradient3172"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective2472"
-       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" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3166"
-       id="linearGradient2487"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="22"
-       x2="74"
-       y2="22" />
-    <inkscape:perspective
-       id="perspective2590"
-       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>
-  <path
-     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:1.59263432;stroke-opacity:1"
-     d="M 34.341481,1.8366553 C 45.747271,1.8366553 45.747271,1.8366553 45.747271,1.8366553 C 45.747271,1.8366553 48.692673,4.0485498 49.668012,5.3948257 C 50.664216,6.7699023 52.163028,10.732081 52.163028,10.732081 L 52.163028,27.633391 C 52.163028,27.633391 50.582578,30.919053 49.668012,32.081104 C 48.648933,33.375948 45.747271,35.639274 45.747271,35.639274 L 33.628619,35.639274 L 33.628619,35.639274 L 33.628619,39.197444 L 19.371381,39.197444 L 19.371381,35.639274 L 7.2527289,35.639274 C 7.2527289,35.639274 4.3510677,33.375948 3.3319885,32.081104 C 2.4174221,30.919053 0.8369718,27.633391 0.8369718,27.633391 L 0.8369718,10.732081 C 0.8369718,10.732081 2.3357841,6.7699023 3.3319885,5.3948257 C 4.3073276,4.0485498 7.2527289,1.8366553 7.2527289,1.8366553 L 18.658519,1.8366553 L 18.658519,6.2843683 L 34.341481,6.2843683 L 34.341481,1.8366553 z"
-     id="path9"
-     sodipodi:nodetypes="ccsccscccccccsccsccccc" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3375"
-     width="53"
-     height="3"
-     x="0"
-     y="7.9999986" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3377"
-     width="53"
-     height="3"
-     x="0"
-     y="30" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3379"
-     width="53"
-     height="3"
-     x="0"
-     y="22.666666" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-opacity:1"
-     id="rect3381"
-     width="53"
-     height="3"
-     x="0"
-     y="15.333332" />
-</svg>
--
cgit v0.9.1