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

diff --git a/images/fi/pen/setpensize.svg b/images/fi/pen/setpensize.svg
index c09871e..5eedfa4 100644
--- a/images/fi/pen/setpensize.svg
+++ b/images/fi/pen/setpensize.svg
@@ -60,14 +60,21 @@
      style="font-size:18px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans">
     <tspan
        x="37"
-       y="27"
+       y="22"
        style="font-size:16px;">aseta</tspan>
   </text>
   <text
      style="font-size:18px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans">
     <tspan
        x="37"
-       y="46"
-       style="font-size:16px;">kynän koko</tspan>
+       y="36"
+       style="font-size:16px;">kynän</tspan>
+  </text>
+  <text
+     style="font-size:18px;text-anchor:middle;text-align:center;font-family:Bitstream Vera Sans">
+    <tspan
+       x="37"
+       y="50"
+       style="font-size:16px;">koko</tspan>
   </text>
 </svg>
--
cgit v0.9.1