[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 38 commits - basic/source binaryurp/source canvas/source configure.ac cppcanvas/source cui/uiconfig editeng/source forms/source icon-themes/galaxy instsetoo_native/inc_common oox/source reportbuilder/java sc/inc sc/source sc/uiconfig sd/source setup_native/source sfx2/source svgio/source svtools/source svx/source sw/source vcl/source writerperfect/source
Andras Timar
andras.timar at collabora.com
Wed Feb 12 02:46:49 PST 2014
basic/source/runtime/methods.cxx | 3
binaryurp/source/bridge.cxx | 16
binaryurp/source/reader.cxx | 1
binaryurp/source/writer.cxx | 1
canvas/source/cairo/cairo_textlayout.cxx | 6
configure.ac | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 -
cui/uiconfig/ui/colorpage.ui | 4
editeng/source/outliner/outlvw.cxx | 23
forms/source/component/EditBase.cxx | 46
icon-themes/galaxy/brand_cp/about.svg | 269 +++--
icon-themes/galaxy/brand_cp/backing_left.png |binary
icon-themes/galaxy/brand_cp/backing_right.png |binary
icon-themes/galaxy/brand_cp/backing_rtl_left.png |binary
icon-themes/galaxy/brand_cp/backing_rtl_right.png |binary
icon-themes/galaxy/brand_cp/backing_space.png |binary
icon-themes/galaxy/brand_cp/flat_logo.svg | 487 ++++++----
icon-themes/galaxy/brand_cp/intro.png |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary
oox/source/ppt/timenodelistcontext.cxx | 5
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java | 5
sc/inc/column.hxx | 2
sc/inc/formulacell.hxx | 5
sc/inc/table.hxx | 7
sc/source/core/data/column.cxx | 6
sc/source/core/data/document.cxx | 26
sc/source/core/data/dptabres.cxx | 2
sc/source/core/data/formulacell.cxx | 40
sc/source/core/data/table2.cxx | 4
sc/source/core/tool/cellform.cxx | 10
sc/source/filter/xml/xmlexprt.cxx | 7
sc/source/ui/miscdlgs/highred.cxx | 5
sc/uiconfig/scalc/ui/externaldata.ui | 20
sd/source/filter/ppt/pptinanimations.cxx | 5
sd/source/ui/dlg/PaneDockingWindow.cxx | 2
sd/source/ui/inc/PaneDockingWindow.hxx | 5
setup_native/source/mac/ooo/osxdndinstall.png |binary
sfx2/source/control/templatesearchview.cxx | 10
sfx2/source/doc/templatedlg.cxx | 2
sfx2/source/inc/templatesearchview.hxx | 8
svgio/source/svgreader/svgnode.cxx | 23
svtools/source/brwbox/brwbox1.cxx | 7
svx/source/svdraw/svdograf.cxx | 3
svx/source/svdraw/svdpagv.cxx | 11
sw/source/core/docnode/ndtbl.cxx | 17
sw/source/core/fields/reffld.cxx | 18
sw/source/core/graphic/ndgrf.cxx | 3
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/text/txtfly.cxx | 6
sw/source/core/txtnode/fntcache.cxx | 5
sw/source/core/txtnode/fntcap.cxx | 4
sw/source/core/txtnode/swfont.cxx | 8
sw/source/core/unocore/unostyle.cxx | 16
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/ui/shells/tabsh.cxx | 2
vcl/source/filter/jpeg/JpegReader.cxx | 6
writerperfect/source/common/DocumentHandler.cxx | 11
58 files changed, 796 insertions(+), 431 deletions(-)
New commits:
commit 14e2671d10dd9c1d4aa9106658ce382619613581
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Feb 12 11:53:01 2014 +0100
Bump version to 4.1-5
Change-Id: I90f4a8fd5eb62155fe81b1e19408da9e540d4958
diff --git a/configure.ac b/configure.ac
index cf87aab..53bae96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[4.1.10.4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.5],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
commit a45d519e5533023f8cb05174e61569207214c74c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 11 17:28:43 2014 +0100
Do not reference a dangling OUString
(cherry picked from commit 151f3d665581d887cda1e36b817afb124c5c789e)
Conflicts:
sw/source/core/unocore/unostyle.cxx
Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 1631a49..47b1acb 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1588,7 +1588,7 @@ struct SwStyleBase_Impl
rtl::Reference< SwDocStyleSheet > mxNewBase;
SfxItemSet* pItemSet;
- const String& rStyleName;
+ String rStyleName;
SwStyleBase_Impl(SwDoc& rSwDoc, const String& rName) :
rDoc(rSwDoc),
commit 68cd0dc45e34b856c23adef4835998d604e10e70
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 11 16:31:47 2014 +0100
nPDescPos is never read
...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 "#86296# use page descriptor
only if necessary", and this nicely removes the odd
for(i = 0; i < nPDescCount + 1; i++)
loop that read past the end of the maPageDescs vector.
(cherry picked from commit 7fb6ae28ae7bebd67c2b9bf2cf517f1f7bb2777e)
Conflicts:
sw/source/core/unocore/unostyle.cxx
Change-Id: I9b0f24231774eef7231eff4b053fd56c020c6e69
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 0e090be..1631a49 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1589,14 +1589,12 @@ struct SwStyleBase_Impl
SfxItemSet* pItemSet;
const String& rStyleName;
- sal_uInt16 nPDescPos;
SwStyleBase_Impl(SwDoc& rSwDoc, const String& rName) :
rDoc(rSwDoc),
pOldPageDesc(0),
pItemSet(0),
- rStyleName(rName),
- nPDescPos(0xffff)
+ rStyleName(rName)
{}
~SwStyleBase_Impl(){ delete pItemSet; }
@@ -1625,7 +1623,6 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
if(rDesc.GetName() == rStyleName)
{
pOldPageDesc = & rDesc;
- nPDescPos = i;
break;
}
}
@@ -1640,15 +1637,6 @@ const SwPageDesc& SwStyleBase_Impl::GetOldPageDesc()
break;
}
}
- for(i = 0; i < nPDescCount + 1; i++)
- {
- const SwPageDesc& rDesc = rDoc.GetPageDesc( i );
- if(rDesc.GetName() == rStyleName)
- {
- nPDescPos = i;
- break;
- }
- }
}
}
return *pOldPageDesc;
commit c3b321e7c405bd3d0f13bb1c37c6e01c87e70c74
Author: Andras Timar <andras.timar at collabora.com>
Date: Wed Feb 12 10:46:31 2014 +0100
new brand images
Change-Id: I2cdc50ef3b1c0c099cea91c4ba161cda5728a758
diff --git a/icon-themes/galaxy/brand_cp/about.svg b/icon-themes/galaxy/brand_cp/about.svg
index 408a21d..64ea4c4 100644
--- a/icon-themes/galaxy/brand_cp/about.svg
+++ b/icon-themes/galaxy/brand_cp/about.svg
@@ -1,52 +1,17 @@
<?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:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- width="486"
- height="322"
- id="svg1604"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="about.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1165"
- inkscape:window-height="869"
- id="namedview3097"
- showgrid="false"
- inkscape:zoom="0.62345679"
- inkscape:cx="243"
- inkscape:cy="161"
- inkscape:window-x="151"
- inkscape:window-y="62"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg1604" />
- <defs
- id="defs1606">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.1" width="486" height="500">
+ <defs>
<linearGradient
id="linearGradient11370">
<stop
id="stop11372"
- style="stop-color:#e9b913;stop-opacity:1"
+ stop-color="#e9b913" stop-opacity="1"
offset="0" />
<stop
id="stop11374"
- style="stop-color:#e9b913;stop-opacity:0"
+ stop-color="#e9b913" stop-opacity="0"
offset="1" />
</linearGradient>
<clipPath
@@ -54,95 +19,161 @@
<rect
width="486"
height="322"
- x="108.62851"
- y="137.47647"
+ x="108.63"
+ y="137.48"
id="rect12002"
- style="fill:#530260;fill-opacity:1;stroke:none" />
+ fill="#530260" fill-opacity="1" stroke="none" />
</clipPath>
<radialGradient
- cx="487.36145"
- cy="334.23981"
- r="97.501144"
- fx="487.36145"
- fy="334.23981"
+ cx="487.36"
+ cy="334.24"
+ r="97.50"
+ fx="487.36"
+ fy="334.24"
id="radialGradient11378"
xlink:href="#linearGradient11370"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,0.88685305,0,26.649594)" />
+ gradientTransform="matrix(1,0,0,0.,-183.019,-50.249)" />
</defs>
- <metadata
- id="metadata1609">
- <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>
<rect
width="486"
- height="322"
+ height="500"
x="-4.7851563e-07"
- y="-1.4311523e-05"
- id="rect10696"
- style="fill:#ffffff;fill-opacity:1;stroke:none" />
+ y="-1.5258789e-05"
+ fill="#ffffff" fill-opacity="1" stroke="none" />
<g
- transform="translate(0,-177)"
- id="g3129">
- <path
- style="fill:#204a87"
- inkscape:connector-curvature="0"
- d="m 486,486.339 c -0.237,0.125 -0.479,0.242 -0.73,0.346 -3.794,-1.957 -2.696,-7.22 -5.76,-9.746 -2.601,-2.706 -6.748,-2.248 -9.92,-3.551 -3.931,-2.954 -2.398,-8.438 -1.293,-12.362 2.031,-6.052 4.129,-13.422 0.041,-19.117 -2.683,-4.471 -8.379,-7.099 -13.517,-5.322 -6.914,1.708 -10.973,8.456 -12.902,14.801 -3.06,6.313 -12.29,8.115 -17.689,3.687 -3.908,-2.648 -8.385,-4.944 -13.231,-4.804 -4.26,-0.757 -5.258,-5.956 -5.087,-9.56 0.415,-9.181 4.071,-17.763 6.109,-26.651 1.941,-12.05 0.144,-24.848 -6.589,-35.138 -4.306,-6.957 -10.083,-12.954 -16.669,-17.892 -11.618,-8.885 -26.398,-14.456 -41.211,-13 -9.78,1.542 -19.4,5.967 -25.192,14.134 -8.542,11.155 -8.915,26.751 -4.27,39.508 7.678,20.212 25.999,36.434 47.428,40.831 6.566,1.646 13.443,0.907 19.981,0.028 5.88,0.148 10.935,6.688 9.172,12.283 -2.052,3.655 -5.547,6.55 -6.524,10.725 -2.561,7.121 0.115,15.299 6.119,19.825 6.745,5.524 16.872,6.924 24.291,2.456 5.059,-3.047 9.205,-7.676 11.097,-12.426 1.856,-4.663 3.919,-10.496 9.399,-12
.162 4.18,-1.203 8.104,1.334 11.483,3.491 3.223,1.561 8.04,-0.354 10.211,3.146 1.916,3.837 -0.348,8.221 -2.054,11.725 -2.549,4.333 -5.246,9.293 -3.782,14.455 0.327,1.489 1.035,2.821 1.989,3.952 h 18.117 c 2.645,-1.942 5.115,-4.224 7.961,-5.697 1.437,-0.332 2.259,0.536 3.021,1.529 v -9.494 z m -91.063,-60.792 c -12.423,12.667 -35.725,10.289 -51.685,-5.054 -15.962,-15.342 -19.098,-38.28 -6.674,-50.948 12.423,-12.666 35.75,-10.053 51.711,5.289 15.96,15.343 19.069,38.047 6.648,50.713 z m 20.417,58.791 c -3.511,1.571 -7.271,1.948 -10.75,1.301 -5.001,-0.93 -9.416,-3.977 -11.654,-8.634 -3.795,-7.896 0.108,-17.412 8.668,-21.244 8.559,-3.831 18.597,-0.557 22.393,7.34 3.796,7.895 -0.097,17.406 -8.657,21.237 z m 36.263,-23.093 c -4.972,-2.002 -7.197,-8.431 -4.971,-14.297 2.229,-5.866 8.633,-8.951 13.602,-6.95 4.971,2.003 6.893,8.406 4.666,14.272 -2.227,5.866 -8.328,8.977 -13.297,6.975 z m 25.592,32.314 c -1.868,2.554 -4.749,4.724 -7.217,5.523 -2.466,0.799 -4.963,0.62 -6.868,-0.747 -1.904,-1.36
8 -3.136,-4.22 -3.138,-6.791 -0.002,-2.569 0.66,-4.56 2.527,-7.112 1.868,-2.553 4.367,-4.399 6.834,-5.199 2.465,-0.799 5.228,-0.414 7.132,0.954 1.905,1.368 3.101,3.22 3.103,5.79 0,2.571 -0.505,5.03 -2.373,7.582 z"
- id="path3131" />
- <path
- style="fill:#204a87"
- inkscape:connector-curvature="0"
- d="m 432.257,490.581 c -0.998,0.373 -1.705,1.138 -2.502,1.807 -1.903,2.232 -2.596,4.932 -2.388,7.612 h 4.574 c -1.066,-2.407 -0.406,-5.086 1.685,-6.255 2.308,-1.29 5.46,-0.247 7.042,2.327 0,0.002 10e-4,0.004 10e-4,0.006 0.779,1.268 1.026,2.67 0.807,3.922 h 6.753 c -1.381,-6.733 -9.167,-12.657 -15.972,-9.419 z"
- id="path3133" />
- <path
- style="fill:#204a87"
- inkscape:connector-curvature="0"
- d="m 434.716,405.68 c -6.335,1.092 -10.952,8.429 -8.54,14.237 2.809,8.83 16.096,12.228 23.017,4.789 1.418,-1.355 2.192,-3.232 2.676,-5.057 1.67,-9.29 -8.457,-16.378 -17.153,-13.969 z m 8.087,14.02 c -1.064,3.113 -4.973,4.541 -8.73,3.187 -0.004,-10e-4 -0.008,-0.002 -0.011,-0.004 -3.756,-1.353 -5.939,-4.976 -4.873,-8.089 1.064,-3.113 4.974,-4.54 8.73,-3.188 0.003,0.002 0.007,0.002 0.01,0.004 3.757,1.354 5.939,4.976 4.874,8.09 z"
- id="path3135" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 440.669,496.078 c 0,-0.002 -10e-4,-0.004 -10e-4,-0.006 -1.582,-2.574 -4.734,-3.617 -7.042,-2.327 -2.091,1.169 -2.751,3.848 -1.685,6.255 h 9.534 c 0.22,-1.252 -0.027,-2.654 -0.806,-3.922 z"
- id="path3137" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 388.289,374.834 c -15.961,-15.342 -39.288,-17.955 -51.711,-5.289 -12.424,12.668 -9.288,35.606 6.674,50.948 15.96,15.343 39.262,17.721 51.685,5.054 12.421,-12.666 9.312,-35.37 -6.648,-50.713 z"
- id="path3139" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 401.618,455.761 c -8.56,3.832 -12.463,13.348 -8.668,21.244 2.238,4.657 6.653,7.704 11.654,8.634 3.479,0.647 7.239,0.271 10.75,-1.301 8.56,-3.831 12.452,-13.342 8.656,-21.237 -3.795,-7.897 -13.833,-11.171 -22.392,-7.34 z"
- id="path3141" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 464.914,454.271 c 2.227,-5.866 0.305,-12.27 -4.666,-14.272 -4.969,-2.001 -11.373,1.084 -13.602,6.95 -2.227,5.866 -0.001,12.295 4.971,14.297 4.969,2.001 11.071,-1.109 13.297,-6.975 z"
- id="path3143" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 476.479,480.187 c -1.904,-1.368 -4.667,-1.753 -7.132,-0.954 -2.467,0.8 -4.966,2.646 -6.834,5.199 -1.867,2.553 -2.529,4.543 -2.527,7.112 0.002,2.571 1.233,5.423 3.138,6.791 1.905,1.367 4.402,1.546 6.868,0.747 2.468,-0.8 5.349,-2.97 7.217,-5.523 1.868,-2.552 2.373,-5.011 2.373,-7.582 -0.002,-2.571 -1.197,-4.422 -3.103,-5.79 z"
- id="path3145" />
- <path
- style="fill:#6d9acb"
- inkscape:connector-curvature="0"
- d="m 437.919,411.606 c -3.757,-1.353 -7.666,0.074 -8.73,3.188 -1.066,3.113 1.117,6.736 4.873,8.089 0.003,0.002 0.007,0.003 0.011,0.004 3.758,1.354 7.666,-0.073 8.73,-3.187 1.065,-3.114 -1.117,-6.736 -4.874,-8.09 -0.003,-0.002 -0.007,-0.002 -0.01,-0.004 z"
- id="path3147" />
+ transform="matrix(0.73533,0,0,0.73560287,48.747204,162.00779)"
+ clip-path="url(#clipPath12000)"
+ opacity="0.6" fill="#43c330">
+ <path
+ d="m 387.37,390.36 58.25,0.43 c 0,0 5.6,0.02 5.59,5.99 l -0.43,57.53 c 0,0 -0.39,5.22 -3.76,1.79 -3.37,-3.42692 -60.98,-61.90002 -60.98898,-61.90002 0,0 -3.09373,-3.88589 1.3391,-3.85299"
+ opacity="0.22" fill="#43c330" stroke="none" />
+ <path
+ d="m 363.46,419.0742 57.03479,-43.60924 c 0,0 5.50008,-4.24516 9.97687,1.60986 l 43.06983,56.3293 c 0,0 3.57184,5.37903 -2.30574,4.59498 -5.87919,-0.78281 -106.16694,-14.16154 -106.16694,-14.16154 0,0 -5.9493,-1.44458 -1.60881,-4.76336"
+ opacity="0.21" fill="#43c330" stroke="none" />
+ <path
+ d="m 556.11,335.77719 23.45351,18.1423 c 0,0 2.27757,1.74532 0.41514,4.15298 l -17.9179,23.16342 c 0,0 -1.76838,1.99598 -2.07855,-0.4332 -0.31084,-2.4297 -5.60295,-43.87834 -5.60295,-43.87834 0,0 -0.0541,-2.52784 1.73075,-1.14716"
+ opacity="0.37" fill="#43c330" stroke="none" />
+ <path
+ d="m 494.48,411.9226 25.41052,37.36802 c 0,0 2.47541,3.60493 -1.36068,6.2135 l -36.9058,25.09621 c 0,0 -3.50531,2.0565 -2.80699,-1.60974 0.69759,-3.66731 12.61322,-66.22358 12.61322,-66.22358 0,0 1.11593,-3.68821 3.04973,-0.84441"
+ opacity="0.37" fill="#43c330" stroke="none" />
+ <path
+ d="m 461.51,323.2971 54.72499,30.27545 c 0,0 5.30905,2.90569 2.20107,8.52359 l -29.90096,54.04807 c 0,0 -3.04434,4.72947 -4.47218,-0.23452 -1.4294,-4.96485 -25.7918,-89.66463 -25.7918,-89.66463 0,0 -0.92583,-5.252 3.23888,-2.94796"
+ opacity="0.30" fill="#43c330" stroke="none" />
+ <path
+ d="m 476.74,325.18647 27.15045,-48.36586 c 0,0 2.60608,-4.69231 7.57117,-1.90513 l 47.76761,26.81462 c 0,0 4.17755,2.72585 -0.23258,3.96482 -4.41089,1.24034 -79.66009,22.38014 -79.66009,22.38014 0,0 -4.66278,0.79218 -2.59656,-2.88859"
+ opacity="0.34" fill="#43c330" stroke="none" />
+ <path
+ d="m 384.18,467.5217 -50.78858,-11.12355 c 0,0 -4.91971,-1.05409 -3.7778,-6.26789 l 10.98596,-50.16036 c 0,0 1.30219,-4.4909 3.61861,-0.87525 2.31787,3.61596 41.84208,65.30926 41.84208,65.30926 0,0 1.98487,3.96432 -1.88027,3.11779"
+ opacity="0.29" fill="#43c330" stroke="none" />
+ <path
+ d="m 476.89,459.52052 44.23792,-6.25066 c 0,0 4.27816,-0.62433 4.91983,3.91699 l 6.17336,43.69073 c 0,0 0.29608,4.00707 -2.65243,1.78864 -2.94978,-2.21827 -53.25941,-40.07144 -53.25941,-40.07144 0,0 -2.78589,-2.59857 0.58073,-3.07426"
+ opacity="0.41" fill="#43c330" stroke="none" />
+ <path
+ d="m 456.82,491.73487 -38.85708,-27.96494 c 0,0 -3.7725,-2.68908 -0.9017,-6.67803 l 27.61902,-38.37644 c 0,0 2.74202,-3.31941 3.37812,0.58297 0.6372,3.90318 11.49031,70.48878 11.49031,70.48878 0,0 0.22845,4.07586 -2.72867,1.94766"
+ opacity="0.1" fill="#43c330" stroke="none" />
+ <path
+ d="m 397.46,317.83211 14.73501,-52.40076 c 0,0 1.40286,-5.07731 6.78216,-3.56466 l 51.75259,14.55275 c 0,0 4.61395,1.63591 0.69324,3.83558 -3.92112,2.20116 -70.81955,39.73312 -70.81955,39.73312 0,0 -4.26483,1.8318 -3.14345,-2.15603"
+ opacity="0.26" fill="#43c330" stroke="none" />
+ <path
+ d="m 468.75,456.93783 -5.44905,-37.76023 c 0,0 -0.54391,-3.65166 3.33244,-4.21104 l 37.29315,-5.38164 c 0,0 3.42101,-0.26293 1.53405,2.26047 -1.88681,2.52448 -34.08394,45.58059 -34.08394,45.58059 0,0 -2.21197,2.3855 -2.62665,-0.48815"
+ opacity="0.27" fill="#43c330" stroke="none" />
+ <path
+ d="m 405.14,483.70663 -27.43003,-18.88304 c 0,0 -2.66271,-1.81525 -0.72423,-4.63113 l 18.64947,-27.09074 c 0,0 1.85866,-2.34838 2.3578,0.35629 0.49991,2.7052 9.01632,48.85443 9.01632,48.85443 0,0 0.21816,2.83124 -1.86933,1.39419"
+ opacity="0.32" fill="#43c330" stroke="none" />
+ <path
+ d="m 608.07,363.65349 -0.60883,20.07161 c 0,0 -0.0501,1.9426 -2.11058,1.88011 l -19.82335,-0.60131 c 0,0 -1.79747,-0.17479 -0.58973,-1.31141 1.20774,-1.13718 21.81514,-20.53094 21.81514,-20.53094 0,0 1.36369,-1.03556 1.31735,0.49194"
+ opacity="0.17" fill="#43c330" stroke="none" />
+ <path
+ d="m 552.74,375.81735 12.62287,51.6096 c 0,0 1.24421,4.98871 -4.05387,6.28453 l -50.97122,12.46673 c 0,0 -4.70672,0.82377 -2.42991,-2.92739 2.27645,-3.75262 41.12567,-67.75748 41.12567,-67.75748 0,0 2.74583,-3.60362 3.70646,0.32401"
+ opacity="0.39" fill="#43c330" stroke="none" />
+ <path
+ d="m 603.47,432.06683 -14.41592,49.42022 c 0,0 -1.3733,4.78874 -6.44662,3.30885 l -48.80893,-14.2376 c 0,0 -4.34839,-1.58944 -0.62038,-3.63368 3.72841,-2.04564 67.33888,-36.92561 67.33888,-36.92561 0,0 4.05006,-1.69318 2.95297,2.06782"
+ opacity="0.49" fill="#43c330" stroke="none" />
+ <path
+ d="m 644.50,400.94979 -32.16962,60.0491 c 0,0 -3.08664,5.8251 -9.2511,2.52267 l -59.30633,-31.7717 c 0,0 -5.19589,-3.24617 0.18965,-4.87433 5.38645,-1.62985 97.27898,-29.41001 97.27898,-29.41001 0,0 5.70661,-1.08561 3.25842,3.48427"
+ opacity="0.3" fill="#43c330" stroke="none" />
+ <path
+ d="m 449.80,463.75759 24.06622,-23.9497 c 0,0 2.31835,-2.32819 4.77696,0.14237 l 23.65345,23.76853 c 0,0 2.00504,2.30293 -0.79907,2.29612 -2.80479,-0.006 -50.65076,-0.12257 -50.65076,-0.12257 0,0 -2.8783,-0.31212 -1.0468,-2.13475"
+ opacity="0.18" fill="#43c330" stroke="none" />
+ <path
+ d="m 407.88,363.18063 32.69466,-59.73131 c 0,0 3.1376,-5.79458 9.26943,-2.43825 l 58.99248,32.29025 c 0,0 5.16424,3.29138 -0.23341,4.87032 -5.39857,1.58062 -97.49762,28.52094 -97.49762,28.52094 0,0 -5.71368,1.03376 -3.22554,-3.51195"
+ opacity="0.14" fill="#43c330" stroke="none" />
+ <path
+ d="m 458.49,396.18645 19.87012,-35.27442 c 0,0 1.90732,-3.42225 5.52848,-1.38245 l 34.8381,19.62434 c 0,0 3.04639,1.99419 -0.17404,2.89379 -3.22098,0.90061 -58.17046,16.25 -58.17046,16.25 0,0 -3.40437,0.57321 -1.8922,-2.11126"
+ opacity="0.22" fill="#43c330" stroke="none" />
+ <path
+ d="m 388.91,409.19135 -20.63124,-26.59848 c 0,0 -2.00818,-2.56487 0.72234,-4.6828 l 26.26947,-20.37605 c 0,0 2.5103,-1.6921 2.16181,1.0661 -0.3479,2.75895 -6.29436,49.82147 -6.29436,49.82147 0,0 -0.65793,2.79397 -2.22802,0.76976"
+ opacity="0.43" fill="#43c330" stroke="none" />
+ <path
+ d="m 526.23,487.54664 -29.25612,-50.37033 c 0,0 -2.85327,-4.86147 2.31759,-7.86482 l 49.74728,-28.89424 c 0,0 4.69508,-2.32376 3.46201,2.3264 -1.23223,4.65159 -22.27227,83.99608 -22.27227,83.99608 0,0 -1.77203,4.64022 -3.99849,0.80691"
+ opacity="0.05" fill="#43c330" stroke="none" />
+ <path
+ d="m 563.10,493.52003 -66.55731,-26.92351 c 0,0 -6.4526,-2.57612 -3.68871,-9.40869 l 26.59048,-65.73404 c 0,0 2.81438,-5.8113 5.12898,-0.35206 2.31649,5.46001 41.80935,98.61027 41.80935,98.61027 0,0 1.78239,5.85698 -3.28279,3.80803"
+ opacity="0.049" fill="#43c330" stroke="none" />
+ <path
+ d="m 393.40,370.0271 3.69159,-29.42155 c 0,0 0.34429,-2.84875 3.36462,-2.46979 l 29.05763,3.64593 c 0,0 2.61803,0.50738 0.68423,2.01 -1.9339,1.50345 -34.93003,27.14212 -34.93003,27.14212 0,0 -2.14897,1.33234 -1.86804,-0.90671"
+ opacity="0.08429661" fill="#43c330" stroke="none" />
+ <path
+ d="m 375.78,268.10832 27.89392,18.19907 c 0,0 2.7073,1.74886 0.83904,4.61236 l -17.97396,27.54889 c 0,0 -1.80006,2.3941 -2.36623,-0.29771 -0.56697,-2.69233 -10.22718,-48.62226 -10.22718,-48.62226 0,0 -0.28839,-2.82534 1.83441,-1.44035"
+ opacity="0.025" fill="#43c330" stroke="none" />
+ <path
+ d="m 477.83,385.88444 19.24792,-40.88606 c 0,0 1.84464,-3.96501 6.04187,-1.98908 l 40.38033,19.00983 c 0,0 3.55365,1.97194 0.0418,3.2356 -3.51235,1.26482 -63.43364,22.82596 -63.43364,22.82596 0,0 -3.74314,0.91528 -2.27833,-2.19625"
+ opacity="0.085" fill="#43c330" stroke="none" />
+ <path
+ d="m 459.8,451.90081 -29.13486,-55.34017 c 0,0 -2.84372,-5.34245 2.83733,-8.33334 l 54.65564,-28.77448 c 0,0 5.14032,-2.28312 3.60994,2.65018 -1.52956,4.93489 -27.64272,89.11074 -27.64272,89.11074 0,0 -2.1081,4.8986 -4.32533,0.68707"
+ opacity="0.07" fill="#43c330" stroke="none" />
+ <path
+ d="m 403.63,449.7412 -23.82568,-50.08775 c 0,0 -2.32763,-4.83652 2.81422,-7.28239 l 49.46821,-23.53097 c 0,0 4.63721,-1.83815 3.10351,2.47836 -1.53302,4.31794 -27.70268,77.9696 -27.70268,77.9696 0,0 -2.04438,4.26496 -3.85758,0.45315"
+ opacity="0.08" fill="#43c330" stroke="none" />
+ <path
+ d="m 516.81,390.82075 -27.88336,-34.90757 c 0,0 -2.71363,-3.36574 0.86988,-6.22816 l 34.47578,-27.53846 c 0,0 3.29932,-2.29314 2.8891,1.37383 -0.40942,3.66796 -7.4092,66.2366 -7.4092,66.2366 0,0 -0.82021,3.72031 -2.9422,1.06376"
+ opacity="0.09" fill="#43c330" stroke="none" />
+ <path
+ d="m 614.17,317.82733 16.10898,64.48591 c 0,0 1.58723,6.23321 -5.03269,7.88692 l -63.68826,15.90972 c 0,0 -5.88303,1.05951 -3.05783,-3.6472 2.82474,-4.70854 51.03102,-85.01785 51.03102,-85.01785 0,0 3.41285,-4.52504 4.63878,0.3825"
+ opacity="0.07" fill="#43c330" stroke="none" />
+ <path
+ d="m 578.17,376.18598 -4.31181,47.67823 c 0,0 -0.39629,4.61572 -5.29079,4.17308 l -47.08847,-4.25848 c 0,0 -4.25256,-0.67233 -1.21637,-3.20491 3.03633,-2.53394 54.84268,-45.74649 54.84268,-45.74649 0,0 3.39291,-2.26986 3.06476,1.35858"
+ opacity="0.02" fill="#43c330" stroke="none" />
+ <path
+ d="M 547.38,391.21933 511.69988,377.7265 c 0,0 -3.45924,-1.29001 -2.07411,-4.9534 l 13.32593,-35.24434 c 0,0 1.42438,-3.12147 2.72045,-0.24946 1.29707,2.8724 23.4111,51.87709 23.4111,51.87709 0,0 1.01816,3.08978 -1.69761,2.06294"
+ opacity="0.06" fill="#43c330" stroke="none" />
+ <path
+ d="m 655.82,415.96406 -32.49745,24.70514 c 0,0 -3.13392,2.405 -5.67007,-0.93109 l -24.39956,-32.09548 c 0,0 -2.02236,-3.06403 1.31825,-2.60896 3.34153,0.45437 60.34163,8.21952 60.34163,8.21952 0,0 3.38035,0.83074 0.9072,2.71087"
+ opacity="0.12" fill="#43c330" stroke="none" />
+ <path
+ d="m 597.5,424.76351 -2.30632,33.22158 c 0,0 -0.20857,3.21587 -3.61899,2.97911 l -32.81065,-2.27779 c 0,0 -2.96731,-0.40582 -0.89249,-2.21126 2.07488,-1.80639 37.47725,-32.61198 37.47725,-32.61198 0,0 2.32672,-1.6279 2.15119,0.90036"
+ opacity="0.08" fill="#43c330" stroke="none" />
+ <path
+ d="m 390.96,311.10717 17.59087,-9.68509 c 0,0 1.69801,-0.94496 2.69226,0.86086 l 9.56529,17.37329 c 0,0 0.76379,1.63648 -0.82912,1.17479 -1.59341,-0.46142 -28.77279,-8.33942 -28.77279,-8.33942 0,0 -1.58523,-0.64736 -0.24651,-1.38443"
+ opacity="0.04" fill="#43c330" stroke="none" />
+ <path
+ d="m 429.58,352.56125 38.01438,-37.11952 c 0,0 3.66234,-3.60878 7.47291,0.29366 l 36.66037,37.54417 c 0,0 3.10334,3.6334 -1.28445,3.58114 -4.38888,-0.0512 -79.25686,-0.94344 -79.25686,-0.94344 0,0 -4.49935,-0.53113 -1.60635,-3.35601"
+ opacity="0.09" fill="#43c330" stroke="none" />
+ <path
+ d="m 595.48,344.99959 -45.87431,17.5244 c 0,0 -4.43155,1.71601 -6.23056,-2.9933 l -17.30763,-45.30687 c 0,0 -1.29793,-4.2214 2.40453,-2.56578 3.70376,1.65514 66.8779,29.90515 66.8779,29.90515 0,0 3.62122,2.10275 0.13007,3.4364"
+ opacity="0.06" fill="#43c330" stroke="none" />
+ <path
+ d="m 512.82,269.3019 6.11802,-41.54515 c 0,0 0.57377,-4.02301 4.83866,-3.39496 l 41.03127,6.04235 c 0,0 3.69139,0.79768 0.90788,2.86661 -2.78368,2.07012 -50.27841,37.37152 -50.27841,37.37152 0,0 -3.08301,1.82132 -2.61742,-1.34037"
+ opacity="0.06644568" fill="#43c330" stroke="none" />
+ <path
+ d="m 572.05,309.87342 -41.73232,-4.67596 c 0,0 -4.0405,-0.43414 -3.56048,-4.71825 l 4.61812,-41.21612 c 0,0 0.6694,-3.71683 2.83348,-1.0066 2.16526,2.71036 39.09015,48.95466 39.09015,48.95466 0,0 1.92698,3.01812 -1.24895,2.66227"
+ id="path1591"
+ opacity="0.02" fill="#43c330" stroke="none" />
+ <path
+ d="m 447.85,289.33814 45.13098,-24.7673 c 0,0 4.35644,-2.41658 6.89897,2.21643 l 24.46095,44.57274 c 0,0 1.95233,4.19805 -2.12971,3.00883 -4.08332,-1.18853 -73.73408,-21.48064 -73.73408,-21.48064 0,0 -4.06169,-1.6652 -0.62711,-3.55006"
+ opacity="0.11" fill="#43c330" stroke="none" />
+ <path
+ d="m 411.58,256.11867 68.06292,-2.84633 c 0,0 6.5852,-0.30537 6.87739,6.68176 l 2.81112,67.22102 c 0,0 -0.15201,6.12462 -4.29309,2.31599 -4.143,-3.80854 -74.80083,-68.79482 -74.80083,-68.79482 0,0 -3.83727,-4.36101 1.34249,-4.57762"
+ opacity="0.06966439" fill="#43c330" stroke="none" />
+ <path
+ d="m 557.66,396.45972 -32.86077,-8.5375 c 0,0 -3.18369,-0.81173 -2.30726,-4.18511 l 8.4319,-32.4543 c 0,0 0.96282,-2.89763 2.38328,-0.47999 1.4214,2.41788 25.65829,43.66981 25.65829,43.66981 0,0 1.19534,2.63682 -1.30544,1.98709"
+ opacity="0.04" fill="#43c330" stroke="none" />
+ <path
+ d="m 492.39,483.71183 -68.05606,2.23273 c 0,0 -6.58481,0.24598 -6.81402,-6.74043 l -2.2051,-67.21426 c 0,0 0.20703,-6.12033 4.31187,-2.27627 4.10677,3.844 74.14634,69.43487 74.14634,69.43487 0,0 3.79621,4.39345 -1.38303,4.56336"
+ opacity="0.03" fill="#43c330" stroke="none" />
+ <path
+ d="m 489.06,463.39983 -14.79888,-37.68469 c 0,0 -1.44866,-3.64025 2.41993,-5.15945 l 37.21856,-14.61584 c 0,0 3.4702,-1.10238 2.13368,1.96264 -1.33618,3.06607 -24.14128,55.36377 -24.14128,55.36377 0,0 -1.70576,3.00148 -2.83199,0.13358"
+ opacity="0.05" fill="#43c330" stroke="none" />
</g>
- <image
- y="-177.5"
- x="-0.5"
- width="487"
- height="501"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAecAAAH1CAYAAADMEzbEAAAACXBIWXMAAAsSAAALEgHS3X78AAAA GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABkhJREFUeNrs1TEBADAIxMBS/9Lw 9EhgZbiTkCWVpB8AcMaXAADMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAwJwBwJwBAHMG AHMGAMwZAMwZADBnADBnAMCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAzBkAzBkAMGcA MGcAwJwBwJwBAHMGAHMGAMwZADBnADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwDAnAHAnAEAcwYA cwYAzBkAzBkAMGcAMGcAwJwBAHMGAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgDMGQDMGQAwZwAw ZwDAnAHAnAEAcwYAcwYAzBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZAMwZADBnAMCcAcCcAQBzBgBz BgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAzBkAzBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZADBnADBn AMCcAcCcAQBzBgBzBgDMGQDMGQAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwBAHMGAHMG AMwZAMwZADBnADBnAMCcAcCcAQBzBgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAMGcAMGcA wJwBwJwBAHMGAHMGAMwZAMwZADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAEAcwYAcwYA zBkAzBkAMGcAMGcAwJwBwJwBAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwDA nAHAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJ
wBAHMGAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgDM GQDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZAMwZADBnAMCc AcCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwBwJwBAHMGAMwZ AMwZADBnADBnAMCcAcCcAQBzBgBzBgDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAwJwB wJwBAHMGAHMGAMwZAMwZADBnADBnAMCcAcCcJQAAcwYAzBkAzBkAMGcAMGcAwJwBwJwBAHMGAHMG AMwZADBnADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAMGcA wJwBAHMGAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAcwYA zBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZAMwZADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwAwZwDA nAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwBwJwBAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgBzBgDM GQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwBAHMGAHMGAMwZAMwZADBnADBnAMCc AcCcAQBzBgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZ AMwZADBnAMCcAcCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwB wJwBAHMGAMwZAMwZADBnADBnAMCcAcCcAQBzBgBzBgDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkA zBkAMGcAwJwBwJwBAHMGAHMGAMwZAM
wZADBnADBnAMCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAHA nAEAcwYAcwYAzBkAMGcAMGcAwJwBwJwBAHMGAHMGAMwZAMwZADBnAMCcAcCcAQBzBgBzBgDMGQDM GQAwZwAwZwDAnAEAcwYAcwYAzBkAzBkAMGcAMGcAwJwBwJwBAHMGAMwZAMwZADBnADBnAMCcAcCc AQBzBgBzBgDMGQAwZwAwZwDAnAHAnAEAcwYAcwYAzBkAzBkAMGcAwJwBwJwBAHMGAHMGAMwZAMwZ ADBnADBnAMCcAQBzBgBzBgDMGQDMGQAwZwAwZwDAnAHAnAEAcwYAzBkAzBkAWI0AAwAK0wez40dt RgAAAABJRU5ErkJggg=="
- id="image3149" />
</svg>
diff --git a/icon-themes/galaxy/brand_cp/backing_left.png b/icon-themes/galaxy/brand_cp/backing_left.png
index 86d9b51..034bdd4 100644
Binary files a/icon-themes/galaxy/brand_cp/backing_left.png and b/icon-themes/galaxy/brand_cp/backing_left.png differ
diff --git a/icon-themes/galaxy/brand_cp/backing_right.png b/icon-themes/galaxy/brand_cp/backing_right.png
index 42fca6d..312f6e2 100644
Binary files a/icon-themes/galaxy/brand_cp/backing_right.png and b/icon-themes/galaxy/brand_cp/backing_right.png differ
diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_left.png b/icon-themes/galaxy/brand_cp/backing_rtl_left.png
index 86d9b51..034bdd4 100644
Binary files a/icon-themes/galaxy/brand_cp/backing_rtl_left.png and b/icon-themes/galaxy/brand_cp/backing_rtl_left.png differ
diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_right.png b/icon-themes/galaxy/brand_cp/backing_rtl_right.png
index 42fca6d..312f6e2 100644
Binary files a/icon-themes/galaxy/brand_cp/backing_rtl_right.png and b/icon-themes/galaxy/brand_cp/backing_rtl_right.png differ
diff --git a/icon-themes/galaxy/brand_cp/backing_space.png b/icon-themes/galaxy/brand_cp/backing_space.png
index dad9584..09f2839 100644
Binary files a/icon-themes/galaxy/brand_cp/backing_space.png and b/icon-themes/galaxy/brand_cp/backing_space.png differ
diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg
index ff5ce4d..27f1d6a 100644
--- a/icon-themes/galaxy/brand_cp/flat_logo.svg
+++ b/icon-themes/galaxy/brand_cp/flat_logo.svg
@@ -1,162 +1,335 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.2" baseProfile="tiny"
- id="svg1205" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="486px" height="80px"
- viewBox="0 0 486 80" xml:space="preserve">
-<rect x="-3" y="-4" fill="#0F3C7E" width="491.5" height="85.5"/>
-<g id="g4122" transform="matrix(0.62747746,0,0,0.62747746,-228.72288,-1457.0571)">
- <path id="path3047" fill="#FFFFFF" d="M484.038,2375.004v45.901h29.599v-6.974h-20.565v-38.928L484.038,2375.004"/>
- <path id="path3049" fill="#FFFFFF" d="M519.098,2420.905h9.035v-33.038h-9.035V2420.905 M523.615,2385.023
- c2.832,0,5.191-2.302,5.191-5.214c0-2.844-2.359-5.212-5.191-5.212c-2.899,0-5.192,2.369-5.192,5.212
- C518.423,2382.722,520.716,2385.023,523.615,2385.023"/>
- <path id="path3051" fill="#FFFFFF" d="M543.865,2391.725h-0.135v-19.565h-9.035v48.745h8.832l0.202-3.858h0.135
- c2.832,3.181,5.664,4.535,10.316,4.535c8.765,0,14.563-7.922,14.563-17.806c0-9.545-5.192-16.586-14.159-16.586
- C549.799,2387.19,546.967,2388.611,543.865,2391.725 M543.731,2403.64c0-5.687,2.562-9.478,7.417-9.478
- c5.394,0,8.091,3.86,8.091,10.156c0,6.229-2.629,10.291-7.956,10.291c-4.652,0-7.551-3.657-7.551-9.479V2403.64"/>
- <path id="path3053" fill="#FFFFFF" d="M592.987,2387.19c-4.315,0.271-8.427,2.91-10.315,6.568h-0.135l-0.202-5.891h-8.833v33.039
- h9.035v-12.458c0-6.635,1.213-9.003,3.303-10.493c1.82-1.287,3.978-1.829,6.944-1.964L592.987,2387.19"/>
- <path id="path3055" fill="#FFFFFF" d="M626.228,2402.423c0-8.193-4.988-15.233-13.618-15.233c-10.384,0-17.059,7.176-17.059,18.075
- c0,10.63,6.877,16.317,17.059,16.317c4.787,0,8.158-0.744,11.327-2.167l-0.943-6.77c-2.968,1.219-6.001,1.964-9.238,1.964
- c-5.461,0-8.968-2.506-9.304-7.651h21.373C626.094,2405.74,626.228,2403.844,626.228,2402.423 M611.665,2394.164
- c3.911,0,5.732,3.181,5.866,6.566h-12.743C605.463,2396.939,608.092,2394.164,611.665,2394.164"/>
- <path id="path3057" fill="#FFFFFF" d="M653.657,2374.327c-12.136,0-22.115,8.869-22.115,23.627c0,14.76,9.979,23.628,22.115,23.628
- c12.136,0,22.115-8.868,22.115-23.628C675.772,2383.196,665.793,2374.327,653.657,2374.327 M653.657,2378.93
- c9.034,0,15.912,6.77,15.912,19.023c0,12.254-6.877,19.024-15.912,19.024c-9.035,0-15.912-6.77-15.912-19.024
- C637.745,2385.701,644.622,2378.93,653.657,2378.93"/>
- <path id="path3059" fill="#FFFFFF" d="M684.407,2386.038v2.099h-5.326v4.333h5.326v28.436h5.663v-28.436h8.361v-4.333h-8.361
- v-2.979c0-5.891,2.495-9.344,7.011-9.344c2.09,0,3.44,0.339,4.72,0.813l0.54-4.198c-1.214-0.474-3.506-0.948-5.327-0.948
- C688.992,2371.483,684.407,2376.696,684.407,2386.038"/>
- <path id="path3061" fill="#FFFFFF" d="M703.235,2386.038v2.099h-5.326v4.333h5.326v28.436h5.663v-28.436h8.361v-4.333h-8.361
- v-2.979c0-5.891,2.495-9.344,7.011-9.344c2.09,0,3.44,0.339,4.72,0.813l0.54-4.198c-1.214-0.474-3.506-0.948-5.327-0.948
- C707.82,2371.483,703.235,2376.696,703.235,2386.038"/>
- <path id="path3063" fill="#FFFFFF" d="M723.819,2420.905h5.664v-32.767h-5.664V2420.905 M726.65,2383.33
- c1.956,0,3.506-1.556,3.506-3.521c0-1.963-1.55-3.52-3.506-3.52c-1.955,0-3.505,1.557-3.505,3.52
- C723.145,2381.774,724.695,2383.33,726.65,2383.33"/>
- <path id="path3065" fill="#FFFFFF" d="M741.26,2404.386c0-8.26,4.921-12.592,11.327-12.592c3.371,0,6.337,0.812,8.765,1.964
- l0.539-4.333c-2.022-1.016-5.259-1.964-8.832-1.964c-10.113,0-17.733,6.16-17.733,17.671c0,10.832,6.877,16.45,15.98,16.45
- c4.045,0,6.944-0.473,10.248-1.896l-0.54-4.333c-2.831,1.287-5.866,1.896-8.698,1.896
- C745.776,2417.249,741.26,2413.118,741.26,2404.386"/>
- <path id="path3067" fill="#FFFFFF" d="M793.836,2405.807c0.135-1.217,0.202-2.233,0.202-3.25c0-8.395-4.383-15.096-12.81-15.096
- c-9.101,0-15.776,7.583-15.776,17.671c0,11.103,6.675,16.45,15.776,16.45c4.047,0,7.08-0.609,10.248-1.896l-0.538-4.333
- c-2.495,1.219-6.068,1.896-8.901,1.896c-6.54,0-10.787-3.994-10.922-11.442H793.836 M780.756,2391.794
- c4.99,0,7.687,4.13,7.687,9.546h-17.059C772.193,2395.585,775.362,2391.794,780.756,2391.794"/>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="486px"
+ height="80px" viewBox="0 0 486 80" enable-background="new 0 0 486 80" xml:space="preserve">
+<g id="svg1205" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" display="none">
+ <rect x="-3" y="-4" display="inline" fill="#0F3C7E" width="491.5" height="85.5"/>
+ <g id="g4122" transform="matrix(0.62747746,0,0,0.62747746,-228.72288,-1457.0571)" display="inline">
+ <path id="path3047" fill="#FFFFFF" d="M484.038,2375.004v45.901h29.599v-6.974h-20.565v-38.928L484.038,2375.004"/>
+ <path id="path3049" fill="#FFFFFF" d="M519.098,2420.905h9.035v-33.038h-9.035V2420.905 M523.615,2385.023
+ c2.832,0,5.191-2.302,5.191-5.214c0-2.844-2.359-5.212-5.191-5.212c-2.899,0-5.192,2.369-5.192,5.212
+ C518.423,2382.722,520.716,2385.023,523.615,2385.023"/>
+ <path id="path3051" fill="#FFFFFF" d="M543.865,2391.725h-0.135v-19.565h-9.035v48.745h8.832l0.202-3.858h0.135
+ c2.832,3.181,5.664,4.535,10.316,4.535c8.765,0,14.563-7.922,14.563-17.806c0-9.545-5.192-16.586-14.159-16.586
+ C549.799,2387.19,546.967,2388.611,543.865,2391.725 M543.731,2403.64c0-5.687,2.562-9.478,7.417-9.478
+ c5.394,0,8.091,3.86,8.091,10.156c0,6.229-2.629,10.291-7.956,10.291c-4.652,0-7.551-3.657-7.551-9.479V2403.64"/>
+ <path id="path3053" fill="#FFFFFF" d="M592.987,2387.19c-4.315,0.271-8.427,2.91-10.315,6.568h-0.135l-0.202-5.891h-8.833v33.039
+ h9.035v-12.458c0-6.635,1.213-9.003,3.303-10.493c1.82-1.287,3.978-1.829,6.944-1.964L592.987,2387.19"/>
+ <path id="path3055" fill="#FFFFFF" d="M626.228,2402.423c0-8.193-4.988-15.233-13.618-15.233
+ c-10.384,0-17.059,7.176-17.059,18.075c0,10.63,6.877,16.317,17.059,16.317c4.787,0,8.158-0.744,11.327-2.167l-0.943-6.77
+ c-2.968,1.219-6.001,1.964-9.238,1.964c-5.461,0-8.968-2.506-9.304-7.651h21.373
+ C626.094,2405.74,626.228,2403.844,626.228,2402.423 M611.665,2394.164c3.911,0,5.732,3.181,5.866,6.566h-12.743
+ C605.463,2396.939,608.092,2394.164,611.665,2394.164"/>
+ <path id="path3057" fill="#FFFFFF" d="M653.657,2374.327c-12.136,0-22.115,8.869-22.115,23.627
+ c0,14.76,9.979,23.628,22.115,23.628c12.136,0,22.115-8.868,22.115-23.628C675.772,2383.196,665.793,2374.327,653.657,2374.327
+ M653.657,2378.93c9.034,0,15.912,6.77,15.912,19.023c0,12.254-6.877,19.024-15.912,19.024c-9.035,0-15.912-6.77-15.912-19.024
+ C637.745,2385.701,644.622,2378.93,653.657,2378.93"/>
+ <path id="path3059" fill="#FFFFFF" d="M684.407,2386.038v2.099h-5.326v4.333h5.326v28.436h5.663v-28.436h8.361v-4.333h-8.361
+ v-2.979c0-5.891,2.495-9.344,7.011-9.344c2.09,0,3.44,0.339,4.72,0.813l0.54-4.198c-1.214-0.474-3.506-0.948-5.327-0.948
+ C688.992,2371.483,684.407,2376.696,684.407,2386.038"/>
+ <path id="path3061" fill="#FFFFFF" d="M703.235,2386.038v2.099h-5.326v4.333h5.326v28.436h5.663v-28.436h8.361v-4.333h-8.361
+ v-2.979c0-5.891,2.495-9.344,7.011-9.344c2.09,0,3.44,0.339,4.72,0.813l0.54-4.198c-1.214-0.474-3.506-0.948-5.327-0.948
+ C707.82,2371.483,703.235,2376.696,703.235,2386.038"/>
+ <path id="path3063" fill="#FFFFFF" d="M723.819,2420.905h5.664v-32.767h-5.664V2420.905 M726.65,2383.33
+ c1.956,0,3.506-1.556,3.506-3.521c0-1.963-1.55-3.52-3.506-3.52c-1.955,0-3.505,1.557-3.505,3.52
+ C723.145,2381.774,724.695,2383.33,726.65,2383.33"/>
+ <path id="path3065" fill="#FFFFFF" d="M741.26,2404.386c0-8.26,4.921-12.592,11.327-12.592c3.371,0,6.337,0.812,8.765,1.964
+ l0.539-4.333c-2.022-1.016-5.259-1.964-8.832-1.964c-10.113,0-17.733,6.16-17.733,17.671c0,10.832,6.877,16.45,15.98,16.45
+ c4.045,0,6.944-0.473,10.248-1.896l-0.54-4.333c-2.831,1.287-5.866,1.896-8.698,1.896
+ C745.776,2417.249,741.26,2413.118,741.26,2404.386"/>
+ <path id="path3067" fill="#FFFFFF" d="M793.836,2405.807c0.135-1.217,0.202-2.233,0.202-3.25c0-8.395-4.383-15.096-12.81-15.096
+ c-9.101,0-15.776,7.583-15.776,17.671c0,11.103,6.675,16.45,15.776,16.45c4.047,0,7.08-0.609,10.248-1.896l-0.538-4.333
+ c-2.495,1.219-6.068,1.896-8.901,1.896c-6.54,0-10.787-3.994-10.922-11.442H793.836 M780.756,2391.794
+ c4.99,0,7.687,4.13,7.687,9.546h-17.059C772.193,2395.585,775.362,2391.794,780.756,2391.794"/>
+ </g>
+ <g id="g2977" transform="matrix(0.62026788,0,0,0.62820994,-318.24592,-674.22997)" display="inline">
+ <path id="path2979" fill="#FFFFFF" d="M585.297,1093.95c-0.754-0.02-1.498,0.452-1.792,1.138
+ c-0.295,0.686-0.123,1.541,0.415,2.063l16.196,16.248c0.523,0.523,1.373,0.696,2.063,0.421c0.69-0.276,1.177-0.985,1.182-1.719
+ v-16.277c0.002-0.981-0.904-1.875-1.898-1.872H585.297z"/>
+ <path id="path2981" fill="#FFFFFF" d="M540.763,1093.949c-1.049,0.016-1.892,0.871-1.89,1.921v74.157
+ c-0.002,1.051,0.841,1.906,1.89,1.921h60.677c1.06,0.002,1.92-0.855,1.922-1.915c0-0.003,0-0.003,0-0.006v-47.754
+ c0.003-0.511-0.198-1.002-0.558-1.363l-26.247-26.372c-0.357-0.371-0.849-0.584-1.363-0.588H540.763z M542.685,1097.792h31.702
+ l25.133,25.256v45.058h-56.834V1097.792z"/>
+ </g>
+ <rect y="75" display="inline" fill="#6C9ACA" width="486" height="5"/>
+ <path id="path10643" display="inline" fill="#FFFFFF" d="M371.109,53.543h-4.697v-3.155c0-0.916-0.052-1.488-0.154-1.716
+ c-0.104-0.228-0.331-0.343-0.682-0.343c-0.397,0-0.647,0.14-0.756,0.417c-0.105,0.275-0.159,0.874-0.159,1.793v8.438
+ c0,0.881,0.054,1.457,0.159,1.728c0.108,0.269,0.349,0.403,0.722,0.403c0.358,0,0.595-0.136,0.704-0.407
+ c0.11-0.272,0.166-0.909,0.166-1.914v-2.298h4.697V57.2c0,1.886-0.133,3.224-0.397,4.011c-0.265,0.788-0.852,1.479-1.759,2.072
+ c-0.908,0.595-2.026,0.89-3.355,0.89c-1.381,0-2.521-0.251-3.417-0.75c-0.896-0.5-1.49-1.195-1.781-2.08
+ c-0.291-0.884-0.438-2.217-0.438-3.995v-5.303c0-1.308,0.044-2.287,0.135-2.941c0.09-0.654,0.356-1.284,0.801-1.89
+ c0.444-0.603,1.062-1.08,1.849-1.429c0.788-0.347,1.693-0.522,2.719-0.522c1.388,0,2.534,0.271,3.437,0.807
+ c0.904,0.537,1.498,1.207,1.783,2.008c0.282,0.803,0.425,2.052,0.425,3.745V53.543L371.109,53.543z"/>
+ <path display="inline" fill="#FFFFFF" d="M382.674,51.785c-0.146-0.516-0.415-1.017-0.812-1.502
+ c-0.394-0.485-0.956-0.879-1.683-1.182c-0.726-0.302-1.595-0.453-2.609-0.453c-1.207,0-2.198,0.234-2.974,0.705
+ c-0.774,0.472-1.312,1.096-1.609,1.872c-0.297,0.775-0.446,1.855-0.446,3.238v3.808c0,1.264,0.081,2.212,0.246,2.841
+ c0.164,0.632,0.438,1.17,0.821,1.613c0.384,0.444,0.923,0.777,1.615,0.999c0.692,0.218,1.537,0.329,2.537,0.329
+ c0.895,0,1.685-0.13,2.375-0.386c0.688-0.257,1.255-0.656,1.694-1.198c0.439-0.541,0.726-1.126,0.859-1.749s0.202-1.604,0.202-2.94
+ v-3.642C382.892,53.086,382.818,52.301,382.674,51.785z M378.353,59.88c0,0.643-0.041,1.06-0.123,1.256
+ c-0.083,0.194-0.255,0.292-0.514,0.292c-0.252,0-0.42-0.108-0.508-0.32c-0.085-0.213-0.129-0.671-0.129-1.373v-6.721
+ c0-0.762,0.044-1.241,0.129-1.441c0.086-0.199,0.261-0.297,0.519-0.297s0.429,0.098,0.508,0.297c0.079,0.2,0.118,0.68,0.118,1.441
+ V59.88z"/>
+ <path id="path10647" display="inline" fill="#FFFFFF" d="M389.04,45.663v18.113h-4.657V45.663H389.04z"/>
+ <path id="path10649" display="inline" fill="#FFFFFF" d="M395.321,45.663v18.113h-4.656V45.663H395.321z"/>
+ <path display="inline" fill="#FFFFFF" d="M430.428,51.785c-0.146-0.516-0.415-1.017-0.811-1.502
+ c-0.396-0.485-0.956-0.879-1.684-1.182c-0.728-0.302-1.595-0.453-2.61-0.453c-1.206,0-2.197,0.234-2.973,0.705
+ c-0.774,0.472-1.312,1.096-1.609,1.872c-0.298,0.775-0.446,1.855-0.446,3.238v3.808c0,1.264,0.081,2.212,0.245,2.841
+ c0.165,0.632,0.438,1.17,0.822,1.613c0.384,0.444,0.923,0.777,1.615,0.999c0.692,0.218,1.537,0.329,2.537,0.329
+ c0.895,0,1.686-0.13,2.375-0.386c0.688-0.257,1.255-0.656,1.694-1.198c0.439-0.541,0.725-1.126,0.859-1.749s0.202-1.604,0.202-2.94
+ v-3.642C430.646,53.086,430.572,52.301,430.428,51.785z M426.107,59.88c0,0.643-0.041,1.06-0.126,1.256
+ c-0.081,0.194-0.253,0.292-0.512,0.292c-0.251,0-0.42-0.108-0.508-0.32c-0.086-0.213-0.129-0.671-0.129-1.373v-6.721
+ c0-0.762,0.043-1.241,0.129-1.441c0.086-0.199,0.261-0.297,0.519-0.297c0.259,0,0.429,0.098,0.508,0.297
+ c0.08,0.2,0.119,0.68,0.119,1.441V59.88z"/>
+ <path display="inline" fill="#FFFFFF" d="M448.306,51.454c-0.155-0.789-0.622-1.454-1.398-1.995
+ c-0.774-0.541-1.927-0.811-3.456-0.811l-4.109,0.011v-0.011c-1.251,0.084-2.207,0.829-2.865,2.237l0.158-1.958h-4.498v14.849h4.539
+ V57.9c0-1.443,0.059-1.686,0.147-2.087c0.09-0.4,0.328-0.711,0.715-0.938c0.286-0.164,0.692-0.269,1.217-0.312v0.027l3.854,0.066
+ v-1.553c0-0.826,0.035-1.338,0.109-1.535c0.071-0.197,0.258-0.296,0.555-0.296c0.261,0,0.447,0.118,0.561,0.352
+ c0.113,0.235,0.169,0.738,0.169,1.512c0,0.618-0.053,1.027-0.156,1.229c-0.104,0.202-0.895,0.596-2.375,1.179
+ c-1.384,0.539-2.249,1.011-2.6,1.414c-0.349,0.404-0.522,1.164-0.522,2.279v1.222c0,1.505,0.329,2.48,0.986,2.926
+ c0.657,0.444,1.38,0.667,2.168,0.667c0.602,0,1.12-0.133,1.555-0.4c0.433-0.267,0.788-0.666,1.063-1.203v1.326h4.419v-7.458
+ C448.541,53.861,448.462,52.241,448.306,51.454z M444.003,59.772c0,0.751-0.041,1.214-0.124,1.392
+ c-0.084,0.176-0.265,0.264-0.539,0.264c-0.291,0-0.486-0.113-0.583-0.338c-0.099-0.225-0.146-0.725-0.146-1.499
+ c0-0.676,0.055-1.192,0.169-1.553c0.112-0.361,0.52-0.809,1.224-1.341V59.772z"/>
+ <path display="inline" fill="#FFFFFF" d="M418.858,50.789c-0.049-0.337-0.192-0.681-0.43-1.031
+ c-0.24-0.351-0.587-0.625-1.041-0.818c-0.455-0.193-0.992-0.291-1.61-0.291c-0.537,0-1.034,0.106-1.493,0.32
+ c-0.457,0.214-0.872,0.54-1.246,0.975v-4.28h-4.537v15.745h-1.562v-5.091c0-2.456-0.079-4.076-0.236-4.864
+ c-0.156-0.788-0.622-1.453-1.397-1.994s-1.927-0.811-3.456-0.811c-1.274,0-2.312,0.237-3.11,0.714
+ c-0.8,0.477-1.33,1.025-1.595,1.647c-0.266,0.624-0.397,1.509-0.397,2.655v0.993h4.26v-1.552c0-0.825,0.037-1.337,0.11-1.535
+ c0.071-0.198,0.258-0.296,0.555-0.296c0.262,0,0.447,0.117,0.562,0.351c0.111,0.235,0.168,0.74,0.168,1.515
+ c0,0.615-0.053,1.024-0.156,1.227s-0.895,0.596-2.375,1.18c-1.384,0.538-2.249,1.01-2.599,1.413
+ c-0.35,0.405-0.523,1.164-0.523,2.279v1.224c0,1.503,0.329,2.479,0.985,2.925c0.658,0.444,1.381,0.667,2.169,0.667
+ c0.601,0,1.119-0.134,1.554-0.4s0.789-0.667,1.064-1.201v1.323h10.523l0.008-1.124c0.379,0.469,0.797,0.819,1.256,1.053
+ c0.458,0.231,0.949,0.351,1.478,0.351c0.736,0,1.372-0.198,1.908-0.589c0.535-0.391,0.875-0.854,1.022-1.389
+ c0.145-0.534,0.216-1.347,0.216-2.438v-6.7C418.931,51.842,418.907,51.124,418.858,50.789z M402.4,59.772L402.4,59.772
+ c-0.001,0.751-0.042,1.214-0.125,1.392c-0.083,0.176-0.264,0.264-0.539,0.264c-0.292,0-0.485-0.113-0.584-0.338
+ s-0.146-0.725-0.146-1.499c0-0.676,0.057-1.192,0.17-1.553c0.111-0.361,0.52-0.809,1.225-1.341V59.772z M414.392,59.408
+ c0,0.883-0.041,1.44-0.126,1.67c-0.085,0.234-0.265,0.35-0.543,0.35c-0.274,0-0.456-0.113-0.546-0.337
+ c-0.091-0.225-0.139-0.738-0.139-1.537v-6.416c0-0.83,0.04-1.348,0.121-1.553c0.081-0.206,0.258-0.309,0.529-0.309
+ c0.278,0,0.465,0.118,0.56,0.354c0.096,0.236,0.144,0.738,0.144,1.508V59.408z"/>
+ <g display="inline">
+ <path fill="#204A87" d="M464.535,56.898c-0.278-1.411-1.911-2.659-3.335-1.981c-0.209,0.077-0.355,0.237-0.522,0.377
+ c-1.336,1.566,0.174,4.235,2.158,4.142C464.099,59.443,464.874,58.021,464.535,56.898z M462.68,57.521
+ c-0.48,0.268-1.139,0.054-1.468-0.485h-0.001c-0.33-0.537-0.207-1.189,0.273-1.46c0.481-0.268,1.139-0.051,1.469,0.487
+ l0.001,0.001C463.282,56.6,463.16,57.254,462.68,57.521z"/>
+ <path fill="#6D9ACB" d="M462.953,56.063c-0.33-0.538-0.987-0.755-1.469-0.487c-0.48,0.271-0.604,0.923-0.273,1.46h0.001
+ c0.329,0.539,0.987,0.753,1.468,0.485S463.282,56.6,462.953,56.063L462.953,56.063z"/>
+ </g>
+ <g display="inline">
+ <path fill="#204A87" d="M474.297,52.73c-0.834,0.199-1.27,1.055-2.045,1.374c-0.79-0.408-0.562-1.505-1.2-2.03
+ c-0.542-0.566-1.407-0.469-2.068-0.741c-0.82-0.616-0.5-1.758-0.27-2.577c0.423-1.263,0.859-2.799,0.008-3.985
+ c-0.559-0.934-1.746-1.481-2.818-1.111c-1.441,0.357-2.287,1.764-2.689,3.087c-0.639,1.315-2.562,1.692-3.688,0.769
+ c-0.815-0.553-1.748-1.03-2.759-1.001c-0.889-0.159-1.097-1.242-1.061-1.994c0.086-1.914,0.848-3.703,1.273-5.557
+ c0.405-2.512,0.029-5.181-1.374-7.326c-0.897-1.451-2.103-2.701-3.476-3.73c-2.421-1.852-5.504-3.014-8.592-2.71
+ c-2.039,0.322-4.045,1.244-5.253,2.947c-1.78,2.326-1.858,5.577-0.89,8.236c1.601,4.214,5.421,7.597,9.888,8.513
+ c1.369,0.344,2.803,0.19,4.167,0.007c1.225,0.03,2.279,1.395,1.911,2.562c-0.428,0.762-1.156,1.365-1.359,2.234
+ c-0.534,1.485,0.023,3.191,1.274,4.134c1.407,1.153,3.519,1.443,5.065,0.512c1.055-0.635,1.92-1.6,2.312-2.591
+ c0.389-0.972,0.818-2.188,1.961-2.534c0.871-0.252,1.69,0.277,2.394,0.728c0.672,0.326,1.677-0.074,2.131,0.655
+ c0.397,0.8-0.073,1.714-0.429,2.444c-0.532,0.904-1.095,1.939-0.789,3.014c0.245,1.118,1.492,1.831,2.609,1.561
+ c1.305-0.192,2.136-1.351,3.243-1.923c0.573-0.134,0.677,0.65,1.123,0.78c1.229,0.37,2.35-0.782,2.618-1.883
+ C475.898,53.785,475.271,52.548,474.297,52.73z M453.418,41.357c-2.59,2.643-7.448,2.146-10.776-1.053
+ c-3.326-3.198-3.98-7.981-1.39-10.623c2.59-2.641,7.452-2.096,10.78,1.103C455.36,33.983,456.008,38.717,453.418,41.357z
+ M457.676,53.616c-0.731,0.327-1.517,0.406-2.242,0.271c-1.042-0.193-1.963-0.829-2.429-1.8c-0.791-1.646,0.021-3.63,1.807-4.429
+ c1.784-0.8,3.877-0.116,4.669,1.528C460.272,50.835,459.46,52.816,457.676,53.616z M465.236,48.802
+ c-1.037-0.417-1.501-1.758-1.037-2.98c0.465-1.225,1.801-1.868,2.838-1.45c1.034,0.418,1.437,1.753,0.971,2.977
+ C467.543,48.57,466.271,49.22,465.236,48.802z M470.572,55.539c-0.39,0.531-0.99,0.984-1.505,1.151
+ c-0.514,0.165-1.035,0.129-1.432-0.156c-0.398-0.285-0.655-0.88-0.655-1.416c0-0.535,0.138-0.95,0.527-1.483
+ c0.39-0.531,0.911-0.918,1.426-1.084c0.513-0.166,1.089-0.086,1.486,0.2c0.396,0.283,0.646,0.672,0.647,1.207
+ C471.067,54.494,470.96,55.006,470.572,55.539z M474.784,55.24c-0.205,0.325-0.482,0.538-0.76,0.658
+ c-0.278,0.12-0.554,0.126-0.769-0.007c-0.214-0.132-0.331-0.379-0.345-0.678c-0.013-0.303,0.019-0.609,0.225-0.934
+ c0.203-0.324,0.479-0.587,0.757-0.707c0.279-0.121,0.612-0.143,0.827-0.011c0.214,0.132,0.332,0.377,0.347,0.676
+ C475.079,54.54,474.989,54.915,474.784,55.24z"/>
+ <path fill="#6D9ACB" d="M452.032,30.785c-3.328-3.198-8.19-3.743-10.78-1.103c-2.591,2.642-1.937,7.424,1.39,10.623
+ c3.328,3.198,8.187,3.695,10.776,1.053C456.008,38.717,455.36,33.983,452.032,30.785z"/>
+ <path fill="#6D9ACB" d="M454.812,47.658c-1.785,0.799-2.598,2.782-1.807,4.429c0.466,0.971,1.387,1.606,2.429,1.8
+ c0.726,0.136,1.511,0.057,2.242-0.271c1.784-0.8,2.597-2.781,1.805-4.43C458.688,47.542,456.596,46.858,454.812,47.658z"/>
+ <path fill="#6D9ACB" d="M468.008,47.348c0.466-1.224,0.063-2.559-0.971-2.977c-1.037-0.418-2.373,0.226-2.838,1.45
+ c-0.464,1.223,0,2.563,1.037,2.98C466.271,49.22,467.543,48.57,468.008,47.348z"/>
+ <path fill="#6D9ACB" d="M470.42,52.751c-0.397-0.286-0.974-0.366-1.486-0.2c-0.515,0.166-1.036,0.553-1.426,1.084
+ c-0.39,0.533-0.527,0.948-0.527,1.483c0,0.536,0.257,1.131,0.655,1.416c0.396,0.285,0.918,0.321,1.432,0.156
+ c0.515-0.167,1.115-0.62,1.505-1.151c0.388-0.533,0.495-1.045,0.495-1.581C471.066,53.423,470.816,53.034,470.42,52.751z"/>
+ <path fill="#6D9ACB" d="M473.893,53.573c-0.278,0.12-0.554,0.383-0.757,0.707c-0.206,0.324-0.237,0.631-0.225,0.934
+ c0.014,0.299,0.131,0.546,0.345,0.678c0.215,0.133,0.49,0.127,0.769,0.007c0.277-0.12,0.555-0.333,0.76-0.658
+ s0.295-0.7,0.282-1.002c-0.015-0.299-0.133-0.544-0.347-0.676C474.505,53.431,474.172,53.452,473.893,53.573z"/>
+ </g>
+ <g display="inline">
+ <path fill="#204A87" d="M461.713,37.216c-1.322,0.228-2.283,1.758-1.781,2.968c0.585,1.841,3.355,2.55,4.799,0.998
+ c0.296-0.282,0.457-0.674,0.559-1.054C465.636,38.192,463.524,36.714,461.713,37.216z M463.398,40.139
+ c-0.222,0.65-1.036,0.947-1.82,0.665c0,0-0.001,0-0.002-0.001c-0.784-0.282-1.239-1.038-1.016-1.687
+ c0.221-0.648,1.036-0.946,1.82-0.664c0,0,0.001,0,0.001,0.001C463.166,38.735,463.621,39.49,463.398,40.139z"/>
+ <path fill="#6D9ACB" d="M462.382,38.453C462.382,38.452,462.381,38.452,462.382,38.453c-0.785-0.283-1.601,0.015-1.821,0.663
+ c-0.224,0.649,0.231,1.404,1.016,1.687c0.001,0.001,0.002,0.001,0.002,0.001c0.784,0.282,1.599-0.015,1.82-0.665
+ C463.621,39.49,463.166,38.735,462.382,38.453z"/>
+ </g>
</g>
-<g id="g2977" transform="matrix(0.62026788,0,0,0.62820994,-318.24592,-674.22997)">
- <path id="path2979" fill="#FFFFFF" d="M585.297,1093.95c-0.754-0.02-1.498,0.452-1.792,1.138c-0.295,0.686-0.123,1.541,0.415,2.063
- l16.196,16.248c0.523,0.523,1.373,0.696,2.063,0.421c0.69-0.276,1.177-0.985,1.182-1.719v-16.277
- c0.002-0.981-0.904-1.875-1.898-1.872H585.297z"/>
- <path id="path2981" fill="#FFFFFF" d="M540.763,1093.949c-1.049,0.016-1.892,0.871-1.89,1.921v74.157
- c-0.002,1.051,0.841,1.906,1.89,1.921h60.677c1.06,0.002,1.92-0.855,1.922-1.915c0-0.003,0-0.003,0-0.006v-47.754
- c0.003-0.511-0.198-1.002-0.558-1.363l-26.247-26.372c-0.357-0.371-0.849-0.584-1.363-0.588H540.763z M542.685,1097.792h31.702
- l25.133,25.256v45.058h-56.834V1097.792z"/>
-</g>
-<rect y="75" fill="#6C9ACA" width="486" height="5"/>
-<path id="path10643" fill="#FFFFFF" d="M371.109,53.543h-4.697v-3.155c0-0.916-0.052-1.488-0.154-1.716
- c-0.104-0.228-0.331-0.343-0.682-0.343c-0.397,0-0.647,0.14-0.756,0.417c-0.105,0.275-0.159,0.874-0.159,1.793v8.438
- c0,0.881,0.054,1.457,0.159,1.728c0.108,0.269,0.349,0.403,0.722,0.403c0.358,0,0.595-0.136,0.704-0.407
- c0.11-0.272,0.166-0.909,0.166-1.914v-2.298h4.697V57.2c0,1.886-0.133,3.224-0.397,4.011c-0.265,0.788-0.852,1.479-1.759,2.072
- c-0.908,0.595-2.026,0.89-3.355,0.89c-1.381,0-2.521-0.251-3.417-0.75c-0.896-0.5-1.49-1.195-1.781-2.08
- c-0.291-0.884-0.438-2.217-0.438-3.995v-5.303c0-1.308,0.044-2.287,0.135-2.941c0.09-0.654,0.356-1.284,0.801-1.89
- c0.444-0.603,1.062-1.08,1.849-1.429c0.788-0.347,1.693-0.522,2.719-0.522c1.388,0,2.534,0.271,3.437,0.807
- c0.904,0.537,1.498,1.207,1.783,2.008c0.282,0.803,0.425,2.052,0.425,3.745V53.543L371.109,53.543z"/>
-<path fill="#FFFFFF" d="M382.674,51.785c-0.146-0.516-0.415-1.017-0.812-1.502c-0.394-0.485-0.956-0.879-1.683-1.182
- c-0.726-0.302-1.595-0.453-2.609-0.453c-1.207,0-2.198,0.234-2.974,0.705c-0.774,0.472-1.312,1.096-1.609,1.872
- c-0.297,0.775-0.446,1.855-0.446,3.238v3.808c0,1.264,0.081,2.212,0.246,2.841c0.164,0.632,0.438,1.17,0.821,1.613
- c0.384,0.444,0.923,0.777,1.615,0.999c0.692,0.218,1.537,0.329,2.537,0.329c0.895,0,1.685-0.13,2.375-0.386
- c0.688-0.257,1.255-0.656,1.694-1.198c0.439-0.541,0.726-1.126,0.859-1.749s0.202-1.604,0.202-2.94v-3.642
- C382.892,53.086,382.818,52.301,382.674,51.785z M378.353,59.88c0,0.643-0.041,1.06-0.123,1.256
- c-0.083,0.194-0.255,0.292-0.514,0.292c-0.252,0-0.42-0.108-0.508-0.32c-0.085-0.213-0.129-0.671-0.129-1.373v-6.721
- c0-0.762,0.044-1.241,0.129-1.441c0.086-0.199,0.261-0.297,0.519-0.297s0.429,0.098,0.508,0.297c0.079,0.2,0.118,0.68,0.118,1.441
- V59.88z"/>
-<path id="path10647" fill="#FFFFFF" d="M389.04,45.663v18.113h-4.657V45.663H389.04z"/>
-<path id="path10649" fill="#FFFFFF" d="M395.321,45.663v18.113h-4.656V45.663H395.321z"/>
-<path fill="#FFFFFF" d="M430.428,51.785c-0.146-0.516-0.415-1.017-0.811-1.502c-0.396-0.485-0.956-0.879-1.684-1.182
- c-0.728-0.302-1.595-0.453-2.61-0.453c-1.206,0-2.197,0.234-2.973,0.705c-0.774,0.472-1.312,1.096-1.609,1.872
- c-0.298,0.775-0.446,1.855-0.446,3.238v3.808c0,1.264,0.081,2.212,0.245,2.841c0.165,0.632,0.438,1.17,0.822,1.613
- c0.384,0.444,0.923,0.777,1.615,0.999c0.692,0.218,1.537,0.329,2.537,0.329c0.895,0,1.686-0.13,2.375-0.386
- c0.688-0.257,1.255-0.656,1.694-1.198c0.439-0.541,0.725-1.126,0.859-1.749s0.202-1.604,0.202-2.94v-3.642
- C430.646,53.086,430.572,52.301,430.428,51.785z M426.107,59.88c0,0.643-0.041,1.06-0.126,1.256
- c-0.081,0.194-0.253,0.292-0.512,0.292c-0.251,0-0.42-0.108-0.508-0.32c-0.086-0.213-0.129-0.671-0.129-1.373v-6.721
- c0-0.762,0.043-1.241,0.129-1.441c0.086-0.199,0.261-0.297,0.519-0.297c0.259,0,0.429,0.098,0.508,0.297
- c0.08,0.2,0.119,0.68,0.119,1.441V59.88z"/>
-<path fill="#FFFFFF" d="M448.306,51.454c-0.155-0.789-0.622-1.454-1.398-1.995c-0.774-0.541-1.927-0.811-3.456-0.811l-4.109,0.011
- v-0.011c-1.251,0.084-2.207,0.829-2.865,2.237l0.158-1.958h-4.498v14.849h4.539V57.9c0-1.443,0.059-1.686,0.147-2.087
- c0.09-0.4,0.328-0.711,0.715-0.938c0.286-0.164,0.692-0.269,1.217-0.312v0.027l3.854,0.066v-1.553c0-0.826,0.035-1.338,0.109-1.535
- c0.071-0.197,0.258-0.296,0.555-0.296c0.261,0,0.447,0.118,0.561,0.352c0.113,0.235,0.169,0.738,0.169,1.512
- c0,0.618-0.053,1.027-0.156,1.229c-0.104,0.202-0.895,0.596-2.375,1.179c-1.384,0.539-2.249,1.011-2.6,1.414
- c-0.349,0.404-0.522,1.164-0.522,2.279v1.222c0,1.505,0.329,2.48,0.986,2.926c0.657,0.444,1.38,0.667,2.168,0.667
- c0.602,0,1.12-0.133,1.555-0.4c0.433-0.267,0.788-0.666,1.063-1.203v1.326h4.419v-7.458
- C448.541,53.861,448.462,52.241,448.306,51.454z M444.003,59.772c0,0.751-0.041,1.214-0.124,1.392
- c-0.084,0.176-0.265,0.264-0.539,0.264c-0.291,0-0.486-0.113-0.583-0.338c-0.099-0.225-0.146-0.725-0.146-1.499
- c0-0.676,0.055-1.192,0.169-1.553c0.112-0.361,0.52-0.809,1.224-1.341V59.772z"/>
-<path fill="#FFFFFF" d="M418.858,50.789c-0.049-0.337-0.192-0.681-0.43-1.031c-0.24-0.351-0.587-0.625-1.041-0.818
- c-0.455-0.193-0.992-0.291-1.61-0.291c-0.537,0-1.034,0.106-1.493,0.32c-0.457,0.214-0.872,0.54-1.246,0.975v-4.28h-4.537v15.745
- h-1.562v-5.091c0-2.456-0.079-4.076-0.236-4.864c-0.156-0.788-0.622-1.453-1.397-1.994s-1.927-0.811-3.456-0.811
- c-1.274,0-2.312,0.237-3.11,0.714c-0.8,0.477-1.33,1.025-1.595,1.647c-0.266,0.624-0.397,1.509-0.397,2.655v0.993h4.26v-1.552
- c0-0.825,0.037-1.337,0.11-1.535c0.071-0.198,0.258-0.296,0.555-0.296c0.262,0,0.447,0.117,0.562,0.351
- c0.111,0.235,0.168,0.74,0.168,1.515c0,0.615-0.053,1.024-0.156,1.227s-0.895,0.596-2.375,1.18c-1.384,0.538-2.249,1.01-2.599,1.413
- c-0.35,0.405-0.523,1.164-0.523,2.279v1.224c0,1.503,0.329,2.479,0.985,2.925c0.658,0.444,1.381,0.667,2.169,0.667
- c0.601,0,1.119-0.134,1.554-0.4s0.789-0.667,1.064-1.201v1.323h10.523l0.008-1.124c0.379,0.469,0.797,0.819,1.256,1.053
- c0.458,0.231,0.949,0.351,1.478,0.351c0.736,0,1.372-0.198,1.908-0.589c0.535-0.391,0.875-0.854,1.022-1.389
- c0.145-0.534,0.216-1.347,0.216-2.438v-6.7C418.931,51.842,418.907,51.124,418.858,50.789z M402.4,59.772L402.4,59.772
- c-0.001,0.751-0.042,1.214-0.125,1.392c-0.083,0.176-0.264,0.264-0.539,0.264c-0.292,0-0.485-0.113-0.584-0.338
- s-0.146-0.725-0.146-1.499c0-0.676,0.057-1.192,0.17-1.553c0.111-0.361,0.52-0.809,1.225-1.341V59.772z M414.392,59.408
- c0,0.883-0.041,1.44-0.126,1.67c-0.085,0.234-0.265,0.35-0.543,0.35c-0.274,0-0.456-0.113-0.546-0.337
- c-0.091-0.225-0.139-0.738-0.139-1.537v-6.416c0-0.83,0.04-1.348,0.121-1.553c0.081-0.206,0.258-0.309,0.529-0.309
- c0.278,0,0.465,0.118,0.56,0.354c0.096,0.236,0.144,0.738,0.144,1.508V59.408z"/>
-<g>
- <path fill="#204A87" d="M464.535,56.898c-0.278-1.411-1.911-2.659-3.335-1.981c-0.209,0.077-0.355,0.237-0.522,0.377
- c-1.336,1.566,0.174,4.235,2.158,4.142C464.099,59.443,464.874,58.021,464.535,56.898z M462.68,57.521
- c-0.48,0.268-1.139,0.054-1.468-0.485h-0.001c-0.33-0.537-0.207-1.189,0.273-1.46c0.481-0.268,1.139-0.051,1.469,0.487l0.001,0.001
- C463.282,56.6,463.16,57.254,462.68,57.521z"/>
- <path fill="#6D9ACB" d="M462.953,56.063c-0.33-0.538-0.987-0.755-1.469-0.487c-0.48,0.271-0.604,0.923-0.273,1.46h0.001
- c0.329,0.539,0.987,0.753,1.468,0.485S463.282,56.6,462.953,56.063L462.953,56.063z"/>
-</g>
-<g>
- <path fill="#204A87" d="M474.297,52.73c-0.834,0.199-1.27,1.055-2.045,1.374c-0.79-0.408-0.562-1.505-1.2-2.03
- c-0.542-0.566-1.407-0.469-2.068-0.741c-0.82-0.616-0.5-1.758-0.27-2.577c0.423-1.263,0.859-2.799,0.008-3.985
- c-0.559-0.934-1.746-1.481-2.818-1.111c-1.441,0.357-2.287,1.764-2.689,3.087c-0.639,1.315-2.562,1.692-3.688,0.769
- c-0.815-0.553-1.748-1.03-2.759-1.001c-0.889-0.159-1.097-1.242-1.061-1.994c0.086-1.914,0.848-3.703,1.273-5.557
- c0.405-2.512,0.029-5.181-1.374-7.326c-0.897-1.451-2.103-2.701-3.476-3.73c-2.421-1.852-5.504-3.014-8.592-2.71
- c-2.039,0.322-4.045,1.244-5.253,2.947c-1.78,2.326-1.858,5.577-0.89,8.236c1.601,4.214,5.421,7.597,9.888,8.513
- c1.369,0.344,2.803,0.19,4.167,0.007c1.225,0.03,2.279,1.395,1.911,2.562c-0.428,0.762-1.156,1.365-1.359,2.234
- c-0.534,1.485,0.023,3.191,1.274,4.134c1.407,1.153,3.519,1.443,5.065,0.512c1.055-0.635,1.92-1.6,2.312-2.591
- c0.389-0.972,0.818-2.188,1.961-2.534c0.871-0.252,1.69,0.277,2.394,0.728c0.672,0.326,1.677-0.074,2.131,0.655
- c0.397,0.8-0.073,1.714-0.429,2.444c-0.532,0.904-1.095,1.939-0.789,3.014c0.245,1.118,1.492,1.831,2.609,1.561
- c1.305-0.192,2.136-1.351,3.243-1.923c0.573-0.134,0.677,0.65,1.123,0.78c1.229,0.37,2.35-0.782,2.618-1.883
- C475.898,53.785,475.271,52.548,474.297,52.73z M453.418,41.357c-2.59,2.643-7.448,2.146-10.776-1.053
- c-3.326-3.198-3.98-7.981-1.39-10.623c2.59-2.641,7.452-2.096,10.78,1.103C455.36,33.983,456.008,38.717,453.418,41.357z
- M457.676,53.616c-0.731,0.327-1.517,0.406-2.242,0.271c-1.042-0.193-1.963-0.829-2.429-1.8c-0.791-1.646,0.021-3.63,1.807-4.429
- c1.784-0.8,3.877-0.116,4.669,1.528C460.272,50.835,459.46,52.816,457.676,53.616z M465.236,48.802
- c-1.037-0.417-1.501-1.758-1.037-2.98c0.465-1.225,1.801-1.868,2.838-1.45c1.034,0.418,1.437,1.753,0.971,2.977
- C467.543,48.57,466.271,49.22,465.236,48.802z M470.572,55.539c-0.39,0.531-0.99,0.984-1.505,1.151
- c-0.514,0.165-1.035,0.129-1.432-0.156c-0.398-0.285-0.655-0.88-0.655-1.416c0-0.535,0.138-0.95,0.527-1.483
- c0.39-0.531,0.911-0.918,1.426-1.084c0.513-0.166,1.089-0.086,1.486,0.2c0.396,0.283,0.646,0.672,0.647,1.207
- C471.067,54.494,470.96,55.006,470.572,55.539z M474.784,55.24c-0.205,0.325-0.482,0.538-0.76,0.658
- c-0.278,0.12-0.554,0.126-0.769-0.007c-0.214-0.132-0.331-0.379-0.345-0.678c-0.013-0.303,0.019-0.609,0.225-0.934
- c0.203-0.324,0.479-0.587,0.757-0.707c0.279-0.121,0.612-0.143,0.827-0.011c0.214,0.132,0.332,0.377,0.347,0.676
- C475.079,54.54,474.989,54.915,474.784,55.24z"/>
- <path fill="#6D9ACB" d="M452.032,30.785c-3.328-3.198-8.19-3.743-10.78-1.103c-2.591,2.642-1.937,7.424,1.39,10.623
- c3.328,3.198,8.187,3.695,10.776,1.053C456.008,38.717,455.36,33.983,452.032,30.785z"/>
- <path fill="#6D9ACB" d="M454.812,47.658c-1.785,0.799-2.598,2.782-1.807,4.429c0.466,0.971,1.387,1.606,2.429,1.8
- c0.726,0.136,1.511,0.057,2.242-0.271c1.784-0.8,2.597-2.781,1.805-4.43C458.688,47.542,456.596,46.858,454.812,47.658z"/>
- <path fill="#6D9ACB" d="M468.008,47.348c0.466-1.224,0.063-2.559-0.971-2.977c-1.037-0.418-2.373,0.226-2.838,1.45
- c-0.464,1.223,0,2.563,1.037,2.98C466.271,49.22,467.543,48.57,468.008,47.348z"/>
- <path fill="#6D9ACB" d="M470.42,52.751c-0.397-0.286-0.974-0.366-1.486-0.2c-0.515,0.166-1.036,0.553-1.426,1.084
- c-0.39,0.533-0.527,0.948-0.527,1.483c0,0.536,0.257,1.131,0.655,1.416c0.396,0.285,0.918,0.321,1.432,0.156
- c0.515-0.167,1.115-0.62,1.505-1.151c0.388-0.533,0.495-1.045,0.495-1.581C471.066,53.423,470.816,53.034,470.42,52.751z"/>
- <path fill="#6D9ACB" d="M473.893,53.573c-0.278,0.12-0.554,0.383-0.757,0.707c-0.206,0.324-0.237,0.631-0.225,0.934
- c0.014,0.299,0.131,0.546,0.345,0.678c0.215,0.133,0.49,0.127,0.769,0.007c0.277-0.12,0.555-0.333,0.76-0.658
- s0.295-0.7,0.282-1.002c-0.015-0.299-0.133-0.544-0.347-0.676C474.505,53.431,474.172,53.452,473.893,53.573z"/>
-</g>
-<g>
- <path fill="#204A87" d="M461.713,37.216c-1.322,0.228-2.283,1.758-1.781,2.968c0.585,1.841,3.355,2.55,4.799,0.998
- c0.296-0.282,0.457-0.674,0.559-1.054C465.636,38.192,463.524,36.714,461.713,37.216z M463.398,40.139
- c-0.222,0.65-1.036,0.947-1.82,0.665c0,0-0.001,0-0.002-0.001c-0.784-0.282-1.239-1.038-1.016-1.687
- c0.221-0.648,1.036-0.946,1.82-0.664c0,0,0.001,0,0.001,0.001C463.166,38.735,463.621,39.49,463.398,40.139z"/>
- <path fill="#6D9ACB" d="M462.382,38.453C462.382,38.452,462.381,38.452,462.382,38.453c-0.785-0.283-1.601,0.015-1.821,0.663
- c-0.224,0.649,0.231,1.404,1.016,1.687c0.001,0.001,0.002,0.001,0.002,0.001c0.784,0.282,1.599-0.015,1.82-0.665
- C463.621,39.49,463.166,38.735,462.382,38.453z"/>
+<g id="svg1205_copy" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg">
+ <rect x="-3" y="-4" fill="#43C200" width="491.5" height="85.5"/>
+ <rect y="75" fill="#4F4F4F" width="486" height="5"/>
+ <g>
+ <path fill="none" d="M223.711,52.553c-0.115-0.07-0.21-0.132-0.289-0.182c-0.078-0.049-0.178-0.095-0.299-0.138
+ c-0.121-0.044-0.274-0.089-0.459-0.141c-0.185-0.049-0.427-0.115-0.726-0.202c-0.143,0.456-0.243,0.912-0.299,1.369
+ c-0.058,0.455-0.083,0.872-0.075,1.249c0.007,0.379,0.035,0.706,0.085,0.985c0.05,0.276,0.103,0.467,0.161,0.565
+ c0.042,0.058,0.1,0.117,0.17,0.182c0.071,0.063,0.161,0.113,0.268,0.15c0.106,0.035,0.216,0.039,0.331,0.011
+ c0.113-0.029,0.235-0.108,0.363-0.236c0.342-0.356,0.598-0.724,0.77-1.102c0.171-0.377,0.281-0.732,0.331-1.068
+ c0.049-0.335,0.043-0.63-0.021-0.888C223.957,52.852,223.854,52.668,223.711,52.553z"/>
+ <polygon fill="none" points="170.95,21.462 170.805,21.315 170.551,21.315 157.097,21.315 156.516,21.315 156.516,21.897
+ 156.516,54.477 156.516,55.058 157.097,55.058 182.695,55.058 183.277,55.058 183.277,54.477 183.277,34.115 183.277,33.86
+ 183.095,33.679 "/>
+ <path fill="none" d="M320.3,51.901h2.849l0.635,1.689h1.242l-2.618-6.727h-1.319l-2.618,6.727h1.205L320.3,51.901z
+ M321.724,48.098l1.026,2.753h-2.05L321.724,48.098z"/>
+ <path fill="none" d="M302.302,53.733c1.764,0,3.426-1.3,3.426-3.51c0-2.202-1.662-3.502-3.426-3.502
+ c-1.767,0-3.416,1.3-3.416,3.502C298.886,52.434,300.535,53.733,302.302,53.733z M302.302,47.795c1.137,0,2.257,0.807,2.257,2.429
+ s-1.12,2.429-2.257,2.429c-1.129,0-2.249-0.807-2.249-2.429S301.173,47.795,302.302,47.795z"/>
+ <path fill="none" d="M311.268,50.935h0.833l1.416,2.655h1.29l-1.52-2.771c0.939-0.227,1.52-0.957,1.52-1.915
+ c0-1.139-0.807-2.04-2.106-2.04h-2.58v6.727h1.147V50.935z M311.268,47.869h1.224c0.701,0,1.158,0.409,1.158,1.035
+ c0,0.615-0.457,1.024-1.158,1.024h-1.224V47.869z"/>
+ <path fill="none" d="M323.083,27.482c-2.353,0-3.732,1.653-4.085,4.161h7.435C326.433,29.283,325.258,27.482,323.083,27.482z"/>
+ <path fill="none" d="M249.36,28.516c-1.559,0-2.706,1.21-2.998,2.862h5.556C251.859,29.902,251.065,28.516,249.36,28.516z"/>
+ <path fill="none" d="M267.679,38.46c3.939,0,6.938-2.951,6.938-8.292c0-5.341-2.998-8.292-6.938-8.292
+ c-3.938,0-6.936,2.951-6.936,8.292C260.743,35.51,263.741,38.46,267.679,38.46z"/>
+ <path fill="none" d="M223.039,37.428c2.322,0,3.468-1.771,3.468-4.486c0-2.744-1.175-4.426-3.528-4.426
+ c-2.116,0-3.232,1.652-3.232,4.131v0.65C219.747,35.833,221.011,37.428,223.039,37.428z"/>
+ <path fill="none" d="M255.562,53.733c1.764,0,3.426-1.3,3.426-3.51c0-2.202-1.662-3.502-3.426-3.502s-3.416,1.3-3.416,3.502
+ C252.146,52.434,253.798,53.733,255.562,53.733z M255.562,47.795c1.14,0,2.257,0.807,2.257,2.429s-1.117,2.429-2.257,2.429
+ c-1.129,0-2.247-0.807-2.247-2.429S254.433,47.795,255.562,47.795z"/>
+ <polygon fill="none" points="276.058,52.511 272.974,52.511 272.974,46.864 271.835,46.864 271.835,53.591 276.058,53.591 "/>
+ <path fill="none" d="M281.532,51.901h2.846l0.635,1.689h1.242l-2.618-6.727h-1.319l-2.616,6.727h1.205L281.532,51.901z
+ M282.955,48.098l1.024,2.753h-2.049L282.955,48.098z"/>
+ <path fill="none" d="M245.24,53.733c1.716,0,2.74-1.092,3.045-2.23l-1.044-0.34c-0.229,0.759-0.873,1.479-2.001,1.479
+ c-1.149,0-2.231-0.833-2.231-2.408c0-1.632,1.11-2.438,2.221-2.438c1.128,0,1.754,0.654,1.954,1.469l1.07-0.359
+ c-0.303-1.178-1.317-2.183-3.024-2.183c-1.747,0-3.387,1.32-3.387,3.512C241.843,52.424,243.427,53.733,245.24,53.733z"/>
+ <path fill="none" d="M294.92,51.732c0-0.797-0.495-1.414-1.207-1.604c0.58-0.208,0.996-0.741,0.996-1.453
+ c0-1.053-0.757-1.812-2.049-1.812h-2.314v6.727h2.486C294.085,53.591,294.92,52.813,294.92,51.732z M291.474,47.832h1.008
+ c0.69,0,1.092,0.371,1.092,0.938c0,0.562-0.401,0.94-1.063,0.94h-1.036V47.832z M291.474,52.624V50.67h1.196
+ c0.702,0,1.092,0.408,1.092,0.985c0,0.599-0.447,0.969-1.131,0.969H291.474z"/>
+ <polygon fill="none" points="267.603,52.511 264.52,52.511 264.52,46.864 263.38,46.864 263.38,53.591 267.603,53.591 "/>
+ <polygon fill="#FFFFFF" points="197.666,20.164 193.727,20.164 193.727,40.172 206.629,40.172 206.629,37.133 197.666,37.133
+ "/>
+ <rect x="209.009" y="25.77" fill="#FFFFFF" width="3.938" height="14.402"/>
+ <path fill="#FFFFFF" d="M210.979,24.532c1.233,0,2.263-1.003,2.263-2.273c0-1.239-1.03-2.272-2.263-2.272
+ c-1.265,0-2.263,1.033-2.263,2.272C208.716,23.528,209.714,24.532,210.979,24.532z"/>
+ <path fill="#FFFFFF" d="M219.747,38.491h0.059c1.234,1.387,2.468,1.977,4.496,1.977c3.821,0,6.348-3.452,6.348-7.761
+ c0-4.161-2.262-7.23-6.171-7.23c-2.086,0-3.321,0.62-4.673,1.977h-0.059v-8.529h-3.938v21.249h3.85L219.747,38.491z
+ M219.747,32.646c0-2.479,1.117-4.131,3.232-4.131c2.353,0,3.528,1.682,3.528,4.426c0,2.716-1.146,4.486-3.468,4.486
+ c-2.028,0-3.292-1.594-3.292-4.131V32.646z"/>
+ <path fill="#FFFFFF" d="M241.131,29.311l0.086-3.836c-1.88,0.118-3.673,1.269-4.497,2.862h-0.058l-0.088-2.567h-3.85v14.402h3.938
+ v-5.43c0-2.893,0.528-3.925,1.441-4.574C238.896,29.608,239.837,29.372,241.131,29.311z"/>
+ <path fill="#FFFFFF" d="M249.771,40.467c2.089,0,3.559-0.324,4.938-0.944l-0.41-2.952c-1.294,0.533-2.617,0.856-4.026,0.856
+ c-2.381,0-3.91-1.092-4.057-3.335h9.316c0.118-0.531,0.176-1.357,0.176-1.977c0-3.571-2.176-6.64-5.938-6.64
+ c-4.524,0-7.435,3.128-7.435,7.88C242.336,37.988,245.335,40.467,249.771,40.467z M249.36,28.516c1.705,0,2.499,1.387,2.558,2.862
+ h-5.556C246.654,29.726,247.802,28.516,249.36,28.516z"/>
+
+ <line fill="none" stroke="#FFFFFF" stroke-width="0" stroke-linecap="round" stroke-linejoin="round" x1="255.708" y1="32.116" x2="255.708" y2="32.115"/>
+
+ <line fill="none" stroke="#FFFFFF" stroke-width="0" stroke-linecap="round" stroke-linejoin="round" x1="255.708" y1="32.116" x2="255.708" y2="32.116"/>
+ <path fill="#FFFFFF" d="M267.679,40.467c5.291,0,9.641-3.866,9.641-10.299c0-6.433-4.35-10.299-9.641-10.299
+ c-5.289,0-9.639,3.866-9.639,10.299C258.04,36.602,262.39,40.467,267.679,40.467z M267.679,21.875
+ c3.939,0,6.938,2.951,6.938,8.292c0,5.342-2.998,8.292-6.938,8.292c-3.938,0-6.936-2.951-6.936-8.292
+ C260.743,24.827,263.741,21.875,267.679,21.875z"/>
+ <path fill="#FFFFFF" d="M281.083,40.172h2.469V27.777h3.417h0.227h2.095v12.395h2.471V27.777h3.644v-1.889h-3.644V24.59
+ c0-2.567,1.088-4.072,3.057-4.072c0.909,0,1.498,0.147,2.057,0.354l0.235-1.83c-0.53-0.207-1.529-0.414-2.321-0.414
+ c-3.498,0-5.498,2.273-5.498,6.346v0.914h-2.095h-0.227h-3.417V24.59c0-2.567,1.088-4.072,3.057-4.072
+ c0.911,0,1.5,0.147,2.059,0.354l0.233-1.83c-0.528-0.207-1.526-0.414-2.321-0.414c-3.498,0-5.496,2.273-5.496,6.346v0.914h-2.321
+ v1.889h2.321V40.172z"/>
+ <rect x="298.265" y="25.888" fill="#FFFFFF" width="2.469" height="14.284"/>
+ <path fill="#FFFFFF" d="M299.499,23.794c0.853,0,1.527-0.679,1.527-1.536c0-0.855-0.675-1.534-1.527-1.534
+ s-1.529,0.679-1.529,1.534C297.97,23.115,298.646,23.794,299.499,23.794z"/>
+ <path fill="#FFFFFF" d="M310.246,40.467c1.763,0,3.027-0.207,4.466-0.826l-0.236-1.888c-1.232,0.56-2.554,0.826-3.79,0.826
+ c-2.85,0-4.818-1.8-4.818-5.607c0-3.6,2.144-5.489,4.937-5.489c1.469,0,2.763,0.354,3.821,0.855l0.235-1.888
+ c-0.883-0.443-2.293-0.856-3.851-0.856c-4.408,0-7.729,2.686-7.729,7.703C303.28,38.018,306.278,40.467,310.246,40.467z"/>
+ <path fill="#FFFFFF" d="M323.288,40.467c1.765,0,3.087-0.266,4.468-0.826l-0.235-1.888c-1.088,0.53-2.646,0.826-3.88,0.826
+ c-2.85,0-4.7-1.742-4.761-4.988h9.905c0.058-0.531,0.089-0.974,0.089-1.417c0-3.659-1.911-6.582-5.586-6.582
+ c-3.967,0-6.876,3.306-6.876,7.703C316.412,38.136,319.321,40.467,323.288,40.467z M323.083,27.482c2.175,0,3.35,1.8,3.35,4.161
+ h-7.435C319.351,29.135,320.73,27.482,323.083,27.482z"/>
+ <path fill="#FFFFFF" d="M172.104,20.218c-0.441-0.428-1.058-0.668-1.672-0.654h-13.915c-1.208,0-1.75,1.013-1.746,1.745v33.733
+ c0.001,1.218,0.528,1.745,1.746,1.745h26.761c1.219,0,1.745-0.527,1.745-1.745V34.151c0.014-0.614-0.227-1.23-0.655-1.672
+ L172.104,20.218z M183.277,34.115v20.362v0.581h-0.582h-25.598h-0.581v-0.581V21.897v-0.582h0.581h13.454h0.254l0.145,0.146
+ l12.145,12.217l0.182,0.181V34.115z"/>
+ <path fill="#FFFFFF" d="M183.855,19.572h-7.009c-0.121-0.019-0.245-0.019-0.365,0c-0.775,0.248-1.035,1.427-0.438,1.982
+ l7.009,7.045c0.647,0.617,1.937,0.088,1.971-0.808v-7.045C185.023,20.131,184.466,19.572,183.855,19.572z"/>
+ <path fill="#FFFFFF" d="M293.762,51.655c0-0.577-0.39-0.985-1.092-0.985h-1.196v1.954h1.157
+ C293.314,52.624,293.762,52.254,293.762,51.655z"/>
+ <path fill="#FFFFFF" d="M302.302,52.652c1.137,0,2.257-0.807,2.257-2.429s-1.12-2.429-2.257-2.429
+ c-1.129,0-2.249,0.807-2.249,2.429S301.173,52.652,302.302,52.652z"/>
+ <path fill="#FFFFFF" d="M293.573,48.77c0-0.567-0.401-0.938-1.092-0.938h-1.008v1.879h1.036
+ C293.172,49.711,293.573,49.332,293.573,48.77z"/>
+ <path fill="#FFFFFF" d="M255.562,52.652c1.14,0,2.257-0.807,2.257-2.429s-1.117-2.429-2.257-2.429
+ c-1.129,0-2.247,0.807-2.247,2.429S254.433,52.652,255.562,52.652z"/>
+ <polygon fill="#FFFFFF" points="282.955,48.098 281.931,50.851 283.979,50.851 "/>
+ <polygon fill="#FFFFFF" points="321.724,48.098 320.7,50.851 322.75,50.851 "/>
+ <path fill="#FFFFFF" d="M238,56.787h90.874V43.766H238V56.787z M321.088,46.864h1.319l2.618,6.727h-1.242l-0.635-1.689H320.3
+ l-0.625,1.689h-1.205L321.088,46.864z M310.12,46.864h2.58c1.3,0,2.106,0.901,2.106,2.04c0,0.958-0.58,1.688-1.52,1.915
+ l1.52,2.771h-1.29l-1.416-2.655h-0.833v2.655h-1.147V46.864z M302.302,46.722c1.764,0,3.426,1.3,3.426,3.502
+ c0,2.21-1.662,3.51-3.426,3.51c-1.767,0-3.416-1.3-3.416-3.51C298.886,48.021,300.535,46.722,302.302,46.722z M290.346,46.864
+ h2.314c1.292,0,2.049,0.759,2.049,1.812c0,0.712-0.416,1.245-0.996,1.453c0.712,0.189,1.207,0.807,1.207,1.604
+ c0,1.081-0.835,1.858-2.088,1.858h-2.486V46.864z M282.317,46.864h1.319l2.618,6.727h-1.242l-0.635-1.689h-2.846l-0.626,1.689
+ h-1.205L282.317,46.864z M271.835,46.864h1.139v5.646h3.084v1.08h-4.223V46.864z M263.38,46.864h1.14v5.646h3.083v1.08h-4.223
+ V46.864z M255.562,46.722c1.764,0,3.426,1.3,3.426,3.502c0,2.21-1.662,3.51-3.426,3.51s-3.416-1.3-3.416-3.51
+ C252.146,48.021,253.798,46.722,255.562,46.722z M245.229,46.722c1.707,0,2.722,1.005,3.024,2.183l-1.07,0.359
+ c-0.2-0.814-0.826-1.469-1.954-1.469c-1.11,0-2.221,0.807-2.221,2.438c0,1.575,1.082,2.408,2.231,2.408
+ c1.128,0,1.771-0.72,2.001-1.479l1.044,0.34c-0.305,1.139-1.329,2.23-3.045,2.23c-1.813,0-3.397-1.31-3.397-3.5
+ C241.843,48.042,243.483,46.722,245.229,46.722z"/>
+ <path fill="#FFFFFF" d="M313.649,48.904c0-0.626-0.457-1.035-1.158-1.035h-1.224v2.06h1.224
+ C313.192,49.929,313.649,49.519,313.649,48.904z"/>
+ <path fill="#FFFFFF" d="M224.417,52.17c-0.171-0.172-0.389-0.324-0.652-0.461c-0.263-0.136-0.552-0.256-0.865-0.362
+ c-0.314-0.108-0.634-0.193-0.961-0.257c-0.329-0.064-0.628-0.104-0.898-0.117c-0.043,0.084-0.121,0.169-0.235,0.256
+ c-0.009,0.01-0.019,0.013-0.028,0.021c-0.519-0.018-0.974,0.011-1.351,0.098c-0.406,0.092-0.756,0.239-1.047,0.437
+ c-0.293,0.201-0.532,0.44-0.716,0.716c-0.186,0.279-0.342,0.582-0.471,0.908c-0.029-0.326-0.05-0.59-0.064-0.79
+ c-0.015-0.198-0.029-0.384-0.043-0.556c-0.015-0.171-0.036-0.353-0.064-0.544c-0.028-0.192-0.071-0.452-0.128-0.78
+ c-0.157-0.072-0.311-0.14-0.46-0.204s-0.217-0.031-0.204,0.097c0.024,0.235,0.051,0.5,0.077,0.752
+ c-0.038-0.052-0.072-0.106-0.119-0.153c-0.072-0.07-0.143-0.113-0.214-0.128c-0.157,0-0.299,0.004-0.427,0.01
+ c-0.128,0.009-0.267,0.015-0.417,0.021c-0.149,0.008-0.313,0.014-0.492,0.021c-0.178,0.007-0.403,0.018-0.673,0.031
+ c0.014-0.299,0.021-0.687,0.021-1.164c0-0.479,0.018-0.976,0.054-1.495c0.035-0.521,0.092-1.038,0.171-1.55
+ c0.078-0.514,0.199-0.966,0.363-1.357c0.164-0.393,0.375-0.692,0.63-0.898c0.256-0.206,0.584-0.261,0.983-0.161
+ c0.185,0,0.345,0.068,0.481,0.202c0.135,0.137,0.246,0.283,0.332,0.439c0.085,0.157,0.153,0.305,0.203,0.438
+ c0.049,0.137,0.088,0.205,0.117,0.205c0.014,0.026,0.021,0.049,0.021,0.063s0.011,0.025,0.033,0.031
+ c0.021,0.008,0.064,0.01,0.128,0.01c0.064,0,0.174,0,0.332,0c0.085-0.056,0.075-0.237-0.032-0.544s-0.289-0.609-0.545-0.908
+ c-0.256-0.3-0.581-0.539-0.972-0.716c-0.393-0.178-0.837-0.168-1.335,0.032c-0.2,0.085-0.414,0.267-0.642,0.546
+ c-0.228,0.275-0.431,0.701-0.609,1.271s-0.313,1.314-0.406,2.232c-0.093,0.921-0.104,2.063-0.032,3.433
+ c-0.499,0.058-0.955,0.106-1.368,0.147c-0.414,0.044-0.663,0.081-0.749,0.108c-0.014,0.028-0.046,0.078-0.096,0.15
+ c-0.05,0.07-0.093,0.146-0.129,0.225c-0.035,0.078-0.053,0.143-0.053,0.191c0,0.05,0.05,0.074,0.149,0.074
+ c0.213-0.014,0.392-0.02,0.535-0.02c0.142,0,0.288-0.005,0.438-0.011c0.149-0.008,0.324-0.019,0.523-0.033
+ c0.2-0.014,0.463-0.035,0.791-0.064c0.085,1.154,0.149,2.124,0.192,2.908s0.075,1.424,0.096,1.924
+ c0.021,0.499,0.035,0.882,0.042,1.152s0.014,0.465,0.021,0.578c0.007,0.113,0.018,0.178,0.032,0.192s0.043,0.022,0.086,0.022
+ c0.128,0.012,0.252,0.025,0.374,0.031c0.121,0.008,0.195-0.046,0.224-0.162c-0.015-0.554-0.04-1.08-0.075-1.58
+ c-0.036-0.5-0.072-1.007-0.107-1.529c-0.036-0.52-0.075-1.068-0.118-1.645c-0.043-0.578-0.071-1.229-0.085-1.956
+ c0.242-0.014,0.46-0.025,0.652-0.033c0.192-0.006,0.381-0.017,0.566-0.031c0.185-0.014,0.377-0.028,0.578-0.043
+ c0.166-0.012,0.363-0.04,0.569-0.07c0.053,0.522,0.108,1.071,0.168,1.664c0.107,1.061,0.146,2.325,0.118,3.795
+ c0,0.07,0.042,0.119,0.128,0.148c0.085,0.028,0.178,0.035,0.277,0.021c0.1-0.015,0.189-0.04,0.268-0.074
+ c0.078-0.036,0.11-0.089,0.096-0.161c-0.029-0.143-0.039-0.339-0.032-0.586c0.007-0.25,0.014-0.506,0.021-0.77
+ c0.007-0.265,0.021-0.515,0.042-0.749c0.021-0.235,0.039-0.418,0.053-0.546c0.085-0.255,0.195-0.538,0.331-0.844
+ c0.136-0.307,0.314-0.594,0.535-0.866c0.221-0.271,0.484-0.51,0.791-0.716s0.666-0.346,1.08-0.418
+ c0.285-0.041,0.466-0.103,0.544-0.181c0.009-0.009,0.013-0.021,0.021-0.031c0.04,0.049,0.079,0.098,0.118,0.148
+ c0.043,0.059,0.085,0.122,0.128,0.191c-0.072,0.387-0.121,0.872-0.15,1.456c-0.028,0.583-0.021,1.252,0.021,2.01
+ c0.014,0.169,0.053,0.373,0.118,0.608c0.064,0.235,0.16,0.458,0.288,0.673c0.128,0.215,0.299,0.396,0.513,0.544
+ c0.214,0.151,0.478,0.227,0.791,0.227c0.185,0,0.385-0.108,0.599-0.323c0.213-0.212,0.413-0.482,0.599-0.811
+ c0.185-0.328,0.353-0.695,0.502-1.102c0.149-0.405,0.259-0.801,0.331-1.185c0.071-0.387,0.092-0.739,0.064-1.059
+ C224.688,52.563,224.588,52.326,224.417,52.17z M224.042,53.996c-0.05,0.336-0.16,0.691-0.331,1.068
+ c-0.171,0.378-0.428,0.745-0.77,1.102c-0.128,0.128-0.25,0.207-0.363,0.236c-0.115,0.028-0.225,0.024-0.331-0.011
+ c-0.107-0.037-0.197-0.087-0.268-0.15c-0.071-0.064-0.128-0.124-0.17-0.182c-0.058-0.099-0.111-0.289-0.161-0.565
+ c-0.05-0.279-0.078-0.606-0.085-0.985c-0.008-0.377,0.017-0.794,0.075-1.249c0.057-0.457,0.156-0.913,0.299-1.369
+ c0.299,0.087,0.541,0.153,0.726,0.202c0.185,0.052,0.338,0.097,0.459,0.141c0.122,0.043,0.221,0.089,0.299,0.138
+ c0.079,0.05,0.174,0.111,0.289,0.182c0.143,0.115,0.246,0.3,0.31,0.556C224.085,53.366,224.092,53.661,224.042,53.996z"/>
+ <path fill="#FFFFFF" d="M232.935,55.407c-0.079-0.007-0.203-0.01-0.375-0.01c-0.314,0.042-0.562-0.02-0.748-0.183
+ c-0.185-0.162-0.328-0.382-0.427-0.652c-0.1-0.27-0.168-0.573-0.203-0.907c-0.036-0.337-0.068-0.652-0.096-0.951
+ c-0.029-0.3-0.063-0.56-0.107-0.78c-0.042-0.221-0.121-0.353-0.235-0.396c-0.243-0.099-0.471-0.063-0.684,0.107
+ c-0.214,0.171-0.413,0.409-0.599,0.717c-0.185,0.305-0.36,0.647-0.523,1.024c-0.165,0.379-0.311,0.725-0.438,1.036
+ c-0.029-0.398-0.051-0.79-0.064-1.174c-0.015-0.386-0.026-0.734-0.032-1.049c-0.007-0.313-0.022-0.579-0.043-0.8
+ c-0.021-0.222-0.047-0.367-0.075-0.439c-0.128-0.241-0.271-0.364-0.428-0.364c-0.157,0-0.32,0.084-0.491,0.246
+ c-0.171,0.165-0.346,0.386-0.524,0.662c-0.178,0.279-0.341,0.578-0.491,0.9c-0.149,0.319-0.281,0.638-0.396,0.951
+ c-0.114,0.312-0.2,0.584-0.256,0.811c0-0.952,0.028-1.752,0.085-2.394s0.071-1.147,0.043-1.519
+ c-0.029-0.026-0.083-0.074-0.161-0.139c-0.078-0.063-0.157-0.109-0.235-0.138c-0.079-0.029-0.154-0.033-0.225-0.011
+ c-0.071,0.021-0.106,0.095-0.106,0.223c-0.014,0.529-0.032,1.147-0.054,1.862c-0.021,0.711-0.043,1.409-0.064,2.095
+ c-0.021,0.682-0.043,1.291-0.064,1.826c-0.021,0.534-0.046,0.895-0.075,1.078c0.071,0.131,0.157,0.254,0.256,0.376
+ c0.1,0.119,0.27,0.152,0.513,0.095c0.028-0.413,0.096-0.87,0.203-1.379c0.107-0.505,0.239-1.011,0.396-1.516
+ c0.157-0.506,0.338-0.995,0.545-1.466c0.207-0.471,0.43-0.889,0.673-1.261c0.115-0.128,0.193-0.148,0.235-0.063
+ c0.042,0.084,0.071,0.241,0.086,0.471c0.014,0.227,0.014,0.501,0,0.822c-0.015,0.32-0.025,0.652-0.032,0.993
+ c-0.007,0.343-0.007,0.681,0,1.016c0.007,0.336,0.04,0.617,0.096,0.846c0.042,0.157,0.143,0.262,0.299,0.319
+ c0.156,0.059,0.27,0.021,0.342-0.106c0.057-0.184,0.139-0.423,0.246-0.717c0.106-0.29,0.231-0.594,0.374-0.908
+ c0.142-0.312,0.292-0.608,0.449-0.887s0.303-0.51,0.438-0.695c0.135-0.184,0.25-0.291,0.343-0.32
+ c0.092-0.028,0.152,0.05,0.181,0.235c0.028,0.428,0.082,0.859,0.16,1.294c0.078,0.434,0.213,0.805,0.407,1.11
+ c0.192,0.308,0.456,0.506,0.79,0.599c0.335,0.093,0.767,0.004,1.294-0.267c0-0.058,0.003-0.099,0.01-0.128
+ c0.007-0.028-0.007-0.05-0.042-0.064C233.07,55.426,233.013,55.415,232.935,55.407z"/>
+ </g>
</g>
</svg>
diff --git a/icon-themes/galaxy/brand_cp/intro.png b/icon-themes/galaxy/brand_cp/intro.png
index 016e378..8d00142 100644
Binary files a/icon-themes/galaxy/brand_cp/intro.png and b/icon-themes/galaxy/brand_cp/intro.png differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 8f457c5..89bc27d 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index 33a8b06..779c988 100644
Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
index 6552d44..7d433fc 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ
commit 5d9dde06e52c9e09b790f4d9bfde4e2b67d03879
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 11 11:55:18 2014 +0000
edit->changes->show has empty filter settings
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9
(cherry picked from commit 55c413b9cb2692b784c6c43a519be08146438237)
Reviewed-on: https://gerrit.libreoffice.org/7995
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index d863bdd..e4b46e8 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -63,6 +63,10 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
{
FreeResource();
+ aFilterCtr.HideRange(false);
+ Size aCtrSize(LogicToPixel(Size(261 , 86), MAP_APPFONT));
+ aFilterCtr.SetSizePixel(aCtrSize);
+
Point aFlFilterPt( aFlFilter.GetPosPixel() );
aFlFilterPt.Y() += aFlFilter.GetSizePixel().Height();
aFilterCtr.SetPosPixel( aFlFilterPt );
@@ -72,7 +76,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighLightHandle ));
aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
- aFilterCtr.HideRange(false);
aFilterCtr.Show();
SetDispatcherLock( true );
commit ae2ea2b3b140bed8f10a8c43cb8f9ee28df12443
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon Feb 10 01:26:35 2014 -0500
fdo#46707: Don't bother with synonyms for text with mixed script types.
Change-Id: I7922905523406d05f864b10e1ecfd27f3fb5f9d6
(cherry picked from commit 49341001e76389f11bf67d756f4742275bc9dcd9)
Reviewed-on: https://gerrit.libreoffice.org/7963
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index c1b8fa8..52429ed 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -29,6 +29,7 @@
#include <editeng/fhgtitem.hxx>
#include <svl/style.hxx>
+#include <svl/languageoptions.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <editeng/outliner.hxx>
@@ -1559,6 +1560,24 @@ Selection OutlinerView::GetSurroundingTextSelection() const
// ===== some code for thesaurus sub menu within context menu
// ======================================================================
+namespace {
+
+bool isSingleScriptType( sal_uInt16 nScriptType )
+{
+ sal_uInt8 nScriptCount = 0;
+
+ if (nScriptType & SCRIPTTYPE_LATIN)
+ ++nScriptCount;
+ if (nScriptType & SCRIPTTYPE_ASIAN)
+ ++nScriptCount;
+ if (nScriptType & SCRIPTTYPE_COMPLEX)
+ ++nScriptCount;
+
+ return nScriptCount == 1;
+}
+
+}
+
// returns: true if a word for thesaurus look-up was found at the current cursor position.
// The status string will be word + iso language string (e.g. "light#en-US")
bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
@@ -1574,6 +1593,10 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
aTextSel = pEditEngine->GetWord( aTextSel, i18n::WordType::DICTIONARY_WORD );
aText = pEditEngine->GetText( aTextSel );
aTextSel.Adjust();
+
+ if (!isSingleScriptType(pEditEngine->GetScriptType(aTextSel)))
+ return false;
+
LanguageType nLang = pEditEngine->GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos );
OUString aLangText( LanguageTag( nLang ).getBcp47() );
commit 3ca30dd49b582fbcd31902d519596a32578b3f04
Author: Joren De Cuyper <jorendc at libreoffice.org>
Date: Sun Feb 9 23:49:21 2014 +0100
related fdo#65430: forgot to 'unlink' setOpenTemplateHdl
This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1
Conflicts:
sfx2/source/doc/templatedlg.cxx
Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92
Reviewed-on: https://gerrit.libreoffice.org/7960
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e6e464c..7032914 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -288,6 +288,7 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
mpRemoteView->setOpenTemplateHdl(Link());
mpSearchView->setItemStateHdl(Link());
+ mpSearchView->setOpenTemplateHdl(Link());
delete mpSearchEdit;
delete mpViewBar;
commit 9a59699f5daa31675aa502151dc067e02291f158
Author: Joren De Cuyper <jorendc at libreoffice.org>
Date: Fri Feb 7 15:08:12 2014 +0100
fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchView
Currently only templateAbstractView had such handler, which are
templateLocalView and templateRemoteView are based on.
Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f
Reviewed-on: https://gerrit.libreoffice.org/7918
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 96e7225260aac0815643a4043f4ddb4e6b5764a1)
Reviewed-on: https://gerrit.libreoffice.org/7924
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 2942b66..f0b87d2 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -20,6 +20,16 @@ TemplateSearchView::~TemplateSearchView ()
{
}
+void TemplateSearchView::setOpenTemplateHdl(const Link &rLink)
+{
+ maOpenTemplateHdl = rLink;
+}
+
+void TemplateSearchView::OnItemDblClicked (ThumbnailViewItem *pItem)
+{
+ maOpenTemplateHdl.Call(pItem);
+}
+
void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
const OUString &rTitle, const OUString &rSubtitle,
const OUString &rPath,
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index a31c235..e6e464c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -236,6 +236,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
TEMPLATE_ITEM_PADDING);
mpSearchView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+ mpSearchView->setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx
index a6a81a3..f1bb49c 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -20,9 +20,17 @@ public:
virtual ~TemplateSearchView();
+ void setOpenTemplateHdl (const Link &rLink);
+
void AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
const OUString &rTitle, const OUString &rSubtitle,
const OUString &rPath, const BitmapEx &rImage );
+
+protected:
+ virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+
+protected:
+ Link maOpenTemplateHdl;
};
#endif // __SFX2_TEMPLATESEARCHVIEW_HXX__
commit 5ff44a89b59a6bdfe4cd471456b623eac91afcff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 14:28:07 2014 +0100
fdo#56511 Don't unduly delay Bridge termination
When terminate is called from the Reader or Writer thread, the final terminate
was delayed until disposal of the BridgeFactory, as an unfortunate consequence
of always trying to join on the Reader and Writer. Instead, forgo the join in
such a case and rely on the underlying osl::Thread becoming detached after
calling termiante.
Change-Id: Ifba788c4d0d2e9b14b4f7f6b5f0f1380b712ce36
(cherry picked from commit f6245d5bcb18dff2721d5975cd84711559cefe65)
Reviewed-on: https://gerrit.libreoffice.org/7926
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 31fc342..f27f377 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -255,10 +255,18 @@ void Bridge::terminate(bool final) {
osl::MutexGuard g2(mutex_);
tp = threadPool_;
threadPool_ = 0;
- assert(!(reader_.is() && isThread(reader_.get())));
- std::swap(reader_, r);
- assert(!(writer_.is() && isThread(writer_.get())));
- std::swap(writer_, w);
+ if (reader_.is()) {
+ if (!isThread(reader_.get())) {
+ r = reader_;
+ }
+ reader_.clear();
+ }
+ if (writer_.is()) {
+ if (!isThread(writer_.get())) {
+ w = writer_;
+ }
+ writer_.clear();
+ }
state_ = STATE_FINAL;
}
assert(!(r.is() && w.is()));
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 184f037..331e4b3 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -128,6 +128,7 @@ void Reader::execute() {
SAL_WARN("binaryurp", "caught C++ exception '" << e.what() << '\'');
}
bridge_->terminate(false);
+ bridge_.clear();
}
void Reader::readMessage(Unmarshal & unmarshal) {
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 3d5c199..edcb0f5 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -177,6 +177,7 @@ void Writer::execute() {
OSL_TRACE(OSL_LOG_PREFIX "caught C++ exception '%s'", e.what());
}
bridge_->terminate(false);
+ bridge_.clear();
}
void Writer::sendRequest(
commit 877db2f59eef960ce92b5f3874798b5570165c9a
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 6 15:16:27 2014 +0100
fdo#33852 do not remove too much from the path
Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017
(cherry picked from commit eba6a6789c8832f961ac7054588ed84d04b65480)
Reviewed-on: https://gerrit.libreoffice.org/7900
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 75b426d..9011251 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2128,7 +2128,10 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
OUString aStr;
if ( aPath >>= aStr )
{
- aStr = aStr.replace( 'E', ' ' );
+ // E can appear inside a number, so we only check for its presence at the end
+ aStr = aStr.trim();
+ if (aStr.endsWith("E"))
+ aStr = aStr.copy(0, aStr.getLength() - 1);
aStr = aStr.trim();
aPath <<= aStr;
xMotion->setPath( aPath );
commit b143b7522cf4a6f416510a29ddab60fedc0adbc4
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 6 13:49:05 2014 +0100
rhbz#1017379 do not remove too much from the path
Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37
(cherry picked from commit 5b35f21f1c69239d0605b0751bed87a410fbffee)
Reviewed-on: https://gerrit.libreoffice.org/7897
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 5e7227a..87d07fb 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -779,7 +779,10 @@ namespace oox { namespace ppt {
}
OUString aStr = xAttribs->getOptionalValue( XML_path );
- aStr = aStr.replace( 'E', ' ' );
+ // E can appear inside a number, so we only check for its presence at the end
+ aStr = aStr.trim();
+ if (aStr.endsWith("E"))
+ aStr = aStr.copy(0, aStr.getLength() - 1);
aStr = aStr.trim();
pNode->getNodeProperties()[ NP_PATH ] = makeAny(aStr);
mnPathEditMode = xAttribs->getOptionalValueToken( XML_pathEditMode, 0 );
commit 2cc15ebd451148d56cf1abee867e949c114ca016
Author: Armin Le Grand <alg at apache.org>
Date: Wed Oct 30 11:22:20 2013 +0000
Resolves: fdo#69271 i#123510 changed priority in style preparation
(cherry picked from commit 86459550d81c3eae067e89d9af1b6e872215a588)
(cherry picked from commit 8b2fb0e153fa846a171105b7801c398ffbe3d595)
Change-Id: Ia567666cd76dce646479003a830d969f4962da71
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 262ec56..f1e7ea8 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -106,14 +106,12 @@ namespace svgio
}
}
- if(maCssStyleVector.empty())
+ if(!maCssStyleVector.empty())
{
- return &rOriginal;
- }
- else
- {
- // set CssStyleParent at maCssStyleVector members to hang them in front of
- // the existing style. Build a style chain, reset parent of original for security.
+ // #i123510# if CSS styles were found, create a linked list with rOriginal as parent
+ // and all CSS styles as linked children, so that the style attribute has
+ // priority over the CSS style. If there is no style attribute this means that
+ // no values are set at rOriginal, thus it is still correct to have that order.
// Repeated style requests should only be issued from sub-Text nodes and I'm not
// sure if in-between text nodes may build other chains (should not happen). But
// it's only a re-chaining with pointers (cheap), so allow to do it every time.
@@ -122,14 +120,15 @@ namespace svgio
for(sal_uInt32 a(0); a < maCssStyleVector.size(); a++)
{
- SvgStyleAttributes* pCandidate = const_cast< SvgStyleAttributes* >(maCssStyleVector[maCssStyleVector.size() - a - 1]);
+ SvgStyleAttributes* pNext = const_cast< SvgStyleAttributes* >(maCssStyleVector[a]);
- pCandidate->setCssStyleParent(pCurrent);
- pCurrent = pCandidate;
+ pCurrent->setCssStyleParent(pNext);
+ pCurrent = pNext;
+ pCurrent->setCssStyleParent(0);
}
-
- return pCurrent;
}
+
+ return &rOriginal;
}
SvgNode::SvgNode(
commit a008ee3e85f8d0abe2ed55ea649724e243e58060
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Wed Feb 5 16:53:10 2014 +0100
fdo#69652 Default(Date|Time) is a UNO struct now
Changed to UNO struct from integer by
fdo#67235 adapt form control code to time nanosecond API change
Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5
Reviewed-on: https://gerrit.libreoffice.org/7882
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index bfbb76f..18473e1 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -26,10 +26,15 @@
#include <cppuhelper/queryinterface.hxx>
#include "frm_resource.hxx"
#include "frm_resource.hrc"
+#include <tools/time.hxx>
+#include <tools/date.hxx>
+#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/Date.hpp>
//.........................................................................
namespace frm
{
+using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
@@ -42,9 +47,14 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-const sal_uInt16 DEFAULT_LONG = 0x0001;
-const sal_uInt16 DEFAULT_DOUBLE = 0x0002;
-const sal_uInt16 FILTERPROPOSAL = 0x0004;
+namespace
+{
+ const sal_uInt16 DEFAULT_LONG = 0x0001;
+ const sal_uInt16 DEFAULT_DOUBLE = 0x0002;
+ const sal_uInt16 FILTERPROPOSAL = 0x0004;
+ const sal_uInt16 DEFAULT_TIME = 0x0008;
+ const sal_uInt16 DEFAULT_DATE = 0x0010;
+}
DBG_NAME( OEditBaseModel )
//------------------------------------------------------------------
@@ -84,7 +94,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
OBoundControlModel::write(_rxOutStream);
// Version
- sal_uInt16 nVersionId = 0x0005;
+ sal_uInt16 nVersionId = 0x0006;
DBG_ASSERT((getPersistenceFlags() & ~PF_SPECIAL_FLAGS) == 0,
"OEditBaseModel::write : invalid special version flags !");
// please don't use other flags, older versions can't interpret them !
@@ -102,6 +112,10 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
nAnyMask |= DEFAULT_LONG;
else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE)
nAnyMask |= DEFAULT_DOUBLE;
+ else if (m_aDefault.getValueType() == ::getCppuType((const util::Time*)0))
+ nAnyMask |= DEFAULT_TIME;
+ else if (m_aDefault.getValueType() == ::getCppuType((const util::Date*)0))
+ nAnyMask |= DEFAULT_DATE;
if (m_bFilterProposal) // Don't save a value, because it's boolean
nAnyMask |= FILTERPROPOSAL;
@@ -113,6 +127,18 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
_rxOutStream->writeLong(getINT32(m_aDefault));
else if ((nAnyMask & DEFAULT_DOUBLE) == DEFAULT_DOUBLE)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list