merge of 2c58b60e1d3b3e6180e692b5ecb380645848d3f6

     and d720748eefecadc42fdb329ec2dd5eea284c11ba

27 files changed, 2837 insertions, 7 deletions

diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb
index 51ab8cee83..d3af648813 100644
--- a/packages/nunome/nunome_1.0.1.bb
+++ b/packages/nunome/nunome_1.0.1.bb
@@ -3,8 +3,8 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
-RDEPENDS = "font-ttf-japanese"
-PR = "r0"
+RDEPENDS = "virtual/japanese-font"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
 	file://nunome.patch;patch=1"
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
index 97f030d3e2..feceb39bce 100644
--- a/packages/openobex/openobex_1.2.bb
+++ b/packages/openobex/openobex_1.2.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "The Openobex project aims to make an \
-open source implementation of the Object Exchange \
-(OBEX) protocol."
+DESCRIPTION = "The Openobex project is an open source implementation of the \
+Object Exchange (OBEX) protocol."
 HOMEPAGE = "http://openobex.triq.net"
 SECTION = "libs"
 PROVIDES = "openobex-apps"
+DEPENDS = "libusb bluez-libs"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1" \
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
 inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
-                --with-usb=${STAGING_DIR} --with-bluez=${STAGING_DIR}"
+                --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
 
 do_stage() {
 	oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
new file mode 100644
index 0000000000..ba79c83c95
--- /dev/null
+++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display"
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+MAINTAINER = "Rolf Leggewie <openembedded-unismall@rolf.leggewie.biz>"
+LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/"
+RPROVIDES = "virtual/japanese-font"
+
+SRC_URI = "http://prdownloads.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz"
+
+S = "${WORKDIR}"
+
+do_install () { 
+        install -d ${D}${palmqtdir}/lib/fonts/ 
+	cd unismall*
+	for i in *_100_*.qpf; do 
+		ln -sf $i $(echo $i | sed 's/_100_/_160_/')
+	done
+	for i in *.qpf; do 
+		install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+	done
+} 
+
+inherit qpf
diff --git a/packages/visual-boot/.mtn2git_empty b/packages/visual-boot/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/visual-boot/.mtn2git_empty
diff --git a/packages/visual-boot/files/.mtn2git_empty b/packages/visual-boot/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/visual-boot/files/.mtn2git_empty
diff --git a/packages/visual-boot/files/svg-source/.mtn2git_empty b/packages/visual-boot/files/svg-source/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/.mtn2git_empty
diff --git a/packages/visual-boot/files/svg-source/images/.mtn2git_empty b/packages/visual-boot/files/svg-source/images/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/.mtn2git_empty
diff --git a/packages/visual-boot/files/svg-source/images/energy.png b/packages/visual-boot/files/svg-source/images/energy.png
new file mode 100644
index 0000000000..cb314aa63d
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/energy.png
diff --git a/packages/visual-boot/files/svg-source/images/gnome-fs-blockdev.png b/packages/visual-boot/files/svg-source/images/gnome-fs-blockdev.png
new file mode 100644
index 0000000000..ca23dc1941
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/gnome-fs-blockdev.png
diff --git a/packages/visual-boot/files/svg-source/images/handheld.png b/packages/visual-boot/files/svg-source/images/handheld.png
new file mode 100644
index 0000000000..10cc239328
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/handheld.png
diff --git a/packages/visual-boot/files/svg-source/images/kcmx.png b/packages/visual-boot/files/svg-source/images/kcmx.png
new file mode 100644
index 0000000000..99a635905d
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/kcmx.png
diff --git a/packages/visual-boot/files/svg-source/images/kdebluetooth.png b/packages/visual-boot/files/svg-source/images/kdebluetooth.png
new file mode 100644
index 0000000000..1051bed663
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/kdebluetooth.png
diff --git a/packages/visual-boot/files/svg-source/images/nfs_unmount.png b/packages/visual-boot/files/svg-source/images/nfs_unmount.png
new file mode 100644
index 0000000000..b5638bc165
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/images/nfs_unmount.png
diff --git a/packages/visual-boot/files/svg-source/visual-boot-apm.svg b/packages/visual-boot/files/svg-source/visual-boot-apm.svg
new file mode 100644
index 0000000000..10f075c2a2
--- /dev/null
+++ b/packages/visual-boot/files/svg-source/visual-boot-apm.svg
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   width="8cm"
+   height="6cm"
+   sodipodi:docname="visual-boot-apm.svg"
+   sodipodi:docbase="/home/mhentges/mhcln01/fs_root/media/md2/chroot/oe-jail/home/mhentges/OpenEmbedded/out.akita/tmp/work/gpe-bootsplash-1.15-r7/install/gpe-bootsplash/usr/share/gpe/bb"
+   version="1.0"
+   inkscape:export-filename="/media/xaos/projekty2006/OpenZaurus/bootsplash-landscape.png"
+   inkscape:export-xdpi="203.2"
+   inkscape:export-ydpi="203.2">
+  <metadata
+     id="metadata27">
+    <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>bootsplashscreen</dc:title>
+        <dc:date>2006-03-23</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Sebastian (xaos) Rosik</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Sebastian (xaos) Rosik</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Sebastian (xaos) Rosik</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Open Zaurus</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/LGPL/2.1/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3">
+    <marker
+       inkscape:stockid="Dot_m"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Dot_m"
+       style="overflow:visible">
+      <path
+         id="path2603"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
+         transform="scale(0.4) translate(7.125493, 1)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path2668"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.8) rotate(180)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path2671"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8)" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2363">
+      <stop
+         style="stop-color:#ebebeb;stop-opacity:1;"
+         offset="0"
+         id="stop2365" />
+      <stop
+         style="stop-color:#ebebeb;stop-opacity:0;"
+         offset="1"
+         id="stop2367" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2309">
+      <stop
+         style="stop-color:#bcbcdb;stop-opacity:1;"
+         offset="0"
+         id="stop2311" />
+      <stop
+         style="stop-color:#d9d9e5;stop-opacity:1;"
+         offset="1"
+         id="stop2313" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2301">
+      <stop
+         style="stop-color:#e6e6ee;stop-opacity:1;"
+         offset="0"
+         id="stop2303" />
+      <stop
+         style="stop-color:#e6e6ee;stop-opacity:0;"
+         offset="1"
+         id="stop2305" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2289">
+      <stop
+         style="stop-color:#8a8aea;stop-opacity:1;"
+         offset="0"
+         id="stop2291" />
+      <stop
+         style="stop-color:#a6a6ea;stop-opacity:0;"
+         offset="1"
+         id="stop2293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2295"
+       x1="128.97487"
+       y1="159.66859"
+       x2="128.73007"
+       y2="132.59842"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2299"
+       gradientUnits="userSpaceOnUse"
+       x1="126.5"
+       y1="170.09842"
+       x2="123.25"
+       y2="132.59842"
+       gradientTransform="matrix(-0.303456,0.000000,0.000000,1.000000,196.6062,0.000000)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2301"
+       id="linearGradient2307"
+       x1="121.62238"
+       y1="163.66666"
+       x2="157.97446"
+       y2="182.03502"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2309"
+       id="linearGradient2315"
+       x1="149.55309"
+       y1="158.1512"
+       x2="96.873627"
+       y2="156.73698"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2324"
+       gradientUnits="userSpaceOnUse"
+       x1="128.97487"
+       y1="159.66859"
+       x2="128.73007"
+       y2="132.59842"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2309"
+       id="linearGradient2342"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)"
+       x1="149.55309"
+       y1="158.1512"
+       x2="96.873627"
+       y2="156.73698" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2301"
+       id="linearGradient2344"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)"
+       x1="121.62238"
+       y1="163.66666"
+       x2="157.97446"
+       y2="182.03502" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.411923,0.000000,0.000000,1.411923,-56.17121,-81.51385)"
+       x1="128.97487"
+       y1="159.66859"
+       x2="128.73007"
+       y2="132.59842" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2363"
+       id="linearGradient2369"
+       x1="278.89688"
+       y1="16.994432"
+       x2="-18.270702"
+       y2="92.226738"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#eeeeee"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.631714"
+     inkscape:cx="124.65391"
+     inkscape:cy="101.9141"
+     inkscape:window-width="1147"
+     inkscape:window-height="823"
+     showguides="true"
+     snaptoguides="true"
+     inkscape:window-x="193"
+     inkscape:window-y="64"
+     inkscape:current-layer="svg1"
+     inkscape:guide-bbox="true" />
+  <path
+     style="opacity:1;fill:url(#linearGradient2369);fill-opacity:1.0;stroke:none;stroke-width:2.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 1.3125 0 C 0.57260956 0.09351202 0 0.73392187 0 1.5 L 0 108.9375 C 64.090977 71.12832 159.77949 47.125 266.59375 47.125 C 272.25866 47.125 277.8696 47.210199 283.46875 47.34375 L 283.46875 1.5 C 283.46875 0.669 282.79975 0 281.96875 0 L 1.5 0 C 1.4350781 0 1.3752026 -0.0079247475 1.3125 0 z "
+     id="rect2360" />
+  <g
+     id="g2348"
+     transform="matrix(0.151043,0.000000,0.000000,0.151043,-4.294217,-26.18901)">
+    <path
+       id="text2250"
+       d="M 90.499578,426.79369 C 90.499562,436.20941 93.324267,444.09505 98.973702,450.45062 C 104.79963,457.15931 112.3616,460.51365 121.65964,460.51364 C 130.95758,460.51365 138.51955,457.15931 144.34557,450.45062 C 149.99491,444.09505 152.81962,436.20941 152.8197,426.79369 L 152.8197,393.5151 C 152.81962,384.09949 149.99491,376.21385 144.34557,369.85817 C 138.51955,363.14959 130.95758,359.79525 121.65964,359.79514 C 112.3616,359.79525 104.79963,363.14959 98.973702,369.85817 C 93.324267,376.21385 90.499562,384.09949 90.499578,393.5151 L 90.499578,426.79369 M 164.29507,425.38133 C 164.29498,437.97485 160.38159,448.77347 152.55488,457.7772 C 144.37493,467.25175 134.07652,471.98901 121.65964,471.98901 C 109.24266,471.98901 98.944253,467.25175 90.764395,457.7772 C 82.937591,448.77347 79.024197,437.97485 79.024202,425.38133 L 79.024202,394.92745 C 79.024197,382.33405 82.937591,371.53544 90.764395,362.53158 C 98.944253,353.05716 109.24266,348.31989 121.65964,348.31977 C 134.07652,348.31989 144.37493,353.05716 152.55488,362.53158 C 160.38159,371.53544 164.29498,382.33405 164.29507,394.92745 L 164.29507,425.38133 M 212.77663,460.51364 C 221.30954,460.51365 228.6067,457.18873 234.66811,450.53889 C 240.55285,444.06562 243.49525,436.50365 243.49533,427.85295 C 243.49525,419.20233 240.55285,411.64036 234.66811,405.16702 C 228.6067,398.45841 221.30954,395.10407 212.77663,395.10399 C 204.18477,395.10407 196.94646,398.45841 191.06169,405.16702 C 185.41225,411.58152 182.58754,419.14349 182.58756,427.85295 C 182.58754,436.5625 185.41225,444.12447 191.06169,450.53889 C 196.94646,457.18873 204.18477,460.51365 212.77663,460.51364 M 212.77663,471.98901 C 199.83001,471.98901 189.61988,466.22191 182.1462,454.68768 L 182.1462,505.26761 L 170.67082,505.26761 L 170.67082,385.5706 L 182.1462,385.5706 L 182.1462,400.92995 C 189.61988,389.39581 199.83001,383.6287 212.77663,383.62862 C 224.48734,383.6287 234.4915,388.10115 242.78915,397.04598 C 250.9101,405.81441 254.97061,416.08339 254.9707,427.85295 C 254.97061,439.6226 250.9101,449.86216 242.78915,458.57165 C 234.43265,467.51656 224.42849,471.98901 212.77663,471.98901 M 270.9338,429.17703 C 271.28687,437.53349 274.52351,444.80123 280.64373,450.98025 C 286.8816,457.33585 294.14933,460.51365 302.44695,460.51364 C 308.50825,460.51365 314.48132,458.65993 320.36619,454.95249 C 326.25092,451.24508 330.48798,446.65494 333.07737,441.18204 L 344.55275,443.2123 C 341.25717,451.3922 335.57834,458.248 327.51623,463.77971 C 319.51283,469.25258 311.15641,471.98901 302.44695,471.98901 C 290.73614,471.98901 280.67313,467.57541 272.25788,458.7482 C 263.84259,449.921 259.63496,439.6226 259.63497,427.85295 C 259.63496,416.08339 263.84259,405.78499 272.25788,396.95771 C 280.67313,388.07173 290.73614,383.6287 302.44695,383.62862 C 314.51074,383.6287 324.66203,388.24827 332.90083,397.48734 C 340.84523,406.37347 344.81748,416.93669 344.81757,429.17703 L 270.9338,429.17703 M 302.44695,395.10399 C 295.97362,395.10407 289.88285,397.36972 284.17462,401.90095 C 278.81942,406.13807 274.90602,411.40497 272.43442,417.70166 L 331.57675,417.70166 C 329.45814,411.34612 325.78014,406.02038 320.54273,401.7244 C 315.01095,397.31087 308.97903,395.10407 302.44695,395.10399 M 351.01677,385.5706 L 362.49215,385.5706 L 362.49215,400.92995 C 369.25965,389.39581 379.29324,383.6287 392.59294,383.62862 C 405.36292,383.6287 415.27881,387.74807 422.34065,395.98672 C 428.93155,403.69588 432.22704,414.08256 432.22713,427.14678 L 432.22713,470.04703 L 420.57521,470.04703 L 420.57521,427.85295 C 420.57513,418.14307 418.39775,410.43398 414.04307,404.72566 C 409.21746,398.31129 402.06743,395.10407 392.59294,395.10399 C 383.70684,395.10407 376.40969,398.37013 370.70146,404.9022 C 365.22856,411.14016 362.49213,418.7904 362.49215,427.85295 L 362.49215,470.04703 L 351.01677,470.04703 L 351.01677,385.5706 M 655.78587,460.51364 C 661.08215,460.51365 666.4079,459.6015 671.76313,457.7772 C 678.94253,455.36445 682.53226,452.06896 682.53233,447.89072 L 682.53233,428.47086 C 682.41456,429.35362 677.35363,429.9421 667.34952,430.2363 C 659.46383,430.53058 653.785,431.06021 650.313,431.8252 C 643.83968,433.17874 639.04357,435.88575 635.92464,439.94623 C 633.74724,442.77097 632.65856,445.41913 632.65858,447.89072 C 632.65856,456.30601 640.36765,460.51365 655.78587,460.51364 M 682.53233,407.81518 C 682.53226,403.93127 679.56043,400.66521 673.61684,398.01697 C 668.73239,395.89852 664.05398,394.83925 659.58157,394.83918 C 644.92837,394.83925 635.83635,399.95903 632.30549,410.19853 L 621.1832,407.81518 C 622.77209,399.45882 627.33281,393.19151 634.86538,389.01322 C 641.22094,385.42357 649.01831,383.6287 658.25749,383.62862 C 665.90769,383.6287 673.38139,385.39414 680.67861,388.92495 C 689.56459,393.22093 694.00762,398.75265 694.0077,405.5201 L 694.0077,456.62966 C 694.00762,458.9836 695.41997,460.27826 698.24476,460.51364 C 698.12698,462.39678 697.97986,466.19248 697.8034,471.90074 C 691.44773,471.54765 687.00471,468.98776 684.47431,464.22107 C 677.23593,469.3997 667.8791,471.98901 656.40378,471.98901 C 632.45259,471.98901 620.47701,463.89741 620.47702,447.71418 C 620.47701,443.35945 621.94822,439.00469 624.89063,434.64991 C 629.06883,428.3532 634.89478,424.23384 642.36851,422.29181 C 646.07591,421.29144 652.78458,420.67354 662.49455,420.43809 C 670.61553,420.20275 676.47091,419.11406 680.06071,417.17202 C 681.59069,416.34821 682.44398,414.9947 682.6206,413.11151 C 682.56168,413.75889 682.53226,411.99345 682.53233,407.81518 M 776.90226,470.04703 L 765.42689,470.04703 L 765.42689,457.95375 C 759.01238,467.31059 750.45,471.98901 739.7397,471.98901 C 727.85236,471.98901 718.61322,467.8108 712.02225,459.45437 C 706.01974,451.86299 703.01849,441.97652 703.0185,429.79494 L 703.0185,385.5706 L 714.49387,385.5706 L 714.49387,429.79494 C 714.49385,438.0337 716.61238,445.03662 720.84946,450.8037 C 725.55728,457.27701 731.85402,460.51365 739.7397,460.51364 C 748.33147,460.51365 754.92245,457.10046 759.51266,450.27407 C 763.45541,444.33044 765.42682,436.85674 765.42689,427.85295 L 765.42689,385.5706 L 776.90226,385.5706 L 776.90226,470.04703 M 796.39699,400.92995 C 803.92952,390.69047 813.90426,385.57069 826.32124,385.5706 L 844.32876,385.5706 L 844.32876,400.92995 C 838.26735,398.34071 832.47081,397.04605 826.93915,397.04598 C 818.28844,397.04605 811.02071,400.01788 805.13593,405.96147 C 799.30995,411.90518 796.39698,419.20233 796.39699,427.85295 L 796.39699,470.04703 L 784.74507,470.04703 L 784.74507,385.5706 L 796.39699,385.5706 L 796.39699,400.92995 M 917.87309,470.04703 L 906.39771,470.04703 L 906.39771,457.95375 C 899.98321,467.31059 891.42082,471.98901 880.71052,471.98901 C 868.82318,471.98901 859.58404,467.8108 852.99308,459.45437 C 846.99056,451.86299 843.98931,441.97652 843.98932,429.79494 L 843.98932,385.5706 L 855.4647,385.5706 L 855.4647,429.79494 C 855.46468,438.0337 857.58321,445.03662 861.82029,450.8037 C 866.52811,457.27701 872.82485,460.51365 880.71052,460.51364 C 889.30229,460.51365 895.89327,457.10046 900.48348,450.27407 C 904.42624,444.33044 906.39764,436.85674 906.39771,427.85295 L 906.39771,385.5706 L 917.87309,385.5706 L 917.87309,470.04703 M 935.5141,445.24256 C 935.86718,450.48006 939.39806,454.48173 946.10676,457.24757 C 951.22651,459.30726 956.90535,460.3371 963.14328,460.33709 C 968.43956,460.3371 973.32394,459.39554 977.79645,457.51239 C 983.62235,455.09963 986.53533,451.6276 986.53539,447.09628 C 986.53533,441.79998 983.00444,438.06313 975.94274,435.88572 C 974.11839,435.35612 966.70354,434.12031 953.69816,432.17829 C 944.1059,430.76597 937.4855,428.52975 933.83693,425.4696 C 930.42373,422.70379 928.15809,420.29102 927.03998,418.23129 C 925.74532,415.93627 925.09799,412.72905 925.09799,408.60963 C 925.09799,400.48866 929.18793,394.1625 937.36782,389.63112 C 944.07648,385.86493 951.84442,383.98179 960.67166,383.98171 C 969.85191,383.98179 977.88467,385.77666 984.76995,389.36631 C 993.1263,393.72114 997.86357,399.98845 998.98176,408.16827 L 987.85947,410.55162 C 985.68203,400.31212 976.00153,395.19234 958.81795,395.19227 C 953.52158,395.19234 948.84317,396.07506 944.78268,397.84043 C 939.36863,400.19442 936.66162,403.69588 936.66164,408.34481 C 936.66162,414.75931 941.48716,419.08464 951.13827,421.32081 C 958.55309,422.14474 965.99736,422.99803 973.47112,423.88071 C 980.82707,424.94002 987.44747,427.91184 993.33235,432.79619 C 996.86315,435.73863 998.62859,440.50532 998.62867,447.09628 C 998.62859,454.92309 994.39154,461.1904 985.91749,465.89824 C 978.85566,469.84106 971.0583,471.81247 962.52537,471.81247 C 953.40389,471.81247 945.40056,470.0176 938.51536,466.42787 C 930.21777,462.07312 925.50992,455.80581 924.39182,447.62591 L 935.5141,445.24256"
+       style="font-size:180.78131104px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Dustismo" />
+    <path
+       id="path2247"
+       d="M 460.23551,243.82114 C 459.31898,243.89717 458.49043,244.39657 457.99514,245.1715 C 451.11297,255.89584 448.54598,269.22076 448.14365,276.62874 C 448.06134,278.12763 449.11846,279.44904 450.59886,279.69774 C 474.86302,283.79193 499.24715,291.46335 513.3599,299.1245 C 513.37005,299.1348 513.38028,299.14504 513.39059,299.1552 L 514.18853,299.58485 L 513.57472,300.29073 C 513.57467,300.30096 513.57467,300.31119 513.57472,300.32142 C 507.60765,307.31484 499.94119,311.2365 488.93067,312.78156 C 478.66339,314.22232 465.20895,313.63986 447.31503,311.86085 C 446.47131,311.77281 445.63056,312.05245 445.00768,312.62832 C 444.38481,313.20419 444.04017,314.02046 444.06189,314.86847 C 444.15674,319.18478 444.93754,324.59771 446.14882,328.77104 C 446.48768,329.94201 447.51228,330.78366 448.72677,330.88865 C 464.1595,332.22498 486.04583,335.80126 500.89975,334.7249 L 502.83323,334.57145 L 501.51356,336.01387 C 501.51351,336.02411 501.51351,336.03433 501.51356,336.04457 C 493.14711,345.04958 480.38505,353.63463 467.96939,362.80625 C 455.55079,371.98004 443.54109,381.64281 436.75768,392.60623 C 429.62582,404.1328 425.62352,419.01306 427.55067,432.68736 C 429.44359,446.11876 437.11262,458.43375 453.33027,465.37221 C 453.69825,465.53258 454.09508,465.61613 454.49649,465.61772 L 538.70983,465.61772 C 538.85361,465.61799 538.99721,465.60772 539.1395,465.58703 C 546.37683,464.51117 554.05408,463.17254 561.5125,461.47458 C 561.10772,462.38738 561.1925,463.44303 561.73779,464.27953 C 562.28305,465.11603 563.2147,465.61966 564.21321,465.61772 L 607.88507,465.61772 C 608.77452,465.61802 609.61656,465.21674 610.17652,464.5257 C 610.73651,463.83466 610.95457,462.92775 610.76993,462.05768 C 610.37203,460.14013 609.65304,458.0519 608.25336,456.07313 C 605.9337,452.79373 601.88836,449.79939 595.39425,448.64615 C 594.69675,448.52153 593.9777,448.65226 593.3687,449.01443 C 591.96243,449.83949 590.52732,450.5243 589.1028,451.2548 C 591.83391,449.48385 594.93567,447.35665 595.05666,447.26511 C 595.10561,447.23233 595.1612,447.2059 595.21011,447.17303 C 616.84797,432.62844 634.0347,408.69158 632.25293,380.94403 C 632.17453,379.6573 631.2692,378.57073 630.01775,378.26138 C 628.7663,377.95203 627.45899,378.49165 626.79012,379.59367 C 616.74824,396.18812 599.50811,406.99458 573.51228,404.45256 L 570.22845,404.14566 C 568.75841,403.94947 567.57016,403.64443 566.20806,403.40911 C 567.54339,403.42961 568.76856,403.34173 569.95225,403.01014 C 571.17548,402.66685 572.0412,401.57851 572.10054,400.30941 C 572.22338,397.10178 570.83851,394.20857 569.1543,391.59345 C 567.4701,388.97834 565.36933,386.60379 563.44596,384.7189 L 561.5125,382.84681 C 561.43098,382.76139 561.31889,382.68614 561.23629,382.60129 C 562.62346,382.9481 564.0595,382.24948 564.64288,380.94403 C 566.33266,377.18714 568.02984,372.7856 569.67604,367.80871 C 570.11608,366.46215 569.53614,364.99298 568.29499,364.31005 C 566.33479,363.24338 564.90354,362.04911 563.63011,360.84208 C 565.06394,361.21489 566.86889,361.7576 568.35637,362.19244 C 568.48093,362.22886 570.20354,363.02254 571.57881,363.75764 C 572.26645,364.12517 572.93299,364.47131 573.48159,364.77041 C 574.0302,365.0695 574.25338,365.22904 574.83195,365.47628 C 575.4916,365.75815 576.18584,366.0817 576.91888,366.36628 C 577.76703,366.69422 578.71906,366.6124 579.49882,366.14454 C 580.27859,365.67669 580.7988,364.87516 580.90857,363.97246 L 581.24616,361.21036 L 581.33824,360.4738 L 582.04411,360.53518 C 582.05433,360.53523 582.06456,360.53523 582.07479,360.53518 L 586.49415,360.8114 C 587.44423,360.87374 588.36595,360.47338 588.96887,359.73648 C 589.57179,358.99957 589.78171,358.01683 589.53245,357.09791 L 588.36624,352.832 L 588.15141,352.09544 L 588.85728,351.84992 L 591.46593,350.95991 C 592.31695,350.6667 592.9874,350.00077 593.28634,349.15175 C 593.5853,348.30273 593.48,347.36365 593.00043,346.60193 C 590.53532,342.65994 587.63761,338.89896 584.37654,335.24662 C 581.64978,332.1927 579.92199,330.54391 578.79096,329.44622 C 579.15917,327.36982 579.50352,324.90282 579.74236,322.84787 C 582.07578,305.61005 583.27702,285.77003 581.85996,266.77725 C 581.77374,265.59503 580.98786,264.57943 579.86512,264.1993 C 547.08554,252.88897 513.2889,244.53461 460.51173,243.82114 C 460.4197,243.81682 460.32754,243.81682 460.23551,243.82114 L 460.23551,243.82114 z M 521.86103,267.69796 C 525.00067,268.26681 528.08764,268.74142 531.31354,269.50866 C 534.32828,270.22569 537.03663,271.11345 539.87605,271.96386 C 536.43316,273.61294 530.95469,275.42373 525.9428,275.61597 C 525.40579,275.00103 524.54566,273.96085 523.70243,272.27076 C 522.93408,270.73077 522.36721,269.16167 521.86103,267.69796 z M 537.45154,393.619 C 537.29321,393.56907 537.14026,393.38055 537.81982,393.86452 L 537.02189,394.96936 L 537.45154,393.619 z M 537.85052,394.14073 L 537.54361,394.72383 L 536.89913,395.39902 L 536.92981,395.24556 L 537.85052,394.14073 z M 537.05257,395.67523 L 536.92981,395.92075 L 536.71498,396.01281 L 536.74567,395.85937 L 537.05257,395.67523 z M 536.56153,396.41179 L 536.6536,396.44248 L 536.6536,396.47317 L 536.6536,396.50386 L 536.56153,396.44248 L 536.56153,396.41179 z "
+       style="fill:#ffc72f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       id="path1324"
+       d="M 456.55272,239.21764 L 455.41719,240.81352 C 445.79319,254.35229 443.05671,271.70316 443.44809,279.97395 L 443.60154,283.04295 L 446.60916,283.50331 C 448.00699,283.71994 449.41535,283.96614 450.81369,284.20918 C 450.8232,284.21083 450.83486,284.20752 450.84438,284.20918 C 452.56215,287.46739 455.63611,290.44493 458.02584,291.69752 C 461.15843,291.83095 464.61575,290.22197 467.75457,287.76921 C 468.36675,287.91927 468.98772,288.04514 469.59597,288.19887 C 471.30919,291.474 474.40793,294.42915 476.80811,295.68723 C 479.51175,295.80237 482.47504,294.61827 485.24786,292.7103 C 486.2101,293.02049 487.1633,293.3148 488.10204,293.63099 C 488.92509,295.65489 490.17201,297.48974 491.32448,298.54139 C 493.53889,299.22513 496.28812,298.76759 498.99698,297.65138 C 501.68812,298.73969 504.20909,299.83808 506.51603,300.93522 C 503.76559,303.28345 500.68054,305.05156 496.91006,306.33666 C 496.90158,306.33955 496.88786,306.33377 496.87937,306.33666 C 495.10385,305.19039 493.2799,304.35152 491.78483,304.00422 C 489.26162,304.54723 486.82625,306.33075 484.69544,308.69979 C 484.58032,308.70996 484.47384,308.75142 484.35785,308.76117 C 482.02788,305.89486 478.39561,303.59353 475.79534,302.83799 C 472.62159,303.34186 469.49372,305.74397 466.86456,308.88393 C 466.26789,308.85652 465.63487,308.82449 465.02316,308.79185 C 462.95687,305.60205 459.36296,302.85141 456.73686,301.85592 C 453.46565,302.11119 450.07311,304.33349 447.16158,307.34943 C 446.07217,307.24032 444.97232,307.13036 443.84707,307.01184 L 440.3484,306.64356 L 439.76529,310.11153 C 438.64162,316.7282 440.08657,326.27355 442.65015,332.76074 L 443.50947,334.93973 L 445.84191,335.12386 C 458.13394,336.04119 476.21598,338.87469 491.60069,339.23633 C 484.16923,345.63822 474.68137,352.23155 465.26868,359.18482 C 452.75785,368.42675 440.31485,378.29376 432.92143,390.24309 C 425.28441,402.58611 420.96149,418.37118 423.06994,433.33185 C 425.17838,448.29251 434.20334,462.39773 452.22543,469.85295 L 452.90061,470.12915 L 453.66786,470.12915 L 611.96685,470.12915 L 615.49619,470.12915 L 615.68034,466.5998 C 615.90466,462.58229 614.98939,457.75029 611.93615,453.43379 C 610.00087,450.69778 607.11044,448.34477 603.40434,446.58992 C 626.30874,428.7483 642.94752,400.18301 634.76951,368.1463 L 631.85397,356.69893 L 627.68012,367.74733 C 620.0231,387.97643 604.36556,401.74365 576.76542,400.0639 C 575.71788,394.4841 572.71462,388.49816 568.32567,383.52199 C 570.11888,379.64532 571.89812,375.11833 573.63504,370.04908 C 575.81428,370.92024 577.99313,371.6548 580.04926,372.25877 L 584.28448,373.48637 L 584.8062,369.12839 L 585.29725,365.26144 L 591.43524,365.66041 L 596.68323,365.99801 L 595.27149,360.93416 L 593.64492,355.01098 L 597.35841,353.75269 L 601.47087,352.34095 L 599.47602,348.47402 C 595.53166,340.91677 590.02354,334.17857 583.76275,327.88104 C 586.80265,308.23802 588.13048,286.16016 586.21794,263.89239 L 586.00312,261.49858 L 583.73205,260.70063 C 549.51482,248.73849 514.24071,239.77904 458.48619,239.24833 L 456.55272,239.21764 z M 460.48104,246.76738 C 512.96582,247.47691 546.29904,255.73866 578.91373,266.99209 C 580.31024,285.70949 579.13751,305.44031 576.8268,322.51029 C 576.53092,325.05607 576.05631,328.7422 575.66058,330.45899 C 576.46421,331.23341 578.99323,333.65636 582.16687,337.21079 C 585.34051,340.76521 588.15781,344.39843 590.51454,348.16711 L 587.90589,349.05713 L 584.59138,350.19266 L 585.51207,353.59925 L 586.67829,357.86516 L 582.25893,357.58894 L 578.76027,357.34343 L 578.33062,360.84208 L 577.99302,363.60418 C 577.32747,363.34581 576.66297,363.05962 575.99817,362.77555 C 575.33339,362.49148 570.83212,359.85049 569.185,359.36896 C 567.53788,358.88744 565.20466,358.12814 563.50734,357.7424 C 562.18507,357.44186 558.224,356.38256 557.2159,356.4841 C 557.13274,357.28202 557.66475,358.87785 559.45627,360.84208 C 561.24776,362.80631 563.45773,365.02395 566.88325,366.88802 C 565.26587,371.7778 563.58405,376.09672 561.94216,379.74713 C 559.93176,378.53442 549.55964,374.72711 545.73784,375.23569 C 551.40038,378.15429 556.05476,381.36912 559.45627,384.93374 L 561.38974,386.83651 C 565.00256,390.37706 569.32264,395.79103 569.1543,400.18666 C 564.84758,401.39311 540.80941,397.71689 536.6536,396.47317 C 545.41079,400.94622 555.00093,405.09651 569.95225,407.0919 L 573.23607,407.3988 C 600.18842,410.03436 618.76769,398.54416 629.3067,381.12817 C 631.00726,407.61113 614.49269,430.70642 593.4301,444.8099 C 593.4301,444.8099 588.97331,448.15623 585.7576,449.96583 C 573.79661,456.69667 555.05142,460.24222 538.70983,462.67148 L 454.49649,462.67148 C 439.09487,456.08215 432.24687,444.92312 430.46623,432.28839 C 428.66186,419.48536 432.48663,405.14166 439.27425,394.17142 C 445.6359,383.88964 457.37718,374.28625 469.71873,365.16938 C 482.06027,356.0525 494.92398,347.4442 503.66186,338.03942 L 510.13745,331.10348 L 500.68493,331.77866 C 486.53327,332.80414 464.60507,329.29606 448.9723,327.94241 C 447.86368,324.12277 447.09594,318.80359 447.00813,314.80709 C 464.98269,316.59412 478.61363,317.20084 489.32963,315.6971 C 500.8554,314.07975 509.37432,309.7728 515.81509,302.2242 L 518.82271,298.72554 L 514.77164,296.54655 C 500.14577,288.60683 475.62646,280.92235 451.0899,276.7822 C 451.46347,269.90346 454.03518,256.81181 460.48104,246.76738 z M 504.95084,262.69548 C 504.85586,262.69785 504.7673,262.72292 504.67462,262.72618 C 508.98826,263.77982 515.56707,265.84799 518.45444,267.02277 C 519.54169,270.76307 522.24446,276.88183 524.62313,278.68497 C 532.48742,278.86137 540.96261,275.21702 544.23403,272.91525 C 548.35352,273.34855 552.84398,275.03374 557.27728,275.61597 C 547.59457,269.19285 517.01467,262.39513 504.95084,262.69548 z M 523.64105,268.28107 C 527.19141,268.7033 532.60255,270.0499 537.66638,271.50351 C 535.77697,272.25326 532.19742,272.85154 527.66143,272.82319 C 526.44002,271.89729 524.19934,270.20169 523.64105,268.28107 z M 455.17168,285.00711 C 457.06027,285.37106 458.94594,285.73738 460.81862,286.14264 C 460.99264,286.18029 461.16653,286.2274 461.34036,286.26539 C 461.67809,286.33922 462.01613,286.40516 462.35312,286.48023 C 462.36302,286.48243 462.37393,286.47802 462.38382,286.48023 L 462.50658,286.51092 C 462.8124,286.57924 463.12211,286.65642 463.42727,286.72575 L 463.61142,286.75644 C 462.06042,288.12731 460.02831,290.10857 458.42481,290.04026 C 457.19557,289.39595 455.7939,286.7734 455.17168,285.00711 z M 474.13809,289.39577 C 476.66694,290.08328 479.14208,290.80562 481.56507,291.54408 C 480.16842,292.77782 478.55771,294.08618 477.23778,294.02997 C 476.09579,293.43139 474.81364,291.13336 474.13809,289.39577 z M 490.74137,294.521 C 492.44588,295.11939 494.1065,295.74999 495.71316,296.36241 C 494.42625,297.01221 492.9483,297.67756 491.96897,297.37518 C 491.4235,296.87744 490.98755,295.69388 490.74137,294.521 z M 456.39926,303.57456 C 456.44963,303.56669 456.50272,303.57845 456.55272,303.57456 C 457.89232,304.08237 459.65272,306.61961 460.45035,308.30082 L 451.76508,307.44149 C 453.09716,305.94255 454.83798,303.81836 456.39926,303.57456 z M 475.67259,304.55663 C 475.69736,304.55169 475.70919,304.56056 475.73396,304.55663 C 477.10971,304.95637 479.07116,307.3635 479.99987,308.97599 L 471.28392,308.79185 C 472.51212,307.16597 474.11145,304.86767 475.67259,304.55663 z M 491.78483,305.72285 C 492.43896,305.87481 493.248,306.45678 494.0252,307.19597 C 492.45704,307.59763 490.7704,307.90419 488.96135,308.17806 C 489.8293,306.99392 490.78535,305.93796 491.78483,305.72285 z M 536.0705,396.16627 C 536.06967,396.16769 536.07109,396.19551 536.0705,396.19695 C 536.0715,396.20016 536.06863,396.22433 536.0705,396.22765 C 536.07408,396.23118 536.09674,396.25468 536.10118,396.25833 C 536.17513,396.311 536.33161,396.36998 536.56153,396.44248 C 536.38969,396.3546 536.24174,396.25436 536.0705,396.16627 z M 594.87252,451.56171 C 600.7684