[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 57 commits - basctl/uiconfig bin/pack-debug bin/upload_symbols.py chart2/uiconfig configure.ac cui/source dbaccess/uiconfig desktop/source distro-configs/CPAndroidBranding.conf distro-configs/CPLinux.conf distro-configs/CPLinux-LOKit.conf distro-configs/CPOSX.conf distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf download.lst extensions/source extensions/uiconfig external/Module_external.mk external/more_fonts external/noto_font external/serf filter/source framework/uiconfig icon-themes/colibre icon-themes/galaxy icon-themes/karasa_jaga icon-themes/tango instsetoo_native/CustomTarget_install.mk instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_common instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util Makefile.fetch officecfg/registry postprocess/CustomTarget_registry.mk postprocess/signing readlicense_oo/CustomTarget_readme.mk readlicense_oo/docs r eadlicense_oo/license readlicense_oo/Package_files.mk reportdesign/uiconfig Repository.mk scp2/source sc/source sc/uiconfig sd/uiconfig setup_native/source sfx2/source sfx2/uiconfig solenv/bin solenv/flatpak-manifest.in starmath/uiconfig svx/source svx/uiconfig sw/uiconfig sysui/desktop sysui/productlist.mk
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Tue Mar 30 14:34:43 UTC 2021
Makefile.fetch | 15
Repository.mk | 13
basctl/uiconfig/basicide/menubar/menubar.xml | 3
bin/pack-debug | 340 +
bin/upload_symbols.py | 2
chart2/uiconfig/menubar/menubar.xml | 3
configure.ac | 36
cui/source/dialogs/about.cxx | 2
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 3
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 3
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 3
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 3
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 3
desktop/source/app/crashreport.cxx | 4
distro-configs/CPAndroidBranding.conf | 3
distro-configs/CPLinux-LOKit.conf | 65
distro-configs/CPLinux.conf | 46
distro-configs/CPOSX.conf | 20
distro-configs/CPWin32-MPL.conf | 28
distro-configs/CPWin32.conf | 24
download.lst | 22
extensions/source/macosx/spotlight/mdimporter/Info.plist | 4
extensions/uiconfig/sbibliography/menubar/menubar.xml | 3
external/Module_external.mk | 1
external/more_fonts/ExternalPackage_karla.mk | 19
external/more_fonts/ExternalPackage_opendyslexic.mk | 19
external/more_fonts/Module_more_fonts.mk | 4
external/more_fonts/UnpackedTarball_karla.mk | 14
external/more_fonts/UnpackedTarball_opendyslexic.mk | 14
external/noto_font/ExternalPackage_noto.mk | 134
external/noto_font/ExternalPackage_notosansjp.mk | 17
external/noto_font/ExternalPackage_notosanskr.mk | 17
external/noto_font/ExternalPackage_notosanssc.mk | 17
external/noto_font/ExternalPackage_notosanstc.mk | 17
external/noto_font/ExternalPackage_notoserifjp.mk | 17
external/noto_font/ExternalPackage_notoserifkr.mk | 17
external/noto_font/ExternalPackage_notoserifsc.mk | 17
external/noto_font/ExternalPackage_notoseriftc.mk | 17
external/noto_font/Makefile | 7
external/noto_font/Module_noto_font.mk | 33
external/noto_font/README | 1
external/noto_font/UnpackedTarball_noto.mk | 46
external/noto_font/UnpackedTarball_notosansjp.mk | 14
external/noto_font/UnpackedTarball_notosanskr.mk | 14
external/noto_font/UnpackedTarball_notosanssc.mk | 14
external/noto_font/UnpackedTarball_notosanstc.mk | 14
external/noto_font/UnpackedTarball_notoserifjp.mk | 14
external/noto_font/UnpackedTarball_notoserifkr.mk | 14
external/noto_font/UnpackedTarball_notoserifsc.mk | 14
external/noto_font/UnpackedTarball_notoseriftc.mk | 14
external/serf/UnpackedTarball_serf.mk | 1
external/serf/ssl.verify.none.patch.1 | 11
filter/source/config/fragments/filters/BroadBand_eBook.xcu | 2
filter/source/config/fragments/filters/ClarisWorks.xcu | 2
filter/source/config/fragments/filters/ClarisWorks_Calc.xcu | 2
filter/source/config/fragments/filters/ClarisWorks_Draw.xcu | 2
filter/source/config/fragments/filters/ClarisWorks_Impress.xcu | 2
filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu | 2
filter/source/config/fragments/filters/CorelDrawDocument.xcu | 2
filter/source/config/fragments/filters/CorelPresentationExchange.xcu | 2
filter/source/config/fragments/filters/DIF.xcu | 2
filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu | 2
filter/source/config/fragments/filters/DocBook_File.xcu | 2
filter/source/config/fragments/filters/DosWord.xcu | 2
filter/source/config/fragments/filters/FictionBook_2.xcu | 2
filter/source/config/fragments/filters/FreehandDocument.xcu | 2
filter/source/config/fragments/filters/Lotus.xcu | 2
filter/source/config/fragments/filters/LotusWordPro.xcu | 2
filter/source/config/fragments/filters/MacWrite.xcu | 2
filter/source/config/fragments/filters/Mac_Word.xcu | 2
filter/source/config/fragments/filters/Mac_Works.xcu | 2
filter/source/config/fragments/filters/Mac_Works_Calc.xcu | 2
filter/source/config/fragments/filters/Mariner_Write.xcu | 2
filter/source/config/fragments/filters/PageMakerDocument.xcu | 2
filter/source/config/fragments/filters/PalmDoc.xcu | 2
filter/source/config/fragments/filters/Palm_Text_Document.xcu | 2
filter/source/config/fragments/filters/Plucker_eBook.xcu | 2
filter/source/config/fragments/filters/QPro.xcu | 2
filter/source/config/fragments/filters/QXPDocument.xcu | 2
filter/source/config/fragments/filters/StarOffice_Drawing.xcu | 2
filter/source/config/fragments/filters/StarOffice_Presentation.xcu | 2
filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu | 2
filter/source/config/fragments/filters/StarOffice_Writer.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu | 2
filter/source/config/fragments/filters/UOF_presentation.xcu | 2
filter/source/config/fragments/filters/UOF_spreadsheet.xcu | 2
filter/source/config/fragments/filters/UOF_text.xcu | 2
filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu | 2
filter/source/config/fragments/filters/WPS_QPro_Calc.xcu | 2
filter/source/config/fragments/filters/WordPerfect.xcu | 2
filter/source/config/fragments/filters/WordPerfectGraphics.xcu | 2
filter/source/config/fragments/filters/WriteNow.xcu | 2
filter/source/config/fragments/filters/ZMFDocument.xcu | 2
framework/uiconfig/startmodule/menubar/menubar.xml | 3
icon-themes/colibre/sfx2/res/logo.png |binary
icon-themes/galaxy/brand_cp/flat_logo.svg | 717 ++
icon-themes/galaxy/brand_cp/intro-highres.png |binary
icon-themes/galaxy/brand_cp/intro.png |binary
icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg | 736 ++
icon-themes/galaxy/brand_cp_snapshot/intro-highres.png |binary
icon-themes/galaxy/brand_cp_snapshot/intro.png |binary
icon-themes/karasa_jaga/sfx2/res/logo.png |binary
icon-themes/tango/sfx2/res/logo.png |binary
instsetoo_native/CustomTarget_install.mk | 18
instsetoo_native/CustomTarget_setup.mk | 14
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 8
instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 8
instsetoo_native/util/openoffice.lst.in | 61
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 6
officecfg/registry/data/org/openoffice/Office/Common.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 1
postprocess/CustomTarget_registry.mk | 4
postprocess/signing/signing.pl | 1
readlicense_oo/CustomTarget_readme.mk | 2
readlicense_oo/Package_files.mk | 4
readlicense_oo/docs/readme.xrm | 201
readlicense_oo/license/EULA.odt |binary
readlicense_oo/license/EULA_en-US.rtf | 105
readlicense_oo/license/license.xml | 14
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 3
sc/source/filter/oox/workbookhelper.cxx | 2
sc/uiconfig/scalc/menubar/menubar.xml | 3
scp2/source/ooo/scpaction_ooo.scp | 25
scp2/source/python/module_python_librelogo.scp | 2
sd/uiconfig/sdraw/menubar/menubar.xml | 3
sd/uiconfig/simpress/menubar/menubar.xml | 3
setup_native/source/packinfo/DS_Store |binary
setup_native/source/packinfo/VolumeIcon.icns |binary
setup_native/source/packinfo/osxdndinstall.png |binary
setup_native/source/packinfo/packinfo_brand.txt | 7
setup_native/source/packinfo/packinfo_office.txt | 2
setup_native/source/packinfo/sla.r | 2728 ++++++++++
sfx2/source/appl/appserv.cxx | 32
sfx2/source/view/viewfrm.cxx | 57
sfx2/uiconfig/ui/licensedialog.ui | 49
solenv/bin/macosx-codesign-app-bundle | 4
solenv/bin/modules/installer/download.pm | 2
solenv/bin/modules/installer/environment.pm | 2
solenv/bin/modules/installer/epmfile.pm | 2
solenv/bin/modules/installer/setupscript.pm | 2
solenv/bin/modules/installer/simplepackage.pm | 14
solenv/bin/modules/installer/windows/admin.pm | 3
solenv/bin/modules/installer/windows/idtglobal.pm | 2
solenv/bin/modules/installer/windows/msp.pm | 2
solenv/flatpak-manifest.in | 6
starmath/uiconfig/smath/menubar/menubar.xml | 3
svx/source/dialog/crashreportdlg.cxx | 14
svx/source/dialog/crashreportdlg.hxx | 4
svx/uiconfig/ui/crashreportdlg.ui | 33
sw/uiconfig/sglobal/menubar/menubar.xml | 3
sw/uiconfig/sweb/menubar/menubar.xml | 3
sw/uiconfig/swform/menubar/menubar.xml | 3
sw/uiconfig/swreport/menubar/menubar.xml | 3
sw/uiconfig/swriter/menubar/menubar.xml | 3
sw/uiconfig/swxform/menubar/menubar.xml | 3
sysui/desktop/freedesktop/freedesktop-menus.spec | 3
sysui/desktop/icons/hicolor/1024x1024/apps/main.png |binary
sysui/desktop/icons/hicolor/128x128/apps/main.png |binary
sysui/desktop/icons/hicolor/128x128/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/16x16/apps/main.png |binary
sysui/desktop/icons/hicolor/16x16/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/256x256/apps/main.png |binary
sysui/desktop/icons/hicolor/256x256/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/32x32/apps/main.png |binary
sysui/desktop/icons/hicolor/32x32/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/48x48/apps/main.png |binary
sysui/desktop/icons/hicolor/48x48/apps/startcenter.png |binary
sysui/desktop/icons/hicolor/512x512/apps/main.png |binary
sysui/desktop/icons/hicolor/scalable/apps/main.svg | 78
sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg | 78
sysui/desktop/icons/main.icns |binary
sysui/desktop/icons/soffice.ico |binary
sysui/desktop/share/create_tree.sh | 8
sysui/productlist.mk | 8
179 files changed, 5877 insertions(+), 526 deletions(-)
New commits:
commit 24d64dab16c751df25f2a2937f9e819c88a2e9dd
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Nov 8 12:05:11 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:43 2021 +0200
[cp] remove black text, because it looks bad with dark theme
Change-Id: I0c335bdabd8a801eab870c64138ae2792588657d
diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg
index 48dd0ff5a0f6..e9e09330dcfa 100644
--- a/icon-themes/galaxy/brand_cp/flat_logo.svg
+++ b/icon-themes/galaxy/brand_cp/flat_logo.svg
@@ -19,7 +19,7 @@
viewBox="0 0 491.5 85.5"
enable-background="new 0 0 486 80"
xml:space="preserve"
- inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
sodipodi:docname="flat_logo.svg"
inkscape:export-filename="/home/samtuke/cb/git/productivity/Marketing/rebrand/splash-screens/collabora-office/flat_logo.png"
inkscape:export-xdpi="90"
@@ -480,21 +480,24 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1992"
+ inkscape:window-width="3840"
+ inkscape:window-height="2095"
id="namedview149"
- showgrid="false"
+ showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- inkscape:zoom="5.341564"
- inkscape:cx="216.49851"
- inkscape:cy="-8.8675977"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:zoom="1.335391"
+ inkscape:cx="514.14833"
+ inkscape:cy="207.11017"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="g4762" /><g
+ inkscape:current-layer="g4762"
+ showguides="true"><inkscape:grid
+ type="xygrid"
+ id="grid219" /></sodipodi:namedview><g
id="svg1205"
display="none"
style="display:none"
@@ -689,37 +692,26 @@
style="display:inline;fill:#ffffff" /></g><g
id="g4762"
transform="matrix(0.81809146,0,0,0.81809146,22.434697,75.008495)"><polygon
- transform="matrix(2.0377711,0,0,2.0377711,94.256411,-105.65899)"
+ transform="matrix(2.0377711,0,0,2.0377711,214.04721,-105.65899)"
id="polygon14"
points="17.258,20.718 17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 "
style="fill:#ffffff" /><path
id="path24-7"
- d="M 130.47169,-64.553074"
+ d="M 250.26248,-64.553074"
stroke-miterlimit="10"
inkscape:connector-curvature="0"
style="fill:#ffffff;stroke:#000000;stroke-width:2.03777099;stroke-miterlimit:10" /><g
- transform="matrix(2.0144385,0,0,2.0144385,132.16103,-257.68199)"
- id="g4221"
- style="fill:#000000"><text
- style="font-size:14.08969975px;line-height:0%;font-family:LiberationSans;fill:#000000"
- font-size="14.0897"
- id="text4158"
- x="40.715214"
- y="113.12014"><tspan
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#000000"
- id="tspan4239">Collabora Office</tspan></text>
-</g><g
- transform="matrix(2.0374308,0,0,2.0374308,92.668958,-105.73989)"
+ transform="matrix(2.0374308,0,0,2.0374308,212.45976,-105.73989)"
id="g4298"><polygon
style="fill:#ffffff"
points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 "
id="polygon14-7" /><polygon
- points="28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 30.379,33.145 17.914,44.893 "
+ points="28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 "
id="polygon16"
style="fill:#504999;fill-opacity:1" /><polygon
style="fill:#c8c8c8"
- points="29.864,32.599 17.358,44.386 17.258,20.718 "
+ points="17.258,20.718 29.864,32.599 17.358,44.386 "
id="polygon18" /><polygon
- points="31.847,41.483 27.743,35.628 18.807,44.052 "
+ points="18.807,44.052 31.847,41.483 27.743,35.628 "
id="polygon20"
style="fill:#38257a;fill-opacity:1" /></g></g></svg>
\ No newline at end of file
commit 2542586a69904ebcac12d44fa181772641db9f73
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jul 28 21:11:54 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:43 2021 +0200
[cp] fix MSI signing
Change-Id: I5451dd451043207d72a8e917fbfbcd0903106599
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index d6ad00b6ccbb..318cb2221643 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -157,8 +157,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
- -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \
- $(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \
+ -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH) \
+ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)/msi/install/*/*.msi \
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
@@ -171,8 +171,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
- -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ Helppack \
- $(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \
+ -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ Helppack \
+ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_helppack/msi/install/*/*.msi \
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
@@ -185,8 +185,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
- -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ SDK \
- $(WORKDIR)/installation/$(PRODUCTNAME)_SDK/msi/install/*/*.msi \
+ -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ SDK \
+ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_SDK/msi/install/*/*.msi \
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
commit 293e7d445ecf9d8fccd187b8506f41cf7282a5f6
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri May 1 21:41:37 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:43 2021 +0200
[cp] Be more relaxed with accepting certs in serf
The Desktop product uses neon, so this patch is for Online.
When the WOPI-like host uses a self-signed SSL certificate,
serf refuses to fetch resources from it, so Insert - Image
and Create from Template operations fail.
Related commit: a08552a8c36754930a3268e27aefee70d5cf21df
But in case of serf somehow we do not trigger the interaction
handler, we get an information message box with the text
"Image file cannot be opened"
So I decided to patch serf. The result is the same.
* In Collabora Online 4.0.x we do not check the cert of
WOPI-like host anyway.
* In Collabora Online 4.2.x we optionally check the cert
of WOPI-like host. The Create from Template and Insert -
Image cases will be exceptional, where we won't check it.
Generally it should not make a big difference.
Change-Id: I3937bf450ef70f3a793ec1c793336d18209b6e62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96652
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/external/serf/UnpackedTarball_serf.mk b/external/serf/UnpackedTarball_serf.mk
index e6e950920b95..3cea304dbcc4 100644
--- a/external/serf/UnpackedTarball_serf.mk
+++ b/external/serf/UnpackedTarball_serf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,serf,\
$(eval $(call gb_UnpackedTarball_add_patches,serf,\
external/serf/windows.build.patch.1 \
+ external/serf/ssl.verify.none.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/serf/ssl.verify.none.patch.1 b/external/serf/ssl.verify.none.patch.1
new file mode 100644
index 000000000000..3bf48e0fc5c2
--- /dev/null
+++ b/external/serf/ssl.verify.none.patch.1
@@ -0,0 +1,11 @@
+--- serf.org/buckets/ssl_buckets.c 2020-05-01 20:45:32.463464917 +0200
++++ serf/buckets/ssl_buckets.c 2020-05-01 20:46:00.643301728 +0200
+@@ -1205,7 +1205,7 @@
+ ssl_ctx->server_cert_callback = NULL;
+ ssl_ctx->server_cert_chain_callback = NULL;
+
+- SSL_CTX_set_verify(ssl_ctx->ctx, SSL_VERIFY_PEER,
++ SSL_CTX_set_verify(ssl_ctx->ctx, SSL_VERIFY_NONE,
+ validate_server_certificate);
+ SSL_CTX_set_options(ssl_ctx->ctx, SSL_OP_ALL);
+ /* Disable SSL compression by default. */
commit 56dabbadb44b802adebde8c6efd65020a9579bc5
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jun 18 12:03:22 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] ReleaseNotesURL
Change-Id: Iff5941ffc49be5fe583ee8966d18b5e7277648ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96594
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 816d22bc993c..1aaeddf220c2 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -363,7 +363,7 @@
<value>https://hub.libreoffice.org/donation/</value>
</prop>
<prop oor:name="ReleaseNotesURL" oor:type="xs:string">
- <value>https://hub.libreoffice.org/ReleaseNotes/</value>
+ <value>https://www.collaboraoffice.com/collabora-office-2021-release-notes/</value>
</prop>
<prop oor:name="InstallJavaURL" oor:type="xs:string">
<value>https://hub.libreoffice.org/InstallJava/</value>
commit 07c0ea7d6335602941e437143562978688f6d6a2
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jun 17 15:34:53 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] Revert "Revert "Restore original $licensepath of the optional EULA
of MSI package""
This reverts commit ce7c473dfb6a0eeab99811b29e205fa8b5379f9d.
I don't remember why I had to revert my original patch on master a year ago.
But for Collabora Office builds it has to be like this, apparently.
Change-Id: I00be2ddb439b9354ee05b891023162ad40a90509
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index b45227f8a1a4..05dfdbfb6787 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -59,7 +59,7 @@ sub create_pathvariables
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
- my $licensepath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget/readlicense_oo/license";
+ my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license";
$variables{'licensepath'} = $licensepath;
my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
commit dded71cdf1045c1622e98895cdfb623020c659dd
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri May 5 16:20:35 2017 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] don't show inaccessible crashreport links
(cherry picked from commit 0d045c85fb8dbdb7fa2e116ef9983e0a60bd2b99)
Change-Id: I3c4ed28cb1a02049fb009f576943f80b8ba8e627
Reviewed-on: https://gerrit.libreoffice.org/78403
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94479
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index e7c895a6e312..653b0ba2d047 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -24,15 +24,16 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnCancel(m_xBuilder->weld_button("btn_cancel"))
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
- , mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
+ , mxEditPostUpload(m_xBuilder->weld_label("ft_post"))
, mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
{
- maSuccessMsg = mxEditPostUpload->get_text();
+ maSuccessMsg = mxEditPostUpload->get_label();
auto nWidth = mxEditPreUpload->get_preferred_size().Width();
nWidth = std::max(nWidth, mxCBSafeMode->get_size_request().Width());
mxEditPreUpload->set_size_request(nWidth, -1);
+ mxEditPostUpload->set_size_request(nWidth, -1);
mxCBSafeMode->set_size_request(nWidth, -1);
mxBtnSend->connect_clicked(LINK(this, CrashReportDialog, BtnHdl));
@@ -72,11 +73,11 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn, void)
OUString aProcessedMessage = maSuccessMsg.replaceAll("%CRASHID", aCrashID.replaceAll("Crash-ID=",""));
// vclbuilder seems to replace _ with ~ even in text
- mxEditPostUpload->set_text(aProcessedMessage.replaceAll("~", "_"));
+ mxEditPostUpload->set_label(aProcessedMessage.replaceAll("~", "_"));
}
else
{
- mxEditPostUpload->set_text(aCrashID);
+ mxEditPostUpload->set_label(aCrashID);
}
mxBtnClose->show();
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index 1c436c1c7639..256cf014c3fb 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -24,7 +24,7 @@ private:
std::unique_ptr<weld::Button> mxBtnCancel;
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
- std::unique_ptr<weld::TextView> mxEditPostUpload;
+ std::unique_ptr<weld::Label> mxEditPostUpload;
std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 84f6bd12961b..a07d5af1626e 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -3,9 +3,7 @@
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
-You can soon find the report at:
-https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
+ <property name="text" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -90,14 +88,11 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
</packing>
</child>
<child>
- <object class="GtkTextView" id="ed_post">
+ <object class="GtkLabel" id="ft_post">
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
<property name="buffer">textbuffer1</property>
- <property name="accepts_tab">False</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
commit bc1cd684e5f3f09aeea28c1cfbe29f7a5a1760b5
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 12 17:06:37 2017 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] Collabora Crashreport Dialog
(cherry picked from commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73)
fix previous commit
(cherry picked from commit 4553bc1bfa72dce55566971e27b94f3a5bfcdc79)
Reviewed-on: https://gerrit.libreoffice.org/78402
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
204f83aede085bbe4f5bd6937238b2117e51c86a
Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94478
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx
index 0f56078b5d40..e7c895a6e312 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -25,7 +25,7 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxBtnClose(m_xBuilder->weld_button("btn_close"))
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
, mxEditPostUpload(m_xBuilder->weld_text_view("ed_post"))
- , mxFtBugReport(m_xBuilder->weld_text_view("ed_bugreport"))
+ , mxBugReportMailto(m_xBuilder->weld_link_button("bugreport_mailto"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
{
maSuccessMsg = mxEditPostUpload->get_text();
@@ -80,7 +80,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn, void)
}
mxBtnClose->show();
- mxFtBugReport->show();
+ mxBugReportMailto->set_uri(mxBugReportMailto->get_uri().replaceAll("%CRASHID", aCrashID.replaceAll("Crash-ID=","")));
+ mxBugReportMailto->show();
mxEditPostUpload->show();
mxBtnSend->set_sensitive(false);
mxBtnCancel->set_sensitive(false);
diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx
index f913cabac43f..1c436c1c7639 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -25,7 +25,7 @@ private:
std::unique_ptr<weld::Button> mxBtnClose;
std::unique_ptr<weld::Label> mxEditPreUpload;
std::unique_ptr<weld::TextView> mxEditPostUpload;
- std::unique_ptr<weld::TextView> mxFtBugReport;
+ std::unique_ptr<weld::LinkButton> mxBugReportMailto;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
OUString maSuccessMsg;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 1befbb7f325a..84f6bd12961b 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -6,11 +6,6 @@
<property name="text" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:
https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
- </object>
- <object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes" context="crashreportdlg|ed_bugreport">Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.
-Add detailed instructions on how to reproduce the crash and the shown crash ID into the crash report field.
-Thank you for your help in improving %PRODUCTNAME.</property>
</object>
<object class="GtkDialog" id="CrashReportDialog">
<property name="can_focus">False</property>
@@ -111,13 +106,16 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
</packing>
</child>
<child>
- <object class="GtkTextView" id="ed_bugreport">
- <property name="can_focus">False</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">textbuffer2</property>
- <property name="accepts_tab">False</property>
+ <object class="GtkLinkButton" id="bugreport_mailto">
+ <property name="label" translatable="yes" context="crashreportdlg|ed_post"> Click here to send an email to support at collaboraoffice.com.
+In the message body please add detailed instructions on how to reproduce the crash.
+Thank you for your help in improving %PRODUCTNAME.</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">mailto:support at collaboraoffice.com?subject=Crash report: %CRASHID</property>
</object>
<packing>
<property name="expand">False</property>
commit b122a9976b2705f823df87d4574a96e270a42752
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Mar 29 16:55:17 2017 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] enable crashreport on Windows
(cherry picked from commit ce263269dff121af85634ada7870f33632e02bdd)
Change-Id: I55df3da63919f76afcd4905b1898287e26c8c4f1
Reviewed-on: https://gerrit.libreoffice.org/78401
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94477
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 277508da712e..23dcd3f47452 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -19,7 +19,7 @@ def main():
print("Usage: upload-symbols.py symbols.zip config.ini \"long explanation\" [--system]")
sys.exit(1)
- base_url = "https://crashreport.libreoffice.org/"
+ base_url = "https://crashreport.collaboraoffice.com/"
upload_url = base_url + "upload/"
login_url = base_url + "accounts/login/"
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 4a5f93c21117..00186075d32a 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -116,7 +116,7 @@ void CrashReporter::writeCommonInfo()
ucbhelper::InternetProxyDecider proxy_decider(::comphelper::getProcessComponentContext());
const OUString protocol = "https";
- const OUString url = "crashreport.libreoffice.org";
+ const OUString url = "crashreport.collaboraoffice.com";
const sal_Int32 port = 443;
const ucbhelper::InternetProxyServer proxy_server = proxy_decider.getProxy(protocol, url, port);
@@ -127,7 +127,7 @@ void CrashReporter::writeCommonInfo()
maKeyValues.clear();
// limit the amount of code that needs to be executed before the crash reporting
- addKeyValue("ProductName", "LibreOffice", AddItem);
+ addKeyValue("ProductName", "CollaboraOffice", AddItem);
addKeyValue("Version", LIBO_VERSION_DOTTED, AddItem);
addKeyValue("BuildID", utl::Bootstrap::getBuildIdData(""), AddItem);
addKeyValue("URL", protocol + "://" + url + "/submit/", AddItem);
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 65b0931c280b..1befbb7f325a 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,7 +5,7 @@
<object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:
-https://crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
+https://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
</object>
<object class="GtkTextBuffer" id="textbuffer2">
<property name="text" translatable="yes" context="crashreportdlg|ed_bugreport">Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.
commit 4be4db10e3aa5aabda2c5ce04a461123368ed7f2
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Jul 13 08:02:27 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] use packagerevision for rpm, too
Change-Id: I8e1431e8db870c2782f22f8450b97cef180f1e33
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 7a1f5fd94c52..ed0066c65f2e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -293,7 +293,7 @@ sub create_epm_header
push(@epmheader, $line);
$line = "%release" . " " . $installer::globals::packagerevision . "\n";
- if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
+ #if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
push(@epmheader, $line);
# Description, Copyright and Vendor are multilingual and are defined in
commit 5728f60d1359eacbc9e325996738db35ba7be94c
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Nov 26 10:58:09 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] attempt to fix DMG background image
It was pointing to /Users/timar/Dropbox/osxdndinstall.png so only
I saw it, and nobody else told me, that the background was missing.
Change-Id: I86da1618e21686817638d83ae7deeb9c7ecf51d1
diff --git a/setup_native/source/packinfo/DS_Store b/setup_native/source/packinfo/DS_Store
index 7c875f77feab..260cdc3c2a6e 100644
Binary files a/setup_native/source/packinfo/DS_Store and b/setup_native/source/packinfo/DS_Store differ
commit aa8887a07f4fdd3f107278283fc76eb858277b66
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 30 11:52:08 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] add UNSTABLE SNAPSHOT theme
Change-Id: I8b48c4ba6c114090243c89e507ef08b8056e641c
Reviewed-on: https://gerrit.libreoffice.org/75236
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg b/icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg
new file mode 100644
index 000000000000..795c74ad3154
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp_snapshot/flat_logo.svg
@@ -0,0 +1,736 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<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"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ width="491.5"
+ height="85.5"
+ viewBox="0 0 491.5 85.5"
+ enable-background="new 0 0 486 80"
+ xml:space="preserve"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ sodipodi:docname="flat_logo.svg"
+ inkscape:export-filename="/home/samtuke/cb/git/productivity/Marketing/rebrand/splash-screens/collabora-office/flat_logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><metadata
+ id="metadata153"><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><defs
+ id="defs151"><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8314"><path
+ d="m 425.724,259.042 428.566,0 0,218.911 -428.566,0 0,-218.911 z"
+ id="path8316"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8326"><path
+ d="m 507.7,372.723 19.783,0 0,-22.257 -19.783,0 0,22.257 z"
+ id="path8328"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8330"><path
+ d="m 507.7,350.466 c 2.343,5.293 19.783,3.393 19.783,3.393 l 0,0 -13.802,18.864 c 0,0 -5.981,-17.666 -5.981,-22.257"
+ id="path8332"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8334"><path
+ d="m 507.69994,372.723 19.78275,0 0,-22.2566 -19.78275,0 0,22.2566 z"
+ id="path8336"
+ inkscape:connector-curvature="0" /></clipPath><linearGradient
+ x1="0"
+ y1="0"
+ x2="1"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(19.782499,0,0,-19.782499,507.70023,361.59463)"
+ spreadMethod="pad"
+ id="linearGradient8338"><stop
+ style="stop-opacity:1;stop-color:#939598"
+ offset="0"
+ id="stop8340" /><stop
+ style="stop-opacity:1;stop-color:#939598"
+ offset="0.79908746"
+ id="stop8342" /><stop
+ style="stop-opacity:1;stop-color:#d1d3d4"
+ offset="1"
+ id="stop8344" /></linearGradient><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8366"><path
+ d="m 507.701,350.392 c 0,4.494 17.666,17.224 17.666,17.224 l 0,0 c 0,0 -17.666,12.682 -17.666,17.358 l 0,0 0,-34.582 z"
+ id="path8368"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8376"><path
+ d="m 507.70051,384.97387 17.66681,0 0,-34.581 -17.66681,0 0,34.581 z"
+ id="path8378"
+ inkscape:connector-curvature="0" /></clipPath><linearGradient
+ x1="0"
+ y1="0"
+ x2="1"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(17.667353,0,0,-17.667353,507.70023,367.68366)"
+ spreadMethod="pad"
+ id="linearGradient8380"><stop
+ style="stop-opacity:1;stop-color:#a7a9ac"
+ offset="0"
+ id="stop8382" /><stop
+ style="stop-opacity:1;stop-color:#d1d3d4"
+ offset="0.20630948"
+ id="stop8384" /><stop
+ style="stop-opacity:1;stop-color:#d1d3d4"
+ offset="0.241935"
+ id="stop8386" /><stop
+ style="stop-opacity:1;stop-color:#d1d3d4"
+ offset="1"
+ id="stop8388" /></linearGradient><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8404"><path
+ d="m 518.22,394.198 9.614,0 0,-0.802 -9.614,0 0,0.802 z"
+ id="path8406"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8408"><path
+ d="m 518.22,393.396 9.614,0 0,0.801 -9.614,0 0,-0.801 z"
+ id="path8410"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8432"><path
+ d="m 513.413,389.791 18.426,0 0,-0.801 -18.426,0 0,0.801 z"
+ id="path8434"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8436"><path
+ d="m 513.413,388.99 18.426,0 0,0.801 -18.426,0 0,-0.801 z"
+ id="path8438"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8460"><path
+ d="m 511.41,385.385 24.836,0 0,-0.801 -24.836,0 0,0.801 z"
+ id="path8462"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8464"><path
+ d="m 511.41,384.584 24.836,0 0,0.801 -24.836,0 0,-0.801 z"
+ id="path8466"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8488"><path
+ d="m 514.214,380.978 26.839,0 0,-0.801 -26.839,0 0,0.801 z"
+ id="path8490"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8492"><path
+ d="m 514.214,380.177 26.839,0 0,0.801 -26.839,0 0,-0.801 z"
+ id="path8494"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8516"><path
+ d="m 519.021,376.573 26.037,0 0,-0.801 -26.037,0 0,0.801 z"
+ id="path8518"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8520"><path
+ d="m 519.021,375.772 26.037,0 0,0.801 -26.037,0 0,-0.801 z"
+ id="path8522"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8544"><path
+ d="m 524.229,372.165 25.237,0 0,-0.801 -25.237,0 0,0.801 z"
+ id="path8546"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8548"><path
+ d="m 524.229,371.364 25.237,0 0,0.801 -25.237,0 0,-0.801 z"
+ id="path8550"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8572"><path
+ d="m 529.036,368.161 24.435,0 0,-0.802 -24.435,0 0,0.802 z"
+ id="path8574"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8576"><path
+ d="m 529.036,367.359 24.436,0 0,0.801 -24.436,0 0,-0.801 z"
+ id="path8578"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8600"><path
+ d="m 523.828,363.753 25.237,0 0,-0.801 -25.237,0 0,0.801 z"
+ id="path8602"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8604"><path
+ d="m 523.828,362.952 25.237,0 0,0.801 -25.237,0 0,-0.801 z"
+ id="path8606"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8628"><path
+ d="m 518.62,359.348 26.039,0 0,-0.802 -26.039,0 0,0.802 z"
+ id="path8630"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8632"><path
+ d="m 518.62,358.546 26.039,0 0,0.801 -26.039,0 0,-0.801 z"
+ id="path8634"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8656"><path
+ d="m 513.813,354.941 26.84,0 0,-0.801 -26.84,0 0,0.801 z"
+ id="path8658"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8660"><path
+ d="m 513.813,354.14 26.839,0 0,0.801 -26.839,0 0,-0.801 z"
+ id="path8662"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8684"><path
+ d="m 511.41,350.534 24.836,0 0,-0.802 -24.836,0 0,0.802 z"
+ id="path8686"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8688"><path
+ d="m 511.41,349.732 24.836,0 0,0.801 -24.836,0 0,-0.801 z"
+ id="path8690"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8712"><path
+ d="m 514.214,346.128 17.625,0 0,-0.801 -17.625,0 0,0.801 z"
+ id="path8714"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8716"><path
+ d="m 514.214,345.327 17.625,0 0,0.801 -17.625,0 0,-0.801 z"
+ id="path8718"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8740"><path
+ d="m 519.021,341.722 8.412,0 0,-0.801 -8.412,0 0,0.801 z"
+ id="path8742"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8744"><path
+ d="m 519.021,340.921 8.412,0 0,0.801 -8.412,0 0,-0.801 z"
+ id="path8746"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8314-6"><path
+ d="m 425.724,259.042 428.566,0 0,218.911 -428.566,0 0,-218.911 z"
+ id="path8316-8"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8326-1"><path
+ d="m 507.7,372.723 19.783,0 0,-22.257 -19.783,0 0,22.257 z"
+ id="path8328-9"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8330-1"><path
+ d="m 507.7,350.466 c 2.343,5.293 19.783,3.393 19.783,3.393 l 0,0 -13.802,18.864 c 0,0 -5.981,-17.666 -5.981,-22.257"
+ id="path8332-1"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8334-0"><path
+ d="m 507.69994,372.723 19.78275,0 0,-22.2566 -19.78275,0 0,22.2566 z"
+ id="path8336-8"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8366-0"><path
+ d="m 507.701,350.392 c 0,4.494 17.666,17.224 17.666,17.224 l 0,0 c 0,0 -17.666,12.682 -17.666,17.358 l 0,0 0,-34.582 z"
+ id="path8368-9"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8376-0"><path
+ d="m 507.70051,384.97387 17.66681,0 0,-34.581 -17.66681,0 0,34.581 z"
+ id="path8378-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8404-7"><path
+ d="m 518.22,394.198 9.614,0 0,-0.802 -9.614,0 0,0.802 z"
+ id="path8406-7"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8408-2"><path
+ d="m 518.22,393.396 9.614,0 0,0.801 -9.614,0 0,-0.801 z"
+ id="path8410-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8432-6"><path
+ d="m 513.413,389.791 18.426,0 0,-0.801 -18.426,0 0,0.801 z"
+ id="path8434-3"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8436-0"><path
+ d="m 513.413,388.99 18.426,0 0,0.801 -18.426,0 0,-0.801 z"
+ id="path8438-5"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8460-6"><path
+ d="m 511.41,385.385 24.836,0 0,-0.801 -24.836,0 0,0.801 z"
+ id="path8462-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8464-3"><path
+ d="m 511.41,384.584 24.836,0 0,0.801 -24.836,0 0,-0.801 z"
+ id="path8466-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8488-7"><path
+ d="m 514.214,380.978 26.839,0 0,-0.801 -26.839,0 0,0.801 z"
+ id="path8490-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8492-8"><path
+ d="m 514.214,380.177 26.839,0 0,0.801 -26.839,0 0,-0.801 z"
+ id="path8494-8"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8516-3"><path
+ d="m 519.021,376.573 26.037,0 0,-0.801 -26.037,0 0,0.801 z"
+ id="path8518-8"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8520-6"><path
+ d="m 519.021,375.772 26.037,0 0,0.801 -26.037,0 0,-0.801 z"
+ id="path8522-1"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8544-3"><path
+ d="m 524.229,372.165 25.237,0 0,-0.801 -25.237,0 0,0.801 z"
+ id="path8546-9"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8548-2"><path
+ d="m 524.229,371.364 25.237,0 0,0.801 -25.237,0 0,-0.801 z"
+ id="path8550-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8572-9"><path
+ d="m 529.036,368.161 24.435,0 0,-0.802 -24.435,0 0,0.802 z"
+ id="path8574-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8576-8"><path
+ d="m 529.036,367.359 24.436,0 0,0.801 -24.436,0 0,-0.801 z"
+ id="path8578-5"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8600-9"><path
+ d="m 523.828,363.753 25.237,0 0,-0.801 -25.237,0 0,0.801 z"
+ id="path8602-1"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8604-0"><path
+ d="m 523.828,362.952 25.237,0 0,0.801 -25.237,0 0,-0.801 z"
+ id="path8606-7"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8628-9"><path
+ d="m 518.62,359.348 26.039,0 0,-0.802 -26.039,0 0,0.802 z"
+ id="path8630-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8632-3"><path
+ d="m 518.62,358.546 26.039,0 0,0.801 -26.039,0 0,-0.801 z"
+ id="path8634-7"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8656-5"><path
+ d="m 513.813,354.941 26.84,0 0,-0.801 -26.84,0 0,0.801 z"
+ id="path8658-4"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8660-2"><path
+ d="m 513.813,354.14 26.839,0 0,0.801 -26.839,0 0,-0.801 z"
+ id="path8662-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8684-0"><path
+ d="m 511.41,350.534 24.836,0 0,-0.802 -24.836,0 0,0.802 z"
+ id="path8686-5"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8688-8"><path
+ d="m 511.41,349.732 24.836,0 0,0.801 -24.836,0 0,-0.801 z"
+ id="path8690-0"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8712-7"><path
+ d="m 514.214,346.128 17.625,0 0,-0.801 -17.625,0 0,0.801 z"
+ id="path8714-8"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8716-8"><path
+ d="m 514.214,345.327 17.625,0 0,0.801 -17.625,0 0,-0.801 z"
+ id="path8718-2"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8740-9"><path
+ d="m 519.021,341.722 8.412,0 0,-0.801 -8.412,0 0,0.801 z"
+ id="path8742-6"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath8744-4"><path
+ d="m 519.021,340.921 8.412,0 0,0.801 -8.412,0 0,-0.801 z"
+ id="path8746-2"
+ inkscape:connector-curvature="0" /></clipPath><linearGradient
+ gradientTransform="translate(0,-4e-6)"
+ y2="347.28149"
+ x2="218.50883"
+ y1="300.49261"
+ x1="151.24023"
+ gradientUnits="userSpaceOnUse"
+ id="path24_1_-9-6"><stop
+ id="stop20-0-1"
+ style="stop-color:#1e1e1f;stop-opacity:1"
+ offset="0" /><stop
+ id="stop32-1-1"
+ style="stop-color:#262727;stop-opacity:1"
+ offset="1" /></linearGradient><linearGradient
+ gradientTransform="matrix(0.09963734,0,0,0.09963734,29.527122,-61.529368)"
+ id="path24_1_"
+ gradientUnits="userSpaceOnUse"
+ x1="103.3008"
+ y1="297.04099"
+ x2="234.9995"
+ y2="297.04099"
+ xlink:href="#SVGID_1_-2"><stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:0.402"
+ id="stop20" /><stop
+ offset="0.4746"
+ style="stop-color:#000000;stop-opacity:0.402"
+ id="stop22" /><stop
+ offset="0.6456"
+ style="stop-color:#000000;stop-opacity:0.351"
+ id="stop24" /><stop
+ offset="0.7675"
+ style="stop-color:#000000;stop-opacity:0.3"
+ id="stop26" /><stop
+ offset="0.866"
+ style="stop-color:#000000;stop-opacity:0.252"
+ id="stop28" /><stop
+ offset="0.9494"
+ style="stop-color:#000000;stop-opacity:0.2"
+ id="stop30" /><stop
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0.15"
+ id="stop32" /></linearGradient><linearGradient
+ gradientTransform="matrix(0.09963734,0,0,0.09963734,29.527122,-61.529368)"
+ y2="256.50339"
+ x2="220.9146"
+ y1="256.50339"
+ x1="103.3008"
+ gradientUnits="userSpaceOnUse"
+ id="SVGID_1_"><stop
+ id="stop37"
+ style="stop-color:#999999"
+ offset="0" /><stop
+ id="stop39"
+ style="stop-color:#BBBBBB"
+ offset="0.1466" /><stop
+ id="stop41"
+ style="stop-color:#CCCCCC"
+ offset="0.2419" /></linearGradient><linearGradient
+ y2="347.28149"
+ x2="218.50883"
+ y1="300.49261"
+ x1="151.24023"
+ gradientUnits="userSpaceOnUse"
+ id="path24_1_-9"
+ gradientTransform="translate(559.73756,-2.4894758)"><stop
+ id="stop20-0"
+ style="stop-color:#1e1e1f;stop-opacity:1"
+ offset="0" /><stop
+ id="stop32-1"
+ style="stop-color:#262727;stop-opacity:1"
+ offset="1" /></linearGradient><linearGradient
+ id="SVGID_1_-2"
+ gradientUnits="userSpaceOnUse"
+ x1="103.3008"
+ y1="256.50339"
+ x2="220.91409"
+ y2="256.50339"
+ gradientTransform="translate(559.73756,-2.4894758)"><stop
+ offset="0"
+ style="stop-color:#595959"
+ id="stop37-5" /><stop
+ offset="0.1466"
+ style="stop-color:#7B7B7B"
+ id="stop39-0" /><stop
+ offset="0.2419"
+ style="stop-color:#8C8C8C"
+ id="stop41-3" /></linearGradient></defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="3840"
+ inkscape:window-height="2096"
+ id="namedview149"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="5.341564"
+ inkscape:cx="182.89412"
+ inkscape:cy="-9.616442"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g4762" /><g
+ id="svg1205"
+ display="none"
+ style="display:none"
+ transform="translate(48.492702,-99.953018)"><rect
+ x="-3"
+ y="-4"
+ display="inline"
+ width="491.5"
+ height="85.5"
+ id="rect4"
+ style="display:inline;fill:#0f3c7e" /><g
+ id="g4122"
+ transform="matrix(0.62747746,0,0,0.62747746,-228.72288,-1457.0571)"
+ display="inline"
+ style="display:inline"><path
+ id="path3047"
+ d="m 484.039,2375.006 0,45.9 29.598,0 0,-6.974 -20.565,0 0,-38.928 -9.033,0"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3049"
+ d="m 519.098,2420.906 9.035,0 0,-33.038 -9.035,0 0,33.038 m 4.517,-35.881 c 2.833,0 5.192,-2.302 5.192,-5.214 0,-2.844 -2.359,-5.212 -5.192,-5.212 -2.898,0 -5.192,2.369 -5.192,5.212 0,2.913 2.294,5.214 5.192,5.214"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3051"
+ d="m 543.866,2391.728 -0.135,0 0,-19.566 -9.034,0 0,48.744 8.832,0 0.201,-3.857 0.135,0 c 2.833,3.181 5.665,4.535 10.317,4.535 8.764,0 14.563,-7.922 14.563,-17.808 0,-9.543 -5.192,-16.584 -14.16,-16.584 -4.785,0 -7.618,1.421 -10.719,4.536 m -0.134,11.914 c 0,-5.688 2.562,-9.478 7.416,-9.478 5.394,0 8.091,3.86 8.091,10.155 0,6.23 -2.629,10.292 -7.956,10.292 -4.652,0 -7.551,-3.657 -7.551,-9.48 l 0,-1.489"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3053"
+ d="m 592.988,2387.192 c -4.316,0.272 -8.428,2.91 -10.315,6.569 l -0.135,0 -0.202,-5.892 -8.832,0 0,33.039 9.034,0 0,-12.458 c 0,-6.635 1.212,-9.002 3.303,-10.493 1.821,-1.287 3.978,-1.829 6.944,-1.964 l 0.203,-8.801"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3055"
+ d="m 626.228,2402.425 c 0,-8.194 -4.988,-15.232 -13.618,-15.232 -10.384,0 -17.059,7.175 -17.059,18.074 0,10.631 6.877,16.318 17.059,16.318 4.787,0 8.158,-0.744 11.327,-2.168 l -0.943,-6.77 c -2.968,1.219 -6.001,1.964 -9.238,1.964 -5.46,0 -8.968,-2.507 -9.304,-7.651 l 21.373,0 c 0.269,-1.219 0.403,-3.114 0.403,-4.535 m -14.562,-8.259 c 3.911,0 5.732,3.181 5.866,6.566 l -12.743,0 c 0.675,-3.79 3.303,-6.566 6.877,-6.566"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3057"
+ d="m 653.657,2374.329 c -12.136,0 -22.114,8.868 -22.114,23.627 0,14.76 9.978,23.628 22.114,23.628 12.136,0 22.115,-8.868 22.115,-23.628 10e-4,-14.758 -9.979,-23.627 -22.115,-23.627 m 0,4.603 c 9.034,0 15.912,6.77 15.912,19.021 0,12.255 -6.876,19.025 -15.912,19.025 -9.035,0 -15.912,-6.77 -15.912,-19.025 0,-12.25 6.878,-19.021 15.912,-19.021"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3059"
+ d="m 684.407,2386.04 0,2.099 -5.326,0 0,4.333 5.326,0 0,28.436 5.663,0 0,-28.436 8.361,0 0,-4.333 -8.361,0 0,-2.979 c 0,-5.891 2.495,-9.344 7.011,-9.344 2.09,0 3.44,0.338 4.72,0.813 l 0.54,-4.198 c -1.216,-0.474 -3.506,-0.948 -5.327,-0.948 -8.022,0 -12.607,5.215 -12.607,14.557"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3061"
+ d="m 703.236,2386.04 0,2.099 -5.326,0 0,4.333 5.326,0 0,28.436 5.664,0 0,-28.436 8.361,0 0,-4.333 -8.361,0 0,-2.979 c 0,-5.891 2.495,-9.344 7.01,-9.344 2.09,0 3.441,0.338 4.72,0.813 l 0.54,-4.198 c -1.214,-0.474 -3.506,-0.948 -5.327,-0.948 -8.022,0 -12.607,5.215 -12.607,14.557"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3063"
+ d="m 723.82,2420.906 5.664,0 0,-32.767 -5.664,0 0,32.767 m 2.831,-37.574 c 1.956,0 3.506,-1.556 3.506,-3.521 0,-1.963 -1.55,-3.52 -3.506,-3.52 -1.955,0 -3.505,1.557 -3.505,3.52 0,1.965 1.55,3.521 3.505,3.521"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3065"
+ d="m 741.26,2404.387 c 0,-8.259 4.921,-12.591 11.327,-12.591 3.371,0 6.337,0.811 8.765,1.964 l 0.54,-4.333 c -2.023,-1.018 -5.259,-1.964 -8.832,-1.964 -10.113,0 -17.733,6.16 -17.733,17.671 0,10.832 6.876,16.45 15.979,16.45 4.045,0 6.944,-0.473 10.248,-1.897 l -0.54,-4.333 c -2.831,1.287 -5.866,1.896 -8.698,1.896 -6.54,0 -11.056,-4.13 -11.056,-12.863"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path3067"
+ d="m 793.836,2405.81 c 0.135,-1.217 0.202,-2.235 0.202,-3.251 0,-8.395 -4.383,-15.095 -12.81,-15.095 -9.1,0 -15.775,7.583 -15.775,17.671 0,11.103 6.675,16.45 15.775,16.45 4.048,0 7.081,-0.61 10.248,-1.897 l -0.539,-4.333 c -2.495,1.219 -6.068,1.896 -8.901,1.896 -6.54,0 -10.787,-3.993 -10.922,-11.44 l 22.722,0 m -13.08,-14.014 c 4.99,0 7.687,4.129 7.687,9.545 l -17.059,0 c 0.81,-5.754 3.978,-9.545 9.372,-9.545"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /></g><g
+ id="g2977"
+ transform="matrix(0.62026788,0,0,0.62820994,-318.24592,-674.22997)"
+ display="inline"
+ style="display:inline"><path
+ id="path2979"
+ d="m 585.297,1093.95 c -0.754,-0.02 -1.499,0.452 -1.792,1.138 -0.296,0.686 -0.123,1.541 0.414,2.063 l 16.196,16.248 c 0.523,0.523 1.373,0.696 2.062,0.421 0.691,-0.276 1.178,-0.986 1.182,-1.719 l 0,-16.276 c 0.003,-0.982 -0.904,-1.876 -1.897,-1.872 l -16.166,0 0,0 z"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /><path
+ id="path2981"
+ d="m 540.763,1093.949 c -1.049,0.016 -1.892,0.871 -1.891,1.921 l 0,74.157 c -0.002,1.051 0.842,1.906 1.891,1.921 l 60.677,0 c 1.06,0 1.921,-0.855 1.922,-1.915 0,0 0,0 0,-0.01 l 0,-47.755 c 0.003,-0.511 -0.198,-1.002 -0.559,-1.363 l -26.246,-26.372 c -0.357,-0.371 -0.85,-0.584 -1.363,-0.588 l -34.431,0 0,0 z m 1.922,3.843 31.701,0 25.134,25.255 0,45.058 -56.835,0 0,-70.313 0,0 z"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff" /></g><rect
+ x="0"
+ y="75"
+ display="inline"
+ width="486"
+ height="5"
+ id="rect21"
+ style="display:inline;fill:#6c9aca" /><path
+ id="path10643"
+ display="inline"
+ d="m 371.109,53.543 -4.696,0 0,-3.154 c 0,-0.916 -0.053,-1.488 -0.154,-1.717 -0.104,-0.229 -0.331,-0.343 -0.682,-0.343 -0.397,0 -0.647,0.14 -0.757,0.417 -0.104,0.275 -0.158,0.874 -0.158,1.793 l 0,8.438 c 0,0.881 0.054,1.457 0.158,1.729 0.108,0.27 0.35,0.402 0.723,0.402 0.357,0 0.595,-0.135 0.704,-0.406 0.109,-0.271 0.166,-0.909 0.166,-1.914 l 0,-2.299 4.696,0 0,0.711 c 0,1.886 -0.133,3.224 -0.396,4.011 -0.266,0.788 -0.853,1.479 -1.759,2.072 -0.908,0.595 -2.026,0.89 -3.355,0.89 -1.381,0 -2.521,-0.251 -3.417,-0.75 -0.896,-0.5 -1.49,-1.194 -1.781,-2.079 -0.291,-0.885 -0.438,-2.218 -0.438,-3.996 l 0,-5.303 c 0,-1.309 0.044,-2.287 0.135,-2.941 0.09,-0.653 0.356,-1.283 0.801,-1.89 0.444,-0.603 1.062,-1.079 1.85,-1.429 0.788,-0.348 1.692,-0.521 2.719,-0.521 1.388,0 2.534,0.271 3.437,0.807 0.904,0.537 1.498,1.207 1.783,2.008 0.282,0.803 0.425,2.052 0.425,3.744 l 0,1.721 -0.004,0 z"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ display="inline"
+ d="m 382.674,51.785 c -0.146,-0.516 -0.415,-1.018 -0.812,-1.502 -0.394,-0.485 -0.956,-0.879 -1.683,-1.182 -0.726,-0.303 -1.595,-0.453 -2.609,-0.453 -1.207,0 -2.197,0.233 -2.974,0.705 -0.774,0.472 -1.312,1.096 -1.609,1.871 -0.297,0.775 -0.445,1.855 -0.445,3.238 l 0,3.809 c 0,1.264 0.081,2.211 0.246,2.84 0.164,0.633 0.438,1.17 0.82,1.613 0.385,0.444 0.923,0.777 1.615,1 0.692,0.217 1.537,0.328 2.537,0.328 0.895,0 1.685,-0.13 2.375,-0.386 0.688,-0.257 1.255,-0.655 1.694,-1.198 0.438,-0.541 0.726,-1.125 0.858,-1.748 0.132,-0.623 0.202,-1.604 0.202,-2.941 l 0,-3.641 c 0.003,-1.052 -0.071,-1.837 -0.215,-2.353 z m -4.321,8.095 c 0,0.644 -0.041,1.06 -0.123,1.257 -0.083,0.193 -0.255,0.291 -0.514,0.291 -0.252,0 -0.42,-0.107 -0.508,-0.32 -0.085,-0.213 -0.129,-0.67 -0.129,-1.373 l 0,-6.721 c 0,-0.762 0.044,-1.24 0.129,-1.441 0.086,-0.198 0.261,-0.297 0.519,-0.297 0.258,0 0.429,0.099 0.508,0.297 0.079,0.201 0.118,0.681 0.118,1.441 l 0,6.866 0,0 z"
+ id="path24"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ id="path10647"
+ display="inline"
+ d="m 389.04,45.663 0,18.112 -4.657,0 0,-18.112 4.657,0 z"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ id="path10649"
+ display="inline"
+ d="m 395.321,45.663 0,18.112 -4.655,0 0,-18.112 4.655,0 z"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ display="inline"
+ d="m 430.428,51.785 c -0.146,-0.516 -0.415,-1.018 -0.812,-1.502 -0.396,-0.485 -0.956,-0.879 -1.684,-1.182 -0.729,-0.303 -1.595,-0.453 -2.61,-0.453 -1.206,0 -2.196,0.233 -2.973,0.705 -0.774,0.472 -1.312,1.096 -1.608,1.871 -0.299,0.775 -0.446,1.855 -0.446,3.238 l 0,3.809 c 0,1.264 0.081,2.211 0.245,2.84 0.165,0.633 0.438,1.17 0.821,1.613 0.384,0.444 0.923,0.777 1.615,1 0.692,0.217 1.537,0.328 2.537,0.328 0.895,0 1.686,-0.13 2.375,-0.386 0.688,-0.257 1.255,-0.655 1.693,-1.198 0.439,-0.541 0.726,-1.125 0.859,-1.748 0.133,-0.623 0.202,-1.604 0.202,-2.941 l 0,-3.641 c 0.004,-1.052 -0.07,-1.837 -0.214,-2.353 z m -4.321,8.095 c 0,0.644 -0.041,1.06 -0.126,1.257 -0.081,0.193 -0.253,0.291 -0.512,0.291 -0.251,0 -0.42,-0.107 -0.508,-0.32 -0.086,-0.213 -0.13,-0.67 -0.13,-1.373 l 0,-6.721 c 0,-0.762 0.044,-1.24 0.13,-1.441 0.086,-0.198 0.261,-0.297 0.519,-0.297 0.259,0 0.429,0.099 0.508,0.297 0.08,0.201 0.119,0.681 0.119,1.441 l 0,6.866 z"
+ id="path28"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ display="inline"
+ d="m 448.306,51.454 c -0.155,-0.789 -0.622,-1.454 -1.398,-1.995 -0.773,-0.541 -1.927,-0.811 -3.456,-0.811 l -4.108,0.011 0,-0.011 c -1.251,0.084 -2.207,0.828 -2.865,2.236 l 0.158,-1.957 -4.498,0 0,14.848 4.539,0 0,-5.875 c 0,-1.443 0.059,-1.687 0.146,-2.088 0.09,-0.399 0.328,-0.711 0.715,-0.938 0.286,-0.164 0.692,-0.27 1.218,-0.312 l 0,0.027 3.854,0.066 0,-1.553 c 0,-0.826 0.035,-1.338 0.109,-1.535 0.07,-0.197 0.258,-0.297 0.555,-0.297 0.261,0 0.447,0.119 0.562,0.353 0.112,0.235 0.169,0.737 0.169,1.513 0,0.617 -0.054,1.026 -0.156,1.229 -0.104,0.201 -0.896,0.596 -2.375,1.179 -1.384,0.539 -2.249,1.011 -2.601,1.414 -0.349,0.403 -0.521,1.164 -0.521,2.278 l 0,1.223 c 0,1.505 0.329,2.48 0.986,2.926 0.656,0.444 1.38,0.668 2.168,0.668 0.602,0 1.12,-0.134 1.555,-0.4 0.433,-0.268 0.788,-0.666 1.062,-1.203 l 0,1.326 4.419,0 0,-7.459 c -0.003,-2.456 -0.081,-4.076 -0.237,-4.863 z m -4.303,8.318 c 0,0.752 -0.041,1.215 -0.124,1.393 -0.084,0.176 -0.266,0.264 -0.539,0.264 -0.291,0 -0.486,-0.1
13 -0.583,-0.338 -0.1,-0.225 -0.146,-0.725 -0.146,-1.499 0,-0.676 0.055,-1.192 0.169,-1.553 0.112,-0.36 0.521,-0.81 1.225,-1.341 l -0.002,3.074 0,0 z"
+ id="path30"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><path
+ display="inline"
+ d="m 418.858,50.789 c -0.049,-0.337 -0.191,-0.682 -0.43,-1.031 -0.24,-0.352 -0.587,-0.625 -1.041,-0.818 -0.455,-0.192 -0.992,-0.291 -1.61,-0.291 -0.536,0 -1.033,0.106 -1.492,0.32 -0.457,0.215 -0.872,0.541 -1.246,0.975 l 0,-4.279 -4.537,0 0,15.745 -1.562,0 0,-5.091 c 0,-2.457 -0.079,-4.076 -0.235,-4.864 -0.156,-0.788 -0.622,-1.453 -1.397,-1.994 -0.774,-0.541 -1.927,-0.812 -3.456,-0.812 -1.273,0 -2.312,0.238 -3.109,0.715 -0.801,0.477 -1.33,1.025 -1.596,1.646 -0.266,0.625 -0.396,1.51 -0.396,2.655 l 0,0.993 4.26,0 0,-1.553 c 0,-0.824 0.037,-1.336 0.11,-1.535 0.07,-0.197 0.258,-0.295 0.555,-0.295 0.262,0 0.447,0.117 0.562,0.351 0.111,0.235 0.168,0.74 0.168,1.515 0,0.615 -0.053,1.024 -0.155,1.228 -0.104,0.202 -0.896,0.596 -2.375,1.18 -1.385,0.538 -2.249,1.011 -2.6,1.413 -0.35,0.405 -0.522,1.164 -0.522,2.279 l 0,1.224 c 0,1.503 0.329,2.479 0.984,2.925 0.658,0.444 1.382,0.668 2.169,0.668 0.602,0 1.119,-0.135 1.555,-0.4 0.435,-0.266 0.789,-0.668 1.063,-1.201 l 0,1.322 10.523,0 0.008,-
1.123 c 0.379,0.469 0.797,0.818 1.256,1.053 0.458,0.23 0.949,0.352 1.479,0.352 0.735,0 1.372,-0.199 1.907,-0.59 0.535,-0.391 0.875,-0.854 1.022,-1.389 0.145,-0.534 0.216,-1.348 0.216,-2.438 l 0,-6.701 c -0.005,-1.101 -0.029,-1.819 -0.078,-2.154 z m -16.458,8.983 0,0 c -10e-4,0.752 -0.042,1.215 -0.125,1.393 -0.083,0.176 -0.264,0.264 -0.539,0.264 -0.292,0 -0.484,-0.113 -0.584,-0.338 -0.099,-0.225 -0.146,-0.725 -0.146,-1.499 0,-0.676 0.057,-1.192 0.17,-1.553 0.111,-0.36 0.52,-0.81 1.225,-1.341 l -0.001,3.074 0,0 z m 11.992,-0.364 c 0,0.883 -0.041,1.439 -0.126,1.67 -0.085,0.234 -0.265,0.35 -0.543,0.35 -0.273,0 -0.456,-0.113 -0.546,-0.337 -0.091,-0.226 -0.139,-0.737 -0.139,-1.536 l 0,-6.416 c 0,-0.83 0.04,-1.349 0.121,-1.554 0.08,-0.206 0.258,-0.31 0.528,-0.31 0.278,0 0.465,0.119 0.561,0.354 0.096,0.235 0.144,0.738 0.144,1.509 l 0,6.27 z"
+ id="path32"
+ inkscape:connector-curvature="0"
+ style="display:inline;fill:#ffffff" /><g
+ display="inline"
+ id="g34"
+ style="display:inline"><path
+ d="m 464.534,56.898 c -0.277,-1.412 -1.911,-2.66 -3.335,-1.981 -0.209,0.077 -0.354,0.237 -0.521,0.377 -1.336,1.565 0.174,4.235 2.158,4.142 1.263,0.007 2.037,-1.414 1.698,-2.538 z m -1.854,0.624 c -0.48,0.268 -1.14,0.054 -1.468,-0.485 l -10e-4,0 c -0.33,-0.537 -0.207,-1.188 0.272,-1.46 0.481,-0.268 1.139,-0.051 1.469,0.486 l 10e-4,0.002 c 0.328,0.535 0.206,1.189 -0.273,1.457 z"
+ id="path36"
+ inkscape:connector-curvature="0"
+ style="fill:#204a87" /><path
+ d="m 462.952,56.063 c -0.33,-0.537 -0.986,-0.754 -1.469,-0.486 -0.479,0.271 -0.604,0.923 -0.272,1.46 l 10e-4,0 c 0.329,0.539 0.986,0.753 1.468,0.485 0.48,-0.269 0.601,-0.922 0.272,-1.459 l 0,0 z"
+ id="path38"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /></g><g
+ display="inline"
+ id="g40"
+ style="display:inline"><path
+ d="m 474.297,52.731 c -0.834,0.199 -1.271,1.055 -2.045,1.373 -0.79,-0.408 -0.562,-1.504 -1.2,-2.029 -0.542,-0.566 -1.407,-0.469 -2.068,-0.741 -0.82,-0.616 -0.5,-1.758 -0.27,-2.577 0.423,-1.263 0.858,-2.799 0.008,-3.984 -0.56,-0.935 -1.746,-1.481 -2.818,-1.111 -1.44,0.357 -2.287,1.764 -2.688,3.087 -0.64,1.315 -2.562,1.692 -3.688,0.769 -0.814,-0.553 -1.748,-1.029 -2.759,-1 -0.889,-0.16 -1.097,-1.242 -1.062,-1.994 0.087,-1.914 0.849,-3.703 1.273,-5.558 0.405,-2.512 0.029,-5.181 -1.374,-7.326 -0.896,-1.451 -2.103,-2.701 -3.476,-3.73 -2.421,-1.852 -5.504,-3.014 -8.593,-2.71 -2.039,0.322 -4.045,1.244 -5.253,2.947 -1.779,2.326 -1.857,5.577 -0.89,8.236 1.601,4.215 5.421,7.598 9.888,8.514 1.369,0.344 2.804,0.189 4.167,0.006 1.226,0.031 2.279,1.396 1.911,2.562 -0.428,0.762 -1.156,1.365 -1.358,2.234 -0.534,1.484 0.022,3.191 1.273,4.134 1.407,1.153 3.52,1.442 5.065,0.513 1.055,-0.636 1.92,-1.601 2.312,-2.592 0.389,-0.973 0.818,-2.188 1.961,-2.533 0.871,-0.253 1.69,0.276 2.395,0.727 0.6
72,0.326 1.677,-0.073 2.131,0.656 0.396,0.799 -0.073,1.713 -0.429,2.443 -0.532,0.904 -1.096,1.939 -0.789,3.014 0.245,1.119 1.491,1.832 2.608,1.562 1.306,-0.192 2.137,-1.351 3.243,-1.923 0.573,-0.135 0.677,0.65 1.123,0.779 1.229,0.371 2.35,-0.781 2.618,-1.883 0.385,-0.811 -0.242,-2.048 -1.216,-1.865 z M 453.418,41.357 c -2.591,2.643 -7.448,2.146 -10.776,-1.053 -3.326,-3.198 -3.98,-7.981 -1.39,-10.623 2.59,-2.641 7.451,-2.096 10.779,1.103 3.329,3.199 3.977,7.933 1.387,10.573 z m 4.258,12.259 c -0.731,0.327 -1.518,0.405 -2.242,0.271 -1.042,-0.193 -1.963,-0.828 -2.429,-1.8 -0.791,-1.646 0.021,-3.63 1.807,-4.429 1.784,-0.801 3.877,-0.116 4.669,1.527 0.791,1.65 -0.021,3.631 -1.805,4.431 z m 7.56,-4.813 c -1.037,-0.418 -1.501,-1.759 -1.037,-2.98 0.465,-1.225 1.802,-1.868 2.838,-1.45 1.034,0.418 1.438,1.753 0.972,2.978 -0.466,1.219 -1.738,1.87 -2.773,1.452 z m 5.336,6.736 c -0.39,0.531 -0.99,0.984 -1.505,1.15 -0.514,0.166 -1.035,0.129 -1.432,-0.155 -0.398,-0.285 -0.655,-0.88 -0.655,-1.416 0
,-0.535 0.138,-0.95 0.527,-1.483 0.39,-0.531 0.911,-0.918 1.426,-1.084 0.513,-0.166 1.089,-0.086 1.486,0.2 0.396,0.283 0.646,0.672 0.646,1.207 0.002,0.536 -0.105,1.048 -0.493,1.581 z m 4.211,-0.299 c -0.205,0.324 -0.481,0.537 -0.76,0.658 -0.278,0.119 -0.554,0.125 -0.769,-0.008 -0.215,-0.131 -0.331,-0.379 -0.346,-0.678 -0.013,-0.303 0.02,-0.609 0.226,-0.934 0.203,-0.324 0.479,-0.588 0.757,-0.707 0.279,-0.121 0.612,-0.143 0.827,-0.012 0.214,0.133 0.332,0.377 0.347,0.676 0.013,0.305 -0.076,0.68 -0.282,1.005 z"
+ id="path42"
+ inkscape:connector-curvature="0"
+ style="fill:#204a87" /><path
+ d="m 452.031,30.785 c -3.328,-3.198 -8.189,-3.743 -10.779,-1.103 -2.592,2.642 -1.938,7.424 1.39,10.623 3.328,3.198 8.187,3.695 10.776,1.052 2.59,-2.64 1.942,-7.374 -1.387,-10.572 z"
+ id="path44"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /><path
+ d="m 454.812,47.658 c -1.785,0.799 -2.598,2.781 -1.807,4.429 0.466,0.972 1.387,1.606 2.429,1.8 0.726,0.137 1.511,0.057 2.242,-0.271 1.784,-0.8 2.597,-2.781 1.805,-4.431 -0.793,-1.643 -2.885,-2.328 -4.669,-1.527 z"
+ id="path46"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /><path
+ d="m 468.008,47.348 c 0.466,-1.224 0.062,-2.559 -0.972,-2.977 -1.036,-0.418 -2.373,0.227 -2.838,1.449 -0.464,1.224 0,2.563 1.037,2.98 1.036,0.421 2.308,-0.23 2.773,-1.452 z"
+ id="path48"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /><path
+ d="m 470.42,52.751 c -0.397,-0.286 -0.975,-0.366 -1.486,-0.2 -0.515,0.166 -1.036,0.553 -1.426,1.084 -0.391,0.533 -0.527,0.948 -0.527,1.483 0,0.536 0.257,1.131 0.655,1.416 0.396,0.284 0.918,0.321 1.432,0.155 0.516,-0.166 1.115,-0.619 1.505,-1.15 0.389,-0.533 0.495,-1.045 0.495,-1.581 -0.002,-0.535 -0.252,-0.924 -0.648,-1.207 z"
+ id="path50"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /><path
+ d="m 473.893,53.572 c -0.278,0.121 -0.554,0.384 -0.757,0.707 -0.206,0.324 -0.237,0.632 -0.226,0.935 0.015,0.3 0.132,0.546 0.346,0.679 0.215,0.133 0.489,0.127 0.769,0.006 0.277,-0.119 0.555,-0.332 0.76,-0.657 0.205,-0.325 0.295,-0.7 0.282,-1.003 -0.015,-0.299 -0.133,-0.543 -0.347,-0.676 -0.215,-0.131 -0.548,-0.111 -0.827,0.009 z"
+ id="path52"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /></g><g
+ display="inline"
+ id="g54"
+ style="display:inline"><path
+ d="m 461.713,37.216 c -1.322,0.228 -2.283,1.758 -1.781,2.968 0.585,1.841 3.354,2.55 4.799,0.998 0.296,-0.281 0.457,-0.674 0.559,-1.054 0.346,-1.936 -1.766,-3.414 -3.577,-2.912 z m 1.685,2.923 c -0.222,0.65 -1.036,0.947 -1.82,0.666 0,0 -10e-4,0 -0.002,-0.002 -0.784,-0.281 -1.238,-1.038 -1.016,-1.687 0.221,-0.648 1.036,-0.946 1.82,-0.664 0,0 10e-4,0 10e-4,0.001 0.784,0.282 1.239,1.037 1.017,1.686 z"
+ id="path56"
+ inkscape:connector-curvature="0"
+ style="fill:#204a87" /><path
+ d="m 462.382,38.453 c 0,-0.001 -0.001,-0.001 0,0 -0.785,-0.283 -1.602,0.015 -1.821,0.663 -0.224,0.649 0.23,1.404 1.016,1.687 10e-4,0.002 0.002,0.002 0.002,0.002 0.784,0.281 1.6,-0.016 1.82,-0.666 0.221,-0.649 -0.234,-1.404 -1.017,-1.686 z"
+ id="path58"
+ inkscape:connector-curvature="0"
+ style="fill:#6d9acb" /></g></g><rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4138"
+ width="499"
+ height="58"
+ x="949.64948"
+ y="-185.39832" /><rect
+ style="opacity:1;fill:#ced0d2;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect4140"
+ width="491.5"
+ height="85.5"
+ x="0"
+ y="0" /><g
+ display="none"
+ id="Layer_1-2"
+ style="display:none"
+ transform="translate(183.59583,-77.321263)"><rect
+ id="rect4151"
+ height="800"
+ width="1280"
+ display="inline"
+ y="-124"
+ x="-812"
+ style="display:inline;fill:#f2f2f2" /><rect
+ id="rect4153"
+ height="80"
+ width="212"
+ display="inline"
+ x="0"
+ y="0"
+ style="display:inline;fill:#ffffff" /></g><g
+ id="g4762"
+ transform="matrix(0.81809146,0,0,0.81809146,22.434697,75.008495)"><polygon
+ transform="matrix(2.0377711,0,0,2.0377711,94.256411,-105.65899)"
+ id="polygon14"
+ points="17.258,20.718 17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 "
+ style="fill:#ffffff" /><path
+ id="path24-7"
+ d="M 130.47169,-64.553074"
+ stroke-miterlimit="10"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;stroke:#000000;stroke-width:2.03777099;stroke-miterlimit:10" /><g
+ transform="matrix(2.0144385,0,0,2.0144385,132.16103,-257.68199)"
+ id="g4221"
+ style="fill:#000000"><text
+ style="font-size:14.08969975px;line-height:0%;font-family:LiberationSans;fill:#000000"
+ font-size="14.0897"
+ id="text4158"
+ x="40.715214"
+ y="113.12014"><tspan
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#000000"
+ id="tspan4239">Collabora Office</tspan></text>
+</g><g
+ transform="matrix(2.0374308,0,0,2.0374308,92.668958,-105.73989)"
+ id="g4298"><polygon
+ style="fill:#ffffff"
+ points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 "
+ id="polygon14-7" /><polygon
+ points="28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 30.379,33.145 17.914,44.893 "
+ id="polygon16"
+ style="fill:#504999;fill-opacity:1" /><polygon
+ style="fill:#c8c8c8"
+ points="29.864,32.599 17.358,44.386 17.258,20.718 "
+ id="polygon18" /><polygon
+ points="31.847,41.483 27.743,35.628 18.807,44.052 "
+ id="polygon20"
+ style="fill:#38257a;fill-opacity:1" /></g><text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.07695389px;line-height:125%;font-family:Impact;-inkscape-font-specification:Impact;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.22235715px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="297.52789"
+ y="3.4419749"
+ id="text221"><tspan
+ sodipodi:role="line"
+ id="tspan219"
+ x="297.52789"
+ y="3.4419749"
+ style="fill:#ff0000;stroke-width:1.22235715px">UNSTABLE SNAPSHOT</tspan></text>
+</g></svg>
\ No newline at end of file
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
new file mode 100644
index 000000000000..87cf05397686
Binary files /dev/null and b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro.png b/icon-themes/galaxy/brand_cp_snapshot/intro.png
new file mode 100644
index 000000000000..fdfbda157a5f
Binary files /dev/null and b/icon-themes/galaxy/brand_cp_snapshot/intro.png differ
commit 64f56d85172a45394fb406a7bb84177e60386fa3
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Apr 7 22:38:39 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Mar 30 16:33:42 2021 +0200
[cp] EULA 2020-04-07
Change-Id: I5b4f35340e8c7b2bfd66d989277301c799f22581
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
index 56ff3b330517..e5c937f15401 100644
Binary files a/readlicense_oo/license/EULA.odt and b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf b/readlicense_oo/license/EULA_en-US.rtf
index ee850441a6c0..b5f8e682645b 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -1,94 +1,105 @@
-{\rtf1\ansi\ansicpg1250\deff0\deflang1038{\fonttbl{\f0\fnil\fprq8\fcharset0 Arial, Arial;}{\f1\fnil\fcharset0 Calibri;}}
-{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;\red51\green51\blue51;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\qj\cf1\lang1169\b\f0\fs28 End User License and Subscription Agreement\par
-\pard\qj Collabora Office (\ldblquote Software\rdblquote )\par
-\cf0\b0\f1\fs22\par
-\par
-\cf1\b\f0\fs20 An individual acting on their own behalf or on behalf of any corporate entity which employs them or which they represent (\ldblquote an Organisation\rdblquote ) represents that he or she has the authority to enter into this agreement on behalf of that Organisation. In this Licence Agreement, \ldblquote You\rdblquote includes both the reader and any Organisation.\par
-\cf0\b0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE READ AND UNDERSTAND THIS AGREEMENT. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \par
-\cf0\f1\fs22\par
-\pard\qj\cf1\b\f0\fs20 PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at The Platinum Building, St John’s Innovation Park, Cambridge, CB4 0DS, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 SOFTWARE\b0 . The Software and each of its components are owned by Collabora or other licensors and are protected as copyrighted works of authorship, and are also protected under applicable database and other applicable laws. To the extent that they are not accompanied by a separate Collabora software licence agreement, any modification, update or upgrade to the Software that You may download or receive, whether as Subscription Services detailed below or otherwise, is included as Software and governed by the \ldblquote Licenses\rdblquote heading below and generally by this Agreement.\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 LICENCES.\b0 Provided that You have subscribed to the Subscription Services as detailed below and Your compliance with the other terms and conditions of this Agreement, Collabora grants to You a perpetual, non-transferable, worldwide licence (\ldblquote Licence\rdblquote ) to reproduce and use copies of the Software within Your Organization. The Software is licensed (not sold) to You. Accordingly no title to or ownership of the Software is transferred to You. You should also be aware that in addition to this grant of Licence, many of the individual components of the Software are subject to open source licences, as detailed further below under \ldblquote Open Source Licences and Limitations\rdblquote .\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 SUBSCRIPTION SERVICES. \b0 The Licence to reproduce and use a copy of the Software is granted subject to the initial purchase by You of Software maintenance and/or support services entitlements (\ldblquote Subscription Services Entitlements\rdblquote ) equivalent in number to the total number of units of the Software that you intend to deploy, install or use in Your Organization.\par
-\pard\qj The Subscription Services Entitlements entitle You during the subscription period to make use of the following services (\ldblquote Subscription Services\rdblquote ):\par
-a) in the case of maintenance services, to any security fixes and Software updates which may be issued by Collabora, including existing fixes from the support services set out at (b), on the terms set out in this Agreement and from time to time at \cf0{\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f1\fs22\par
-\cf1\f0\fs20 b) in the case of support services, to fee based technical support on the terms set out in this Agreement, or any separate agreement, and from time to time at \cf0{\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\cf1\f0\fs20 . \par
-All Subscription Services will be supplied in a professional manner in accordance with generally accepted industry standards. \par
-Unless the Subscription Services and Subscription Services Entitlements are set out in a separate contract with Collabora, they are offered to You subject to the terms set out in this Agreement. \par
-\cf0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME.\par
-\pard\qj\tx5693\tab\par
-\pard\qj\fs24 HOME USE.\fs20 Collabora grants primary users of Subscription Services Entitlements and their immediate family members a License to reproduce and use copies of the Software for Home Use as detailed below unless otherwise prohibited by any applicable laws, policies or regulations. Home Use is usage outside the scope of normal business that occurs primarily inside the home.\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 LICENSE COMPLIANCE AUDIT\b0 . Collabora may, upon fifteen (15) days\rquote advance notice and at its expense, conduct an annual audit if You are an Organisation, during your normal business hours, of Your use of the Software to verify compliance with this Agreement and in particular Your commitment under the License herein to purchase an equivalent number units of Subscription Services Entitlements. You agree to keep records sufficient to certify your compliance with this Agreement. Upon Collabora\rquote s or its authorized representative\rquote s reasonable written commitment(s) to safeguard your confidential information, you shall fully cooperate with such audit and provide any necessary assistance and access to records and computers. If an audit reveals that you have or at any time had unlicensed installation, use of, or access to the Software, You will promptly acquire sufficient Subscription Services Entitlements to cover any shortage. If a shortage of 5% or mor
e is found, you must reimburse Collabora for the costs incurred in the audit and acquire the necessary additional Subscription Services Entitlements within 30 days. \par
-\cf0\f1\fs22\par
-\cf3\b\f0\fs20 EVALUATION LICENCE.\b0 An evaluation licence is granted when You deploy, install or use an evaluation version of the Software or You are granted a time limited, non-exclusive and non-transferable licence by Collabora for evaluation purposes. The Software is licensed to You for the sole purpose of evaluating the Software and only for a specified evaluation period of 30 days. After 30 days You must either purchase an equivalent Subscription Services Entitlement from Collabora, or destroy and stop using the Software. If You purchase the Subscription Service Entitlement before the expiration of the evaluation time, You have a valid licence and You do not need to destroy the Software. \par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 OPEN SOURCE LICENCES/LIMITATIONS.\b0 The individual components included in the Software are licensed primarily pursuant to Mozilla Public License v2.0 open source licence in addition to other open source licences identified in the documentation or located in the source code or binary code for the component. As such the source code form of the Software is made available at all times under the terms of such licences. \par
-\pard\qj Whilst this Agreement in no way limits Your rights under such licences, nor is intended to supersede or conflict with the licence terms or obligations for use of any individual open source component, the Mozilla Public License v2.0 has been utilised to license the majority of the components comprising the Software because it imposes (as is set out in paragraph 3.2(b) of it) specific conditions on the free distribution of such software in its executable form. \par
-\b \par
-MAINTENANCE SERVICES. \par
-\b0 1) By purchasing maintenance services You are entitled to install and use all upgrades and updates made commercially available by Collabora during the period covered by the maintenance services subscription, up to the number of installations for which You have purchase maintenance services. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 2) Any \ldblquote update\rdblquote means a fix or compilation of fixes released by Collabora to correct operational errors (a defect that prevents it from operating substantially as intended, where such intent shall be deduced based on a competent inspection of the source code and documentation) in the Software. An \ldblquote upgrade\rdblquote means any new version of the Software which bears the same product name, including version changes evidenced by a number immediately after the name of the Software. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 3) If a question arises as to whether a release by Collabora is an upgrade or an update or a new Software product, Collabora\rquote s opinion will prevail provided that Collabora treats the product offering the same for its end users generally.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 4) If Collabora commercially releases any upgrade or updates, it will make such upgrades or updates available to You within a reasonable period of time after they become commercially available, although Collabora cannot guarantee any specific turnaround times and/or regular release intervals. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 5) At its sole discretion Collabora will determine whether to eliminate an operational error by means of issuing an update. Collabora will inform you by email (to the address given on registration of the maintenance services) as soon as new updates are released at the Collabora website.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 6) Maintenance services do not include integration services, installation of upgrades or updates, support services or any other benefits not expressly described in this Agreement.\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 SUPPORT SERVICES\par
-\pard\sa120\sl276\slmult1\cf0\b0 By purchasing an entitlement to \lquote Level 3\rquote technical support services will be provided on certain terms which include:\par
-- allocation of a severity level for each support case and any variations on this;\par
-- Collabora\rquote s work availability times, initial response time and the communication frequency for each support case based on such allocated case severity level; \par
-- Your limit on the number of support cases that You can report for each such allocated case severity level (although for the avoidance of doubt, any unused limit cannot be refunded and expires at the end of the Subscription Services Entitlement period unless otherwise agreed). \par
-\pard\sa120\sl276\slmult1 The specific terms are subject to change from time to time and accordingly are set out at {\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f0\fs20 , unless separately agreed with You such as in a purchase order. You are urged to check these terms again now before proceeding with any purchase of Subscription Services Entitlements. \par
-Alternatively, Collabora also entitle You to purchase the support services entitlement from a reseller or other intermediary rather than from Collabora directly. If You have purchased the services entitlement from such a party please check with them if any support service entitlement terms have been separately negotiated between them and Collabora, as any such terms are deemed to be incorporated into this Agreement and shall take precedence over any conflicting terms set out at {\field{\*\fldinst{HYPERLINK "http://www.CollaboraOffice.com/"}}{\fldrslt{\ul\cf2 http://www.CollaboraOffice.com/}}}\f0\fs20 or on a purchase order.\par
-\pard\qj\cf1\b LIMITATIONS AND EXCLUSIONS\par
-\b0 1) Collabora offers no rights other than those expressly granted to You in this Agreement. Except as agreed to under a separate written agreement with Collabora or in the licence terms accompanying a particular component, to the maximum extent permitted under applicable law (and not applicable to claims relating to death or personal injury caused by negligence or fraudulent misrepresentation) the Software is provided and licensed "as is" without any warranties of any kind, express or implied, including any implied warranties of quality, title, non-infringement, non-interruption or fitness for a particular purpose. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 2) The Software is only compatible with certain computers and operating systems. It is not warranted for non-compatible systems or for incorrect or unauthorised use, being use which is not in accordance with the Documentation. Please contact Collabora for information about compatibility or incorrect use. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 3) The Software may include or be bundled with other software programmes or services licensed or sold by an entity other than Collabora. Collabora does not warrant non-Collabora products or services, which are provided on an "as is" basis. Please see the third party entity regarding remedies.\par
-\cf0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 4) No right or licence, express or implied, is granted under this Agreement with respect to any trademark, trade name or service mark (\ldblquote Mark\rdblquote ) of Collabora. If You distribute any open source component of the Software, You must remove all Marks except those used to identify Collabora\rquote s ownership or licensing of the component. In addition you may not vary, delete or obscure any notices of proprietary rights or any product identification or restrictions on or in the Software.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 5) Neither Collabora nor any of its licensors, subsidiaries, contractors or employees will in any case be liable for any incidental, consequential, indirect or economic damages arising out of the use of or inability to use the Software or Subscription Services, including without limitation loss of profits, business or data, even if advised of the possibility of those damages. In particular, as files may be altered or damaged in the course of Collabora providing Subscription Services, You agree to take appropriate measures to isolate and back up Your systems. \par
-\cf0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 6) Notwithstanding (5) above, in no event will Collabora's aggregate liability for damages (whether in one instance or a series of instances) exceed 1.25 times the amount paid by You for the Subscription Services Entitlements out of which such claim arose.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 7) Upon any default in Collabora\rquote s provision of Subscription Services, Collabora's only obligation is to either correct the Subscription Services so that they comply with this warranty or at its option refund the amount You paid to Collabora for the portion of such Services that fail to comply with this warranty and in such event You may elect to terminate this Agreement with immediate effect.\par
-\cf0\f1\fs22\par
-\par
-\cf1\b\f0\fs20 GENERAL TERMS\par
-\b0 1) This Agreement may not be transferred or assigned without the prior written approval of Collabora.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 2) This Agreement will terminate if You fail to comply with any term or condition of this Agreement.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 3) Unless explicitly indicated otherwise, this Agreement sets forth the entire understanding and agreement between You and Collabora and may be amended or modified only by a written agreement agreed to by You and Collabora. No licensor, distributor, or reseller is authorised to modify this Agreement whether formally or informally.\par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 4) No waiver of any right under this Agreement will be effective unless in writing. No waiver of any past or present right will be deemed to be a waiver of any future right arising under this Agreement. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 5) If any provision in this Agreement is invalid or unenforceable, that provision will be construed, limited, modified or, if necessary, severed, to the extent necessary, to eliminate its invalidity or unenforceability, and the other provisions of this Agreement will remain unaffected. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 6) Any products or technical information provided under this Agreement may be subject to trade laws of various countries including U.S. export controls. Both You and Collabora each agree to comply with all export control regulations and to obtain any required licenses or classification to export, re-export or import deliverables and Collabora assumes no responsibility for the Your failure to comply with any such necessary export control laws, rules or regulations. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 7) If You are an Organisation You agree that you will not use the Software in breach of any relevant laws in the country in which you use the Software, and you agree to implement internal safeguards to prevent any unauthorized copying, distribution, installation, or use of, or access to, the Software.\par
-\cf0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 8) You may make a reasonable number of copies\b \b0 of the Software over and above the number of units of Software for which you have purchased Subscription Services Entitlements, purely for backup, archival or other security purposes. In so doing You will not be in breach of the terms of this Agreement.\par
-\cf0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 9) Without regard to conflict of laws rules and principles or the United Nations Convention of Contracts for the International Sale of Goods, this Agreement is governed by the laws of England, and any action relating to this Agreement may only be brought before the courts of England.\par
-\cf0\f1\fs22\par
-\par
-\cf1\i\f0\fs20 EULA 2014-10-20\par
-}
+{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fswiss\fcharset0 ArialMT;}{\f1\fswiss\fcharset0 Helvetica;}}
+{\colortbl ;\red0\green0\blue255;\red51\green51\blue51;}
+{\*\generator Riched20 10.0.18362}\viewkind4\uc1
+\pard\qj\b\f0\fs28\lang14 End User License and Subscription Agreement\b0\fs24\par
+\b\fs28 Collabora Office (\ldblquote Software\rdblquote )\b0\fs24\par
+\b\fs20\par
+\par
+An individual acting on their own behalf or on behalf of any corporate entity which employs them or which they represent (\ldblquote an Organisation\rdblquote ) represents that he or she has the authority to enter into this agreement on behalf of that Organisation. In this Licence Agreement, \ldblquote You\rdblquote includes both the reader and any Organisation.\b0\fs24\par
+\fs20\par
+PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE READ AND UNDERSTAND THIS AGREEMENT. \fs24\par
+\fs20\par
+IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \fs24\par
+\fs20\par
+\b PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at The Platinum Building, St John\rquote s Innovation Park, Cambridge, CB4 0DS, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \fs24\par
+\fs20\par
+\b SOFTWARE\b0 . The Software and each of its components are owned by Collabora or other licensors and are protected as copyrighted works of authorship, and are also protected under applicable database and other applicable laws. To the extent that they are not accompanied by a separate Collabora software licence agreement, any modification, update or upgrade to the Software that You may download or receive, whether as Subscription Services detailed below or otherwise, is included as Software and governed by the \ldblquote Licenses\rdblquote heading below and generally by this Agreement.\fs24\par
+\fs20\par
+\b LICENCES.\b0 Provided that You have subscribed to the Subscription Services as detailed below and Your compliance with the other terms and conditions of this Agreement, Collabora grants to You a perpetual, non-transferable, worldwide licence (\ldblquote Licence\rdblquote ) to reproduce and use copies of the Software within Your Organization. The Software is licensed (not sold) to You. Accordingly no title to or ownership of the Software is transferred to You. You should also be aware that in addition to this grant of Licence, many of the individual components of the Software are subject to open source licences, as detailed further below under \ldblquote Open Source Licences and Limitations\rdblquote .\fs24\par
+\fs20\par
+\b SUBSCRIPTION SERVICES. \b0 The Licence to reproduce and use a copy of the Software is granted subject to the initial purchase by You of Software maintenance and/or support services entitlements (\ldblquote Subscription Services Entitlements\rdblquote ) equivalent in number to the total number of units of the Software that you intend to deploy, install or use in Your Organization.\fs24\par
+\fs20 The Subscription Services Entitlements entitle You during the subscription period to make use of the following services (\ldblquote Subscription Services\rdblquote ):\fs24\par
+\fs20 a) in the case of maintenance services, to any security fixes and Software updates which may be issued by Collabora, including existing fixes from the support services set out at (b), on the terms set out in this Agreement and from time to time at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs24\par
+\fs20 b) in the case of support services, to fee based technical support on the terms set out in this Agreement, or any separate agreement, and from time to time at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs20 . \fs24\par
+\fs20 All Subscription Services will be supplied in a professional manner in accordance with generally accepted industry standards. \fs24\par
+\fs20 Unless the Subscription Services and Subscription Services Entitlements are set out in a separate contract with Collabora, they are offered to You subject to the terms set out in this Agreement. \fs24\par
+\fs20\par
+IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME.\fs24\par
+
+\pard\qj\tx5693\fs20\tab\fs24\par
+
+\pard\qj\b\fs20 HOME USE.\b0 Collabora grants primary users of Subscription Services Entitlements and their immediate family members a License to reproduce and use copies of the Software for Home Use as detailed below unless otherwise prohibited by any applicable laws, policies or regulations. Home Use is usage outside the scope of normal business that occurs primarily inside the home.\fs24\par
+\fs20\par
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list