]> git.sur5r.net Git - minitube/commitdiff
Imported Upstream version 1.3 upstream/1.3
authorJakob Haufe <sur5r@sur5r.net>
Mon, 6 Aug 2012 20:31:37 +0000 (22:31 +0200)
committerJakob Haufe <sur5r@sur5r.net>
Mon, 6 Aug 2012 20:31:37 +0000 (22:31 +0200)
28 files changed:
CHANGES
data/128x128/minitube.png
data/16x16/minitube.png
data/22x22/minitube.png
data/256x256/minitube.png
data/32x32/minitube.png
data/48x48/minitube.png
data/512x512/minitube.png
data/64x64/minitube.png
data/minitube.svg
images/app.png
locale/de_DE.ts
locale/fi_FI.ts
locale/locale.pri
locale/mkd_MKD.ts [new file with mode: 0644]
minitube.pro
src/AboutView.cpp
src/ListModel.cpp
src/MainWindow.cpp
src/MainWindow.h
src/MediaView.cpp
src/MediaView.h
src/SearchView.cpp
src/downloaditem.cpp
src/downloaditem.h
src/networkaccess.cpp
src/networkaccess.h
src/video.cpp

diff --git a/CHANGES b/CHANGES
index eac32b806dbf35043ac1c6c7a51a04ac509a1700..ee7cef57910ef8d37b6292070fe581395648c306 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,17 @@
+1.3 - Dec 10, 2010
+- Minitube works again!
+- Big internal changes in how playback works, seeking is now disabled on Linux
+- Brand new icon designed by David Nel
+- Using Qt/Cocoa on the Mac, now requiring Leopard or better
+- New Macedonian translation by Veta Branislav
+- Updated Finnish translation
+- New german translation by Jakob Kramer
+
 1.2 - Oct 11, 2010
 - Ability to download videos
 - Support for media keys on GNOME
 - More style, especially on the Mac
-- Fixed crash when trying delete or move the the las playlist item
+- Fixed crash when trying delete or move the the last playlist item
 
 1.1 - Jul 27, 2010
 - Minitube now correctly plays cat and mouse with YouTube
index d46188e0fb18bbb46dceff16d7b341f02d7d338c..44f4add8b1b63686a09df97871eba286473dbfeb 100644 (file)
Binary files a/data/128x128/minitube.png and b/data/128x128/minitube.png differ
index c785c2bf477913c4cbfa217430d7f240fa37a555..ab0d47770e8ffc1fa187de118cd014b619262604 100644 (file)
Binary files a/data/16x16/minitube.png and b/data/16x16/minitube.png differ
index bcb2a97cc20868f69e70fef460051c8718b730d5..9e4df1298c09663deac38f8b843ea5eaf0ad2a74 100644 (file)
Binary files a/data/22x22/minitube.png and b/data/22x22/minitube.png differ
index 5a2a186cb72cc195d2e6eca5ccce2f480b9ba22f..38c2c3090068f5e446cd7bff4820e27a42e68541 100644 (file)
Binary files a/data/256x256/minitube.png and b/data/256x256/minitube.png differ
index 7d8d63a7f9a0076deea1620b241abc008adac281..27aed8b3a3aa379ada11c82716b04454c48980a8 100644 (file)
Binary files a/data/32x32/minitube.png and b/data/32x32/minitube.png differ
index aeb6f116194ba924dcf720f0804d42ca79d1ebf7..398e2c377c7ab0293846ceba8b0f89c9214b2d86 100644 (file)
Binary files a/data/48x48/minitube.png and b/data/48x48/minitube.png differ
index 1d1d0edaa9d191af61d28bae1c846a3ccde1c519..77cfb0355f834b6c68a645b18edf51f006fe255c 100644 (file)
Binary files a/data/512x512/minitube.png and b/data/512x512/minitube.png differ
index 674a03d14803e5b13d327075fc020f4805b80c28..3afc57b22c60b96b161ed16095244e6c9e2cc04c 100644 (file)
Binary files a/data/64x64/minitube.png and b/data/64x64/minitube.png differ
index 5d2670d2bf95fd46526c9c53c656a5ef225a491b..dfe72b15abd3176603b75705a8a0e6ba5a2f4142 100644 (file)
@@ -1,5 +1,6 @@
 <?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: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="32"
-   height="32"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/needcoffee/Templates"
-   sodipodi:docname="tv.svg"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/flavio/projects/minitube/images/app.png"
-   inkscape:export-xdpi="360"
-   inkscape:export-ydpi="360">
+   width="256"
+   height="256"
+   id="svg5060"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="minitube.svg">
   <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective65" />
+     id="defs5062">
+    <filter
+       inkscape:collect="always"
+       id="filter4563-1"
+       x="-0.031309646"
+       width="1.0626193"
+       y="-0.71720898"
+       height="2.434418"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.6241879"
+         id="feGaussianBlur4565-5" />
+    </filter>
+    <linearGradient
+       id="linearGradient4178-1">
+      <stop
+         id="stop4289"
+         offset="0"
+         style="stop-color:#a64b1f;stop-opacity:1" />
+      <stop
+         id="stop4182-3"
+         offset="1"
+         style="stop-color:#5b2a0c;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient8228">
+       id="linearGradient5368-5">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#333333;stop-opacity:1"
          offset="0"
-         id="stop8230" />
+         id="stop5370-3" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#000000;stop-opacity:1"
          offset="1"
-         id="stop8232" />
+         id="stop5372-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7815">
+       inkscape:collect="always"
+       id="linearGradient4144-3">
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#53270a;stop-opacity:1"
          offset="0"
-         id="stop7817" />
+         id="stop4146-4" />
       <stop
-         id="stop7823"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1;" />
+         style="stop-color:#a64b1f;stop-opacity:1"
+         offset="1"
+         id="stop4148-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4404-9">
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#cd8838;stop-opacity:1;"
+         offset="0"
+         id="stop4406-0" />
+      <stop
+         style="stop-color:#cd8838;stop-opacity:0;"
          offset="1"
-         id="stop7819" />
+         id="stop4408-4" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient7422">
+       id="linearGradient4440-0">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#2c1200;stop-opacity:1;"
          offset="0"
-         id="stop7424" />
+         id="stop4442-0" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         style="stop-color:#2c1200;stop-opacity:0;"
+         offset="1"
+         id="stop4444-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4428-5">
+      <stop
+         style="stop-color:#130800;stop-opacity:1"
+         offset="0"
+         id="stop4430-7" />
+      <stop
+         style="stop-color:#160a00;stop-opacity:0.698"
+         offset="1"
+         id="stop4432-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4473-3">
+      <stop
+         style="stop-color:#170900;stop-opacity:1;"
+         offset="0"
+         id="stop4475-6" />
+      <stop
+         style="stop-color:#170900;stop-opacity:0;"
+         offset="1"
+         id="stop4477-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5054"
+       id="linearGradient4185"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.7329952,0,0,3.7329952,335.49976,-100.67389)"
+       x1="49.356548"
+       y1="20.648026"
+       x2="49.356548"
+       y2="73.09745" />
+    <linearGradient
+       id="linearGradient5054"
+       inkscape:collect="always">
+      <stop
+         id="stop5056"
+         offset="0"
+         style="stop-color:#da8d56;stop-opacity:1" />
+      <stop
+         id="stop5058"
+         offset="1"
+         style="stop-color:#b56228;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5207-1">
+      <stop
+         style="stop-color:#a05a2c;stop-opacity:1"
+         offset="0"
+         id="stop5209-3" />
+      <stop
+         style="stop-color:#784421;stop-opacity:1"
+         offset="1"
+         id="stop5211-4" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5230-8"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.47316457"
+         id="feGaussianBlur5232-9" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5298-2">
+      <stop
+         style="stop-color:#502d16;stop-opacity:1"
+         offset="0"
+         id="stop5300-1" />
+      <stop
+         style="stop-color:#502d16;stop-opacity:0"
+         offset="1"
+         id="stop5302-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5238-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5240-7" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop5242-7" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter4911-1"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.155"
+         id="feGaussianBlur4913-6" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4915-4">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop4917-2" />
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:0;"
+         offset="1"
+         id="stop4919-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4588-9-6">
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1"
+         offset="0"
+         id="stop4590-3-5" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4592-9-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5284-6">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1;"
+         offset="0"
+         id="stop5286-8" />
+      <stop
+         style="stop-color:#cccccc;stop-opacity:0;"
          offset="1"
-         id="stop7426" />
+         id="stop5288-5" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4911-3-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.155"
+         id="feGaussianBlur4913-9-3" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4588-9-0-9">
+      <stop
+         style="stop-color:#d4d4d4;stop-opacity:1"
+         offset="0"
+         id="stop4590-3-3-4" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4592-9-3-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6646">
+       inkscape:collect="always"
+       id="linearGradient4915-2-6">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
+         style="stop-color:#4d4d4d;stop-opacity:1;"
          offset="0"
-         id="stop6648" />
+         id="stop4917-5-9" />
       <stop
-         style="stop-color:#555753;stop-opacity:1"
+         style="stop-color:#4d4d4d;stop-opacity:0;"
          offset="1"
-         id="stop6650" />
+         id="stop4919-4-3" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient6257">
+       id="linearGradient4895-4">
       <stop
-         style="stop-color:#555753;stop-opacity:1;"
+         style="stop-color:#333333;stop-opacity:1"
          offset="0"
-         id="stop6259" />
+         id="stop4897-7" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1"
+         style="stop-color:#808080;stop-opacity:1"
          offset="1"
-         id="stop6261" />
+         id="stop4899-0" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5863">
+       inkscape:collect="always"
+       id="linearGradient4887-3">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop4889-6" />
+      <stop
+         style="stop-color:#b3b3b3;stop-opacity:1"
+         offset="1"
+         id="stop4891-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4895-1-2">
+      <stop
+         style="stop-color:#333333;stop-opacity:1"
+         offset="0"
+         id="stop4897-1-4" />
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="1"
+         id="stop4899-4-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4887-7-8">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop4889-8-7" />
+      <stop
+         style="stop-color:#b3b3b3;stop-opacity:1"
+         offset="1"
+         id="stop4891-8-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4816-5">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         id="stop5865" />
+         id="stop4818-3" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1"
+         style="stop-color:#000000;stop-opacity:0;"
          offset="1"
-         id="stop5867" />
+         id="stop4820-8" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5088">
+       id="linearGradient3960-2">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.54347825;"
+         style="stop-color:#73d1ff;stop-opacity:1"
          offset="0"
-         id="stop5090" />
+         id="stop3962-9" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         style="stop-color:#4a79b8;stop-opacity:1"
          offset="1"
-         id="stop5092" />
+         id="stop3964-6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient4701"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       id="linearGradient3975-4">
       <stop
-         id="stop4703"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
+         id="stop3977-5" />
       <stop
-         id="stop4705"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
+         id="stop3979-5" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient4301">
+       id="linearGradient4371-6">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop4303" />
+         id="stop4373-2" />
       <stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop4305" />
+         id="stop4375-6" />
     </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4394-5"
+       x="-0.11183436"
+       width="1.2236687"
+       y="-0.20305102"
+       height="1.4061019">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="12.587777"
+         id="feGaussianBlur4396-6" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4607-9"
+       x="-0.46153846"
+       width="1.9230769"
+       y="-0.46153846"
+       height="1.9230769"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="7.8125"
+         id="feGaussianBlur4609-4" />
+    </filter>
     <linearGradient
+       id="linearGradient4847-9"
+       inkscape:collect="always">
+      <stop
+         id="stop4849-9"
+         offset="0"
+         style="stop-color:#cef4ff;stop-opacity:1" />
+      <stop
+         id="stop4851-3"
+         offset="1"
+         style="stop-color:#adedff;stop-opacity:0.13235294" />
+    </linearGradient>
+    <filter
        inkscape:collect="always"
-       id="linearGradient3145">
+       id="filter4630-0"
+       x="-0.12742878"
+       width="1.2548577"
+       y="-0.48608795"
+       height="1.972176"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.6933091"
+         id="feGaussianBlur4632-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4634-4">
+      <stop
+         style="stop-color:#adf2ff;stop-opacity:1"
+         offset="0"
+         id="stop4636-5" />
+      <stop
+         style="stop-color:#f0ffad;stop-opacity:0"
+         offset="1"
+         id="stop4638-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6615">
+      <stop
+         id="stop6617"
+         offset="0"
+         style="stop-color:#a64b1f;stop-opacity:1" />
+      <stop
+         id="stop6619"
+         offset="1"
+         style="stop-color:#5b2a0c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4473-3"
+       id="linearGradient5615"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.6767535,0,0,3.6767535,338.34699,-97.070017)"
+       x1="49.886879"
+       y1="105.43992"
+       x2="49.886879"
+       y2="70.189346" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4481-2">
+      <stop
+         style="stop-color:#b56228;stop-opacity:1;"
+         offset="0"
+         id="stop4483-2" />
+      <stop
+         style="stop-color:#b56228;stop-opacity:0;"
+         offset="1"
+         id="stop4485-0" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5428-8"
+       x="-0.049649414"
+       width="1.0992988"
+       y="-0.33671328"
+       height="1.6734266"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.9290865"
+         id="feGaussianBlur5430-5" />
+    </filter>
+    <linearGradient
+       id="linearGradient6801">
+      <stop
+         style="stop-color:#73d1ff;stop-opacity:1"
+         offset="0"
+         id="stop6803" />
+      <stop
+         style="stop-color:#4a79b8;stop-opacity:1"
+         offset="1"
+         id="stop6805" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5410-5"
+       x="-0.16879599"
+       width="1.337592"
+       y="-0.86917335"
+       height="2.7383468"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.2893846"
+         id="feGaussianBlur5412-0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4460-7">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3147" />
+         id="stop4462-3" />
       <stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop3149" />
+         id="stop4464-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6873">
+      <stop
+         id="stop6875"
+         offset="0"
+         style="stop-color:#a64b1f;stop-opacity:1" />
+      <stop
+         id="stop6877"
+         offset="1"
+         style="stop-color:#5b2a0c;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3145"
-       id="linearGradient3151"
-       x1="7"
-       y1="-1"
-       x2="12"
-       y2="16"
+       xlink:href="#linearGradient5284-6"
+       id="linearGradient5353"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6666666,0,0,1.0000001,-2.7699557e-8,-3)" />
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,323.44145,-110.87361)"
+       x1="109.48217"
+       y1="28.91128"
+       x2="108.68206"
+       y2="34.568138" />
     <linearGradient
+       id="linearGradient7064">
+      <stop
+         style="stop-color:#73d1ff;stop-opacity:1"
+         offset="0"
+         id="stop7066" />
+      <stop
+         style="stop-color:#4a79b8;stop-opacity:1"
+         offset="1"
+         id="stop7068" />
+    </linearGradient>
+    <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4301"
-       id="linearGradient4307"
-       x1="-5"
-       y1="-7"
-       x2="39"
-       y2="30"
+       xlink:href="#linearGradient4178-1"
+       id="radialGradient5084"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5555555,0,0,0.5692092,2.6666665,1.1694899)" />
+       gradientTransform="matrix(4.8594622,-0.11058189,0.05843403,2.5678511,213.72352,-2423.9327)"
+       cx="60.413155"
+       cy="945.41626"
+       fx="60.413155"
+       fy="945.41626"
+       r="64" />
+    <linearGradient
+       id="linearGradient7141">
+      <stop
+         id="stop7143"
+         offset="0"
+         style="stop-color:#a64b1f;stop-opacity:1" />
+      <stop
+         id="stop7145"
+         offset="1"
+         style="stop-color:#5b2a0c;stop-opacity:1" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4701"
-       id="radialGradient4699"
+       xlink:href="#linearGradient5368-5"
+       id="radialGradient5086"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0025642,3.1703514e-8,-1.117005e-8,0.4159999,-8.0615381,4.9319989)"
-       cx="24"
-       cy="39.923077"
-       fx="24"
-       fy="39.923077"
-       r="20" />
+       gradientTransform="matrix(3.8921716,0,0,0.37761572,327.44145,65.748855)"
+       cx="59.75"
+       cy="-1043.5648"
+       fx="59.75"
+       fy="-1043.5648"
+       r="59.5" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5088"
-       id="linearGradient5097"
+       xlink:href="#linearGradient4144-3"
+       id="linearGradient4150-3"
+       x1="58.25"
+       y1="-930.98718"
+       x2="58.25"
+       y2="-942.24829"
        gradientUnits="userSpaceOnUse"
-       x1="2"
-       y1="-4"
-       x2="19"
-       y2="30"
-       gradientTransform="matrix(0.5675677,0,0,0.6086956,2.3783783,0.5000008)" />
+       gradientTransform="matrix(3.8921716,0,0,-3.8921716,327.44145,-3708.6498)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5863"
-       id="linearGradient5872"
+       xlink:href="#linearGradient4404-9"
+       id="linearGradient4410-3"
+       x1="60.104076"
+       y1="-945.01538"
+       x2="60.604076"
+       y2="-931.68439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,-3.8921716,327.44145,-3708.6498)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4440-0"
+       id="linearGradient5088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-3708.6498)"
+       x1="71.771339"
+       y1="1032.9099"
+       x2="64.36039"
+       y2="997.90814" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4428-5"
+       id="radialGradient5090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.8812978,2.4234119e-6,-1.9460858e-7,0.4722891,200.13757,-176.54972)"
+       cx="64"
+       cy="1032.8134"
+       fx="64"
+       fy="1032.8134"
+       r="64" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4473-3"
+       id="linearGradient4479-6"
+       x1="49.886879"
+       y1="105.43992"
+       x2="49.886879"
+       y2="70.189346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4481-2"
+       id="linearGradient4487-8"
+       x1="49.356548"
+       y1="20.648026"
+       x2="49.356548"
+       y2="73.09745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5207-1"
+       id="radialGradient5092"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.0638923,0.02724933,-0.03290095,6.1141652,198.56043,-302.43353)"
+       cx="112.34137"
+       cy="79.656364"
+       fx="112.34137"
+       fy="79.656364"
+       r="12.625" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5298-2"
+       id="linearGradient5094"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-111.15861)"
+       x1="130.8627"
+       y1="104.27817"
+       x2="110.68109"
+       y2="80.590096" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5238-3"
+       id="linearGradient5096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,325.94145,-110.87361)"
+       x1="110.62798"
+       y1="97.985451"
+       x2="111.95164"
+       y2="102.71423" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4915-4"
+       id="radialGradient5252-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.4939901,0,0,3.4939901,371.15402,-95.919045)"
+       cx="115.95312"
+       cy="38.515625"
+       fx="115.95312"
+       fy="38.515625"
+       r="9.078125" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4588-9-6"
+       id="radialGradient5098"
+       gradientUnits="userSpaceOnUse"
+       cx="111.25"
+       cy="71.5"
+       fx="111.25"
+       fy="71.5"
+       r="7.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5284-6"
+       id="linearGradient5290-4"
+       x1="109.48217"
+       y1="28.91128"
+       x2="108.68206"
+       y2="34.568138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,323.44145,-110.87361)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4895-4"
+       id="radialGradient5100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6850937,0,0,1,-77.3964,0)"
+       cx="113.39778"
+       cy="76.378975"
+       fx="113.39778"
+       fy="76.378975"
+       r="7.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4887-3"
+       id="radialGradient5102"
+       gradientUnits="userSpaceOnUse"
+       cx="111.25"
+       cy="71.5"
+       fx="111.25"
+       fy="71.5"
+       r="7.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4588-9-0-9"
+       id="radialGradient5104"
        gradientUnits="userSpaceOnUse"
-       x1="8"
-       y1="37"
-       x2="8"
-       y2="41"
-       gradientTransform="matrix(3.1249998,0,0,0.9999976,-10.562498,-13.999915)" />
+       cx="111.25"
+       cy="71.5"
+       fx="111.25"
+       fy="71.5"
+       r="7.75" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6257"
-       id="linearGradient6263"
-       x1="12.283331"
-       y1="41.250008"
-       x2="12.283331"
-       y2="36.750004"
+       xlink:href="#linearGradient5284-6"
+       id="linearGradient5294-0"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5405406,0,0,-0.3333337,1.5270266,38.000017)" />
+       x1="109.48217"
+       y1="28.91128"
+       x2="108.68206"
+       y2="34.568138"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,323.44145,-35.532655)" />
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6646"
-       id="radialGradient6652"
-       cx="12"
-       cy="8.4459467"
-       fx="12"
-       fy="8.4459467"
-       r="22"
-       gradientTransform="matrix(0.3514481,0.895542,-1.0274841,0.4545455,12.925816,-8.0855683)"
+       xlink:href="#linearGradient4895-1-2"
+       id="radialGradient5106"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6850937,0,0,1,-77.3964,0)"
+       cx="113.39778"
+       cy="76.378975"
+       fx="113.39778"
+       fy="76.378975"
+       r="7.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4887-7-8"
+       id="radialGradient5108"
+       gradientUnits="userSpaceOnUse"
+       cx="111.25"
+       cy="71.5"
+       fx="111.25"
+       fy="71.5"
+       r="7.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4915-2-6"
+       id="radialGradient5269-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.4939901,0,0,3.4939901,371.15401,-22.007695)"
+       cx="115.95312"
+       cy="38.515625"
+       fx="115.95312"
+       fy="38.515625"
+       r="9.078125" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4816-5"
+       id="radialGradient4832-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.8921716,0,0,-3.883747,719.09122,389.16593)"
+       cx="10.1875"
+       cy="30.633202"
+       fx="10.1875"
+       fy="30.633202"
+       r="14.4375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4816-5"
+       id="radialGradient4826-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.8921716,0,0,3.883747,719.09122,-110.52583)"
+       cx="10.1875"
+       cy="30.633202"
+       fx="10.1875"
+       fy="30.633202"
+       r="14.4375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4816-5"
+       id="radialGradient4822-6"
+       cx="10.1875"
+       cy="30.633202"
+       fx="10.1875"
+       fy="30.633202"
+       r="14.4375"
+       gradientTransform="matrix(3.8921716,0,0,3.883747,327.44145,-110.52583)"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7422"
-       id="radialGradient7831"
+       xlink:href="#linearGradient4816-5"
+       id="radialGradient4834-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2500003,0,-10.875016)"
-       cx="2"
-       cy="43.5"
-       fx="2"
-       fy="43.5"
-       r="2" />
+       gradientTransform="matrix(3.8921716,0,0,-3.883747,327.44145,389.16593)"
+       cx="10.1875"
+       cy="30.633202"
+       fx="10.1875"
+       fy="30.633202"
+       r="14.4375" />
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7422"
-       id="radialGradient7833"
+       xlink:href="#linearGradient3960-2"
+       id="radialGradient3966-99"
+       cx="49.965237"
+       cy="48.331631"
+       fx="49.965237"
+       fy="48.331631"
+       r="43.558849"
+       gradientTransform="matrix(4.8240968,0.01393156,-0.01274425,4.4129644,280.63852,-144.94969)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7332">
+      <stop
+         style="stop-color:#73d1ff;stop-opacity:1"
+         offset="0"
+         id="stop7334" />
+      <stop
+         style="stop-color:#4a79b8;stop-opacity:1"
+         offset="1"
+         id="stop7336" />
+    </linearGradient>
+    <linearGradient
+       y2="111.61543"
+       x2="46.997017"
+       y1="20.398657"
+       x1="49.665684"
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4396"
+       xlink:href="#linearGradient3975-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4371-6"
+       id="linearGradient5110"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.2500003,44,-10.875014)"
-       cx="2"
-       cy="43.5"
-       fx="2"
-       fy="43.5"
-       r="2" />
+       gradientTransform="translate(323.39805,233.35946)"
+       x1="203.16451"
+       y1="-258.83478"
+       x2="210.00467"
+       y2="59.165237" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7815"
-       id="linearGradient7835"
+       xlink:href="#linearGradient3975-4"
+       id="linearGradient3981-6"
+       x1="49.665684"
+       y1="20.398657"
+       x2="46.997017"
+       y2="111.61543"
        gradientUnits="userSpaceOnUse"
-       x1="6"
-       y1="41"
-       x2="6"
-       y2="46" />
+       gradientTransform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient8228"
-       id="linearGradient8234"
-       x1="10"
-       y1="40.999996"
-       x2="10"
-       y2="35.999996"
+       xlink:href="#linearGradient4847-9"
+       id="linearGradient4640-8"
+       x1="48.020046"
+       y1="32.548672"
+       x2="48.020046"
+       y2="51.632603"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6756757,0,0,0.7499986,-0.2162159,-3.8749457)" />
+       gradientTransform="translate(0,7.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4634-4"
+       id="linearGradient4644-1"
+       gradientUnits="userSpaceOnUse"
+       x1="48.020046"
+       y1="32.548672"
+       x2="48.020046"
+       y2="51.632603" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4460-7"
+       id="radialGradient4466-8"
+       cx="189"
+       cy="-122.25826"
+       fx="189"
+       fy="-122.25826"
+       r="114.29688"
+       gradientTransform="matrix(-0.60369109,1.1373889,-1.1337314,-0.60174319,487.88765,-185.17513)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="13.62465"
-     inkscape:cx="28.332311"
-     inkscape:cy="12.08918"
+     inkscape:zoom="2.3984375"
+     inkscape:cx="128"
+     inkscape:cy="128"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
+     showgrid="true"
      inkscape:window-width="1280"
-     inkscape:window-height="772"
+     inkscape:window-height="752"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:showpageshadow="false"
-     width="32px"
-     height="32px"
-     borderlayer="true"
-     gridtolerance="10000"
-     showgrid="false">
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
     <inkscape:grid
        type="xygrid"
-       id="grid2173" />
+       id="grid3243"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata5065">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Ebene 1"
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-211.91083,-239.45013)">
     <g
-       id="g7826"
-       style="opacity:0.46000001"
-       transform="matrix(0.6666666,0,0,1.1999995,0,-24.199975)">
-      <path
-         sodipodi:nodetypes="cscc"
-         id="path6654"
-         d="M 2,45.999998 C 0.896,45.999998 0,44.879998 0,43.499998 C 0,42.119997 0.896,40.999997 2,40.999997 C 2,40.999997 2,45.999998 2,45.999998 z"
-         style="color:#000000;fill:url(#radialGradient7831);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path7037"
-         d="M 48,43.5 C 48,44.88 47.104,46 46,46 C 46,46 46,40.999999 46,40.999999 C 47.104,40.999999 48,42.119999 48,43.5 z"
-         style="color:#000000;fill:url(#radialGradient7833);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         id="rect7432"
-         d="M 2,41 L 46,41 L 46,46 L 2,46 L 2,41 z"
-         style="fill:url(#linearGradient7835);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+       style="display:inline"
+       id="g4909"
+       transform="matrix(0.47216003,0,0,0.47920117,67.002335,300.84116)"
+       inkscape:export-filename="/home/kolorguild/Desktop/MiniTube_Rev1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <path
+         transform="matrix(3.8701065,0,0,-4.0392556,330.31318,-115.63372)"
+         style="opacity:0.55;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4563-1);enable-background:accumulate"
+         d="m 1.75,-114.46751 124.5,0 0,5.43503 -124.5,0 z"
+         id="rect3001-9-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#radialGradient5084);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 327.44147,-37.048817 498.19796,0 0,350.548307 -498.19796,0 z"
+         id="rect3001-1"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="scale(1,-1)"
+         style="color:#000000;fill:url(#radialGradient5086);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 344.95624,-338.54572 463.16842,0 0,25.04624 -463.16842,0 z"
+         id="rect3024-3"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect3033-3"
+         d="m 327.44145,-37.048805 498.19796,0 -77.84343,-47.42622 -342.5111,0 z"
+         style="color:#000000;fill:url(#linearGradient4150-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="opacity:0.5;color:#000000;fill:url(#linearGradient4410-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 327.44145,-37.048805 498.19796,0 -77.84343,-47.42622 -342.5111,0 z"
+         id="path4402-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect4412-7"
+         d="m 327.44145,-36.964495 498.19797,0 0,3 -498.19797,0 z"
+         style="color:#000000;fill:#ffccaa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#linearGradient5088);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 327.44147,144.59523 498.19796,0 0,168.90437 -498.19796,0 z"
+         id="rect4436-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#radialGradient5090);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 327.44147,309.29077 498.19796,0 0,3.89217 -498.19796,0 z"
+         id="rect4424-4"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4471-4"
+         d="m 711.06361,122.53505 -373.16195,83.3168 0,80.88439 c 0,7.51928 6.10301,13.6226 13.6226,13.6226 l 345.91675,0 c 7.5196,0 13.6226,-6.10332 13.6226,-13.6226 l 0,-164.20119 z"
+         style="color:#000000;fill:url(#linearGradient4479-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect4448-9"
+         d="m 351.52426,-23.299745 c -7.51959,0 -13.6226,6.103 -13.6226,13.6225996 l 0,215.5289954 373.16195,-83.3168 0,-132.2121954 c 0,-7.5195996 -6.103,-13.6225996 -13.6226,-13.6225996 l -345.91675,0 z"
+         style="color:#000000;fill:url(#linearGradient4487-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 820.44141,-33.963001 5,0 0,347.462521 -5,0 z"
+         id="rect4437-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 327.44144,-33.963001 5,0 0,347.462521 -5,0 z"
+         id="rect4439-7"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)"
+         style="opacity:0.5245098;color:#000000;fill:#ffc643;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5428-8);enable-background:accumulate"
+         d="m 101.25,23.875 c 0,3.796958 -20.874724,6.875 -46.625,6.875 C 28.874724,30.75 8,27.671958 8,23.875 8,20.078042 28.874724,17 54.625,17 c 25.750276,0 46.625,3.078042 46.625,6.875 z"
+         id="path5426-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#radialGradient5092);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 715.68555,142.11749 98.27733,0 0,154.38491 -98.27733,0 z"
+         id="rect3009-1"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.8921716,0,0,3.8921716,327.44145,-140.0649)"
+         inkscape:connector-curvature="0"
+         id="rect5215-0"
+         d="m 100.10355,73.055271 0,38.545709 24.5429,0 0,-38.545709 -24.5429,0 z m 0.8505,0.850497 22.8419,0 0,36.844712 -22.8419,0 0,-36.844712 z"
+         style="color:#000000;fill:#502d16;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5230-8);enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#linearGradient5094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 715.68555,141.83246 98.27733,0 0,154.3849 -98.27733,0 z"
+         id="rect5296-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#c07341;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 715.68555,142.4823 98.27733,0 0,1 -98.27733,0 z"
+         id="rect3560-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,161.35944 70,0 0,2 -70,0 z"
+         id="rect4468-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,167.52611 70,0 0,2 -70,0 z"
+         id="rect4470-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,173.69276 70,0 0,2 -70,0 z"
+         id="rect4472-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,179.85945 70,0 0,2 -70,0 z"
+         id="rect4474-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,186.02611 70,0 0,2 -70,0 z"
+         id="rect4476-9"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,192.19279 70,0 0,2 -70,0 z"
+         id="rect4478-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,198.35945 70,0 0,2 -70,0 z"
+         id="rect4480-0"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,204.52614 70,0 0,2 -70,0 z"
+         id="rect4482-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,210.69279 70,0 0,2 -70,0 z"
+         id="rect4502-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,216.85948 70,0 0,2 -70,0 z"
+         id="rect4504-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,223.02614 70,0 0,2 -70,0 z"
+         id="rect4506-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,229.19279 70,0 0,2 -70,0 z"
+         id="rect4508-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,235.35948 70,0 0,2 -70,0 z"
+         id="rect4510-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,241.52614 70,0 0,2 -70,0 z"
+         id="rect4512-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,247.69279 70,0 0,2 -70,0 z"
+         id="rect4514-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 729.39801,253.85948 70,0 0,2 -70,0 z"
+         id="rect4516-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient5096);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 732.95892,270.33685 61.91568,0 0,15.12444 -61.91568,0 z"
+         id="rect4975-7"
+         inkscape:connector-curvature="0" />
+      <g
+         style="font-size:10.57348347px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#4d4d4d;fill-opacity:1;stroke:none;font-family:ChunkFive;-inkscape-font-specification:ChunkFive"
+         id="text5234-0">
+        <path
+           d="m 756.30291,274.04429 -7.09481,0 0,2.7491 1.5543,0 0,-1.3534 0.90932,0 0,4.58889 -0.86702,0 0,1.40627 3.93333,0 0,-1.40627 -0.8776,0 0,-4.58889 0.88818,0 0,1.3534 1.5543,0 0,-2.7491"
+           id="path5042"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 756.62193,274.04429 0,1.37455 0.59212,0 0,2.61165 c 0,2.40018 1.14193,3.52097 3.27778,3.58441 1.98781,0 3.03459,-1.13137 3.03459,-3.63728 l 0,-2.56936 0.57096,0 0,-1.36397 -3.12975,0 0,1.3957 0.57097,0 0,2.24157 c 0,1.81864 -0.42294,2.07241 -1.06792,2.07241 -0.6767,0 -1.05735,-0.3595 -1.05735,-2.06183 l 0,-2.28388 0.57097,0 0,-1.36397 -3.36237,0"
+           id="path5044"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 764.51322,281.43515 4.01792,0 c 2.04068,0 2.87599,-0.65556 2.87599,-2.14642 0,-1.02562 -0.63441,-1.58602 -1.3957,-1.79749 0.79301,-0.3172 1.0362,-0.75072 1.0362,-1.63889 0,-1.15251 -0.8353,-1.80806 -2.5905,-1.80806 l -3.94391,0 0,1.36397 0.61326,0 0,4.65234 -0.61326,0 0,1.37455 m 2.80197,-5.99516 0.66613,0 c 0.40179,0 0.69785,0.28548 0.69785,0.77186 0,0.50753 -0.1586,0.81416 -0.719,0.81416 l -0.64498,0 0,-1.58602 m 0,4.62061 0,-1.83979 0.81416,0 c 0.58154,0 0.88817,0.39122 0.88817,0.93047 0,0.57097 -0.41236,0.90932 -0.85645,0.90932 l -0.84588,0"
+           id="path5046"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 771.78249,274.04429 0,1.3957 0.66613,0 0,4.58889 -0.66613,0 0,1.40627 6.37581,0 0,-2.38961 -1.82921,0 0,0.98334 -1.69176,0 0,-1.72348 2.00896,0 0,-1.40627 -2.00896,0 0,-1.45914 1.69176,0 0,0.94104 1.82921,0 0,-2.33674 -6.37581,0"
+           id="path5048"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 732.95892,284.46133 61.91568,0 0,1 -61.91568,0 z"
+         id="rect5246-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 732.95892,270.31918 61.91568,0 0,1 -61.91568,0 z"
+         id="rect4330-5"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.0898643,0,0,4.0898643,309.48105,-267.26427)"
+         style="opacity:0.55;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4911-1);enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4952-3"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.0898643,0,0,4.0898643,309.48105,-271.04514)"
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4954-07"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4964-2"
+         d="m 764.44633,-10.316295 c -17.50551,0 -31.66434,14.1588196 -31.66434,31.66429 0,17.50546 14.15883,31.77347 31.66434,31.77347 17.50539,0 31.77343,-14.26801 31.77343,-31.77347 0,-17.5054704 -14.26804,-31.66429 -31.77343,-31.66429 z m 0,2.6204996 c 16.0582,0 29.15295,12.98558 29.15295,29.0437904 0,16.0582 -13.09475,29.15298 -29.15295,29.15298 -16.05825,0 -29.04381,-13.09478 -29.04381,-29.15298 0,-16.0582104 12.98556,-29.0437904 29.04381,-29.0437904 z"
+         style="color:#000000;fill:url(#radialGradient5252-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.50002804,0.86600922,0.86600922,-0.50002804,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="26.205729"
+         inkscape:transform-center-y="14.110368"
+         d="m 399.49319,619.86658 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4074-9"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.6247758,0,0,3.6247758,361.22214,-237.79132)"
+         style="color:#000000;fill:url(#radialGradient5098);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4954-0-9"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5281-3"
+         d="m 762.06494,-4.5221654 c -3.37404,0.53914 -6.8359,1.30737 -9.82571,3.02364 -3.0919,2.00818995 -5.83125,4.60872 -8.06174,7.54737 -1.83434,2.57665 -3.19485,5.5307704 -4.0194,8.5858504 -0.59438,2.93408 -0.90606,6.05689 -0.008,8.9651 0.4392,1.27088 1.15201,2.77636 2.26478,3.5172 2.15774,0.54265 3.73901,-1.82676 5.0381,-3.22437 2.03791,-2.54176 3.56072,-5.48879 5.94495,-7.75865 2.64733,-2.69058 5.76726,-5.1264 9.58178,-5.79616 3.72049,-0.8126904 7.6459,-0.002 11.00808,1.70535 3.2586,1.63034 6.06143,4.00681 8.70402,6.48425 1.67052,1.25697 3.97072,3.08153 6.07346,1.93931 1.49121,-1.87955 0.11054,-4.43544 0,-6.54951 -1.18863,-3.50263 -2.78543,-6.9004204 -5.33827,-9.6274004 -2.87662,-3.13985 -6.32139,-5.8729 -10.34675,-7.36763 -3.09101,-1.12113 -6.42769,-1.53401 -9.70692,-1.54511 -0.43666,0.0335 -0.87329,0.0672 -1.30991,0.10077 z"
+         style="color:#000000;fill:url(#linearGradient5290-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:transform-center-x="14.775838"
+         inkscape:transform-center-y="5.6183708"
+         inkscape:connector-curvature="0"
+         id="path4956-0"
+         d="m 736.76201,35.694115 19.65582,-3.18137 -3.64798,-6.21483 -3.6479,-6.21483 -12.35994,15.61103 z"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4958-2"
+         d="m 737.73291,35.071795 12.35306,-7.25745 -1.54414,-5.55891 z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="matrix(2.1521212,0,0,2.1521212,525.05496,-132.49651)"
+         style="color:#000000;fill:url(#radialGradient5100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4960-7"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4986-9"
+         d="m 775.19802,8.7144446 c 1.58855,2.5537904 2.54871,5.4084304 2.54871,8.6373204 0,9.21153 -7.49679,16.70828 -16.70827,16.70828 -4.05023,0 -7.73032,-1.42226 -10.61967,-3.82308 2.95524,4.67354 8.07956,7.78776 14.01796,7.78776 9.21149,0 16.70828,-7.49675 16.70828,-16.70828 0,-5.11062 -2.32729,-9.5425 -5.94701,-12.6020004 z"
+         style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.6466293,0,0,1.6466293,581.29093,-96.353835)"
+         style="color:#000000;fill:url(#radialGradient5102);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4962-9"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4977-5"
+         d="m 774.20684,13.245495 c 0.17009,0.83074 0.28335,1.66774 0.28335,2.54872 0,7.04792 -5.83728,12.7436 -12.88519,12.7436 -3.91027,0 -7.28762,-1.76151 -9.62849,-4.53105 1.18992,5.81514 6.29349,10.19488 12.4604,10.19488 7.0479,0 12.74359,-5.83729 12.74359,-12.8852 0,-3.11991 -1.11413,-5.85389 -2.9735,-8.07095 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4995-2"
+         d="m 764.43675,8.5728446 c -7.04794,0 -12.74359,5.6956904 -12.74359,12.7436004 0,3.11992 1.25573,5.99548 3.1151,8.21255 -1.0756,-1.87055 -1.69917,-4.05921 -1.69917,-6.37181 0,-7.04791 5.69569,-12.7436 12.74364,-12.7436 3.52393,0 6.75276,1.37213 9.0621,3.68149 -2.30685,-3.30022 -6.14601,-5.5222304 -10.47808,-5.5222304 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.0781879,0,0,1.0781879,644.53003,-55.710275)"
+         style="color:#000000;fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path5041-0"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.0898643,0,0,4.0898643,309.48105,-193.35292)"
+         style="opacity:0.55;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4911-3-8);enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4952-1-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.0898643,0,0,4.0898643,309.48105,-197.13379)"
+         style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4954-2-3"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.6247758,0,0,3.6247758,361.22214,-163.87997)"
+         style="color:#000000;fill:url(#radialGradient5104);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4954-0-0-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient5294-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 762.06494,70.818785 c -3.37404,0.53915 -6.8359,1.30737 -9.82571,3.02364 -3.0919,2.00819 -5.83125,4.60872 -8.06174,7.54737 -1.83434,2.57665 -3.19485,5.53077 -4.0194,8.58585 -0.59438,2.93408 -0.90606,6.05689 -0.008,8.9651 0.4392,1.270875 1.15201,2.776355 2.26478,3.517205 2.15774,0.54264 3.73901,-1.82676 5.0381,-3.224375 2.03791,-2.54176 3.56072,-5.48879 5.94495,-7.75864 2.64733,-2.69059 5.76726,-5.12641 9.58178,-5.79616 3.72049,-0.8127 7.6459,-0.002 11.00808,1.70534 3.2586,1.63034 6.06143,4.00682 8.70402,6.48426 1.67052,1.25697 3.97072,3.08152 6.07346,1.93931 1.49121,-1.87955 0.11054,-4.43545 0,-6.54951 -1.18863,-3.50263 -2.78543,-6.90043 -5.33827,-9.62741 -2.87662,-3.13985 -6.32139,-5.87289 -10.34675,-7.36763 -3.09101,-1.12113 -6.42769,-1.534 -9.70692,-1.54511 -0.43666,0.0335 -0.87329,0.0672 -1.30991,0.10077 z"
+         id="path5292-9"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:transform-center-x="-14.775853"
+         inkscape:transform-center-y="5.6183693"
+         inkscape:connector-curvature="0"
+         id="path4956-7-6"
+         d="m 791.97071,109.60546 -19.65581,-3.18137 3.64797,-6.21483 3.6479,-6.214825 12.35994,15.611025 z"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4958-0-5"
+         d="m 790.99981,108.98314 -12.35305,-7.25745 1.54414,-5.558905 z"
+         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="matrix(-2.1521212,0,0,2.1521212,1003.6778,-58.585155)"
+         style="color:#000000;fill:url(#radialGradient5106);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4960-8-6"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4986-7-3"
+         d="m 753.5347,82.625795 c -1.58855,2.55379 -2.54871,5.40843 -2.54871,8.63733 0,9.211515 7.49675,16.708275 16.70828,16.708275 4.05023,0 7.73032,-1.42227 10.61967,-3.82308 -2.95525,4.67353 -8.07956,7.78775 -14.01797,7.78775 -9.21152,0 -16.70827,-7.49675 -16.70827,-16.708275 0,-5.11062 2.32728,-9.5425 5.947,-12.602 z"
+         style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-1.6466293,0,0,1.6466293,947.44176,-22.442475)"
+         style="color:#000000;fill:url(#radialGradient5108);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path4962-7-0"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4964-9-2"
+         d="m 764.44633,63.595055 c -17.50547,0 -31.66434,14.15882 -31.66434,31.66429 0,17.505455 14.15887,31.773465 31.66434,31.773465 17.50543,0 31.77343,-14.26801 31.77343,-31.773465 0,-17.50547 -14.268,-31.66429 -31.77343,-31.66429 z m 0,2.6205 c 16.0582,0 29.15295,12.98558 29.15295,29.04379 0,16.058205 -13.09475,29.152975 -29.15295,29.152975 -16.05821,0 -29.04381,-13.09477 -29.04381,-29.152975 0,-16.05821 12.9856,-29.04379 29.04381,-29.04379 z"
+         style="color:#000000;fill:url(#radialGradient5269-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4977-1-0"
+         d="m 754.52588,87.156855 c -0.17008,0.83073 -0.28335,1.66773 -0.28335,2.54871 0,7.04792 5.83729,12.743605 12.88519,12.743605 3.91027,0 7.28763,-1.76152 9.6285,-4.531055 -1.18992,5.815135 -6.29349,10.194875 -12.4604,10.194875 -7.04795,0 -12.74359,-5.83728 -12.74359,-12.885195 0,-3.11991 1.11413,-5.85389 2.9735,-8.07094 z"
+         style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4995-3-7"
+         d="m 764.29597,82.484195 c 7.04795,0 12.7436,5.69569 12.7436,12.7436 0,3.11992 -1.25574,5.995475 -3.1151,8.212545 1.0756,-1.87055 1.69916,-4.059205 1.69916,-6.371795 0,-7.04792 -5.69568,-12.74361 -12.74363,-12.74361 -3.52393,0 -6.75276,1.37213 -9.0621,3.68149 2.30685,-3.30022 6.14601,-5.52223 10.47807,-5.52223 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-1.0781879,0,0,1.0781879,884.20269,18.201075)"
+         style="color:#000000;fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 119,71.5 c 0,4.280207 -3.46979,7.75 -7.75,7.75 -4.28021,0 -7.75,-3.469793 -7.75,-7.75 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 z"
+         id="path5041-6-4"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5262-7"
+         d="m 763.03187,14.737225 c -2.49725,0.69509 -4.56267,3.15781 -5.19636,6.16589 3.45995,0.53559 6.96259,-0.37127 10.42051,0.23587 1.17649,0.5351 3.47342,-1.12631 2.11194,-2.62809 -1.59533,-2.80882 -4.5721,-4.27277 -7.33609,-3.77366 z"
+         style="color:#000000;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 763.03187,88.702085 c -2.49725,0.69509 -4.56267,3.15781 -5.19636,6.16589 3.45995,0.53559 6.96259,-0.37127 10.42051,0.23587 1.17649,0.5351 3.47342,-1.12631 2.11194,-2.62808 -1.59533,-2.80883 -4.5721,-4.27278 -7.33609,-3.77366 z"
+         id="path5279-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#ae5d26;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 715.13519,-19.771091 99.70206,0 0,156.270601 -99.70206,0 z"
+         id="rect4332-0"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect4352-1"
+         d="m 715.83555,-19.359285 0,154.749995 98.28125,0 0,-1.0625 -96.875,0 0,-153.687495 -1.40625,0 z"
+         style="opacity:0.5;color:#000000;fill:#28170b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#ffd5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 763.59055,15.076015 c -1.40646,0.39148 -2.56972,1.77849 -2.92661,3.47265 1.94865,0.30165 3.92136,-0.2091 5.86887,0.13285 0.6626,0.30137 1.95624,-0.63435 1.18945,-1.48015 -0.89849,-1.58194 -2.57502,-2.40645 -4.13171,-2.12535 z"
+         id="path4357-6"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4359-7"
+         d="m 763.59055,88.615125 c -1.40646,0.39148 -2.56972,1.77849 -2.92661,3.47265 1.94865,0.30165 3.92136,-0.2091 5.86887,0.13285 0.6626,0.30137 1.95624,-0.63435 1.18945,-1.48015 -0.89849,-1.58194 -2.57502,-2.40645 -4.13171,-2.12535 z"
+         style="color:#000000;fill:#ffd5d5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 762.95068,-10.121586 1.76777,0 0,3.1819803 -1.76777,0 z"
+         id="rect4068-57"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.50002804,-0.86600922,0.86600922,0.50002804,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="26.205739"
+         inkscape:transform-center-y="-14.110373"
+         d="m 360.99567,641.37311 1.76776,0 0,3.18198 -1.76776,0 z"
+         id="rect4070-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-0.50002804,-0.86600922,-0.86600922,0.50002804,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-26.20572"
+         inkscape:transform-center-y="-14.11036"
+         d="m -403.51566,-682.70038 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4072-89"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-0.50002804,0.86600922,-0.86600922,-0.50002804,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-26.205726"
+         inkscape:transform-center-y="14.110358"
+         d="m -365.1889,-704.25269 1.76776,0 0,3.18198 -1.76776,0 z"
+         id="rect4076-0"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 762.95068,49.628414 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4078-7"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.71617662,0.69791909,0.69791909,-0.71617662,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="21.396096"
+         inkscape:transform-center-y="20.689351"
+         d="m 612.66302,433.78595 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4074-8-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.96251275,-0.27123644,0.27123644,0.96251275,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 708.39404,267.53101 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4068-5-0"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.2463901,-0.96917074,0.96917074,0.2463901,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="29.050592"
+         inkscape:transform-center-y="-6.4734563"
+         d="m 93.266106,732.96063 1.767767,0 0,3.18198 -1.767767,0 z"
+         id="rect4070-2-3"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-0.71617662,-0.69791909,-0.69791909,0.71617662,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-21.396102"
+         inkscape:transform-center-y="-20.689354"
+         d="m -616.68549,-496.61975 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4072-8-1"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(-0.2463901,0.96917074,-0.96917074,-0.2463901,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:transform-center-x="-29.050602"
+         inkscape:transform-center-y="6.4734577"
+         d="m -97.459343,-795.84021 1.767767,0 0,3.18198 -1.767767,0 z"
+         id="rect4076-3-0"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.96251275,-0.27123644,0.27123644,0.96251275,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 708.39404,327.28101 1.76777,0 0,3.18198 -1.76777,0 z"
+         id="rect4078-6-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 355.17326,-19.841206 338.61875,0 c 7.35971,0 13.28468,5.924969 13.28468,13.2846836 l 0,290.1624124 c 0,7.35972 -5.92497,13.28469 -13.28468,13.28469 l -338.61875,0 c -7.35971,0 -13.28468,-5.92497 -13.28468,-13.28469 l 0,-290.1624124 c 0,-7.3597146 5.92497,-13.2846836 13.28468,-13.2846836 z"
+         id="rect3003-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#3c3c3c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 363.67979,-11.884495 321.60572,0 c 6.98995,0 12.61723,5.6272846 12.61723,12.61722968 l 0,275.58393532 c 0,6.98994 -5.62728,12.61723 -12.61723,12.61723 l -321.60572,0 c -6.98994,0 -12.61723,-5.62729 -12.61723,-12.61723 l 0,-275.58393532 c 0,-6.98994508 5.62729,-12.61722968 12.61723,-12.61722968 z"
+         id="rect3190-7"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4828-3"
+         d="m 691.3595,275.18116 c 0,0 -0.97305,9.73043 -9.73043,9.73043 -8.75739,0 -102.65603,0 -102.65603,0 l 112.14319,-112.1432 z"
+         style="color:#000000;fill:url(#radialGradient4832-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#radialGradient4826-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 691.3595,3.4589346 c 0,0 -0.97305,-9.73043 -9.73043,-9.73043 -8.75739,0 -102.65603,0 -102.65603,0 L 691.11623,105.87169 z"
+         id="path4824-2"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4814-2"
+         d="m 355.17317,3.4589346 c 0,0 0.97305,-9.73043 9.73043,-9.73043 8.75739,0 102.65603,0 102.65603,0 L 355.41644,105.87169 z"
+         style="color:#000000;fill:url(#radialGradient4822-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#radialGradient4834-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 355.17317,275.18116 c 0,0 0.97305,9.73043 9.73043,9.73043 8.75739,0 102.65603,0 102.65603,0 L 355.41644,172.76839 z"
+         id="path4830-1"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="zzzzzzzzzzzzz"
+         inkscape:connector-curvature="0"
+         id="rect3011-5"
+         d="m 391.86614,7.2812046 c 10.12565,-5.84604 56.38767,-15.56869 132.6165,-15.56869 76.22882,0 122.57814,11.78445 132.61649,15.56869 10.03835,3.7842404 17.20775,10.9536604 21.33602,21.3360304 4.12827,10.38236 14.88064,60.51361 15.56869,109.907485 0.68804,49.39395 -9.03226,98.83737 -15.56869,109.90749 -6.53643,11.07011 -11.29767,14.79959 -21.33602,21.3361 -10.03835,6.53652 -55.01158,15.56869 -132.61649,15.56869 -77.60492,0 -124.30638,-10.77081 -132.6165,-15.56869 -8.31011,-4.79787 -17.66054,-7.61892 -21.33602,-21.3361 -3.67548,-13.71718 -15.56869,-40.21625 -15.56869,-109.90749 0,-69.691235 9.43439,-99.282565 15.56869,-109.907485 6.13429,-10.62493 11.21038,-15.48999 21.33602,-21.3360304 z"
+         style="color:#000000;fill:url(#radialGradient3966-99);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3968-3"
+         d="m 524.48264,-8.3392054 c -76.22882,0 -122.45145,9.72264 -132.5771,15.56868 C 381.7799,13.075515 376.6329,18.011495 370.4986,28.636425 c -6.1343,10.62492 -15.56869,40.14097 -15.56869,109.832205 0,69.69124 11.89321,96.23667 15.56869,109.95385 3.67548,13.71718 13.09683,16.48743 21.40694,21.28531 8.31012,4.79788 54.97218,15.56869 132.5771,15.56869 77.60491,0 122.53874,-9.03218 132.57709,-15.56869 10.03835,-6.53651 14.87052,-10.2152 21.40695,-21.28531 6.53643,-11.07012 16.25673,-60.55989 15.56868,-109.95385 -0.68804,-49.393865 -11.44041,-99.449845 -15.56868,-109.832205 -4.12827,-10.38237 -11.3686,-17.62271 -21.40695,-21.4069504 -10.03835,-3.78424 -56.34827,-15.56868 -132.57709,-15.56868 z m 0,3.40565 c 37.93726,0 68.42582,2.93194 90.61462,6.32477 22.1888,3.39283 36.2576,7.30856 40.74617,9.0006504 9.19459,3.46616 15.63975,9.85098 19.46086,19.46086 1.74189,4.38077 5.61124,19.80128 8.87901,39.6515 3.26778,19.85021 6.10564,44.500675 6.44641,68.964405 0.34065,24.45555 -1.97657,49.09655 -5.10847,68.84279 -1.56595,9.87311 -3.32636,18.47491 -5.10848,25.29911 -1.78211,6.8242 -3.61163,11.98605 -4.86521,14.10912 -6.32881,10.7185 -10.34542,13.57905 -20.31227,20.06901 -1.83019,1.19175 -6.35371,3.02309 -13.01445,4.74359 -6.66074,1.72049 -15.64237,3.46313 -26.63705,4.98684 -21.98935,3.04746 -52.43205,5.35174 -91.10114,5.35174 -38.64341,0 -69.61154,-2.69471 -91.83092,-5.95989 -11.1097,-1.63257 -20.02296,-3.45932 -26.63705,-5.10848 -6.6141,-1.64915 -11.05289,-3.2324 -12.4063,-4.0138 -4.39413,-2.53695 -8.64454,-4.40395 -12.04141,-7.05456 -3.39687,-2.65061 -6.12168,-5.95786 -7.78434,-12.16303 -1.93418,-7.2185 -5.73708,-16.98713 -9.12228,-33.81324 -3.38519,-16.82612 -6.32478,-40.63914 -6.32478,-75.2892 0,-69.380975 9.56317,-98.570185 15.08217,-108.129385 5.94847,-10.30308 10.35378,-14.51133 20.19064,-20.19064 1.90793,-1.1015404 6.58442,-2.8050104 13.37934,-4.5003204 6.79491,-1.69532 15.79987,-3.41951 26.88031,-4.98685005 22.16088,-3.13466995 52.64637,-5.59498995 90.61462,-5.59498995 z"
+         style="opacity:0.4;color:#000000;fill:url(#linearGradient4396);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#linearGradient5110);stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 363.67979,-11.884495 321.60572,0 c 6.98995,0 12.61723,5.6272846 12.61723,12.61722968 l 0,275.58393532 c 0,6.98994 -5.62728,12.61723 -12.61723,12.61723 l -321.60572,0 c -6.98994,0 -12.61723,-5.62729 -12.61723,-12.61723 l 0,-275.58393532 c 0,-6.98994508 5.62729,-12.61722968 12.61723,-12.61722968 z"
+         id="rect4361-3"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4379-8"
+         d="m 163.78125,255.4375 c -20.28684,0.91114 -39.33262,9.70513 -55.93716,20.91365 -13.184972,8.78765 -26.200609,18.9683 -34.006347,33.06505 -7.303427,13.44665 -5.551036,30.54932 2.456482,43.28845 9.000967,14.89871 24.072905,25.05003 39.889755,31.60794 22.48735,9.34372 46.99131,11.32158 70.69712,15.79234 17.5172,3.21913 35.65418,5.9784 53.33379,2.31566 20.53611,-4.09543 38.65851,-15.31237 55.81638,-26.81517 9.68279,-6.76763 19.28006,-13.71562 28.21873,-21.44917 8.17387,-7.42107 14.86404,-17.54967 15.0896,-28.90913 0.40367,-13.64502 -7.48545,-26.65221 -18.68335,-34.09087 -15.17268,-10.49597 -33.48914,-15.06098 -51.51074,-17.69033 -11.26397,-1.68464 -22.62051,-2.72486 -33.83597,-4.7505 -13.28386,-2.0987 -26.35214,-5.31872 -39.29492,-8.93579 -10.50519,-2.72952 -21.33414,-4.77215 -32.23337,-4.34213 z"
+         style="opacity:0.2;color:#000000;fill:#000000;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4394-5);enable-background:accumulate"
+         transform="matrix(1.084705,0,0,1.6978802,306.09403,-415.78189)" />
+      <path
+         style="opacity:0.4;color:#000000;fill:url(#linearGradient3981-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 524.48264,-8.3392054 c -76.22882,0 -122.45145,9.72264 -132.5771,15.56868 C 381.7799,13.075515 376.6329,18.011495 370.4986,28.636425 c -6.1343,10.62492 -15.56869,40.14097 -15.56869,109.832205 0,69.69124 11.89321,96.23667 15.56869,109.95385 3.67548,13.71718 13.09683,16.48743 21.40694,21.28531 8.31012,4.79788 54.97218,15.56869 132.5771,15.56869 77.60491,0 122.53874,-9.03218 132.57709,-15.56869 10.03835,-6.53651 14.87052,-10.2152 21.40695,-21.28531 6.53643,-11.07012 16.25673,-60.55989 15.56868,-109.95385 -0.68804,-49.393865 -11.44041,-99.449845 -15.56868,-109.832205 -4.12827,-10.38237 -11.3686,-17.62271 -21.40695,-21.4069504 -10.03835,-3.78424 -56.34827,-15.56868 -132.57709,-15.56868 z m 0,3.40565 c 37.93726,0 68.42582,2.93194 90.61462,6.32477 22.1888,3.39283 36.2576,7.30856 40.74617,9.0006504 9.19459,3.46616 15.63975,9.85098 19.46086,19.46086 1.74189,4.38077 5.61124,19.80128 8.87901,39.6515 3.26778,19.85021 6.10564,44.500675 6.44641,68.964405 0.34065,24.45555 -1.97657,49.09655 -5.10847,68.84279 -1.56595,9.87311 -3.32636,18.47491 -5.10848,25.29911 -1.78211,6.8242 -3.61163,11.98605 -4.86521,14.10912 -6.32881,10.7185 -10.34542,13.57905 -20.31227,20.06901 -1.83019,1.19175 -6.35371,3.02309 -13.01445,4.74359 -6.66074,1.72049 -15.64237,3.46313 -26.63705,4.98684 -21.98935,3.04746 -52.43205,5.35174 -91.10114,5.35174 -38.64341,0 -69.61154,-2.69471 -91.83092,-5.95989 -11.1097,-1.63257 -20.02296,-3.45932 -26.63705,-5.10848 -6.6141,-1.64915 -11.05289,-3.2324 -12.4063,-4.0138 -4.39413,-2.53695 -8.64454,-4.40395 -12.04141,-7.05456 -3.39687,-2.65061 -6.12168,-5.95786 -7.78434,-12.16303 -1.93418,-7.2185 -5.73708,-16.98713 -9.12228,-33.81324 -3.38519,-16.82612 -6.32478,-40.63914 -6.32478,-75.2892 0,-69.380975 9.56317,-98.570185 15.08217,-108.129385 5.94847,-10.30308 10.35378,-14.51133 20.19064,-20.19064 1.90793,-1.1015404 6.58442,-2.8050104 13.37934,-4.5003204 6.79491,-1.69532 15.79987,-3.41951 26.88031,-4.98685005 22.16088,-3.13466995 52.64637,-5.59498995 90.61462,-5.59498995 z"
+         id="path4061-2"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(5.1625764,0,0,5.262216,262.57141,-200.18338)"
+         style="color:#000000;fill:#adecff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4607-9);enable-background:accumulate"
+         d="M 71.375,65.1875 C 71.375,76.405784 62.280784,85.5 51.0625,85.5 39.844216,85.5 30.75,76.405784 30.75,65.1875 c 0,-11.218284 9.094216,-20.3125 20.3125,-20.3125 11.218284,0 20.3125,9.094216 20.3125,20.3125 z"
+         id="path4597-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.8921716,0,0,3.8921716,327.44145,-140.0649)"
+         inkscape:connector-curvature="0"
+         id="path4611-5"
+         d="m 46,37 c -2.76546,0.13842 -5.511265,0.548355 -8.28125,0.625 -4.299638,0.672623 -8.670651,1.295138 -12.71875,2.96875 -2.757518,1.194938 -5.372002,2.815566 -7.468215,4.986034 -1.155432,1.231133 -2.079862,2.780942 -2.136938,4.508917 -0.120408,1.435997 0.771843,2.893603 2.105153,3.442549 1.781227,0.864518 3.816413,0.690281 5.727934,0.524423 3.320738,-0.260836 6.517886,-1.2486 9.787391,-1.821536 2.671731,-0.517101 5.396554,-0.66653 8.109675,-0.796637 3.402249,-0.02642 6.795043,0.24855 10.1875,0.46875 4.125459,0.02667 8.270322,0.06327 12.360762,0.653116 3.067285,0.499408 6.143657,0.949611 9.179754,1.62177 1.639792,0.303475 3.254528,0.777516 4.928234,0.850114 1.906538,0.261156 4.034712,0.240414 5.646246,-0.953434 0.895661,-0.59358 1.495121,-1.586083 1.510004,-2.671566 0.10301,-1.946273 -1.041294,-3.700035 -2.388547,-5.00341 -1.16803,-1.195014 -2.506587,-2.212635 -3.929895,-3.082474 C 76.64618,42.167842 74.55927,41.207892 72.365214,40.561054 68.343575,39.290401 64.237916,38.235739 60.055909,37.657403 56.156897,37.162052 52.228716,36.884374 48.29693,36.9375 47.530019,36.924017 46.765278,36.949584 46,37 z"
+         style="color:#000000;fill:url(#linearGradient4640-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4630-0);enable-background:accumulate" />
+      <path
+         transform="matrix(3.8921716,0,0,-3.8921716,327.44145,383.81108)"
+         style="opacity:0.6;color:#000000;fill:url(#linearGradient4644-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4630-0);enable-background:accumulate"
+         d="m 46,29.5 c -2.76546,0.13842 -5.511265,0.548355 -8.28125,0.625 -4.299638,0.672623 -8.670651,1.295138 -12.71875,2.96875 -2.757518,1.194938 -5.372002,2.815566 -7.468215,4.986034 -1.155432,1.231133 -2.079862,2.780942 -2.136938,4.508917 -0.120408,1.435997 0.771843,2.893603 2.105153,3.442549 1.781227,0.864518 3.816413,0.690281 5.727934,0.524423 3.320738,-0.260836 6.517886,-1.2486 9.787391,-1.821536 2.671731,-0.517101 5.396554,-0.66653 8.109675,-0.796637 3.402249,-0.02642 6.795043,0.24855 10.1875,0.46875 4.125459,0.02667 8.270322,0.06327 12.360762,0.653116 3.067285,0.499408 6.143657,0.949611 9.179754,1.62177 1.639792,0.303475 3.254528,0.777516 4.928234,0.850114 1.906538,0.261156 4.034712,0.240414 5.646246,-0.953434 0.895661,-0.59358 1.495121,-1.586083 1.510004,-2.671566 0.10301,-1.946273 -1.041294,-3.700035 -2.388547,-5.00341 -1.16803,-1.195014 -2.506587,-2.212635 -3.929895,-3.082474 C 76.64618,34.667842 74.55927,33.707892 72.365214,33.061054 68.343575,31.790401 64.237916,30.735739 60.055909,30.157403 56.156897,29.662052 52.228716,29.384374 48.29693,29.4375 47.530019,29.424017 46.765278,29.449584 46,29.5 z"
+         id="path4642-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(3.8921716,0,0,3.8921716,327.44145,-110.87361)"
+         style="opacity:0.3;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 50.625,28.84375 c -9.686776,0 -17.457881,0.613473 -23.0625,1.40625 -2.805845,0.396889 -5.07952,0.86447 -6.75,1.28125 -0.849027,0.21183 -1.556762,0.418657 -2.0625,0.59375 -0.252869,0.08755 -0.451795,0.16394 -0.59375,0.21875 -0.07098,0.02741 -0.114965,0.04569 -0.15625,0.0625 -0.02064,0.0084 -0.04742,0.02488 -0.0625,0.03125 -0.0075,0.0032 -0.02163,-0.0042 -0.03125,0 -0.0096,0.0042 -0.0933,0.06224 -0.09375,0.0625 -2.341414,1.351817 -3.181517,2.147687 -4.59375,4.59375 -0.596531,1.033223 -1.472526,3.276399 -2.25,7.5625 -0.777474,4.286101 -1.40625,10.56242 -1.40625,19.40625 0,8.811617 0.747065,14.791551 1.59375,19 0.846461,4.207333 1.762687,6.541805 2.3125,8.59375 0.324695,1.211786 0.894412,1.857475 1.4375,2.28125 0.719081,0.561104 1.634267,0.953115 2.90625,1.6875 a 1.0074215,1.0074215 0 0 0 0.25,0.09375 c 0.0049,0.0017 0.02578,-0.002 0.03125,0 A 1.0074215,1.0074215 0 0 0 18.1875,95.75 c 0.100693,0.03639 0.193762,0.09295 0.375,0.15625 0.476771,0.166528 1.193742,0.384928 2.03125,0.59375 1.633296,0.407242 3.876308,0.868141 6.6875,1.28125 5.621661,0.826112 13.48991,1.5 23.34375,1.5 9.873069,0 17.631963,-0.57382 23.1875,-1.34375 2.778336,-0.385044 5.025425,-0.828751 6.65625,-1.25 0.833343,-0.215256 1.522742,-0.44265 2,-0.625 0.238629,-0.09118 0.439925,-0.1667 0.5625,-0.21875 0.03064,-0.01301 0.04048,-0.02178 0.0625,-0.03125 a 1.0074215,1.0074215 0 0 0 0.125,-0.0625 1.0074215,1.0074215 0 0 0 0.125,-0.0625 c 2.495741,-1.625112 3.190742,-2.121339 4.6875,-4.65625 0.117757,-0.199432 0.071,-0.104606 0.09375,-0.15625 0.02275,-0.05164 0.02909,-0.137801 0.0625,-0.21875 0.06682,-0.161898 0.149204,-0.382641 0.25,-0.65625 0.201593,-0.547218 0.46251,-1.2947 0.6875,-2.15625 C 89.566676,86.15245 90.011311,83.990036 90.40625,81.5 91.196891,76.515111 91.773485,70.297805 91.6875,64.125 91.60146,57.948312 90.891713,51.630831 90.0625,46.59375 89.646752,44.068277 89.157803,41.769052 88.75,40.03125 88.546098,39.162349 88.366675,38.423805 88.21875,37.875 88.070825,37.326195 87.982231,37.019678 87.875,36.75 87.053828,34.684798 85.686336,33.405677 83.78125,32.6875 82.804425,32.319258 79.284098,31.298039 73.65625,30.4375 68.036091,29.578136 60.288749,28.84375 50.625,28.84375 z"
+         id="path4684-0"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.4657045,0,0,3.8921716,311.91576,-110.87361)"
+         style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5410-5);enable-background:accumulate"
+         d="m 77.958523,30.330875 c 0,3.270641 -13.65262,5.92202 -30.493981,5.92202 -16.84136,0 -30.49398,-2.651379 -30.49398,-5.92202 0,-3.270641 13.65262,-5.922019 30.49398,-5.922019 16.841361,0 30.493981,2.651378 30.493981,5.922019 z"
+         id="path5408-8"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(4.4657045,0,0,3.8921716,311.91576,149.89553)"
+         style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5410-5);enable-background:accumulate"
+         d="m 77.958523,30.330875 c 0,3.270641 -13.65262,5.92202 -30.493981,5.92202 -16.84136,0 -30.49398,-2.651379 -30.49398,-5.92202 0,-3.270641 13.65262,-5.922019 30.49398,-5.922019 16.841361,0 30.493981,2.651378 30.493981,5.922019 z"
+         id="path5414-6"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4398-9"
+         d="m 524.4918,-8.2967854 c -1.32812,0 -2.6276,0.0254 -3.9375,0.0312 L 371.02305,250.01571 c 3.95686,12.33638 12.86985,15.14624 20.84375,19.75 7.5656,4.36803 46.97508,13.70906 112.53125,15.34375 L 599.6168,-4.0780354 c -20.26261,-2.41271 -45.38368,-4.21875 -75.125,-4.21875 z"
+         style="opacity:0.2;color:#000000;fill:url(#radialGradient4466-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4063-3"
+         d="m 396.96055,22.140715 c -10.68818,0.79565 -20.75359,9.4755 -21.92182,20.34318 -0.46157,5.49113 6.5719,8.99243 11.09084,6.4041 8.45654,-3.46832 16.83527,-8.36857 22.0369,-16.09661 2.01978,-3.40303 0.11669,-7.94015 -3.37334,-9.46875 -2.42182,-1.16626 -5.18889,-1.31597 -7.83258,-1.18192 z"
+         style="opacity:0.3;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 373.26748,55.023085 c -4.02633,4.80915 -4.49053,12.57331 -0.40721,17.49687 2.11569,2.43374 6.45403,0.91095 7.21148,-2.04101 1.99454,-4.96309 3.35653,-10.47769 2.23594,-15.8128 -0.6039,-2.23571 -3.28395,-3.28809 -5.34905,-2.44732 -1.47731,0.54039 -2.66893,1.64033 -3.69116,2.80426 z"
+         id="path4066-3"
+         inkscape:connector-curvature="0" />
     </g>
-    <path
-       style="fill:#2e3436;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 4.2388889,2.5000001 L 1.5,3.8684212 L 1.5,28.500002 L 30.499999,28.500002 L 30.499999,3.8684212 L 27.76111,2.5000001 L 4.2388889,2.5000001 z"
-       id="rect2174"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="fill:url(#linearGradient3151);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 4.6666667,3 L 27.333332,3 L 30,5 L 2,5 L 4.6666667,3 z"
-       id="rect2761"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2757"
-       d="M 4.7696847,3.5000001 L 2.5000002,4.5250628 L 2.5000002,27.500001 L 29.500001,27.500001 L 29.500001,4.5250628 L 27.230316,3.5000001 L 4.7696847,3.5000001 z"
-       style="fill:none;fill-opacity:1;stroke:url(#radialGradient6652);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       style="fill:url(#radialGradient4699);fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 4.5,6.5000002 L 27.5,6.5000002 L 27.5,22.500001 L 4.5,22.500001 L 4.5,6.5000002 z"
-       id="rect2759" />
-    <path
-       style="opacity:0.4;fill:url(#linearGradient4307);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6,8 L 26,8 L 26,11.415255 C 26,11.415255 24.888889,9.7076275 18.777778,13.692092 C 12.666667,17.676555 6,14.898987 6,14.898987 L 6,8 z"
-       id="rect3536"
-       sodipodi:nodetypes="ccczcc" />
-    <path
-       style="fill:none;fill-opacity:1;stroke:url(#linearGradient5097);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 5.5000001,7.4999998 L 26.500001,7.4999998 L 26.500001,21.499999 L 5.5000001,21.499999 L 5.5000001,7.4999998 z"
-       id="rect3534" />
-    <path
-       style="fill:url(#linearGradient5872);fill-opacity:1;stroke:url(#linearGradient8234);stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 3.5000001,23.500001 L 28.5,23.500001 L 28.5,26.499995 L 3.5000001,26.499995 L 3.5000001,23.500001 z"
-       id="rect5099" />
-    <path
-       id="path5874"
-       d="M 4.4999997,25.500001 L 24.500001,25.500001 L 24.500001,24.5 L 4.4999997,24.5 L 4.4999997,25.500001 z"
-       style="fill:none;fill-opacity:1;stroke:url(#linearGradient6263);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       style="fill:#2e3436;fill-opacity:1;stroke:#555753;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 25.5,24.499999 L 27.499999,24.499999 L 27.499999,25.5 L 25.5,25.5 L 25.5,24.499999 z"
-       id="path7839" />
-    <rect
-       style="opacity:1;fill:#4e9a06;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect7843"
-       width="1"
-       height="1"
-       x="27"
-       y="25" />
-    <rect
-       y="25"
-       x="26"
-       height="1"
-       width="1"
-       id="rect7845"
-       style="opacity:1;fill:#8ae234;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
index 18961b30f6d31a9a8de828dd0018cba2cf85a499..44f4add8b1b63686a09df97871eba286473dbfeb 100644 (file)
Binary files a/images/app.png and b/images/app.png differ
index d491dd7693d6a724f601f0ecca63c1ce89859748..b69915b2aa694fb16aa53aaeb965842db7a9e937 100644 (file)
@@ -7,47 +7,59 @@
     <message>
         <location filename="../src/AboutView.cpp" line="21"/>
         <source>There&apos;s life outside the browser!</source>
-        <translation>Es gibt Leben außerhalb des Browsers!</translation>
+        <translation>Es existiert Leben neben dem Browser!</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="22"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
+    <message>
+        <source>This is a &quot;Technology Preview&quot; release, do not expect it to be perfect.</source>
+        <translation type="obsolete">Dies ist eine &quot;Technology Vorschau&quot;, erwarte nicht, dass sie perfekt ist.</translation>
+    </message>
     <message>
         <location filename="../src/AboutView.cpp" line="29"/>
         <source>Report bugs and send in your ideas to %1</source>
-        <translation>Berichten Sie Fehler und senden Sie Ihre Ideen an %1</translation>
+        <translation>Bitte berichte Fehler und sende Deine Ideen an %1</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="25"/>
         <source>%1 is Free Software but its development takes precious time.</source>
         <translation>%1 ist freie Software, aber die Entwicklung kostet wertvolle Zeit.</translation>
     </message>
+    <message>
+        <source>Please &lt;a href=&apos;%1&apos;&gt;donate via PayPal&lt;/a&gt; to support the continued development of %2.</source>
+        <translation type="obsolete">Bitte &lt;a href=&apos;%1&apos;&gt;spende via PayPal&lt;/a&gt; um die dauerhafte Entwicklung von %2 zu unterstützen.</translation>
+    </message>
     <message>
         <location filename="../src/AboutView.cpp" line="26"/>
         <source>Please &lt;a href=&apos;%1&apos;&gt;donate&lt;/a&gt; to support the continued development of %2.</source>
-        <translation>Bitte &lt;a href=&apos;%1&apos;&gt;spenden&lt;/a&gt; Sie um die ständige Entwicklung von %2 zu unterstützen.</translation>
+        <translation>Bitte &lt;a href=&apos;%1&apos;&gt;spende&lt;/a&gt;, um die ständige Entwicklung von %2 zu unterstützen.</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="33"/>
         <source>Icon designed by %1.</source>
-        <translation>Icon entworfen von %1.</translation>
+        <translation>Symbol-Entwurf durch %1.</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="34"/>
         <source>Compact mode contributed by %1.</source>
-        <translation>Kompakt-Ansicht beigetragen von %1.</translation>
+        <translation>Kompakt-Modus beigetragen von %1.</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="35"/>
         <source>HTTP proxy support contributed by %1.</source>
-        <translation>HTTP-Proxy Unterstützung beigetragen von %1.</translation>
+        <translation>HTTP Proxy-Unterstützung beigetragen von %1.</translation>
+    </message>
+    <message>
+        <source>Windows version built by %1</source>
+        <translation type="obsolete">Windows Version erstellt durch %1</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="38"/>
         <source>Translated by %1</source>
-        <translation>Übersetzt von %1</translation>
+        <translation>Übersetzung durch %1</translation>
     </message>
     <message>
         <location filename="../src/AboutView.cpp" line="65"/>
@@ -67,7 +79,7 @@
     <message>
         <location filename="../src/AboutView.h" line="20"/>
         <source>What you always wanted to know about %1 and never dared to ask</source>
-        <translation>Was Sie schon immer über %1 wissen wollten, aber nie zu fragen wagten</translation>
+        <translation>Was Du schon immer über %1 wissen wolltest, aber nie zu fragen wagtest</translation>
     </message>
 </context>
 <context>
@@ -75,7 +87,7 @@
     <message>
         <location filename="../src/searchlineedit.cpp" line="56"/>
         <source>Clear</source>
-        <translation>Löschen</translation>
+        <translation>Säubern</translation>
     </message>
 </context>
 <context>
         <source>bytes</source>
         <translation>Bytes</translation>
     </message>
-    <message>
-        <location filename="../src/downloaditem.cpp" line="236"/>
-        <source>bytes/sec</source>
-        <translation>Bytes/s</translation>
-    </message>
     <message>
         <location filename="../src/downloaditem.cpp" line="217"/>
-        <source>KiB</source>
-        <translation>KiB</translation>
+        <source>KB</source>
+        <translation>kB</translation>
     </message>
     <message>
         <location filename="../src/downloaditem.cpp" line="220"/>
-        <source>MiB</source>
-        <translation>MiB</translation>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <location filename="../src/downloaditem.cpp" line="236"/>
+        <source>bytes/sec</source>
+        <translation>Bytes/s</translation>
     </message>
     <message>
         <location filename="../src/downloaditem.cpp" line="239"/>
-        <source>KiB/sec</source>
-        <translation>KiB/s</translation>
+        <source>KB/sec</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <location filename="../src/downloaditem.cpp" line="242"/>
-        <source>MiB/sec</source>
-        <translation>MiB/s</translation>
+        <source>MB/sec</source>
+        <translation>MB/s</translation>
     </message>
     <message>
         <location filename="../src/downloaditem.cpp" line="248"/>
     <message>
         <location filename="../src/downloadmanager.cpp" line="47"/>
         <source>This is just the demo version of %1.</source>
-        <translation>Dies ist nur eine Demoversion von %1.</translation>
+        <translation>Dies ist nur die Demoversion von %1.</translation>
     </message>
     <message>
         <location filename="../src/downloadmanager.cpp" line="49"/>
         <source>It can only download videos shorter than %1 minutes so you can test the download functionality.</source>
-        <translation>Sie kann nur Videos herunterladen, die kürzer als %1 Minuten sind, damit Sie diese Funktion testen können.</translation>
+        <translation>Sie kann nur Videos die kürzer als %1 Minuten sind herunterladen, damit die Download-Funktionalität getestet werden kann.</translation>
     </message>
     <message>
         <location filename="../src/downloadmanager.cpp" line="53"/>
     <message>
         <location filename="../src/downloadmanager.cpp" line="54"/>
         <source>Get the full version</source>
-        <translation>Volle Version herunterladen</translation>
+        <translation>Die Vollversion holen</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/downloadmanager.cpp" line="126"/>
     <message>
         <location filename="../src/downloadsettings.cpp" line="14"/>
         <source>Change location...</source>
-        <translation>Pfad ändern...</translation>
+        <translation>Speicherort ändern…</translation>
     </message>
     <message>
         <location filename="../src/downloadsettings.cpp" line="38"/>
         <source>Choose the download location</source>
-        <translation>Download-Verzeichnis auswählen</translation>
+        <translation>Wähle den Speicherort</translation>
     </message>
     <message>
         <location filename="../src/downloadsettings.cpp" line="49"/>
         <source>Download location changed.</source>
-        <translation>Download-Verzeichnis geändert.</translation>
+        <translation>Speicherort wurde verändert.</translation>
     </message>
     <message>
         <location filename="../src/downloadsettings.cpp" line="51"/>
         <source>Current downloads will still go in the previous location.</source>
-        <translation>Bereits laufende Downloads bleiben weiterhin im alten Verzeichnis.</translation>
+        <translation>Aktuelle Downloads werden immernoch im alten Speicherort gespeichert.</translation>
     </message>
     <message>
         <location filename="../src/downloadsettings.cpp" line="63"/>
         <source>Downloading to: %1</source>
-        <translation>Speichere in: %1</translation>
+        <translation>Lade herunter nach: %1</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="17"/>
         <source>Pause</source>
-        <translation>Pausieren</translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="18"/>
         <source>Play/Pause</source>
-        <translation>Wiedergeben/Pausieren</translation>
+        <translation>Abspielen/Pause</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="19"/>
         <source>Stop</source>
-        <translation>Anhalten</translation>
+        <translation>Halt</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="20"/>
         <source>Stop playing after current track</source>
-        <translation>Wiedergabe nach aktuellem Titel anhalten</translation>
+        <translation>Nachdem aktueller Titel abgespielt wurde halten</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="21"/>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="25"/>
         <source>Mute</source>
-        <translation>Stumm schalten</translation>
+        <translation>Stummschalten</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="26"/>
         <source>Seek forward</source>
-        <translation>Vorspulen</translation>
+        <translation>Vorwärts spulen</translation>
     </message>
     <message>
         <location filename="../src/globalshortcuts.cpp" line="27"/>
         <source>Seek backward</source>
-        <translation>Zurückspulen</translation>
+        <translation>Rückwärts spulen</translation>
     </message>
 </context>
 <context>
 </context>
 <context>
     <name>MainWindow</name>
+    <message>
+        <source>&amp;Back</source>
+        <translation type="obsolete">&amp;Zurück</translation>
+    </message>
+    <message>
+        <source>Go to the previous view</source>
+        <translation type="obsolete">Gehe zur vorherigen Ansicht</translation>
+    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="102"/>
         <source>&amp;Stop</source>
-        <translation>An&amp;alten</translation>
+        <translation>&amp;Halt</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="103"/>
         <source>Stop playback and go back to the search view</source>
-        <translation>Wiedergabe anhalten und zurück zur Suchansicht</translation>
+        <translation>Wiedergabe anhalten und zur Suchansicht zurückkehren</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="109"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="110"/>
         <source>Skip to the next video</source>
-        <translation>Springe zum nächsten Video</translation>
+        <translation>Zum nächsten Video springen</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="116"/>
         <source>Go full screen</source>
         <translation>Vollbildmodus aktivieren</translation>
     </message>
+    <message>
+        <source>&amp;Compact View</source>
+        <translation type="obsolete">&amp;Kompakt Ansicht</translation>
+    </message>
+    <message>
+        <source>Go compact view</source>
+        <translation type="obsolete">Kompakt Ansicht aktivieren</translation>
+    </message>
+    <message>
+        <source>&amp;YouTube</source>
+        <translation type="obsolete">&amp;YouTube</translation>
+    </message>
+    <message>
+        <source>Open the YouTube video page</source>
+        <translation type="obsolete">Öffne die YouTube Video Seite</translation>
+    </message>
+    <message>
+        <source>Ctrl+Y</source>
+        <translation type="obsolete">Ctrl+Y</translation>
+    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="133"/>
         <source>&amp;Compact mode</source>
     <message>
         <location filename="../src/MainWindow.cpp" line="283"/>
         <source>&amp;Download</source>
-        <translation>&amp;Herunterladen</translation>
+        <translation>H&amp;erunterladen</translation>
+    </message>
+    <message>
+        <source>Download this video</source>
+        <translation type="obsolete">Dieses Video herunterladen</translation>
+    </message>
+    <message>
+        <source>Ctrl+S</source>
+        <translation type="obsolete">Strg+S</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="142"/>
         <source>Open the &amp;YouTube page</source>
-        <translation>Öffne die &amp;YouTube Seite</translation>
+        <translation>Öffne die &amp;YouTube-Seite</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="143"/>
         <source>Go to the YouTube video page and pause playback</source>
-        <translation>Gehe zur YouTube Video Seite und pausiere die Wiedergabe</translation>
+        <translation>Gehe zur YouTube-Video-Seite und pausiere die Wiedergabe</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="149"/>
         <source>Copy the YouTube &amp;link</source>
-        <translation>YouTube &amp;Link kopieren</translation>
+        <translation>YouTube-&amp;Link kopieren</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="150"/>
         <source>Copy the current video YouTube link to the clipboard</source>
-        <translation>YouTube Link in die Zwischenablage kopieren</translation>
+        <translation>YouTube-Link in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="156"/>
         <source>Copy the video stream &amp;URL</source>
-        <translation>Video &amp;URL kopieren</translation>
+        <translation>Video-&amp;URL kopieren</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="157"/>
         <source>Copy the current video stream URL to the clipboard</source>
-        <translation>Video URL in die Zwischenablage kopieren</translation>
+        <translation>Video-URL in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="163"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="171"/>
         <source>Move up the selected videos in the playlist</source>
-        <translation>Bewerge das ausgewählte Video in der Abspielliste hinauf</translation>
+        <translation>Bewege das ausgewählte Video in der Abspielliste hinauf</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="177"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="189"/>
         <source>Clear the search history. Cannot be undone.</source>
-        <translation>Such-Chronik löschen. Kann nicht rückgängig gemacht werden.</translation>
+        <translation>Such-Verlauf leeren. Kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="194"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="196"/>
         <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
+        <translation>Strg+Q</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="197"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="203"/>
         <source>%1 on the Web</source>
-        <translation>%1 im Internet</translation>
+        <translation>%1 im Web</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="207"/>
         <source>Make a &amp;donation</source>
-        <translation>Eine Spen&amp;de machen</translation>
+        <translation>Spen&amp;den</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="274"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="275"/>
         <source>Show details about video downloads</source>
-        <translation>Details über Video-Downloads zeigen</translation>
+        <translation>Zeige Details über Video-Downloads</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="284"/>
         <source>Download the current video</source>
-        <translation>Video herunterladen</translation>
+        <translation>Das aktuelle Video herunterladen</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="576"/>
         <source>Do you want to exit %1 with a download in progress?</source>
-        <translation>Wollen Sie %1 mit einem aktivem Download beenden?</translation>
+        <translation>Möchtest Du %1 mit einem aktiven Download beenden?</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="577"/>
         <source>If you close %1 now, this download will be cancelled.</source>
-        <translation>Wenn Sie %1 beenden, wird das Herunterladen abgebrochen.</translation>
+        <translation>Wenn Du %1 jetzt beendest, wird der Download abgebrochen.</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="580"/>
         <source>Close and cancel download</source>
-        <translation>Beenden und Herunterladen abbrechen</translation>
+        <translation>Beenden und Download abbrechen</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="581"/>
         <source>Wait for download to finish</source>
-        <translation>Warten, bis das Herunterladen abgeschlossen ist</translation>
+        <translation>Auf Abschluß des Downloads warten</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="877"/>
         <source>Maximum video definition set to %1</source>
-        <translation>Maximale Videoauflösung wurde auf %1 gesetzt</translation>
+        <translation>Maximale Video-Auflösung wurde auf %1 gesetzt</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="933"/>
         <source>Downloads complete</source>
-        <translation>Downloads abgeschlossen</translation>
+        <translation>Downloads heruntergeladen</translation>
+    </message>
+    <message>
+        <source>&amp;Donate via PayPal</source>
+        <translation type="obsolete">Spen&amp;den via PayPal</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="208"/>
         <source>Please support the continued development of %1</source>
-        <translation>Bitte unterstützen Sie die fortwährende Entwicklung von %1</translation>
+        <translation>Bitte unterstütze die weitere Entwicklung von %1</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="212"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="241"/>
         <source>Mute volume</source>
-        <translation>Ton stumm schalten</translation>
+        <translation>Stummschalten</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="243"/>
         <source>Remaining time: %1</source>
         <translation>Verbleibende Zeit: %1</translation>
     </message>
+    <message>
+        <source>High Definition video is enabled</source>
+        <translation type="obsolete">High Definition Video ist eingeschaltet</translation>
+    </message>
+    <message>
+        <source>High Definition video is not enabled</source>
+        <translation type="obsolete">High Definition Video ist nicht eingeschaltet</translation>
+    </message>
+    <message>
+        <source>The current video is in High Definition</source>
+        <translation type="obsolete">Das derzeitige Video ist in High Definition</translation>
+    </message>
+    <message>
+        <source>The current video is not in High Definition</source>
+        <translation type="obsolete">Das derzeitige Video ist nicht in High Definition</translation>
+    </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="917"/>
         <source>Your privacy is now safe</source>
-        <translation>Ihre Privatsphäre ist nun geschützt</translation>
+        <translation>Deine Privatsphäre ist nun geschützt</translation>
+    </message>
+    <message>
+        <source>No Video playing</source>
+        <translation type="obsolete">Es wird kein Video abgespielt</translation>
+    </message>
+    <message>
+        <source>You must first play the video you intent to download !</source>
+        <translation type="obsolete">Du musst das Video erst abspielen !</translation>
+    </message>
+    <message>
+        <source>Save video as...</source>
+        <translation type="obsolete">Video speichern unter...</translation>
+    </message>
+    <message>
+        <source>minitube video.mp4</source>
+        <translation type="obsolete">minitube video.mp4</translation>
+    </message>
+    <message>
+        <source>Downloading: </source>
+        <translation type="obsolete">Herunterladen:</translation>
+    </message>
+    <message>
+        <source>Abort Download</source>
+        <translation type="obsolete">Herunterladen abbrechen</translation>
+    </message>
+    <message>
+        <source>File creation failed</source>
+        <translation type="obsolete">Das anlegen der Datei ist fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Download failed</source>
+        <translation type="obsolete">Herunterladen fehlgeschlagen</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="861"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="867"/>
         <source>Volume is muted</source>
-        <translation>Ton ist stumm geschaltet</translation>
+        <translation>Ton ist stummgeschaltet</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="870"/>
         <source>Volume is unmuted</source>
-        <translation>Stummschaltung deaktiviert</translation>
+        <translation>Ton ist angeschaltet</translation>
+    </message>
+    <message>
+        <source>&amp;Search</source>
+        <translation type="obsolete">&amp;Suche</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="325"/>
     <message>
         <location filename="../src/MainWindow.cpp" line="333"/>
         <source>&amp;Playlist</source>
-        <translation>&amp;Abspielliste</translation>
+        <translation>A&amp;bspielliste</translation>
     </message>
     <message>
         <location filename="../src/MainWindow.cpp" line="340"/>
     <message>
         <location filename="../src/MediaView.cpp" line="26"/>
         <source>Most relevant</source>
-        <translation>Die bedeutsamsten</translation>
+        <translation>Die Bedeutsamsten</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="33"/>
         <source>Most recent</source>
-        <translation>Die neusten</translation>
+        <translation>Die Neusten</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="40"/>
     <message>
         <location filename="../src/MediaView.cpp" line="360"/>
         <source>You can now paste the YouTube link into another application</source>
-        <translation>Sie können nun den YouTube Link in einer anderen Anwendung einfügen</translation>
+        <translation>Du kannst den YouTube-Link nun in einer anderen Anwendung einfügen</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="368"/>
         <source>You can now paste the video stream URL into another application</source>
-        <translation>Sie können nun die Video URL in einer anderen Anwendung einfügen</translation>
+        <translation>Du kannst die Video-URL nun in einer anderen Anwendung einfügen</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="369"/>
     <message>
         <location filename="../src/MediaView.cpp" line="466"/>
         <source>It allows you to test the application and see if it works for you.</source>
-        <translation>Es gibt Ihnen die Möglichkeit das Programm zu testen und zu sehen, ob es funktioniert.</translation>
+        <translation>Sie erlaubt Dir die Anwendung zu testen und zu schauen ob es bei Dir läuft.</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="469"/>
     <message>
         <location filename="../src/MediaView.cpp" line="470"/>
         <source>Get the full version</source>
-        <translation>Volle Version herunterladen</translation>
+        <translation>Die Vollversion holen</translation>
     </message>
     <message>
         <location filename="../src/MediaView.cpp" line="495"/>
     <message>
         <location filename="../src/MediaView.h" line="36"/>
         <source>You&apos;re watching &quot;%1&quot;</source>
-        <translation>Sie betrachten &quot;%1&quot;</translation>
+        <translation>Du betrachtest &quot;%1&quot;</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="266"/>
         <source>%1 of %2 (%3) ? %4</source>
-        <translation>%1 von %2 (%3) ? %4</translation>
+        <translation>%1 von %2 (%3)  %4</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="273"/>
         <source>Preparing</source>
-        <translation>Initialisiere</translation>
+        <translation>Bereite vor</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="275"/>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="277"/>
         <source>Completed</source>
-        <translation>Abgeschlossen</translation>
+        <translation>Fertiggestellt</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="279"/>
         <source>Stopped</source>
-        <translation>Abgebrochen</translation>
+        <translation>Gestoppt</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="315"/>
         <source>Stop downloading</source>
-        <translation>Herunterladen abbrechen</translation>
+        <translation>Stoppe herunterladen</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="325"/>
         <source>Show in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige in %1</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="327"/>
         <source>Open parent folder</source>
-        <translation>Beinhaltenden Ordner öffnen</translation>
+        <translation>Eltern-Ordner öffnen</translation>
     </message>
     <message>
         <location filename="../src/playlist/PrettyItemDelegate.cpp" line="336"/>
     <message>
         <location filename="../src/SearchView.cpp" line="97"/>
         <source>Recent keywords</source>
-        <translation>Kürzlich verwendete Schlüsselwörter</translation>
+        <translation>Aktuelle Schlüsselwörter</translation>
     </message>
     <message>
         <location filename="../src/SearchView.cpp" line="199"/>
     <message>
         <location filename="../src/SearchView.h" line="29"/>
         <source>Make yourself comfortable</source>
-        <translation>Machen Sie es sich gemütlich</translation>
+        <translation>Mach es Dir gemütlich</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsView</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="obsolete">Einstellungen</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="obsolete">S&amp;chließen</translation>
     </message>
 </context>
 <context>
     <message>
         <location filename="../src/video.cpp" line="173"/>
         <source>Network error: %1 for %2</source>
-        <translation>Netzwerk Fehler: %1 für %2</translation>
+        <translation>Netzwerk-Fehler: %1 für %2</translation>
     </message>
 </context>
 </TS>
index 061d14dcbfbc96b35290834afb454f749bbf2264..dde17fe7cc8209cf1b353bdff87ce8d88cdf14ff 100644 (file)
     <name>DownloadItem</name>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation>tavua</translation>
     </message>
     <message>
         <source>KB</source>
-        <translation type="unfinished"></translation>
+        <translation>Kt</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>Mt</translation>
     </message>
     <message>
         <source>bytes/sec</source>
-        <translation type="unfinished"></translation>
+        <translation>tavua/sekunnissa</translation>
     </message>
     <message>
         <source>KB/sec</source>
-        <translation type="unfinished"></translation>
+        <translation>Kt/s</translation>
     </message>
     <message>
         <source>MB/sec</source>
-        <translation type="unfinished"></translation>
+        <translation>Mt/s</translation>
     </message>
     <message>
         <source>seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>sekunttia</translation>
     </message>
     <message>
         <source>minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>minuuttia</translation>
     </message>
     <message>
         <source>%4 %5 remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>%4 %5 jäljellä</translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message numerus="yes">
         <source>%n Download(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n Lataus(ta)</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <source>This is just the demo version of %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tämä on vain kokeilu versio %1sta.</translation>
     </message>
     <message>
         <source>It can only download videos shorter than %1 minutes so you can test the download functionality.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voit ladata vain videoita jotka ovat lyhyempiä kuin %1 minuuttia, jotta voit testata lataus ominaisuutta.</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Jatka</translation>
     </message>
     <message>
         <source>Get the full version</source>
-        <translation type="unfinished"></translation>
+        <translation>Hanki täysi versio</translation>
     </message>
 </context>
 <context>
     <name>DownloadSettings</name>
     <message>
         <source>Change location...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vaihda sijaintia...</translation>
     </message>
     <message>
         <source>Choose the download location</source>
-        <translation type="unfinished"></translation>
+        <translation>Valitse latausten sijainti</translation>
     </message>
     <message>
         <source>Download location changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lataus sijaintia on muutettu.</translation>
     </message>
     <message>
         <source>Current downloads will still go in the previous location.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nykyiset lataukset menevät vanhaan sijaintiin.</translation>
     </message>
     <message>
         <source>Downloading to: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladataan kansioon: %1</translation>
     </message>
 </context>
 <context>
     <name>DownloadView</name>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Lataukset</translation>
     </message>
 </context>
 <context>
     <name>GlobalShortcuts</name>
     <message>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Toista</translation>
     </message>
     <message>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Keskeytä</translation>
     </message>
     <message>
         <source>Play/Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Toista/Keskeytä</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Pysäytä</translation>
     </message>
     <message>
         <source>Stop playing after current track</source>
-        <translation type="unfinished"></translation>
+        <translation>Pysäytä toisto nykyisen kappaleen jälkeen</translation>
     </message>
     <message>
         <source>Next track</source>
-        <translation type="unfinished"></translation>
+        <translation>Seuraava kappale</translation>
     </message>
     <message>
         <source>Previous track</source>
-        <translation type="unfinished"></translation>
+        <translation>Edellinen kappale</translation>
     </message>
     <message>
         <source>Increase volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Lisää äänen voimakkuutta</translation>
     </message>
     <message>
         <source>Decrease volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Vähennä äänen voimakkuutta</translation>
     </message>
     <message>
         <source>Mute</source>
-        <translation type="unfinished"></translation>
+        <translation>Mykistä</translation>
     </message>
     <message>
         <source>Seek forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Kelaa eteenpäin</translation>
     </message>
     <message>
         <source>Seek backward</source>
-        <translation type="unfinished"></translation>
+        <translation>Kelaa taaksepäin</translation>
     </message>
 </context>
 <context>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lataukset</translation>
     </message>
     <message>
         <source>Show details about video downloads</source>
-        <translation type="unfinished"></translation>
+        <translation>Näytä tietoja latauksista</translation>
     </message>
     <message>
         <source>&amp;Download</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lataa</translation>
     </message>
     <message>
         <source>Download the current video</source>
-        <translation type="unfinished"></translation>
+        <translation>Lataa nykyinen video</translation>
     </message>
     <message>
         <source>Do you want to exit %1 with a download in progress?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tahdotko lopettaa vaikka %1 lataus(ta) on kesken?</translation>
     </message>
     <message>
         <source>If you close %1 now, this download will be cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jos suljet %1n nyt niin tämä lataus keskeytetään.</translation>
     </message>
     <message>
         <source>Close and cancel download</source>
-        <translation type="unfinished"></translation>
+        <translation>Sulje ja keskeytä lataus</translation>
     </message>
     <message>
         <source>Wait for download to finish</source>
-        <translation type="unfinished"></translation>
+        <translation>Odota latauksen valmistumista</translation>
     </message>
     <message>
         <source>Downloads complete</source>
-        <translation type="unfinished"></translation>
+        <translation>Lataukset ovat valmistuneet</translation>
     </message>
 </context>
 <context>
     </message>
     <message>
         <source>This is just the demo version of %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tämä on vain %1n kokeiluversio.</translation>
     </message>
     <message>
         <source>It allows you to test the application and see if it works for you.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voit kokeilla ohjelmaa nähdäksesi että toimiiko se.</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Jatka</translation>
     </message>
     <message>
         <source>Get the full version</source>
-        <translation type="unfinished"></translation>
+        <translation>Hanki täysi versio</translation>
     </message>
     <message>
         <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladataan %1ta/tä</translation>
     </message>
 </context>
 <context>
     </message>
     <message>
         <source>%1 of %2 (%3) ? %4</source>
-        <translation type="unfinished"></translation>
+        <translation>%1  %2 (%3)sta ? %4</translation>
     </message>
     <message>
         <source>Preparing</source>
-        <translation type="unfinished"></translation>
+        <translation>Valmistellaan</translation>
     </message>
     <message>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Epäonnistui</translation>
     </message>
     <message>
         <source>Completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Valmis</translation>
     </message>
     <message>
         <source>Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Pysäytetty</translation>
     </message>
     <message>
         <source>Stop downloading</source>
-        <translation type="unfinished"></translation>
+        <translation>Pysäytä lataus</translation>
     </message>
     <message>
         <source>Show in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Avaa %1ssa/ssä</translation>
     </message>
     <message>
         <source>Open parent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Avaa yläkansio</translation>
     </message>
     <message>
         <source>Restart downloading</source>
-        <translation type="unfinished"></translation>
+        <translation>Käynnistä lataus uudelleen</translation>
     </message>
 </context>
 <context>
index 77a2f1379a8db2f7d41cd32888aa1a51db4d08ae..e3d47fa3c92f620990b71c9f75cf5e4ebfeeb66f 100644 (file)
@@ -29,7 +29,8 @@ TRANSLATIONS += \
     pt_PT.ts \
     fi_FI.ts \
     bg_BG.ts \
-    zh_CN.ts
+    zh_CN.ts \
+    mkd_MKD.ts
 
 isEmpty(QMAKE_LRELEASE) {
     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
diff --git a/locale/mkd_MKD.ts b/locale/mkd_MKD.ts
new file mode 100644 (file)
index 0000000..09a8099
--- /dev/null
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_US">
+<context>
+    <name></name>
+    <message>
+        <source>There&apos;s life outside the browser!</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Има живот и надвор од браузерот!</translation>
+    </message>
+    <message>
+        <source>Version %1</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Верзија %1</translation>
+    </message>
+    <message>
+        <source>%1 is Free Software but its development takes precious time.</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>%1 е Слободен Софтвер, но неговиот развој одзема драгоцено време.</translation>
+    </message>
+    <message>
+        <source>Please &lt;a href=&apos;%1&apos;&gt;donate&lt;/a&gt; to support the continued development of %2.</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Ве молам &lt;a href=&apos;%1&apos;&gt;донирајте&lt;/a&gt; за да го поддржите понатамошниот развој на %2.</translation>
+    </message>
+    <message>
+        <source>Report bugs and send in your ideas to %1</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Известувајте за грешки и испраќајте ги вашите идеи на %1</translation>
+    </message>
+    <message>
+        <source>Icon designed by %1.</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Иконите се изработени од %1.</translation>
+    </message>
+    <message>
+        <source>Compact mode contributed by %1.</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Компактниот режим е објавен од %1.</translation>
+    </message>
+    <message>
+        <source>HTTP proxy support contributed by %1.</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>HTTP proxy поддржката е објавена од %1.</translation>
+    </message>
+    <message>
+        <source>Translated by %1</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Преведено од %1</translation>
+    </message>
+    <message>
+        <source>Released under the &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Објавено е под &lt;a href=&apos;%1&apos;&gt;GNU General Public License&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>&amp;Затвори</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>За</translation>
+    </message>
+    <message>
+        <source>What you always wanted to know about %1 and never dared to ask</source>
+        <translatorcomment>AboutView</translatorcomment>
+        <translation>Што одсекогаш сте сакале да знаете за %1 но никогаш не сте се осмелиле да прашате</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translatorcomment>ClearButton</translatorcomment>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Searching...</source>
+        <translatorcomment>ListModel</translatorcomment>
+        <translation>Пребарување...</translation>
+    </message>
+    <message>
+        <source>Show %1 More</source>
+        <translatorcomment>ListModel</translatorcomment>
+        <translation>Прикажи %1 повеќе</translation>
+    </message>
+    <message>
+        <source>No videos</source>
+        <translatorcomment>ListModel</translatorcomment>
+        <translation>Нема видео</translation>
+    </message>
+    <message>
+        <source>No more videos</source>
+        <translatorcomment>ListModel</translatorcomment>
+        <translation>Нема повеќе видеа</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translatorcomment>LoadingWidget</translatorcomment>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>&amp;Stop</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Стоп</translation>
+    </message>
+    <message>
+        <source>Stop playback and go back to the search view</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Стопирај ја репродукцијата и врати се во пребарувачот</translation>
+    </message>
+    <message>
+        <source>S&amp;kip</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>П&amp;рескокни</translation>
+    </message>
+    <message>
+        <source>Skip to the next video</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Следно видео</translation>
+    </message>
+    <message>
+        <source>&amp;Pause</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Пауза</translation>
+    </message>
+    <message>
+        <source>Pause playback</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Паузирај ја репродукцијата</translation>
+    </message>
+    <message>
+        <source>&amp;Full Screen</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Цел Екран</translation>
+    </message>
+    <message>
+        <source>Go full screen</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Отвори на цел екран</translation>
+    </message>
+    <message>
+        <source>&amp;Compact mode</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Компактен режим</translation>
+    </message>
+    <message>
+        <source>Hide the playlist and the toolbar</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Сокриј ја плејлистата и лентата со алатки</translation>
+    </message>
+    <message>
+        <source>Open the &amp;YouTube page</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Отвори ја &amp;YouTube страницата</translation>
+    </message>
+    <message>
+        <source>Go to the YouTube video page and pause playback</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Отиди на YouTube страницата и паузирај ја репродукцијата</translation>
+    </message>
+    <message>
+        <source>Copy the YouTube &amp;link</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Копирај го YouTube &amp;линкот</translation>
+    </message>
+    <message>
+        <source>Copy the current video YouTube link to the clipboard</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Копирај го видео линот од YouTube во клипбодот</translation>
+    </message>
+    <message>
+        <source>Copy the video stream &amp;URL</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Копирај го &amp;URL-то на видео емитувањето</translation>
+    </message>
+    <message>
+        <source>Copy the current video stream URL to the clipboard</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Копирај го URL-то на гледаното видео во клипбордот</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Отстрани</translation>
+    </message>
+    <message>
+        <source>Remove the selected videos from the playlist</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Отстранете ги избраните видеа од плејлистата</translation>
+    </message>
+    <message>
+        <source>Move &amp;Up</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Придвижи &amp;нагоре</translation>
+    </message>
+    <message>
+        <source>Move up the selected videos in the playlist</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Премести ги избраните видеа во плејлистата</translation>
+    </message>
+    <message>
+        <source>Move &amp;Down</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Придвижи &amp;надолу</translation>
+    </message>
+    <message>
+        <source>Move down the selected videos in the playlist</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Премести ги надолу во плејлистата избраните видеа</translation>
+    </message>
+    <message>
+        <source>&amp;Clear recent keywords</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Исчисти ги последниве клучни зборови</translation>
+    </message>
+    <message>
+        <source>Clear the search history. Cannot be undone.</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Исчисти ја историјата од пребарувањето.Неможе да се назад.</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Излез</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <source>Bye</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Чао</translation>
+    </message>
+    <message>
+        <source>&amp;Website</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Веб страна</translation>
+    </message>
+    <message>
+        <source>%1 on the Web</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>%1 на Веб</translation>
+    </message>
+    <message>
+        <source>Make a &amp;donation</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Направи &amp;донација</translation>
+    </message>
+    <message>
+        <source>Please support the continued development of %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Ве молам подпомогнете го идниот развој на %1</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;За</translation>
+    </message>
+    <message>
+        <source>Info about %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Информација за %1</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Пребарување</translation>
+    </message>
+    <message>
+        <source>Mute volume</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Прекини го звукот</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>&amp;Application</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Апликација</translation>
+    </message>
+    <message>
+        <source>&amp;Playlist</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Плејлиста</translation>
+    </message>
+    <message>
+        <source>&amp;Video</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Видео</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Помош</translation>
+    </message>
+    <message>
+        <source>Press %1 to raise the volume, %2 to lower it</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Притисни %1 за да го зголемиш звукот, %2 да го намалиш</translation>
+    </message>
+    <message>
+        <source>Opening %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Се отвара %1</translation>
+    </message>
+    <message>
+        <source>Fatal error: %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Фатална грешка: %1</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Грешка: %1</translation>
+    </message>
+    <message>
+        <source>&amp;Play</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>&amp;Пушти</translation>
+    </message>
+    <message>
+        <source>Resume playback</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Продолжи со репродукција</translation>
+    </message>
+    <message>
+        <source>Exit &amp;Full Screen</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Излези од &amp;Цел екран</translation>
+    </message>
+    <message>
+        <source>Remaining time: %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Останато време: %1</translation>
+    </message>
+    <message>
+        <source>Volume at %1%</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Звук на %1%</translation>
+    </message>
+    <message>
+        <source>Volume is muted</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Звукот е исклучен</translation>
+    </message>
+    <message>
+        <source>Volume is unmuted</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Звукот е вклучен</translation>
+    </message>
+    <message>
+        <source>Maximum video definition set to %1</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Максималната видео резолуција е поставена на %1</translation>
+    </message>
+    <message>
+        <source>Your privacy is now safe</source>
+        <translatorcomment>MainWindow</translatorcomment>
+        <translation>Вашата приватност е заштитена</translation>
+    </message>
+    <message>
+        <source>Most relevant</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Најрелевантни</translation>
+    </message>
+    <message>
+        <source>Most recent</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Најновите</translation>
+    </message>
+    <message>
+        <source>Most viewed</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Најмногу гледани</translation>
+    </message>
+    <message>
+        <source>You can now paste the YouTube link into another application</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Може да го вметнете YouTube линкот во друга апликација</translation>
+    </message>
+    <message>
+        <source>You can now paste the video stream URL into another application</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Може да ја вметнете URL адресата на емитувањето во друга апликација</translation>
+    </message>
+    <message>
+        <source>The link will be valid only for a limited time.</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Линкот ќе биде валиден само за определно време.</translation>
+    </message>
+    <message>
+        <source>You&apos;re watching &quot;%1&quot;</source>
+        <translatorcomment>MediaView</translatorcomment>
+        <translation>Вие гледате &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <source>Network error: %1</source>
+        <translatorcomment>NetworkAccess</translatorcomment>
+        <translation>Грешка во мрежата: %1</translation>
+    </message>
+    <message>
+        <source>%1 views</source>
+        <translatorcomment>PrettyItemDelegate</translatorcomment>
+        <translation>%1 прегледувања</translation>
+    </message>
+    <message>
+        <source>Welcome to &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;,</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Добредојдовте во &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;,</translation>
+    </message>
+    <message>
+        <source>Enter a keyword to start watching videos.</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Внесете клучен збор за да почнете да гледате видео клипови.</translation>
+    </message>
+    <message>
+        <source>Watch</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Гледај</translation>
+    </message>
+    <message>
+        <source>Recent keywords</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Последни користени клучни зборови</translation>
+    </message>
+    <message>
+        <source>A new version of %1 is available. Please &lt;a href=&apos;%2&apos;&gt;update to version %3&lt;/a&gt;</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Нова верзија на %1 е достапна.Ве молиме &lt;a href=&apos;%2&apos;&gt; обновете до верзија %3&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Make yourself comfortable</source>
+        <translatorcomment>SearchView</translatorcomment>
+        <translation>Опуштете се</translation>
+    </message>
+    <message>
+        <source>Network error: %1 for %2</source>
+        <translatorcomment>Video</translatorcomment>
+        <translation>Грешка во мрежата: %1 за %2</translation>
+    </message>
+</context>
+</TS>
index bea0df2365237761eda4c7fa457da58a6a127116..94ac55ed328ed6fa11a182e08b3983eb3abe5242 100755 (executable)
@@ -1,6 +1,6 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 1.2
+VERSION = 1.3
 DEFINES += APP_VERSION="$$VERSION"
 INCLUDEPATH += /usr/include/phonon
 
index 961c867594b0e4db3e3e0294f93b754e35765c75..1a0ec1730492455150abadb0431cc03fec66eaae 100644 (file)
@@ -59,7 +59,8 @@ AboutView::AboutView(QWidget *parent) : QWidget(parent) {
                                                       "Daniel Rodrigues (pt_PT), "
                                                       "Jesse Jaara (fi_FI), "
                                                       "Tsvyatko Makazchiev (bg_BG), "
-                                                      "Changtai Liang (zh_CN)"
+                                                      "Changtai Liang (zh_CN), "
+                                                      "Veta Branislav (mkd_MKD)"
                                                       ) + "</p>"
 #if !defined(APP_MAC) && !defined(Q_WS_WIN)
                    "<p>" + tr("Released under the <a href='%1'>GNU General Public License</a>")
index 761e5a4bff6c200c8ed49dba0bfdff35751b4408..1c146eec728e1fbf0eedf47397f0c167c3586b78 100755 (executable)
@@ -202,6 +202,10 @@ void ListModel::addVideo(Video* video) {
 
         // save keyword
         QString query = searchParams->keywords();
+        if (query.startsWith("http://")) {
+            // Save the video title
+            query += "|" + videos.first()->title();
+        }
         QSettings settings;
         QStringList keywords = settings.value(recentKeywordsKey).toStringList();
         keywords.removeAll(query);
index c87c398be0d84b2e8d7c7be7362441f510d65d32..1ef752bd424d60008f45786f3d787c00b85f73af 100755 (executable)
@@ -45,6 +45,7 @@ MainWindow::MainWindow() :
     createStatusBar();
 
     initPhonon();
+    // mediaView->setSlider(slider);
     mediaView->setMediaObject(mediaObject);
 
     // remove that useless menu/toolbar context menu
@@ -395,12 +396,24 @@ void MainWindow::createToolBars() {
     mainToolBar->addWidget(new Spacer());
 
     seekSlider = new Phonon::SeekSlider(this);
+#ifdef Q_WS_X11
+    seekSlider->setDisabled(true);
+#endif
     seekSlider->setIconVisible(false);
     seekSlider->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
     mainToolBar->addWidget(seekSlider);
 
     mainToolBar->addWidget(new Spacer());
 
+/*
+    slider = new QSlider(this);
+    slider->setOrientation(Qt::Horizontal);
+    slider->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    mainToolBar->addWidget(slider);
+*/
+
+    mainToolBar->addWidget(new Spacer());
+
     totalTime = new QLabel(mainToolBar);
     totalTime->setFont(smallerFont);
     mainToolBar->addWidget(totalTime);
@@ -453,7 +466,7 @@ void MainWindow::readSettings() {
     restoreGeometry(settings.value("geometry").toByteArray());
 #ifdef APP_MAC
     if (!isMaximized())
-        move(x(), y() + mainToolBar->height() + 8);
+        move(x(), y() + 10);
 #endif
     setDefinitionMode(settings.value("definition", VideoDefinition::getDefinitionNames().first()).toString());
     audioOutput->setVolume(settings.value("volume", 1).toDouble());
@@ -814,6 +827,11 @@ void MainWindow::tick(qint64 time) {
     const qint64 remainingTime = mediaObject->remainingTime();
     currentTime->setStatusTip(tr("Remaining time: %1").arg(formatTime(remainingTime)));
 
+    /*
+    slider->blockSignals(true);
+    slider->setValue(time/1000);
+    slider->blockSignals(false);
+    */
 }
 
 void MainWindow::totalTimeChanged(qint64 time) {
@@ -822,6 +840,13 @@ void MainWindow::totalTimeChanged(qint64 time) {
         return;
     }
     totalTime->setText(formatTime(time));
+
+    /*
+    slider->blockSignals(true);
+    slider->setMaximum(time/1000);
+    slider->blockSignals(false);
+    */
+
 }
 
 QString MainWindow::formatTime(qint64 time) {
index e90dbf83ce16e737c9586e2abc1723b68f0efe9e..203a2144523248eaa45ddeee8410db72db3baf6c 100755 (executable)
@@ -21,6 +21,7 @@ class MainWindow : public QMainWindow {
 public:
     MainWindow();
     ~MainWindow();
+    Phonon::SeekSlider* getSeekSlider() { return seekSlider; }
 
 protected:
     void closeEvent(QCloseEvent *);
@@ -125,6 +126,7 @@ private:
 
     // phonon
     Phonon::SeekSlider *seekSlider;
+    // QSlider *slider;
     Phonon::VolumeSlider *volumeSlider;
     Phonon::MediaObject *mediaObject;
     Phonon::AudioOutput *audioOutput;
index 739c595a048b4bafd7449409c2d1fa57f550f6cf..8890acebddf2abeee5818edca4debedc2999cd14 100644 (file)
@@ -5,6 +5,12 @@
 #include "minisplitter.h"
 #include "constants.h"
 #include "downloadmanager.h"
+#include "downloaditem.h"
+#include "MainWindow.h"
+
+namespace The {
+    NetworkAccess* http();
+}
 
 namespace The {
     QMap<QString, QAction*>* globalActions();
@@ -15,6 +21,7 @@ namespace The {
 MediaView::MediaView(QWidget *parent) : QWidget(parent) {
 
     reallyStopped = false;
+    downloadItem = 0;
 
     QBoxLayout *layout = new QHBoxLayout();
     layout->setMargin(0);
@@ -152,6 +159,12 @@ void MediaView::search(SearchParams *searchParams) {
     workaroundTimer->stop();
     errorTimer->stop();
 
+    mediaObject->pause();
+    if (downloadItem) {
+        delete downloadItem;
+        downloadItem = 0;
+    }
+
     this->searchParams = searchParams;
 
     // start serching for videos
@@ -162,6 +175,17 @@ void MediaView::search(SearchParams *searchParams) {
 
     listView->setFocus();
 
+
+    QString keyword = searchParams->keywords();
+    QString display = keyword;
+    if (keyword.startsWith("http://")) {
+        int separator = keyword.indexOf("|");
+        if (separator > 0 && separator + 1 < keyword.length()) {
+            display = keyword.mid(separator+1);
+        }
+    }
+    // tr("You're watching \"%1\"").arg(searchParams->keywords())
+
 }
 
 void MediaView::disappear() {
@@ -179,12 +203,14 @@ void MediaView::stateChanged(Phonon::State newState, Phonon::State /*oldState*/)
 {
 
     // qDebug() << "Phonon state: " << newState << oldState;
+    // slider->setEnabled(newState == Phonon::PlayingState);
 
     switch (newState) {
 
     case Phonon::ErrorState:
         qDebug() << "Phonon error:" << mediaObject->errorString() << mediaObject->errorType();
-        handleError(mediaObject->errorString());
+        if (mediaObject->errorType() == Phonon::FatalError)
+            handleError(mediaObject->errorString());
         break;
 
     case Phonon::PlayingState:
@@ -244,6 +270,10 @@ void MediaView::stop() {
     workaroundTimer->stop();
     errorTimer->stop();
     listView->selectionModel()->clearSelection();
+    if (downloadItem) {
+        delete downloadItem;
+        downloadItem = 0;
+    }
 }
 
 void MediaView::activeRowChanged(int row) {
@@ -257,6 +287,13 @@ void MediaView::activeRowChanged(int row) {
     workaroundTimer->stop();
     errorTimer->stop();
 
+    mediaObject->pause();
+    if (downloadItem) {
+        delete downloadItem;
+        downloadItem = 0;
+    }
+    // slider->setMinimum(0);
+
     // immediately show the loading widget
     videoAreaWidget->showLoading(video);
 
@@ -289,9 +326,75 @@ void MediaView::gotStreamUrl(QUrl streamUrl) {
     }
     video->disconnect(this);
 
+    QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation);
+    QString tempFile = tempDir + "/minitube.mp4";
+    if (!QFile::remove(tempFile)) {
+        qDebug() << "Cannot remove temp file";
+    }
+
+    Video *videoCopy = video->clone();
+    if (downloadItem) delete downloadItem;
+    downloadItem = new DownloadItem(videoCopy, streamUrl, tempFile, this);
+    connect(downloadItem, SIGNAL(statusChanged()), SLOT(downloadStatusChanged()));
+    // connect(downloadItem, SIGNAL(progress(int)), SLOT(downloadProgress(int)));
+    // connect(downloadItem, SIGNAL(finished()), SLOT(itemFinished()));
+    downloadItem->start();
+
+}
+
+/*
+void MediaView::downloadProgress(int percent) {
+    MainWindow* mainWindow = dynamic_cast<MainWindow*>(window());
+
+    mainWindow->getSeekSlider()->setStyleSheet(" QSlider::groove:horizontal {"
+        "border: 1px solid #999999;"
+        // "border-left: 50px solid rgba(255, 0, 0, 128);"
+        "height: 8px;"
+        "background: qlineargradient(x1:0, y1:0, x2:.5, y2:0, stop:0 rgba(255, 0, 0, 92), stop:"
+        + QString::number(percent/100.0) +
+
+        " rgba(255, 0, 0, 92), stop:" + QString::number((percent+1)/100.0) + " transparent, stop:1 transparent);"
+        "margin: 2px 0;"
+    "}"
+    "QSlider::handle:horizontal {"
+        "background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);"
+        "border: 1px solid #5c5c5c;"
+        "width: 16px;"
+        "height: 16px;"
+        "margin: -2px 0;"
+        "border-radius: 8px;"
+    "}"
+
+    );
+}
+
+*/
+
+void MediaView::downloadStatusChanged() {
+    switch(downloadItem->status()) {
+    case Downloading:
+        startPlaying();
+        break;
+    case Starting:
+        qDebug() << "Starting";
+        break;
+    case Finished:
+        qDebug() << "Finished";
+        break;
+    case Failed:
+        qDebug() << "Failed";
+    case Idle:
+        qDebug() << "Idle";
+        break;
+    }
+}
+
+void MediaView::startPlaying() {
+    if (reallyStopped) return;
+
     // go!
-    qDebug() << "Playing" << streamUrl.toString();
-    mediaObject->setCurrentSource(streamUrl);
+    qDebug() << "Playing" << downloadItem->currentFilename();
+    mediaObject->setCurrentSource(downloadItem->currentFilename());
     mediaObject->play();
 
     // ensure we always have 10 videos ahead
@@ -364,7 +467,7 @@ void MediaView::copyWebPage() {
 void MediaView::copyVideoLink() {
     Video* video = listModel->activeVideo();
     if (!video) return;
-    QApplication::clipboard()->setText(video->getStreamUrl().toString());
+    QApplication::clipboard()->setText(video->getStreamUrl().toEncoded());
     QString message = tr("You can now paste the video stream URL into another application")
                       + ". " + tr("The link will be valid only for a limited time.");
     QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(window());
@@ -500,3 +603,50 @@ void MediaView::fullscreen() {
     videoAreaWidget->setParent(0);
     videoAreaWidget->showFullScreen();
 }
+
+/*
+void MediaView::setSlider(QSlider *slider) {
+    this->slider = slider;
+    // slider->setEnabled(false);
+    slider->setTracking(false);
+    // connect(slider, SIGNAL(valueChanged(int)), SLOT(sliderMoved(int)));
+}
+
+void MediaView::sliderMoved(int value) {
+    qDebug() << __func__;
+    int sliderPercent = (value * 100) / (slider->maximum() - slider->minimum());
+    qDebug() << slider->minimum() << value << slider->maximum();
+    if (sliderPercent <= downloadItem->currentPercent()) {
+        qDebug() << sliderPercent << downloadItem->currentPercent();
+        mediaObject->seek(value);
+    } else {
+        seekTo(value);
+    }
+}
+
+void MediaView::seekTo(int value) {
+    qDebug() << __func__;
+    mediaObject->pause();
+    workaroundTimer->stop();
+    errorTimer->stop();
+    // mediaObject->clear();
+
+    QString tempDir = QDesktopServices::storageLocation(QDesktopServices::TempLocation);
+    QString tempFile = tempDir + "/minitube" + QString::number(value) + ".mp4";
+    if (!QFile::remove(tempFile)) {
+        qDebug() << "Cannot remove temp file";
+    }
+    Video *videoCopy = downloadItem->getVideo()->clone();
+    QUrl streamUrl = videoCopy->getStreamUrl();
+    streamUrl.addQueryItem("begin", QString::number(value));
+    if (downloadItem) delete downloadItem;
+    downloadItem = new DownloadItem(videoCopy, streamUrl, tempFile, this);
+    connect(downloadItem, SIGNAL(statusChanged()), SLOT(downloadStatusChanged()));
+    // connect(downloadItem, SIGNAL(finished()), SLOT(itemFinished()));
+    downloadItem->start();
+
+    // slider->setMinimum(value);
+
+}
+
+*/
index 7a19d68d58aa897eb716a07bf9cab62a8c01f1b4..f61799a7806ac4072fd4dc95ecf827337e1fdb2a 100644 (file)
@@ -13,6 +13,8 @@
 #include "loadingwidget.h"
 #include "videoareawidget.h"
 
+class DownloadItem;
+
 namespace The {
     QMap<QString, QAction*>* globalActions();
 }
@@ -32,13 +34,14 @@ public:
     QMap<QString, QVariant> metadata() {
         QMap<QString, QVariant> metadata;
         if (searchParams) {
-            metadata.insert("title", searchParams->keywords());
-            metadata.insert("description", tr("You're watching \"%1\"").arg(searchParams->keywords()));
+            metadata.insert("title", "");
+            metadata.insert("description", "");
         }
         return metadata;
     }
 
     void setMediaObject(Phonon::MediaObject *mediaObject);
+    void setSlider(QSlider *slider);
 
 public slots:
     void search(SearchParams *searchParams);
@@ -78,6 +81,14 @@ private slots:
 #ifdef APP_DEMO
     void demoMessage();
 #endif
+    void startPlaying();
+    void downloadStatusChanged();
+
+    /*
+    void downloadProgress(int percent);
+    void sliderMoved(int value);
+    void seekTo(int value);
+    */
 
 private:
 
@@ -114,6 +125,9 @@ private:
     QTimer *demoTimer;
 #endif
 
+    DownloadItem *downloadItem;
+    // QSlider *slider;
+
 };
 
 #endif // __MEDIAVIEW_H__
index d1907f0d68215f2d4f876273f6b664f0586b304e..76f7da4abe9980b65789db1f3b7c1b6bda2e717f 100644 (file)
@@ -135,9 +135,18 @@ void SearchView::updateRecentKeywords() {
     The::globalActions()->value("clearRecentKeywords")->setEnabled(!keywords.isEmpty());
 
     foreach (QString keyword, keywords) {
-        QLabel *itemLabel = new QLabel("<a href=\"" + keyword
+        QString link = keyword;
+        QString display = keyword;
+        if (keyword.startsWith("http://")) {
+            int separator = keyword.indexOf("|");
+            if (separator > 0 && separator + 1 < keyword.length()) {
+                link = keyword.left(separator);
+                display = keyword.mid(separator+1);
+            }
+        }
+        QLabel *itemLabel = new QLabel("<a href=\"" + link
                                        + "\" style=\"color:palette(text); text-decoration:none\">"
-                                       + keyword + "</a>", this);
+                                       + display + "</a>", this);
 
         itemLabel->setMaximumWidth(queryEdit->width() + watchButton->width());
         // itemLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
index ab92fc328a345c102d82f1a9acbb2534c12acf4b..1219fb489944ca9800af9aae1075e03cc648d544 100644 (file)
@@ -99,7 +99,6 @@ void DownloadItem::downloadReadyRead() {
         emit statusChanged();
     }
 
-    m_status = Downloading;
     if (-1 == m_file.write(m_reply->readAll())) {
         /*
         downloadInfoLabel->setText(tr("Error saving: %1")
@@ -108,7 +107,10 @@ void DownloadItem::downloadReadyRead() {
         */
     } else {
         m_startedSaving = true;
-        if (m_finishedDownloading)
+        if (m_status != Downloading) {
+            // m_status = Downloading;
+            // emit statusChanged();
+        } else if (m_finishedDownloading)
             requestFinished();
     }
 }
@@ -157,6 +159,14 @@ void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
         percent = bytesReceived * 100 / bytesTotal;
     }
 
+    // qDebug() << bytesReceived << bytesTotal;
+    if (m_status != Downloading
+        && bytesReceived > 1024 * 512
+        && bytesReceived > bytesTotal * .01) {
+        m_status = Downloading;
+        emit statusChanged();
+    }
+
     emit progress(percent);
     // emit statusChanged();
 }
index 1d6b1f19874899a89da272346574af81bd4019f3..7ccf4db87937c09818fbb37de77dba82603e8ef9 100644 (file)
@@ -31,6 +31,7 @@ public:
     double currentSpeed() const;
     int currentPercent() const { return percent; }
     Video* getVideo() const { return video; }
+    QString currentFilename() const { return m_file.fileName(); }
     DownloadItemStatus status() const { return m_status; }
     static QString formattedFilesize(qint64 size);
     static QString formattedSpeed(double speed);
index 378cb1a80fd51e9573e27b2e778ef6dc46141d1e..4c4058ee95a56bef68343afb5fe66042382c51e6 100644 (file)
@@ -6,9 +6,13 @@ namespace The {
     NetworkAccess* http();
 }
 
+/*
 const QString USER_AGENT = QString(Constants::APP_NAME)
                            + " " + Constants::VERSION
                            + " (" + Constants::WEBSITE + ")";
+*/
+
+const QString USER_AGENT = "Mozilla/5.0 (X11; U; Linux x86; en-US; rv:1.9.2.12) Gecko/20101028 Firefox/3.6.12";
 
 NetworkReply::NetworkReply(QNetworkReply *networkReply) : QObject(networkReply) {
     this->networkReply = networkReply;
@@ -54,24 +58,20 @@ void NetworkReply::requestError(QNetworkReply::NetworkError code) {
 
 NetworkAccess::NetworkAccess( QObject* parent) : QObject( parent ) {}
 
-QNetworkReply* NetworkAccess::simpleGet(QUrl url, int operation) {
+QNetworkReply* NetworkAccess::manualGet(QNetworkRequest request, int operation) {
 
     QNetworkAccessManager *manager = The::networkAccessManager();
 
-    QNetworkRequest request(url);
-    request.setRawHeader("User-Agent", USER_AGENT.toUtf8());
-    request.setRawHeader("Connection", "Keep-Alive");
-
     QNetworkReply *networkReply;
     switch (operation) {
 
     case QNetworkAccessManager::GetOperation:
-        qDebug() << "GET" << url.toString();
+        qDebug() << "GET" << request.url().toEncoded();
         networkReply = manager->get(request);
         break;
 
     case QNetworkAccessManager::HeadOperation:
-        qDebug() << "HEAD" << url.toString();
+        qDebug() << "HEAD" << request.url().toEncoded();
         networkReply = manager->head(request);
         break;
 
@@ -86,7 +86,18 @@ QNetworkReply* NetworkAccess::simpleGet(QUrl url, int operation) {
             this, SLOT(error(QNetworkReply::NetworkError)));
 
     return networkReply;
+}
+
+QNetworkReply* NetworkAccess::simpleGet(QUrl url, int operation) {
+
+    QNetworkRequest request(url);
+    request.setRawHeader("User-Agent", USER_AGENT.toUtf8());
+    request.setRawHeader("Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7");
+    request.setRawHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
+    request.setRawHeader("Accept-Language", "en-us,en;q=0.5");
+    // request.setRawHeader("Connection", "Keep-Alive");
 
+    return manualGet(request, operation);
 }
 
 NetworkReply* NetworkAccess::get(const QUrl url) {
index 64cf5086c35025ed38235bad7bca04cfb9a4bc34..58e55e3b1caccb9d15130506d24bac3147340d89 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef NETWORKACCESS_H
 #define NETWORKACCESS_H
 
+#include <QtCore>
 #include <QtNetwork>
 
 namespace The {
@@ -35,6 +36,7 @@ class NetworkAccess : public QObject {
 
 public:
     NetworkAccess( QObject* parent=0);
+    QNetworkReply* manualGet(QNetworkRequest request, int operation = QNetworkAccessManager::GetOperation);
     QNetworkReply* simpleGet(QUrl url, int operation = QNetworkAccessManager::GetOperation);
     NetworkReply* get(QUrl url);
     NetworkReply* head(QUrl url);
index 35e837109f7fd927321dfe56d4666ab75b38de94..7b7a803de33d28ca07a891e0690cf9a9192d9a6b 100644 (file)
@@ -102,6 +102,8 @@ void  Video::getVideoInfo() {
 void  Video::gotVideoInfo(QByteArray data) {
     QString videoInfo = QString::fromUtf8(data);
 
+    // qDebug() << "videoInfo" << videoInfo;
+
     // get video token
     QRegExp re = QRegExp("^.*&token=([^&]+).*$");
     bool match = re.exactMatch(videoInfo);
@@ -118,7 +120,6 @@ void  Video::gotVideoInfo(QByteArray data) {
     // qDebug() << "videoToken" << videoToken;
     this->videoToken = videoToken;
 
-    /*
     // get fmt_url_map
     re = QRegExp("^.*&fmt_url_map=([^&]+).*$");
     match = re.exactMatch(videoInfo);
@@ -129,32 +130,54 @@ void  Video::gotVideoInfo(QByteArray data) {
         getVideoInfo();
         return;
     }
+
     QString fmtUrlMap = re.cap(1);
+    fmtUrlMap = QByteArray::fromPercentEncoding(fmtUrlMap.toUtf8());
 
-    while (fmtUrlMap.contains('%'))
-        fmtUrlMap = QByteArray::fromPercentEncoding(fmtUrlMap.toAscii());
+    QSettings settings;
+    QString definitionName = settings.value("definition").toString();
+    int definitionCode = VideoDefinition::getDefinitionCode(definitionName);
 
-    qDebug() << "fmtUrlMap" << fmtUrlMap;
+    // qDebug() << "fmtUrlMap" << fmtUrlMap;
     QStringList formatUrls = fmtUrlMap.split(",", QString::SkipEmptyParts);
+    QHash<int, QString> urlMap;
     foreach(QString formatUrl, formatUrls) {
         int separator = formatUrl.indexOf("|");
         if (separator == -1) continue;
         int format = formatUrl.left(separator).toInt();
         QString url = formatUrl.mid(separator + 1);
-        qDebug() << format << url;
+
+        if (format == definitionCode) {
+            QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
+            m_streamUrl = videoUrl;
+            emit gotStreamUrl(videoUrl);
+            loadingStreamUrl = false;
+            return;
+        }
+
+        urlMap.insert(format, url);
     }
-    */
 
-    QSettings settings;
-    QString definitionName = settings.value("definition").toString();
-    int definitionCode = VideoDefinition::getDefinitionCode(definitionName);
-    if (definitionCode == 18) {
-        // This is assumed always available
-        foundVideoUrl(videoToken, 18);
-    } else {
-        findVideoUrl(definitionCode);
+    QList<int> definitionCodes = VideoDefinition::getDefinitionCodes();
+    int currentIndex = definitionCodes.indexOf(definitionCode);
+    int previousIndex = 0;
+    while (currentIndex >= 0) {
+        previousIndex = currentIndex - 1;
+        int definitionCode = definitionCodes.at(previousIndex);
+        if (urlMap.contains(definitionCode)) {
+            qDebug() << "Found format" << definitionCode;
+            QString url = urlMap.value(definitionCode);
+            QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
+            m_streamUrl = videoUrl;
+            emit gotStreamUrl(videoUrl);
+            loadingStreamUrl = false;
+            return;
+        }
+        currentIndex--;
     }
 
+    emit errorStreamUrl(tr("Cannot get video stream for %1").arg(m_webpage.toString()));
+
 }
 
 void Video::foundVideoUrl(QString videoToken, int definitionCode) {