officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 6 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 readlicense_oo/Package_files.mk | 4 readlicense_oo/docs/readme.xrm | 196 ---------- readlicense_oo/license/EULA.odt |binary readlicense_oo/license/EULA_en-US.rtf | 105 +++++ sfx2/source/appl/appserv.cxx | 26 + sfx2/uiconfig/ui/licensedialog.ui | 49 ++ solenv/bin/modules/installer/environment.pm | 2 solenv/bin/modules/installer/windows/idtglobal.pm | 2 11 files changed, 186 insertions(+), 208 deletions(-)
New commits: commit d064ea3659198fcd914b6939ec1f31880ebe9809 Author: Gülşah Köse <gulsah.k...@collabora.com> AuthorDate: Wed Sep 18 23:07:09 2019 +0300 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:50:27 2022 +0100 [cp] add EULA button to Help - License Information... dialog Forward port of acd8acfa89d9 from distro/collabora/cp-6.0 Rewritten for weld API Change-Id: I62b9293c68059389a63e523ea5747fdb267b1a99 28a21f5831e0b2e99eb11f1c1ac2b8845c462669 Reviewed-on: https://gerrit.libreoffice.org/79110 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 107b8c1f749a..ccb93bfc4c6b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -254,21 +254,43 @@ namespace class LicenseDialog : public weld::GenericDialogController { + private: + std::unique_ptr<weld::Button> m_xBtnLicense; + std::unique_ptr<weld::Button> m_xBtnEula; + + DECL_LINK(EulaHdl, weld::Button&, void); + DECL_LINK(LicenseHdl, weld::Button&, void); + public: LicenseDialog(weld::Window* pParent) : GenericDialogController(pParent, "sfx/ui/licensedialog.ui", "LicenseDialog") + , m_xBtnLicense(m_xBuilder->weld_button("license")) + , m_xBtnEula(m_xBuilder->weld_button("eula")) { + m_xBtnLicense->connect_clicked( LINK(this, LicenseDialog, LicenseHdl) ); + m_xBtnEula->connect_clicked( LINK(this, LicenseDialog, EulaHdl) ); } virtual short run() override { short nRet = GenericDialogController::run(); - if (nRet == RET_OK) - showDocument("LICENSE"); return nRet; } }; + IMPL_LINK_NOARG(LicenseDialog, EulaHdl, weld::Button&, void) + { + response(RET_OK); + showDocument("EULA.odt"); + } + + IMPL_LINK_NOARG(LicenseDialog, LicenseHdl, weld::Button&, void) + { + response(RET_OK); + showDocument("LICENSE"); + } + + class SafeModeQueryDialog : public weld::MessageDialogController { public: diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui index 71d504f9300d..a1d42e05dc7a 100644 --- a/sfx2/uiconfig/ui/licensedialog.ui +++ b/sfx2/uiconfig/ui/licensedialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="LicenseDialog"> @@ -11,6 +11,9 @@ <property name="default_width">0</property> <property name="default_height">0</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -21,7 +24,7 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="ok"> + <object class="GtkButton" id="license"> <property name="label" translatable="yes" context="licensedialog|show">_Show License</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -36,6 +39,23 @@ <property name="secondary">True</property> </packing> </child> + <child> + <object class="GtkButton" id="eula"> + <property name="label" translatable="yes" context="licensedialog|eula">_EULA</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + <property name="secondary">True</property> + </packing> + </child> <child> <object class="GtkButton" id="close"> <property name="label" translatable="yes" context="stock">_Close</property> @@ -50,7 +70,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> @@ -61,6 +81,24 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="licensedialog|label2">%PRODUCTNAME binary package is made available subject to the terms of the End User License and Subscription Agreement; choose EULA to see exact details in English.</property> + <property name="use_underline">True</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">eula</property> + <property name="max_width_chars">80</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> @@ -88,11 +126,8 @@ This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyri </object> </child> <action-widgets> - <action-widget response="-5">ok</action-widget> + <action-widget response="-5">license</action-widget> <action-widget response="-7">close</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> commit 4157921a0741b292e322d4306e6a520ef4dd528e Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Apr 18 02:16:38 2014 -0700 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:50:27 2022 +0100 [cp] Collabora Office EULA Change-Id: Ia380db465f5094216cb36526f6cc178043376356 diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 101d3878de3f..95614109e3d1 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -11,9 +11,13 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/l ifneq ($(OS),MACOSX) $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf)) $(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt)) else $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf)) $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt)) endif diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt new file mode 100644 index 000000000000..e5c937f15401 Binary files /dev/null and b/readlicense_oo/license/EULA.odt differ diff --git a/readlicense_oo/license/EULA_en-US.rtf b/readlicense_oo/license/EULA_en-US.rtf new file mode 100644 index 000000000000..b5f8e682645b --- /dev/null +++ b/readlicense_oo/license/EULA_en-US.rtf @@ -0,0 +1,105 @@ +{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fswiss\fcharset0 ArialMT;}{\f1\fswiss\fcharset0 Helvetica;}} +{\colortbl ;\red0\green0\blue255;\red51\green51\blue51;} +{\*\generator Riched20 10.0.18362}\viewkind4\uc1 +\pard\qj\b\f0\fs28\lang14 End User License and Subscription Agreement\b0\fs24\par +\b\fs28 Collabora Office (\ldblquote Software\rdblquote )\b0\fs24\par +\b\fs20\par +\par +An individual acting on their own behalf or on behalf of any corporate entity which employs them or which they represent (\ldblquote an Organisation\rdblquote ) represents that he or she has the authority to enter into this agreement on behalf of that Organisation. In this Licence Agreement, \ldblquote You\rdblquote includes both the reader and any Organisation.\b0\fs24\par +\fs20\par +PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE READ AND UNDERSTAND THIS AGREEMENT. \fs24\par +\fs20\par +IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \fs24\par +\fs20\par +\b PARTIES.\b0 This software licence and subscription agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement between You and Collabora Productivity Limited, incorporated and registered in England and Wales with company number 08644931 whose registered office is at The Platinum Building, St John\rquote s Innovation Park, Cambridge, CB4 0DS, United Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to Collabora shall also refer to its authorised resellers and third party distributors from time to time. \fs24\par +\fs20\par +\b SOFTWARE\b0 . The Software and each of its components are owned by Collabora or other licensors and are protected as copyrighted works of authorship, and are also protected under applicable database and other applicable laws. To the extent that they are not accompanied by a separate Collabora software licence agreement, any modification, update or upgrade to the Software that You may download or receive, whether as Subscription Services detailed below or otherwise, is included as Software and governed by the \ldblquote Licenses\rdblquote heading below and generally by this Agreement.\fs24\par +\fs20\par +\b LICENCES.\b0 Provided that You have subscribed to the Subscription Services as detailed below and Your compliance with the other terms and conditions of this Agreement, Collabora grants to You a perpetual, non-transferable, worldwide licence (\ldblquote Licence\rdblquote ) to reproduce and use copies of the Software within Your Organization. The Software is licensed (not sold) to You. Accordingly no title to or ownership of the Software is transferred to You. You should also be aware that in addition to this grant of Licence, many of the individual components of the Software are subject to open source licences, as detailed further below under \ldblquote Open Source Licences and Limitations\rdblquote .\fs24\par +\fs20\par +\b SUBSCRIPTION SERVICES. \b0 The Licence to reproduce and use a copy of the Software is granted subject to the initial purchase by You of Software maintenance and/or support services entitlements (\ldblquote Subscription Services Entitlements\rdblquote ) equivalent in number to the total number of units of the Software that you intend to deploy, install or use in Your Organization.\fs24\par +\fs20 The Subscription Services Entitlements entitle You during the subscription period to make use of the following services (\ldblquote Subscription Services\rdblquote ):\fs24\par +\fs20 a) in the case of maintenance services, to any security fixes and Software updates which may be issued by Collabora, including existing fixes from the support services set out at (b), on the terms set out in this Agreement and from time to time at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs24\par +\fs20 b) in the case of support services, to fee based technical support on the terms set out in this Agreement, or any separate agreement, and from time to time at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs20 . \fs24\par +\fs20 All Subscription Services will be supplied in a professional manner in accordance with generally accepted industry standards. \fs24\par +\fs20 Unless the Subscription Services and Subscription Services Entitlements are set out in a separate contract with Collabora, they are offered to You subject to the terms set out in this Agreement. \fs24\par +\fs20\par +IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME.\fs24\par + +\pard\qj\tx5693\fs20\tab\fs24\par + +\pard\qj\b\fs20 HOME USE.\b0 Collabora grants primary users of Subscription Services Entitlements and their immediate family members a License to reproduce and use copies of the Software for Home Use as detailed below unless otherwise prohibited by any applicable laws, policies or regulations. Home Use is usage outside the scope of normal business that occurs primarily inside the home.\fs24\par +\fs20\par +\b LICENSE COMPLIANCE AUDIT\b0 . Collabora may, upon fifteen (15) days\rquote advance notice and at its expense, conduct an annual audit if You are an Organisation, during your normal business hours, of Your use of the Software to verify compliance with this Agreement and in particular Your commitment under the License herein to purchase an equivalent number units of Subscription Services Entitlements. You agree to keep records sufficient to certify your compliance with this Agreement. Upon Collabora\rquote s or its authorized representative\rquote s reasonable written commitment(s) to safeguard your confidential information, you shall fully cooperate with such audit and provide any necessary assistance and access to records and computers. If an audit reveals that you have or at any time had unlicensed installation, use of, or access to the Software, You will promptly acquire sufficient Subscription Services Entitlements to cover any shortage. If a shortage of 5% or more is found, you must reimburse Collabora for the costs incurred in the audit and acquire the necessary additional Subscription Services Entitlements within 30 days. \fs24\par +\fs20\par +\cf2\b EVALUATION LICENCE.\b0 An evaluation licence is granted when You deploy, install or use an evaluation version of the Software or You are granted a time limited, non-exclusive and non-transferable licence by Collabora for evaluation purposes. The Software is licensed to You for the sole purpose of evaluating the Software and only for a specified evaluation period of 30 days. After 30 days You must either purchase an equivalent Subscription Services Entitlement from Collabora, or destroy and stop using the Software. If You purchase the Subscription Service Entitlement before the expiration of the evaluation time, You have a valid licence and You do not need to destroy the Software. \cf0\fs24\par +\b\fs20\par +OPEN SOURCE LICENCES/REQUIREMENTS.\b0 Many of the individual components included in the Software are licensed primarily pursuant to Mozilla Public License v2.0 open source licence, in addition to other open source licences identified in the documentation or located in the source code or binary code for the component. For these the source code form of the Software is made available at all times under the terms of such licences.\fs24\par +\fs20 Whilst this Agreement in no way limits Your rights under such licences, nor is it intended to supersede or conflict with the licence terms or obligations for use of any individual open source component, the Mozilla Public License v2.0 has been utilised to license the majority of the components comprising the Software because it allows the imposition (as is set out in its paragraph 3.2(b)) of the conditions of this Agreement on the free distribution of Software in its Executable Form.\fs24\par +\fs20 For the avoidance of doubt, Collabora branding, theme data and Collabora Marks are not made available under an Open Source license.\fs24\par +\b\fs20\par +MAINTENANCE SERVICES. \b0\fs24\par +\fs20 1) By purchasing maintenance services You are entitled to install and use all upgrades and updates made commercially available by Collabora during the period covered by the maintenance services subscription, up to the number of installations for which You have purchase maintenance services. \fs24\par +\fs20\par +2) Any \ldblquote update\rdblquote means a fix or compilation of fixes released by Collabora to correct operational errors (a defect that prevents it from operating substantially as intended, where such intent shall be deduced based on a competent inspection of the source code and documentation) in the Software. An \ldblquote upgrade\rdblquote means any new version of the Software which bears the same product name, including version changes evidenced by a number immediately after the name of the Software. \fs24\par +\fs20\par +3) If a question arises as to whether a release by Collabora is an upgrade or an update or a new Software product, Collabora\rquote s opinion will prevail provided that Collabora treats the product offering the same for its end users generally.\fs24\par +\fs20\par +4) If Collabora commercially releases any upgrade or updates, it will make such upgrades or updates available to You within a reasonable period of time after they become commercially available, although Collabora cannot guarantee any specific turnaround times and/or regular release intervals. \fs24\par +\fs20\par +5) At its sole discretion Collabora will determine whether to eliminate an operational error by means of issuing an update. Collabora will inform you by email (to the address given on registration of the maintenance services) as soon as new updates are released at the Collabora website.\fs24\par +\fs20\par +6) Maintenance services do not include integration services, installation of upgrades or updates, support services or any other benefits not expressly described in this Agreement.\fs24\par +\fs20\par +\b SUPPORT SERVICES\b0\fs24\par +\fs20 By purchasing an entitlement to \lquote Level 3\rquote technical support, services will be provided on certain terms which include:\fs24\par + +\pard\sa120\sl276\slmult1\fs20 - allocation of a severity level for each support case and any variations on this;\f1\fs22\par +\f0\fs20 - Collabora\rquote s work availability times, initial response time and the communication frequency for each support case based on such allocated case severity level; \f1\fs22\par +\f0\fs20 - Your limit on the number of support cases that You can report for each such allocated case severity level (although for the avoidance of doubt, any unused limit cannot be refunded and expires at the end of the Subscription Services Entitlement period unless otherwise agreed). \f1\fs22\par +\f0\fs20 The specific terms are subject to change from time to time and accordingly are set out at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs20 , unless separately agreed with You such as in a purchase order. You are urged to check these terms again now before proceeding with any purchase of Subscription Services Entitlements. \f1\fs22\par +\f0\fs20 Alternatively, Collabora also entitle You to purchase the support services entitlement from a reseller or other intermediary rather than from Collabora directly. If You have purchased the services entitlement from such a party please check with them if any support service entitlement terms have been separately negotiated between them and Collabora, as any such terms are deemed to be incorporated into this Agreement and shall take precedence over any conflicting terms set out at {{\field{\*\fldinst{HYPERLINK http://www.CollaboraOffice.com/ }}{\fldrslt{http://www.CollaboraOffice.com/\ul0\cf0}}}}\f0\fs20 or on a purchase order.\f1\fs22\par + +\pard\qj\b\f0\fs20 LIMITATIONS AND EXCLUSIONS\b0\fs24\par +\fs20 1) Collabora offers no rights other than those expressly granted to You in this Agreement. Except as agreed to under a separate written agreement with Collabora or in the licence terms accompanying a particular component, to the maximum extent permitted under applicable law (and not applicable to claims relating to death or personal injury caused by negligence or fraudulent misrepresentation) the Software is provided and licensed "as is" without any warranties of any kind, express or implied, including any implied warranties of quality, title, non-infringement, non-interruption or fitness for a particular purpose. \fs24\par +\fs20\par +2) The Software is only compatible with certain computers and operating systems. It is not warranted for non-compatible systems or for incorrect or unauthorised use, being use which is not in accordance with the Documentation. Please contact Collabora for information about compatibility or incorrect use. \fs24\par +\fs20\par +3) The Software may include or be bundled with other software programmes or services licensed or sold by an entity other than Collabora. Collabora does not warrant non-Collabora products or services, which are provided on an "as is" basis. Please see the third party entity regarding remedies.\fs24\par +\fs20\par +4) No right or licence, express or implied, is granted under this Agreement with respect to any trademark, trade name or service mark (\ldblquote Mark\rdblquote ) of Collabora. If You distribute any open source component of the Software, You must remove all Marks except those used to identify Collabora\rquote s ownership or licensing of the component. In addition you may not vary, delete or obscure any notices of proprietary rights or any product identification or restrictions on or in the Software.\fs24\par +\fs20\par +5) Neither Collabora nor any of its licensors, subsidiaries, contractors or employees will in any case be liable for any incidental, consequential, indirect or economic damages arising out of the use of or inability to use the Software or Subscription Services, including without limitation loss of profits, business or data, even if advised of the possibility of those damages. In particular, as files may be altered or damaged in the course of Collabora providing Subscription Services, You agree to take appropriate measures to isolate and back up Your systems. \fs24\par +\fs20\par +6) Notwithstanding (5) above, in no event will Collabora's aggregate liability for damages (whether in one instance or a series of instances) exceed 1.25 times the amount paid by You for the Subscription Services Entitlements out of which such claim arose.\fs24\par +\fs20\par +7) Upon any default in Collabora\rquote s provision of Subscription Services, Collabora's only obligation is to either correct the Subscription Services so that they comply with this warranty or at its option refund the amount You paid to Collabora for the portion of such Services that fail to comply with this warranty and in such event You may elect to terminate this Agreement with immediate effect.\fs24\par +\fs20\par +\par +\b GENERAL TERMS\b0\fs24\par +\fs20 1) This Agreement may not be transferred or assigned without the prior written approval of Collabora.\fs24\par +\fs20\par +2) This Agreement will terminate if You fail to comply with any term or condition of this Agreement.\fs24\par +\fs20\par +3) Unless explicitly indicated otherwise, this Agreement sets forth the entire understanding and agreement between You and Collabora and may be amended or modified only by a written agreement agreed to by You and Collabora. No licensor, distributor, or reseller is authorised to modify this Agreement whether formally or informally.\fs24\par +\fs20\par +4) No waiver of any right under this Agreement will be effective unless in writing. No waiver of any past or present right will be deemed to be a waiver of any future right arising under this Agreement. \fs24\par +\fs20\par +5) If any provision in this Agreement is invalid or unenforceable, that provision will be construed, limited, modified or, if necessary, severed, to the extent necessary, to eliminate its invalidity or unenforceability, and the other provisions of this Agreement will remain unaffected. \fs24\par +\fs20\par +6) Any products or technical information provided under this Agreement may be subject to trade laws of various countries including U.S. export controls. Both You and Collabora each agree to comply with all export control regulations and to obtain any required licenses or classification to export, re-export or import deliverables and Collabora assumes no responsibility for the Your failure to comply with any such necessary export control laws, rules or regulations. \fs24\par +\fs20\par +7) If You are an Organisation You agree that you will not use the Software in breach of any relevant laws in the country in which you use the Software, and you agree to implement internal safeguards to prevent any unauthorized copying, distribution, installation, or use of, or access to, the Software.\fs24\par +\fs20\par +8) You may make a reasonable number of copies\b \b0 of the Software over and above the number of units of Software for which you have purchased Subscription Services Entitlements, purely for backup, archival or other security purposes. In so doing You will not be in breach of the terms of this Agreement.\fs24\par +\fs20\par +9) Without regard to conflict of laws rules and principles or the United Nations Convention of Contracts for the International Sale of Goods, this Agreement is governed by the laws of England, and any action relating to this Agreement may only be brought before the courts of England.\fs24\par +\fs20\par +\par +\i EULA 2020-04-07\i0\fs24\par +\par + +\pard\qc\fs16 Collabora Productivity Ltd. The Platinum Building, St John\rquote s Innovation Park, Cambridge, CB4 0DS, United Kingdom\par +Registered in England and Wales with company number 08644931\par +Telephone +44 (0)1223 362967 libreoff...@collabora.com {{\field{\*\fldinst{HYPERLINK http://CollaboraOffice.com }}{\fldrslt{http://CollaboraOffice.com\ul0\cf0}}}}\f0\fs16 \par +} diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index b45227f8a1a4..05dfdbfb6787 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -59,7 +59,7 @@ sub create_pathvariables my $filelistpath = $environment->{'WORKDIR'}; $variables{'filelistpath'} = $filelistpath; - my $licensepath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget/readlicense_oo/license"; + my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license"; $variables{'licensepath'} = $licensepath; my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo"; diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 26c8e951c9c9..00c466b459e3 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -813,7 +813,7 @@ sub get_rtflicensefilesource { my ($language, $includepatharrayref) = @_; - my $licensefilename = "license_" . $language . ".rtf"; + my $licensefilename = "EULA_en-US.rtf"; my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1); commit 7606557ee755698443acb97fad5445ace8b2cfbb Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Thu Apr 18 12:38:11 2019 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:40:36 2022 +0100 [cp] ViewPDFAfterExport default true Change-Id: I2c054ba672c7ab52a6e3f3f085823fd5015f0d62 Reviewed-on: https://gerrit.libreoffice.org/75233 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 3dbec6d99490..06c36df8e13a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5077,7 +5077,7 @@ <info> <desc>Specifies if PDF automatically opens after export.</desc> </info> - <value>false</value> + <value>true</value> </prop> <prop oor:name="ExportBookmarks" oor:type="xs:boolean" oor:nillable="false"> <info> commit 589b1471130ae2a6451027650ff7b09b7af8ca61 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Mar 4 10:50:11 2016 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:40:19 2022 +0100 [cp] 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 d01823d780d7..ac069b01bbc9 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -17,201 +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="https://git.libreoffice.org/core/tree/master/README.md">https://git.libreoffice.org/core/tree/master/README.md</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="https://www.libreoffice.org/">https://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="https://www.documentfoundation.org/contribution/">https://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">macOS 10.10 (Yosemite) or higher</p> - </li> - </ul> - </div> - <div class="WIN" id="SystemRequirements_WIN"> - <ul> - <li> - <p id="s2s3sdf21" xml:lang="en-US">Microsoft Windows 7 SP1, 8, 8.1 Update (S14) 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 3.10 or higher;</p> - </li> - - <li> - <p id="s253we" xml:lang="en-US">glibc2 version 2.17 or higher;</p> - </li> - - <li> - <p id="s255we" xml:lang="en-US">FreeType version 2.8.0 or higher;</p> - </li> - - <li> - <p id="s256we" xml:lang="en-US">GTK version 3.20 or higher;</p> - </li> - - <li> - <p id="wd2dff" xml:lang="en-US">Gnome 3.18 or higher, with the at-spi2 1.32 package (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: sudo dnf 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="https://en.wikipedia.org/wiki/Freedesktop.org">https://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 'dnf 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.</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 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 Emails From ${PRODUCTNAME}</h2> - <p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as Email' 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="https://www.microsoft.com">https://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="https://www.libreoffice.org/accessibility/">https://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 <a href="https://www.libreoffice.org/get-help/community-support/">main support page</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="https://www.documentfoundation.org/nabble/">https://www.documentfoundation.org/nabble/</a> or search the archives of the 'us...@libreoffice.org' mailing list at <a href="https://www.libreoffice.org/lists/users/">https://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:us...@libreoffice.org">us...@libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:users+subscr...@libreoffice.org">users+subscr...@libreoffice.org</a>.</p> - <p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="https://www.libreoffice.org/get-help/frequently-asked-questions/">the LibreOffice website</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, hosted at <a href="https://bugs.documentfoundation.org/">https://bugs.documentfoundation.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="https://www.libreoffice.org/community/get-involved/">the LibreOffice website</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="https://www.libreoffice.org/community/developers/">the LibreOffice website</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="https://www.libreoffice.org/get-help/mailing-lists/">https://www.libreoffice.org/get-help/mailing-lists/</a></p> - <ul> - <li> - <p id="subscribelist1" xml:lang="en-US">News: annou...@documentfoundation.org *recommended to all users* (light traffic)</p> - </li> - - <li> - <p id="subscribelist2" xml:lang="en-US">Main user list: us...@global.libreoffice.org *easy way to lurk on discussions* (heavy traffic)</p> - </li> - - <li> - <p id="subscribelist3" xml:lang="en-US">Marketing project: market...@global.libreoffice.org *beyond development* (getting heavy)</p> - </li> - - <li> - <p id="subscribelist4" xml:lang="en-US">General developer list: libreoffice@lists.freedesktop.org (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">https://CollaboraOffice.com/</a>.</p> </div> </body> </html> commit 92a53447cceb0fd14eeb03c43331dd7179ce63d6 Author: Thais Vieira <thais.vie...@collabora.com> AuthorDate: Fri Sep 4 08:21:28 2020 -0300 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:35:29 2022 +0100 Loleaflet:fix menu entry replacing the 'Select...' to 'Select Table' to it be consistent with the pattern. Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044 Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 7d0f7721ab42..67e0d0cb3936 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2063,7 +2063,7 @@ <value xml:lang="en-US">Select Table</value> </prop> <prop oor:name="ContextLabel" oor:type="xs:string"> - <value xml:lang="en-US">~Select...</value> + <value xml:lang="en-US">~Select Table</value> </prop> <prop oor:name="PopupLabel" oor:type="xs:string"> <value xml:lang="en-US">Select Table</value> commit 8ea15b6593bfa44c42319bad280ff902b24eaed1 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Sat Nov 28 17:09:59 2015 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sun Feb 13 11:35:19 2022 +0100 [cp] Ctrl+3 keyboard shortcut for Set Optimal Column Width in Calc (cherry picked from commit fc53041c0387388f1275abf7beefea4d80d5ee3b) (cherry picked from commit 895e91d8aeaf77dc38fe14ad165b6f7ad5272491) Change-Id: I1e218a429b509fda35accc832d01fc1f12e8dddd diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 9514b9cdca14..e93012222e17 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -628,6 +628,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing <value xml:lang="en-US" install:module="macosx">.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>