cui/uiconfig/ui/aboutdialog.ui | 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 | 2
readlicense_oo/license/LICENSE.fodt | 2
readlicense_oo/license/LICENSE.html | 2
setup_native/source/packinfo/packinfo_brand.txt | 16 +-
setup_native/source/packinfo/packinfo_extensions.txt | 10 -
setup_native/source/packinfo/packinfo_office.txt | 116 +++++++++---------
setup_native/source/packinfo/packinfo_office_help.txt | 2
setup_native/source/packinfo/packinfo_office_lang.txt | 20 +--
setup_native/source/packinfo/packinfo_sdkoo.txt | 2
setup_native/source/packinfo/packinfo_ure.txt | 4
sfx2/uiconfig/ui/licensedialog.ui | 2
18 files changed, 96 insertions(+), 96 deletions(-)
New commits:
commit f6075c95a23c1972af5a132949279f8f0a9724ff
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Date: Mon Jan 1 00:00:00 2018 -0600
Bump copyright year to 2018
Change-Id: Iabd06fbda15d2f83f6ee0cdd37b268910d380476
(cherry picked from commit 864c3aa5ddeab486d2233c7b8f7c467306c3ef54)
Reviewed-on: https://gerrit.libreoffice.org/56379
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 067ca0633d9f..5395d5f58f6c 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -211,7 +211,7 @@
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="aboutdialog|copyright">Copyright © 2000–2017 LibreOffice
contributors.</property>
+ <property name="label" translatable="yes"
context="aboutdialog|copyright">Copyright © 2000–2018 LibreOffice
contributors.</property>
<property name="justify">center</property>
<property name="wrap">True</property>
</object>
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 16dc10cacfaa..be303622580e 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -527,7 +527,7 @@
</div>
<div id="Footer">
<div id="FooterText">
- <p>Copyright © 2000–2017 LibreOffice contributors. All rights
+ <p>Copyright © 2000–2018 LibreOffice contributors. All rights
reserved.<br/>
LibreOffice was created by The Document Foundation, based on
Apache OpenOffice, which is Copyright 2011 The Apache Software
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 0a7cdcc82d57..273b2eb55848 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -911,7 +911,7 @@ types the specified types depend on.</p>
<div id="Footer">
<div id="FooterText">
<p>
- Copyright © 2000–2017 LibreOffice contributors.
All rights reserved.
+ Copyright © 2000–2018 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 b3d3c1c38f9b..7774eac5c550 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–2017 LibreOffice contributors.
All rights reserved.
+ Copyright © 2000–2018 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/examples.html b/odk/examples/examples.html
index 0864c099c53f..22a465b173af 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -810,7 +810,7 @@
<div id="Footer">
<div id="FooterText">
<p>
- Copyright © 2000–2017 LibreOffice contributors.
All rights reserved.
+ Copyright © 2000–2018 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/index.html b/odk/index.html
index 24b4fbd99f6b..4e8cdd753118 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -189,7 +189,7 @@
<div id="Footer">
<div id="FooterText">
<p>
- Copyright © 2000–2017 LibreOffice
contributors. All rights reserved.
+ Copyright © 2000–2018 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/index_online.html b/odk/index_online.html
index f0a36830c035..31b88b3e6c9e 100644
--- a/odk/index_online.html
+++ b/odk/index_online.html
@@ -234,7 +234,7 @@
<div id="Footer">
<div id="FooterText">
<p>
- Copyright © 2000–2017 LibreOffice contributors.
All rights reserved.
+ Copyright © 2000–2018 LibreOffice contributors.
All rights reserved.
<br>
LibreOffice was created by The Document
Foundation, based on Apache OpenOffice, which is Copyright 2011 The Apache
Software Foundation.
<br>
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 8a897fd9e717..7ebab994a6f8 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -14,7 +14,7 @@
All trademarks and registered trademarks mentioned herein are the
property of their respective owners.
- Copyright © 2000, 2017 LibreOffice contributors. All rights reserved.
+ Copyright © 2000–2018 LibreOffice contributors. All rights reserved.
This product is based on OpenOffice.org. Portions of this software are
copyright © 2000-2011, Oracle and/or its affiliates.
diff --git a/readlicense_oo/license/LICENSE.fodt
b/readlicense_oo/license/LICENSE.fodt
index 1aa5c897b60a..bf25468c4f97 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -3123,7 +3123,7 @@
<text:p text:style-name="Standard"><text:a xlink:type="simple"
xlink:href="#Mozilla Public License Version 2.0|outline"
text:style-name="Internet_20_link"
text:visited-style-name="Visited_20_Internet_20_Link"><text:span
text:style-name="T22">Jump to MPL Version 2</text:span></text:a></text:p>
<text:p text:style-name="Standard">Third Party Code Additional copyright
notices and license terms applicable to portions of the Software can be found
<text:a xlink:type="simple" xlink:href="#thirdparty"
text:style-name="Internet_20_link"
text:visited-style-name="Visited_20_Internet_20_Link">below</text:a> in this
document.</text:p>
<text:p text:style-name="P38">All trademarks and registered trademarks
mentioned herein are the property of their respective owners.</text:p>
- <text:p text:style-name="P39">Copyright © 2000, 2017 LibreOffice
contributors. All rights reserved.</text:p>
+ <text:p text:style-name="P39">Copyright © 2000–2018 LibreOffice
contributors. All rights reserved.</text:p>
<text:p text:style-name="P39">This product is based on OpenOffice.org.
Portions of this software are copyright © 2000-2011, Oracle and/or its
affiliates.</text:p>
<text:p text:style-name="Standard">This product has been created by The
Document Foundation, incorporating many modifications from different
contributors, see <text:a xlink:type="simple"
xlink:href="http://www.libreoffice.org/"; text:style-name="Internet_20_link"
text:visited-style-name="Visited_20_Internet_20_Link">http://www.libreoffice.org/</text:a>
for more details.</text:p>
<text:p text:style-name="Standard"><text:span
text:style-name="Strong_20_Emphasis">Note:</text:span> Do not translate or
localize this document. Only English version is legally binding.</text:p>
diff --git a/readlicense_oo/license/LICENSE.html
b/readlicense_oo/license/LICENSE.html
index 05cffacc32a4..c12876b17b64 100644
--- a/readlicense_oo/license/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
@@ -115,4 +115,4 @@
.Variable { font-style:italic; }
<!-- ODF styles with no properties representable as CSS -->
.Sect1 .T4 { }
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
