configure.ac | 5 cui/source/dialogs/about.cxx | 2 distro-configs/CPLinux.conf | 45 distro-configs/CPOSX.conf | 20 distro-configs/CPWin32-MPL.conf | 31 distro-configs/CPWin32.conf | 26 extensions/source/macosx/spotlight/mdimporter/Info.plist | 4 icon-themes/galaxy/brand_cp/flat_logo.svg | 829 ++++++++++ icon-themes/galaxy/brand_cp/intro.png |binary icon-themes/galaxy/sfx2/res/logo.png |binary instsetoo_native/CustomTarget_install.mk | 4 instsetoo_native/CustomTarget_setup.mk | 8 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 | 10 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 10 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 10 instsetoo_native/util/openoffice.lst.in | 39 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 6 postprocess/CustomTarget_registry.mk | 4 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 | 94 + scp2/source/ooo/common_brand.scp | 13 scp2/source/ooo/file_font_ooo.scp | 2 scp2/source/ooo/scpaction_ooo.scp | 18 setup_native/source/packinfo/osxdndinstall.png |binary setup_native/source/packinfo/packinfo_brand.txt | 7 setup_native/source/packinfo/packinfo_office.txt | 2 solenv/bin/modules/installer/download.pm | 2 solenv/bin/modules/installer/setupscript.pm | 2 solenv/bin/modules/installer/windows/admin.pm | 2 solenv/bin/modules/installer/windows/idtglobal.pm | 2 sysui/desktop/freedesktop/freedesktop-menus.spec | 3 sysui/desktop/icons/main.icns |binary sysui/desktop/share/create_tree.sh | 8 sysui/productlist.mk | 4 38 files changed, 1144 insertions(+), 273 deletions(-)
New commits: commit 50965bcf1599c4b3d423c81be11c11b223cc1821 Author: Andras Timar <[email protected]> Date: Fri Dec 16 10:49:51 2016 +0100 --enable-symbols for Windows and Linux Change-Id: I4ae001f7ec1936b7932a6fcb0c13a366b281edc3 (cherry picked from commit 24676ffd2d766d3dde6f36224f0bad14f148dc9e) diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf index 32f3b1a..c41f508 100644 --- a/distro-configs/CPLinux.conf +++ b/distro-configs/CPLinux.conf @@ -42,3 +42,4 @@ --with-package-format=deb rpm --enable-release-build --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW +--enable-symbols diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf index 4e432bc..de46331 100644 --- a/distro-configs/CPWin32.conf +++ b/distro-configs/CPWin32.conf @@ -23,3 +23,4 @@ --enable-mergelibs --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW --enable-windows-build-signing +--enable-symbols commit 7911df6efbddfed55c13fdccdd5be04978f2f82d Author: Andras Timar <[email protected]> Date: Mon Nov 2 20:47:19 2015 +0100 OS X: use own com.collaboraoffice identifier Change-Id: I0421b032a1da1692871673c550a42f35c75f6bdb (cherry picked from commit 7a7c03bbb5a78c7a25e9b4dae203ee4436c654f1) (cherry picked from commit 5bfaeb57bc5553d4a26f239fa5e5399a7e70bf24) diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf index bbb0154..060ddc9 100644 --- a/distro-configs/CPOSX.conf +++ b/distro-configs/CPOSX.conf @@ -16,4 +16,5 @@ --without-system-postgresql --disable-gtk --with-package-format=dmg +--with-macosx-bundle-identifier=com.collaboraoffice --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW commit de978d10b99dcfd7976e1cdccfd67a1baad0ce3d Author: Andras Timar <[email protected]> Date: Thu Mar 10 09:17:18 2016 +0100 OS X: fix main applicaton icon of Collabora Office Change-Id: Idf2a81cdb8e3e0d137143e37e7653c5be195391e (cherry picked from commit c6237d49cf39a503b58868a20d2076c470c4828b) (cherry picked from commit 8804d91769198dab8bed579aa7be5fe44ac769ff) diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns index ab165f9..4de9216 100644 Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ commit 01a72027ba5ead29060999c98f90f340949d055c Author: Andras Timar <[email protected]> Date: Mon May 2 11:14:00 2016 +0200 do not localize Collabora Office URL Change-Id: I1eb33d3ce649ff8ca1158e96fe6c6bc1a3ab75ea (cherry picked from commit 9189450fa042526ee5380a2b9004b8a1a32a9e48) (cherry picked from commit b36267edb632577ca5e6deb219d5da4d5b8e9bef) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 336951b..2cac97c 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -119,7 +119,7 @@ IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, void ) else if (pButton == m_pWebsiteButton) { sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get(); - localizeWebserviceURI(sURL); + // localizeWebserviceURI(sURL); } // If the URL is empty, don't do anything commit 7fbff2f80cbd972136576b64db3cc9f955db09f0 Author: Andras Timar <[email protected]> Date: Mon Aug 24 10:07:45 2015 +0200 enable breeze and sifr (cherry picked from commit ace78a2e440cc71ba69179c2c715e1d96981a8cb) (cherry picked from commit 6583d52f0287d88fbb79ee10e4e4fcc516c5b38e) Change-Id: Id46452b5121077de7d5368257b538a85d1ef7dae diff --git a/configure.ac b/configure.ac index e14e24d..e6f9a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -12676,7 +12676,7 @@ if test "$enable_mpl_subset" = "yes"; then fi for theme in $WITH_THEMES; do case $theme in - breeze|crystal|default|hicontrast|oxygen|sifr) + crystal|default|hicontrast|oxygen) AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;; *) : ;; esac commit 586bdc9b1d4d120b7b5128588487c1dc3eb8632a Author: Andras Timar <[email protected]> Date: Wed Mar 2 11:09:50 2016 +0100 don't package 'install' script because it's not for end users Change-Id: I64ea8d8722c9da252c6142a862e9363759d38ba3 (cherry picked from commit 74d90488662c55fd5f31b203e02b228137b42076) (cherry picked from commit ccf572e5e4a0a2fe1c3f5b9a166e2d5e4277c83a) diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index d5f1ba2..009fb47 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -36,14 +36,6 @@ ScpAction scp_Copy_Readme_Txt End #endif -#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM) -ScpAction scp_Copy_Install - Copy = "scripts/install"; - Name = "install"; - UnixRights = 755; -End -#endif - #if defined(WNT) && defined(_gcc3) #if defined(MINGW_GCCDLL) ScpAction SCP_COPY_MINGW_GCCS commit 462cc61adc6a8597efd7408e58c81251cf7be26a Author: Andras Timar <[email protected]> Date: Tue Nov 3 18:08:54 2015 +0100 sysui: Collabora Office branding Change-Id: Idfe91c87631956072f1e44d09168de6cd91aed6b (cherry picked from commit dd8b7bfc252400153b5ec1b52c045c346ad853fe) (cherry picked from commit e2a4ac9783408104607bca9bd00f6f333ffe54a2) diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 9c952a5..2d1cd73 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -24,6 +24,7 @@ Name: %pkgprefix-freedesktop-menus #BuildRequires: perl Group: Office License: LGPLv3 with MPLv2, ALv2 and others +Provides: collaboraoffice-desktop-integration Provides: libreoffice-desktop-integration Conflicts: %pkgprefix-suse-menus Conflicts: %pkgprefix-debian-menus @@ -387,7 +388,7 @@ done # glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374) # https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362 %defattr(-, root, root) -%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion" +%if "%unixfilename" != "collaboraoffice%productversion" && "%unixfilename" != "collaboraofficedev%productversion" # compat symlinks %attr(0755,root,root) /opt/%unixfilename %endif diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 86d2837..a9e3b4f 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -65,14 +65,14 @@ office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API boostrap functions running right ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}" -if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then +if test "${PREFIX}" != collaboraoffice${PRODUCTVERSION} -a "${PREFIX}" != collaboraofficedev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" - ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" - ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}" + ln -sf collaboraoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" + ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/collaboraoffice${PRODUCTVERSION}" fi -test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" +test "${PREFIX}" = collaboraofficedev${PRODUCTVERSION} && mime_def_file="collaboraofficedev${PRODUCTVERSION}.xml" || mime_def_file="collaboraoffice${PRODUCTVERSION}.xml" mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages" cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" commit 703dae0ff4858b62cfca818f2ea15b215354bafe Author: Andras Timar <[email protected]> Date: Sat Oct 31 23:34:21 2015 +0100 OS X: remove LibreOffice readme+license from Collabora Office DMG Change-Id: Ie62c6a98563261e3601be70ff5eff6603b625445 (cherry picked from commit 08f328e20e85d41793413df6ed653d033b499517) (cherry picked from commit 8988a747cb8937da96f4f2b5164b393fb988f6f5) diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index c84f4a9..d5f1ba2 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -18,15 +18,7 @@ #include "macros.inc" -#ifdef MACOSX -ScpAction scp_Copy_Thirdpartylicense_Readme_Html - Copy = "LICENSE.html"; - Name= "LICENSE.html"; - Subdir = "LICENSEs"; -End -#endif - -#ifndef WNT +#if !defined(WNT) && !defined(MACOSX) ScpAction scp_Copy_Readme_Txt #ifdef UNX README_ALL_LANG(Copy, README); commit dadc7ea77dc2d8478f2c5ada648ac11b9653617d Author: Andras Timar <[email protected]> Date: Sat Oct 31 23:19:09 2015 +0100 OS X: Change main LibreOffice icon to Collabora Office icon Change-Id: I52dd21c50942d2c7d6dff2f3c2ae3577e2bb9c65 (cherry picked from commit 74dc1adc6ac676c96a744e829609a73ee3ae0484) (cherry picked from commit 123f7e41c69013c2e6e3656b4ef6d03dc56ac0f3) diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns index c3e1bf6..ab165f9 100644 Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ commit a4b77701bb6b508b11109c93a841bed52436977d Author: Andras Timar <[email protected]> Date: Fri Mar 4 10:50:11 2016 +0100 fix README for Collabora Office (cherry picked from commit 869d1d4702ebb8f27380c276da12c5da4ad6e47a) (cherry picked from commit fc3adf23236913624716bc2f6eef3af959a16b88) Change-Id: I4892a36115f0ee5bedd1c87521535d60a4002252 diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 9db5868..72b4ac9 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -17,206 +17,7 @@ <body> <div id="Intro"> <h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1> - <p id="LatestUpdates" xml:lang="en-US">For the latest updates to this readme file, see <a href="http://www.libreoffice.org/welcome/readme.html";>http://www.libreoffice.org/welcome/readme.html</a></p> - <p id="A6" xml:lang="en-US">This file contains important information about the ${PRODUCTNAME} software. You are recommended to read this information very carefully before starting installation.</p> - <p id="A7" xml:lang="en-US">The ${PRODUCTNAME} community is responsible for the development of this product, and invites you to consider participating as a community member. If you are a new user, you can visit the ${PRODUCTNAME} site, where you will find lots of information about the ${PRODUCTNAME} project and the communities that exist around it. Go to <a href="http://www.libreoffice.org/";>http://www.libreoffice.org/</a>.</p> - <h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} Really Free for Any User?</h3> - <p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text packaged with this ${PRODUCTNAME} download.</p> - <h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} Free for Any User?</h3> - <p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading Open Source productivity software for home and office.</p> - <p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure that ${PRODUCTNAME} continues to be available far into the future, please consider contributing to the project - see <a href="http://www.documentfoundation.org/contribution/";>http://www.documentfoundation.org/contribution/</a> for details. Everyone can make a contribution of some kind.</p> - </div> - - <div id="Installation"> - <h2 id="rr3fgf42r" xml:lang="en-US">Notes on Installation</h2> - <p class="note" id="javaneeded" xml:lang="en-US">${PRODUCTNAME} requires a recent version of Java Runtime Environment (JRE) for full functionality. JRE is not part of the ${PRODUCTNAME} installation package, it should be installed separately.</p> - <h3 id="sdfsdfgf42r" xml:lang="en-US">System Requirements</h3> - <div class="MAC" id="SystemRequirements_OSX"> - <ul> - <li> - <p id="macxiOSX" xml:lang="en-US">MacOSX 10.8 (Mountain Lion) or higher</p> - </li> - </ul> - </div> - <div class="WIN" id="SystemRequirements_WIN"> - <ul> - <li> - <p id="s2s3sdf21" xml:lang="en-US">Microsoft Windows XP SP3, Vista, 7, 8, or 10</p> - </li> - </ul> - <p class="note" id="edssc3d" xml:lang="en-US">Please be aware that administrator rights are needed for the installation process.</p> - <p id="MSOReg1" xml:lang="en-US">Registration of ${PRODUCTNAME} as default application for Microsoft Office formats can be forced or suppressed by using the following command line switches with the installer:</p> - <ul> - <li> - <p id="MSOReg2" xml:lang="en-US"><tt>REGISTER_ALL_MSO_TYPES=1</tt> will force registration of ${PRODUCTNAME} as default application for Microsoft Office formats.</p> - </li> - - <li> - <p id="MSOReg3" xml:lang="en-US"><tt>REGISTER_NO_MSO_TYPES=1</tt> will suppress registration of ${PRODUCTNAME} as default application for Microsoft Office formats.</p> - </li> - </ul> - </div> - <div class="LINUX" id="Linuxi2"> - <p id="s2we10" xml:lang="en-US">As a general rule, you are recommended to install ${PRODUCTNAME} via the installation methods recommended by your particular Linux distribution (such as the Ubuntu Software Center, in the case of Ubuntu Linux). This is because it is usually the simplest way to obtain an installation that is optimally integrated into your system. Indeed, ${PRODUCTNAME} may well be already installed by default when you originally install your Linux operating system.</p> - <p id="s2we11" xml:lang="en-US">This "stand-alone" ${PRODUCTNAME} installer is provided for users in need of previews, having special needs, and for out-of-the-ordinary cases.</p> - <ul> - <li> - <p id="s2we35" xml:lang="en-US">Linux Kernel version 2.6.18 or higher;</p> - </li> - - <li> - <p id="s253we" xml:lang="en-US">glibc2 version 2.5 or higher;</p> - </li> - - <li> - <p id="s255we" xml:lang="en-US">freetype version 2.2.0 or higher;</p> - </li> - - <li> - <p id="s256we" xml:lang="en-US">gtk version 2.10.4 or higher;</p> - </li> - - <li> - <p id="wd2dff" xml:lang="en-US">Gnome 2.16 or higher, with the gail 1.9 and the at-spi 1.7 packages (required for support for assistive technology [AT] tools), or another compatible GUI (such as KDE, among others).</p> - </li> - </ul> - <p id="Linuxi3a" xml:lang="en-US">There is a wide variety of Linux distributions, and there may be different installation options (KDE vs Gnome, etc.) available from the same Linux vendor. Some distributions ship with their own ânativeâ version of ${PRODUCTNAME}, which may have different features from this community-supplied version of ${PRODUCTNAME}. In many cases, you can install the community-supplied ${PRODUCTNAME} alongside a native version. However, you may prefer to remove the ânativeâ version before installing this community-supplied version. For details on how to do that, please consult the user help resources provided by your particular Linux vendor.</p> - <p class="note" id="Linuxi4a" xml:lang="en-US">It is a recommended best practice to back-up your system and data before you remove or install software.</p> - </div> - <p id="Precautions" xml:lang="en-US">Please make sure you have enough free memory in the temporary directory on your system, and please ensure that read, write and run access rights have been granted. Close all other programs before starting the installation process.</p> - <h3 id="sdfsdfgf42s" xml:lang="en-US">Installation of ${PRODUCTNAME} on Debian/Ubuntu-based Linux systems</h3> - <p id="debianinstall1" xml:lang="en-US">For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack.</p> - <p id="debianinstall2" xml:lang="en-US">When you unpack the downloaded archive, you will see that the contents have been decompressed into a sub-directory. Open a file manager window, and change directory to the one starting with "LibreOffice_", followed by the version number and some platform information.</p> - <p id="debianinstall3" xml:lang="en-US">This directory contains a subdirectory called "DEBS". Change directory to the "DEBS" directory.</p> - <p id="debianinstall4" xml:lang="en-US">Right-click within the directory and choose "Open in Terminal". A terminal window will open. From the command line of the terminal window, enter the following command (you will be prompted to enter your root user's password before the command will execute):</p> - <p id="debianinstall5" xml:lang="en-US">The following commands will install LibreOffice and the desktop integration packages (you may just copy and paste them into the terminal screen rather than trying to type them):</p> - <p id="debianinstall6" xml:lang="en-US">sudo dpkg -i *.deb</p> - <p id="debianinstall9" xml:lang="en-US">The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu.</p> - <h3 id="sdfsdfgf42t" xml:lang="en-US">Installation of ${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM packages</h3> - <p id="rpminstall1" xml:lang="en-US">For instructions on how to install a language pack (after having installed the US English version of ${PRODUCTNAME}), please read the section below entitled Installing a Language Pack.</p> - <p id="rpminstall2" xml:lang="en-US">When you unpack the downloaded archive, you will see that the contents have been decompressed into a sub-directory. Open a file manager window, and change directory to the one starting with "LibreOffice_", followed by the version number and some platform information.</p> - <p id="rpminstall3" xml:lang="en-US">This directory contains a subdirectory called "RPMS". Change directory to the "RPMS" directory.</p> - <p id="rpminstall4" xml:lang="en-US">Right-click within the directory and choose "Open in Terminal". A terminal window will open. From the command line of the terminal window, enter the following command (you will be prompted to enter your root user's password before the command will execute):</p> - <p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p> - <p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p> - <p id="rpminstall7" xml:lang="en-US">For other RPM-based systems (openSUSE, etc.): rpm -Uvh *.rpm</p> - <p id="rpminstallE" xml:lang="en-US">The installation process is now completed, and you should have icons for all the ${PRODUCTNAME} applications in your desktop's Applications/Office menu.</p> - <p id="rpminstall7a" xml:lang="en-US">Alternatively, you can use the 'install' script, located in the toplevel directory of this archive to perform an installation as a user. The script will set up ${PRODUCTNAME} to have its own profile for this installation, separated from your normal ${PRODUCTNAME} profile. Note that this will not install the system integration parts such as desktop menu items and desktop MIME type registrations.</p> - <h3 id="sdfsdfgf42t2" xml:lang="en-US">Notes Concerning Desktop Integration for Linux Distributions Not Covered in the Above Installation Instructions</h3> - <p id="otherinstall1" xml:lang="en-US">It should be easily possible to install ${PRODUCTNAME} on other Linux distributions not specifically covered in these installation instructions. The main aspect for which differences might be encountered is desktop integration.</p> - <p id="otherinstall2" xml:lang="en-US">The RPMS (or DEBS, respectively) directory also contains a package named libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (or libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, respectively, or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (<a href="http://en.wikipedia.org/wiki/Freedesktop.org";>http://en.wikipedia.org/wiki/Freedesktop.org</a>), and is provided for installation on other Linux distributions not covered in the aforementioned instructions.</p> - <h3 id="sdfsdfgf42t3" xml:lang="en-US">Installing a Language Pack</h3> - <p id="linuxlangpack1" xml:lang="en-US">Download the language pack for your desired language and platform. They are available from the same location as the main installation archive. From the Nautilus file manager, extract the downloaded archive into a directory (your desktop, for instance). Ensure that you have exited all ${PRODUCTNAME} applications (including the QuickStarter, if it is started).</p> - <p id="linuxlangpack2" xml:lang="en-US">Change directory to the directory in which you extracted your downloaded language pack.</p> - <p id="linuxlangpack3" xml:lang="en-US">Now change directory to the directory that was created during the extraction process. For instance, for the French language pack for a 32-bit Debian/Ubuntu-based system, the directory is named LibreOffice_, plus some version information, plus Linux_x86_langpack-deb_fr.</p> - <p id="linuxlangpack4" xml:lang="en-US">Now change directory to the directory that contains the packages to install. On Debian/Ubuntu-based systems, the directory will be DEBS. On Fedora, openSUSE or Mandriva systems, the directory will be RPMS.</p> - <p id="linuxlangpack5" xml:lang="en-US">From the Nautilus file manager, right-click in the directory and choose the command "Open in terminal". In the terminal window you just opened, execute the command to install the language pack (with all of the commands below, you may be prompted to enter your root user's password):</p> - <p id="linuxlangpack6" xml:lang="en-US">For Debian/Ubuntu-based systems: sudo dpkg -i *.deb</p> - <p id="linuxlangpack7" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p> - <p id="linuxlangpack8" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p> - <p id="linuxlangpack9" xml:lang="en-US">For other RPM-using systems (openSUSE, etc.): rpm -Uvh *.rpm</p> - <p id="linuxlangpackA" xml:lang="en-US">Now start one of the ${PRODUCTNAME} applications - Writer, for instance. Go to the Tools menu and choose Options. In the Options dialog box, click on "Language Settings" and then click on "Languages". Dropdown the "User interface" list and select the language you just installed. If you want, do the same thing for the "Locale setting", the "Default currency", and the "Default languages for documents".</p> - <p id="linuxlangpackB" xml:lang="en-US">After adjusting those settings, click on OK. The dialog box will close, and you will see an information message telling you that your changes will only be activated after you exit ${PRODUCTNAME} and start it again (remember to also exit the QuickStarter if it is started).</p> - <p id="linuxlangpackC" xml:lang="en-US">The next time you start ${PRODUCTNAME}, it will start in the language you just installed.</p> - </div> - - <div class="LINUX WIN" id="StartupProblems"> - <h2 id="naso01" xml:lang="en-US">Problems During Program Startup</h2> - <p id="abcdef" xml:lang="en-US">Difficulties starting ${PRODUCTNAME} (e.g. applications hang) as well as problems with the screen display are often caused by the graphics card driver. If these problems occur, please update your graphics card driver or try using the graphics driver delivered with your operating system. Difficulties displaying 3D objects can often be solved by deactivating the option "Use OpenGL" under 'Tools - Options - ${PRODUCTNAME} - View - 3D view'.</p> - </div> - - <div class="WIN" id="Scroll"> - <h2 id="naso" xml:lang="en-US">ALPS/Synaptics notebook touchpads in Windows</h2> - <p id="naso2" xml:lang="en-US">Due to a Windows driver issue, you cannot scroll through ${PRODUCTNAME} documents when you slide your finger across an ALPS/Synaptics touchpad.</p> - <p id="naso6" xml:lang="en-US">To enable touchpad scrolling, add the following lines to the "<tt>C:\Program Files\Synaptics\SynTP\SynTPEnh.ini</tt>" configuration file, and restart your computer:</p> - <p class="code" id="naso7">[${PRODUCTNAME}]</p> - <p class="code" id="naso3">FC = "SALFRAME"</p> - <p class="code" id="naso4">SF = 0x10000000</p> - <p class="code" id="naso5">SF |= 0x00004000</p> - <p class="note" id="naso8" xml:lang="en-US">The location of the configuration file might vary on different versions of Windows.</p> - </div> - - <div class="SOLSPARC SOLX86" id="NetscapeAdressBook"> - <h2 id="sdfsd32asrc" xml:lang="en-US">Mozilla Address Book Driver</h2> - <p id="sdcc32asrc" xml:lang="en-US">The Mozilla address book driver requires the <tt>SUNWzlib</tt> package. This package is not part of the minimum Solaris operating system installation. If you require access to the Mozilla address book, then add this package to your Solaris operating system using the command "<tt>pkgadd</tt>" from the installation CD.</p> - </div> - - <div id="Keyboard"> - <h2 id="awe1" xml:lang="en-US">Shortcut Keys</h2> - <p id="w32e1" xml:lang="en-US">Only shortcut keys (key combinations) not used by the operating system can be used in ${PRODUCTNAME}. If a key combination in ${PRODUCTNAME} does not work as described in the ${PRODUCTNAME} Help, check if that shortcut is already used by the operating system. To rectify such conflicts, you can change the keys assigned by your operating system. Alternatively, you can change almost any key assignment in ${PRODUCTNAME}. For more information on this topic, refer to the ${PRODUCTNAME} Help or the Help documentation of your operating system.</p> - <div class="MAC" id="MACKeysBETA"> - <p id="mackeys1" xml:lang="en-US">The application help of ${PRODUCTNAME} may use shortcut combinations for PC keyboards only.</p> - </div> - </div> - - <div class="LINUX MAC SOLSPARC SOLX86" id="FileLocking"> - <h2 id="gfh6w" xml:lang="en-US">File Locking</h2> - <p id="pji76w" xml:lang="en-US">File locking is enabled by default in ${PRODUCTNAME}. On a network that uses the Network File System protocol (NFS), the locking daemon for NFS clients must be active. To disable file locking, edit the <tt>soffice</tt> script and change the line "<tt>export SAL_ENABLE_FILE_LOCKING</tt>" to "<tt># export SAL_ENABLE_FILE_LOCKING</tt>". If you disable file locking, the write access of a document is not restricted to the user who first opens the document.</p> - </div> - - <div class="LINUX" id="Graphic Performance"> - <h2 id="gfh6w0" xml:lang="en-US">Graphic Performance</h2> - <p id="pji76w0" xml:lang="en-US">By default, ${PRODUCTNAME} favours nice-looking graphics over speed. If you experience slow graphics, switching off 'Tools - Options - ${PRODUCTNAME} - View - Use Anti-Aliasing' may help.</p> - </div> - - <div class="WIN" id="Mapi"> - <h2 id="gfh6w1" xml:lang="en-US">Problems When Sending Documents as E-mails From ${PRODUCTNAME}</h2> - <p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file "Mapi" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href="http://www.microsoft.com";>http://www.microsoft.com</a> to search the Microsoft Knowledge Base for "mapi dll".</p> - </div> - - <div id="A11y"> - <h2 id="aw22" xml:lang="en-US">Important Accessibility Notes</h2> - <p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.libreoffice.org/accessibility/";>http://www.libreoffice.org/accessibility/</a></p> - </div> - - <div id="UserSupport"> - <h2 id="support" xml:lang="en-US">User Support</h2> - <p id="support1" xml:lang="en-US">The main support page <a href="http://www.libreoffice.org/support/";>http://www.libreoffice.org/support/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://www.documentfoundation.org/nabble/";>http://www.documentfoundation.org/nabble/</a> or search the archives of the '[email protected]' mailing list at <a href="http://www.libreoffice.org/lists/users/";>http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:[email protected]";>[email protected]</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:[email protected]";>[email protected]</a>.</p> - <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://www.libreoffice.org/faq/";>http://www.libreoffice.org/faq/.</a></p> - </div> - - <div id="ReportBugsIssues"> - <h2 id="reportbugs" xml:lang="en-US">Reporting Bugs & Issues</h2> - <p id="reportbugs1" xml:lang="en-US">Our system for reporting, tracking and solving bugs is currently BugZilla, kindly hosted at <a href="https://bugs.libreoffice.org/";>https://bugs.libreoffice.org/</a>. We encourage all users to feel entitled and welcome to report bugs that may arise on your particular platform. Energetic reporting of bugs is one of the most important contributions that the user community can make to the ongoing development and improvement of ${PRODUCTNAME}.</p> - </div> - - <div id="GettingInvolved"> - <h2 id="gettinginvolved1" xml:lang="en-US">Getting Involved</h2> - <p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p> - <p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href="http://www.libreoffice.org/contribution/";>http://www.libreoffice.org/contribution/</a></p> - <h3 id="howtostart" xml:lang="en-US">How to Start</h3> - <p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://www.libreoffice.org/develop/";>http://www.libreoffice.org/develop/</a>.</p> - <h3 id="subscribe" xml:lang="en-US">Subscribe</h3> - <p id="subscribe1" xml:lang="en-US">Here are a few of the mailing lists to which you can subscribe at <a href="http://www.libreoffice.org/contribution/";>http://www.libreoffice.org/contribution/</a></p> - <ul> - <li> - <p id="subscribelist1" xml:lang="en-US">News: [email protected] *recommended to all users* (light traffic)</p> - </li> - - <li> - <p id="subscribelist2" xml:lang="en-US">Main user list: [email protected] *easy way to lurk on discussions* (heavy traffic)</p> - </li> - - <li> - <p id="subscribelist3" xml:lang="en-US">Marketing project: [email protected] *beyond development* (getting heavy)</p> - </li> - - <li> - <p id="subscribelist4" xml:lang="en-US">General developer list: [email protected] (heavy traffic)</p> - </li> - </ul> - <h3 id="joining0" xml:lang="en-US">Joining one or more Projects</h3> - <p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p> - </div> - - <div id="Credits"> - <p id="credits" xml:lang="en-US">We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.</p> - <p id="credits2" xml:lang="en-US">The LibreOffice Community</p> - </div> - - <div id="ModifiedSourceCode"> - <h2 id="ModifiedSourceCodeHeading" xml:lang="en-US">Used / Modified Source Code</h2> - <p id="ModifiedSourceCodePara" xml:lang="en-US">Portions Copyright 1998, 1999 James Clark. Portions Copyright 1996, 1998 Netscape Communications Corporation.</p> + <p id="CollaboraOffice" xml:lang="en-US">For more information please visit ${PRODUCTNAME} home page at <a href="https://collaboraoffice.com";>http://CollaboraOffice.com/</a>.</p> </div> </body> </html> commit c0f05216cf74e08960a61acd4eb2312033b696a9 Author: Andras Timar <[email protected]> Date: Wed Nov 4 15:15:55 2015 +0100 STARTCENTER_INFO_URL = https://collaboraoffice.com/ Change-Id: Id84259ff8bf27475d63c0ab31c4312bc78cb55d8 (cherry picked from commit 666337ce629737a73791e6fa4f0a7ac98541dc1f) (cherry picked from commit a156cd0b9d712485a2624edcda1584361c8913c0) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 6d0008b..b858b29 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -69,7 +69,7 @@ LibreOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ - STARTCENTER_INFO_URL https://www.libreoffice.org/ + STARTCENTER_INFO_URL https://collaboraoffice.com/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 88f43b7..6ee4597 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -544,7 +544,7 @@ postprocess_main_SED := \ -e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \ -e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ -e 's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \ - -e 's,$${STARTCENTER_INFO_URL},https://www.libreoffice.org/,g' \ + -e 's,$${STARTCENTER_INFO_URL},https://collaboraoffice.com/,g' \ -e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \ -e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \ -e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \ commit c1650839eed35dbf1a5a76a2babdafc76d883983 Author: Andras Timar <[email protected]> Date: Sat Nov 28 17:09:59 2015 +0100 Ctrl+3 keyboard shortcut for Set Optimal Column Width in Calc Change-Id: I1e218a429b509fda35accc832d01fc1f12e8dddd (cherry picked from commit fc53041c0387388f1275abf7beefea4d80d5ee3b) (cherry picked from commit 895e91d8aeaf77dc38fe14ad165b6f7ad5272491) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index da69c83..747a1d9 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -575,6 +575,12 @@ <value xml:lang="en-US">.uno:NumberFormatScientific</value> </prop> </node> + <node oor:name="3_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="en-US">.uno:SetOptimalColumnWidthDirect</value> + </prop> + </node> <node oor:name="3_SHIFT_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> commit 4e8cbca138e1444fd337275f4f1f1ff03231bbaa Author: Andras Timar <[email protected]> Date: Fri Oct 2 14:18:26 2015 +0200 provide libreoffice-writer, libreoffice-calc etc. metapackages Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1 (cherry picked from commit d151f43cdb0e7735d267115868a9dac9f45bb6b2) (cherry picked from commit ddb987c79a3852cfb552f10b1beca03f419879c2) diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index ba039a5..610f137 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -28,6 +28,7 @@ vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice" End Start @@ -42,6 +43,7 @@ vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-writer" End Start @@ -56,6 +58,7 @@ vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-calc" End Start @@ -70,6 +73,7 @@ vendor = "The Document Foundation" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-impress" End Start @@ -84,6 +88,7 @@ vendor = "The Document Foundation" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-draw" End Start @@ -98,6 +103,7 @@ vendor = "The Document Foundation" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-math" End Start @@ -112,6 +118,7 @@ vendor = "The Document Foundation" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-base" End Start diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index a8f8491..5445688b 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -48,6 +48,7 @@ vendor = "The Document Foundation" description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-evolution libreoffice-gnome" End Start @@ -95,6 +96,7 @@ vendor = "The Document Foundation" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-common" End Start commit a5fe06a5864e3f75bfa5d0ed4aeef0c3c4eebbb6 Author: Andras Timar <[email protected]> Date: Thu Oct 29 20:55:39 2015 +0100 OSX DMG background image must be 72 DPI Change-Id: I29be97c1a0e783abcf24720a7c5bc6c832e78eb3 (cherry picked from commit 2e324090e01db1ff059a57f3ecfbe8f2a6da2c77) (cherry picked from commit 9ea41d8f915491653df47064edafda47a987fe80) diff --git a/setup_native/source/packinfo/osxdndinstall.png b/setup_native/source/packinfo/osxdndinstall.png index 89d9976..af22449 100644 Binary files a/setup_native/source/packinfo/osxdndinstall.png and b/setup_native/source/packinfo/osxdndinstall.png differ commit d03cdd3dc4cd98f2d5e091d1b52c02853477f759 Author: Andras Timar <[email protected]> Date: Sun Sep 6 01:31:01 2015 -0700 hack to fix an MSP creation error Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff) (cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111) diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index 6fb1858..9e2dcd1 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -296,6 +296,8 @@ sub create_directory_structure { if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; } } + # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA" + $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} = $targetdir . $installer::globals::separator . "System"; return \%fullpathhash; } commit ec6dd004e6dcf480a908e09863efcafca79e243b Author: Andras Timar <[email protected]> Date: Wed Oct 28 15:12:34 2015 +0100 Amended Collabora Office branding images flat_logo.svg: transparency, bigger log, bigger text logo.png: new, replacing green number 5 Change-Id: I314d28f33a148ff438dae8de4db7b08097318fe0 (cherry picked from commit 5d81503823f2405c2eaec97c98e432886863ce02) (cherry picked from commit 34b62aa74bd67cd080b647929ca3efed1d8c8405) diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg index ac1be9a..0245cfc 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.91 r13725" + inkscape:version="0.48.4 r9939" 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,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="3200" - inkscape:window-height="1671" + inkscape:window-width="1920" + inkscape:window-height="1018" id="namedview149" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="2.6707819" - inkscape:cx="221.95942" - inkscape:cy="83.915307" - inkscape:window-x="0" - inkscape:window-y="55" + inkscape:zoom="1.335391" + inkscape:cx="271.36578" + inkscape:cy="-21.533046" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" /><g + inkscape:current-layer="g4762" /><g id="svg1205" display="none" style="display:none" @@ -663,7 +663,7 @@ height="58" x="949.64948" y="-185.39832" /><rect - style="opacity:1;fill:#ced0d2;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" + 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" @@ -689,28 +689,29 @@ style="display:inline;fill:#ffffff" /></g><g id="g4762" transform="matrix(0.81809146,0,0,0.81809146,22.434697,75.008495)"><polygon - transform="translate(185.39244,-71.931432)" + transform="matrix(2.0377711,0,0,2.0377711,94.256411,-105.65899)" id="polygon14" - points="17.358,44.386 17.258,20.718 17.772,20.172 30.958,32.599 17.914,44.893 " + points="30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 17.772,20.172 " style="fill:#ffffff" /><path id="path24-7" - d="M 203.16444,-51.759432" + d="M 130.47169,-64.553074" stroke-miterlimit="10" inkscape:connector-curvature="0" - style="fill:#ffffff;stroke:#000000;stroke-miterlimit:10" /><g - transform="matrix(0.98854994,0,0,0.98854994,203.99345,-146.53402)" + 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;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> + style="font-size:14.08969975px;fill:#000000;font-family:LiberationSans" + 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;fill:#000000;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans" + id="tspan4239">Collabora Office</tspan></text> + </g><g id="g4266" - transform="matrix(1.0319472,0,0,1.0319472,161.81471,-2.258415)"><path + transform="matrix(2.1028722,0,0,2.1028722,46.210308,36.318668)"><path style="fill:#5e3dcc" inkscape:connector-curvature="0" d="m 50.274805,-58.443898 c 0,0 -10.455046,7.866666 -10.455046,10.955225 0,3.088558 0,20.157431 0,22.936814 0,2.779583 10.546114,10.95134 10.546114,10.95134 L 72.739737,-35.974881 50.274805,-58.443898" diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png index 5d7e59c..2da1471 100644 Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ commit 2bb0ab225bf98df11d55dba90f0a0293ad528dcf Author: Andras Timar <[email protected]> Date: Thu Oct 8 10:43:12 2015 +0200 Collabora Office branding (cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6 diff --git a/configure.ac b/configure.ac index 8fd003b..e14e24d 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,7 @@ if test -n "$with_product_name" -a "$with_product_name" != no; then fi if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then PRODUCTNAME="${PRODUCTNAME}Dev" + PRODUCTNAME=AC_PACKAGE_NAME fi AC_MSG_RESULT([$PRODUCTNAME]) AC_SUBST(PRODUCTNAME) diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg b/icon-themes/galaxy/brand_cp/flat_logo.svg new file mode 100644 index 0000000..ac1be9a --- /dev/null +++ b/icon-themes/galaxy/brand_cp/flat_logo.svg @@ -0,0 +1,828 @@ +<?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.91 r13725" + 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="3200" + inkscape:window-height="1671" + id="namedview149" + showgrid="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:zoom="2.6707819" + inkscape:cx="221.95942" + inkscape:cy="83.915307" + inkscape:window-x="0" + inkscape:window-y="55" + inkscape:window-maximized="1" + inkscape:current-layer="Layer_1" /><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: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="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="translate(185.39244,-71.931432)" + id="polygon14" + points="17.358,44.386 17.258,20.718 17.772,20.172 30.958,32.599 17.914,44.893 " + style="fill:#ffffff" /><path + id="path24-7" + d="M 203.16444,-51.759432" + stroke-miterlimit="10" + inkscape:connector-curvature="0" + style="fill:#ffffff;stroke:#000000;stroke-miterlimit:10" /><g + transform="matrix(0.98854994,0,0,0.98854994,203.99345,-146.53402)" + id="g4221" + style="fill:#000000"><text + style="font-size:14.08969975px;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 + id="g4266" + transform="matrix(1.0319472,0,0,1.0319472,161.81471,-2.258415)"><path + style="fill:#5e3dcc" + inkscape:connector-curvature="0" + d="m 50.274805,-58.443898 c 0,0 -10.455046,7.866666 -10.455046,10.955225 0,3.088558 0,20.157431 0,22.936814 0,2.779583 10.546114,10.95134 10.546114,10.95134 L 72.739737,-35.974881 50.274805,-58.443898" + id="path24_106_" /><path + inkscape:connector-curvature="0" + style="fill:url(#path24_1_);fill-opacity:1" + d="m 43.787118,-39.314127 9.154779,12.51176 c 0,0 -11.567596,-1.260512 -13.122138,2.250508 0,-3.044219 3.967359,-14.762268 3.967359,-14.762268 z" + id="path24_105_" /><path + d="m 39.819759,-47.440648 c 0,3.102109 11.718746,11.513892 11.718746,11.513892 0,0 -11.718746,8.44257 -11.718746,11.423221 l 0,-22.937113 z" + id="path43" + style="fill:url(#SVGID_1_)" + inkscape:connector-curvature="0" /><line + stroke-miterlimit="10" + x1="47.095875" + y1="-53.193111" + x2="52.941898" + y2="-53.193111" + id="line47" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="43.992672" + y1="-50.3106" + x2="55.69717" + y2="-50.3106" + id="line49" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="42.42976" + y1="-47.427994" + x2="58.579178" + y2="-47.427994" + id="line51" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="44.389626" + y1="-44.545185" + x2="61.706097" + y2="-44.545185" + id="line53" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="47.580212" + y1="-41.662579" + x2="64.343399" + y2="-41.662579" + id="line55" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="51.005047" + y1="-38.779873" + x2="67.225609" + y2="-38.779873" + id="line57" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="54.291084" + y1="-35.897064" + x2="70.030098" + y2="-35.897064" + id="line59" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="50.779568" + y1="-33.014259" + x2="67.069572" + y2="-33.014259" + id="line61" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="47.247921" + y1="-30.131649" + x2="64.186966" + y2="-30.131649" + id="line63" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="44.085434" + y1="-27.248842" + x2="61.304359" + y2="-27.248842" + id="line65" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="42.645077" + y1="-24.366137" + x2="58.421654" + y2="-24.366137" + id="line67" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="44.43755" + y1="-21.483328" + x2="55.538845" + y2="-21.483328" + id="line69" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><line + stroke-miterlimit="10" + x1="47.580212" + y1="-18.600719" + x2="52.656338" + y2="-18.600719" + id="line71" + style="opacity:0.3;fill:#ffffff;stroke:#ffffff;stroke-width:0.447272;stroke-linecap:round;stroke-miterlimit:10" /><path + id="path22_11_" + d="m 46.431491,-37.528427 c -0.854689,0 -1.547467,0.692679 -1.547467,1.547767 0,0.854091 0.692778,1.547168 1.547467,1.547168 0.85449,0 1.547269,-0.693077 1.547269,-1.547168 0,-0.855088 -0.692779,-1.547767 -1.547269,-1.547767 m 0,2.542945 c -0.549998,0 -0.995775,-0.445579 -0.995775,-0.995178 0,-0.549998 0.445877,-0.996174 0.995775,-0.996174 0.549899,0 0.995876,0.446275 0.995876,0.996174 -10e-5,0.549699 -0.446077,0.995178 -0.995876,0.995178" + inkscape:connector-curvature="0" + style="fill:#5e3dcc" /><path + id="path24_102_" + d="m 43.986292,-36.774072 -0.390678,0.390877 0.435913,0.411203 -0.432426,0.407617 0.390578,0.390478 0.798593,-0.798095 -0.80198,-0.80208" + inkscape:connector-curvature="0" + style="fill:#5e3dcc" /><path + id="path26_11_" + d="m 42.548724,-34.415856 c -0.385696,0 -0.735822,-0.134112 -1.039915,-0.398848 -0.341158,-0.297816 -0.513929,-0.691284 -0.513929,-1.16765 0,-0.423558 0.15653,-0.791021 0.465206,-1.092922 0.305289,-0.300905 0.678132,-0.45325 1.107569,-0.45325 0.42585,0 0.796102,0.154139 1.100196,0.458331 l -0.403631,0.403532 c -0.195788,-0.195489 -0.423658,-0.290842 -0.696565,-0.290842 -0.277988,0 -0.509545,0.09466 -0.708023,0.289746 -0.19778,0.193396 -0.29383,0.417879 -0.29383,0.685405 0,0.309175 0.10422,0.550297 0.318142,0.737017 0.199573,0.173768 0.417082,0.258161 0.66468,0.258161 0.282871,0 0.517118,-0.09436 0.716592,-0.289148 l 0.398649,0.40951 c -0.306783,0.29931 -0.682217,0.450958 -1.115141,0.450958" + inkscape:connector-curvature="0" + style="fill:#666666" /></g></g></svg> \ No newline at end of file diff --git a/icon-themes/galaxy/brand_cp/intro.png b/icon-themes/galaxy/brand_cp/intro.png new file mode 100644 index 0000000..60257cd Binary files /dev/null and b/icon-themes/galaxy/brand_cp/intro.png differ diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 2b9429c..4664781 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]" | tr -d " "),$(shell echo $(PRODUCTNAME) | tr -d " "))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ @@ -123,9 +123,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'NativeProgress=false' \ && echo 'ProgressBarColor=0,0,0' \ && echo 'ProgressFrameColor=102,102,102' \ - && echo 'ProgressPosition=35,153' \ - && echo 'ProgressSize=444,8' \ - && echo 'ProgressTextBaseline=145' \ + && echo 'ProgressPosition=26,235' \ + && echo 'ProgressSize=460,6' \ + && echo 'ProgressTextBaseline=230' \ && echo 'ProgressTextColor=255,255,255' \ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ && echo 'SecureUserConfig=true' \ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp index e267d49..dca3b6a 100644 ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
