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

diff --git a/images/tr/toolbar/hideshowon.svg b/images/tr/toolbar/hideshowon.svg
deleted file mode 100644
index 6f0ad56..0000000
--- a/images/tr/toolbar/hideshowon.svg
+++ /dev/null
@@ -1,127 +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="hideshowon.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="6.4022989"
-     inkscape:cx="43.5"
-     inkscape:cy="-5.1863207"
-     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" />
-  </defs>
-  <g
-     id="g2478"
-     transform="matrix(0.7128619,0,0,0.8895426,-6.102877e-4,0.9471127)">
-    <path
-       sodipodi:nodetypes="ccsccscccccccsccsccccc"
-       id="path9"
-       d="M 48,1 C 64,1 64,1 64,1 C 64,1 68.131798,3.4865526 69.5,5 C 70.897472,6.5458243 73,11 73,11 L 73,30 C 73,30 70.78295,33.693654 69.5,35 C 68.07044,36.455629 64,39 64,39 L 47,39 L 47,39 L 47,43 L 27,43 L 27,39 L 10,39 C 10,39 5.9295605,36.455629 4.5,35 C 3.2170498,33.693654 1,30 1,30 L 1,11 C 1,11 3.1025283,6.5458243 4.5,5 C 5.8682021,3.4865526 10,1 10,1 L 26,1 L 26,6 L 48,6 L 48,1 z"
-       style="fill:url(#linearGradient2487);fill-opacity:1;stroke:#c0a000;stroke-width:2;stroke-opacity:1" />
-    <path
-       id="path11"
-       d="M 49,2.5 L 63,2.5"
-       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1" />
-    <path
-       id="path13"
-       d="M 11,2.5 L 25,2.5"
-       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1" />
-    <path
-       id="path15"
-       d="M 10.5,39.5 L 26.5,39.5"
-       style="fill:none;stroke:#606000;stroke-width:1;stroke-opacity:1" />
-    <path
-       id="path17"
-       d="M 47.5,39.5 L 63.5,39.5"
-       style="fill:none;stroke:#606000;stroke-width:1;stroke-opacity:1" />
-    <path
-       id="path19"
-       d="M 26.5,43.5 L 47.5,43.5"
-       style="fill:none;stroke:#606000;stroke-width:1;stroke-opacity:1" />
-    <path
-       id="path21"
-       d="M 25,7.5 L 49,7.5"
-       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-opacity:1" />
-  </g>
-</svg>
--
cgit v0.9.1