compilerplugins/LICENSE.TXT | 2 +- cui/inc/strings.hrc | 2 +- odk/docs/install.html | 2 +- odk/docs/tools.html | 2 +- odk/examples/DevelopersGuide/examples.html | 2 +- odk/examples/examples.html | 2 +- odk/index.html | 2 +- odk/index_online.html | 2 +- readlicense_oo/license/license.xml | 2 +- setup_native/source/packinfo/packinfo_librelogo_disabled.txt | 2 +- sfx2/uiconfig/ui/licensedialog.ui | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 5d5bb2e5f4c1010efbbe95d5e30091bf251b2d74 Author: Julien Nabet <[email protected]> AuthorDate: Wed Mar 13 21:50:45 2024 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Jan 17 07:42:47 2025 +0100 tdf#160180: bump copyright year to 2024 Conflicts: setup_native/source/packinfo/packinfo_brand.txt setup_native/source/packinfo/packinfo_extensions.txt setup_native/source/packinfo/packinfo_office.txt setup_native/source/packinfo/packinfo_office_help.txt setup_native/source/packinfo/packinfo_office_lang.txt setup_native/source/packinfo/packinfo_sdkoo.txt setup_native/source/packinfo/packinfo_ure.txt Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Julien Nabet <[email protected]> (cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164748 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 697dbd9a708e73f6e83a76baf0541dcaf1489a68) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180310 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT index 1e8587c1cce9..860092aee87e 100644 --- a/compilerplugins/LICENSE.TXT +++ b/compilerplugins/LICENSE.TXT @@ -1,7 +1,7 @@ University of Illinois/NCSA Open Source License -Copyright (c) 2012-2023 The Document Foundation +Copyright (c) 2012-2024 The Document Foundation All rights reserved. Developed by: diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index f5252694459c..52c4a7e4244a 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -358,7 +358,7 @@ #define RID_CUISTR_CANNOTCONVERTURL_ERR NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a filesystem path.") -#define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.") +#define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.") #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.") #define RID_CUISTR_ABOUT_BASED_ON NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.") #define RID_CUISTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org") diff --git a/odk/docs/install.html b/odk/docs/install.html index 42e3b13cfb2f..e23fa3a535fe 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -534,7 +534,7 @@ </div> <div id="Footer"> <div id="FooterText"> - <p>Copyright © 2000–2023 LibreOffice contributors. All rights + <p>Copyright © 2000–2024 LibreOffice contributors. All rights reserved.<br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org.<br/> The Document Foundation acknowledges all community members, please diff --git a/odk/docs/tools.html b/odk/docs/tools.html index f9edc69c9394..d17542825537 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -881,7 +881,7 @@ types the specified types depend on.</p> <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on Apache OpenOffice, which is Copyright 2011, diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 7112439f4fac..e8cc4a50a5a1 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -2856,7 +2856,7 @@ for the Office application.</td> <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/examples/examples.html b/odk/examples/examples.html index f50dffbc79e8..9c3c34eff00a 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -932,7 +932,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/index.html b/odk/index.html index 6cc5beaae2c9..3a8c91da7874 100644 --- a/odk/index.html +++ b/odk/index.html @@ -188,7 +188,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/index_online.html b/odk/index_online.html index 80c1c44c1b04..4edb8bf2a344 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -234,7 +234,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br> LibreOffice was created by The Document Foundation, based on OpenOffice.org. <br> diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 34b01186ce5a..ccea05028ee0 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -13,7 +13,7 @@ <p>Third Party Code Additional copyright notices and license terms applicable to portions of the Software can be found <a href="#thirdparty">below</a> in this document.</p> <p>All trademarks and registered trademarks mentioned herein are the property of their respective owners.</p> - <p>Copyright © 2000–2023 LibreOffice contributors. All rights reserved.</p> + <p>Copyright © 2000–2024 LibreOffice contributors. All rights reserved.</p> <p>This product is based on OpenOffice.org. Portions of this software are copyright © 2000-2011, Oracle and/or its affiliates.</p> <p>This product has been created by The Document Foundation, incorporating many modifications from different diff --git a/setup_native/source/packinfo/packinfo_librelogo_disabled.txt b/setup_native/source/packinfo/packinfo_librelogo_disabled.txt index 262212ecdef9..e675efbec8f0 100644 --- a/setup_native/source/packinfo/packinfo_librelogo_disabled.txt +++ b/setup_native/source/packinfo/packinfo_librelogo_disabled.txt @@ -27,7 +27,7 @@ linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui index fe06c7544e92..bded0aab355d 100644 --- a/sfx2/uiconfig/ui/licensedialog.ui +++ b/sfx2/uiconfig/ui/licensedialog.ui @@ -109,7 +109,7 @@ Third Party Code Additional copyright notices and license terms applicable to po All trademarks and registered trademarks mentioned herein are the property of their respective owners. -Copyright © 2000–2023 LibreOffice contributors. All rights reserved. +Copyright © 2000–2024 LibreOffice contributors. All rights reserved. This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2011 Oracle and/or its affiliates. %OOOVENDOR acknowledges all community members, please see http://www.libreoffice.org/ for more details.</property> <property name="wrap">True</property>
