This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 484de5a git-site-role commit from build_staging.sh
484de5a is described below
commit 484de5a5009d1aca4353996debf0d3e805a17e6a
Author: jenkins <[email protected]>
AuthorDate: Thu Mar 18 17:49:02 2021 +0000
git-site-role commit from build_staging.sh
---
content/download/common/java.html | 9 +++++----
content/feed.xml | 4 ++--
content/nl/download/msg_prop_l10n_nl.js | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/content/download/common/java.html
b/content/download/common/java.html
index d95daf8..49584c2 100644
--- a/content/download/common/java.html
+++ b/content/download/common/java.html
@@ -46,7 +46,7 @@ and Apache OpenOffice in the
<p>So what does this mean exactly? Base (the database component) relies
completely on Java technologies to run, but other
programs (like Writer, Calc and Impress) only need Java for special
functionality. If you do not need to use Base and do
-not want to use any of the Wizards, then you do not need to have Java
installed and configured for running Apache
+not want to use any of the Wizards, then you do not need to have Java
installed and configured for running Apache
OpenOffice (and older versions of OpenOffice.org). You can completely prevent
OpenOffice from prompting you about the use
of Java by telling OpenOffice not to use a Java runtime environment (JRE).
From the OpenOffice main menu use:
<strong>"Tools - Options... - Java"</strong>, and uncheck "Use a Java runtime
environment". However, we do recommend
@@ -80,9 +80,10 @@ Furthermore you have to install a 32-bit JRE - additionally
or instead - when yo
</p>
<h3>Where Can I Get Java?</h3>
-<p>The current versions of Apache OpenOffice work reliably with a variety of
JREs including
-<a href="https://java.com";>Oracle Java, versions 6, 7 and 8</a> and
-<a href="http://openjdk.java.net/";>openJDK, versions 6, 7 and 8</a>. Feel free
to download a JRE from either of these sites
+<p>The current versions of Apache OpenOffice work reliably with a variety of
JREs including
+<a href="https://java.com";>Oracle Java, versions 6, 7 and 8</a>,
+<a href="https://openjdk.java.net/";>openJDK, versions 6, 7 and 8</a> and
+<a href="https://adoptopenjdk.net/";>AdoptOpenJDK, versions 8 and 11</a>. Feel
free to download a JRE from either of these sites
if you feel you need this functionality.
</p>
diff --git a/content/feed.xml b/content/feed.xml
index 6ec6f28..734d93f 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -6,8 +6,8 @@
<atom:link href="http://localhost:8820/feed.xml"; rel="self"
type="application/rss+xml" />
<description>OpenOffice.org Feed</description>
<language>en-us</language>
- <pubDate>Thu, 18 Mar 2021 17:35:42 +0000</pubDate>
- <lastBuildDate>Thu, 18 Mar 2021 17:35:42 +0000</lastBuildDate>
+ <pubDate>Thu, 18 Mar 2021 17:47:47 +0000</pubDate>
+ <lastBuildDate>Thu, 18 Mar 2021 17:47:47 +0000</lastBuildDate>
</channel>
diff --git a/content/nl/download/msg_prop_l10n_nl.js
b/content/nl/download/msg_prop_l10n_nl.js
index 65dcd81..bb5c29c 100644
--- a/content/nl/download/msg_prop_l10n_nl.js
+++ b/content/nl/download/msg_prop_l10n_nl.js
@@ -242,7 +242,7 @@ l10n.dl_full_link_title = "Klik
hier om te downloaden: ";
l10n.dl_langpack_link_text = "Download taalpakket";
l10n.dl_langpack_link_title = "Klik hier om te downloaden:
";
l10n.dl_win_info_text = "Belangrijke hint: 32-bit,
64-bit en Java - Wat te kiezen?";
-l10n.dl_win_info_title = "Momenteel bieden we een
32-bit (x86) versie aan voor Windows. Die installeert echter, en kan ook worden
uitgevoerd, op Windows 64-bit (x86-64).\nOnthoud dat u misschien Java in 32-bit
nodig hebt voor aanvulende functionaliteiten die dan slechts eenmalig gekozen
moet worden (in menu 'Extra - Opties - OpenOffice - Java').\n\nBekijk voor meer
informatie over OpenOffice en Java de link aan de rechterkant 'Java and Apache
OpenOffice'.";
+l10n.dl_win_info_title = "Momenteel bieden we een
32-bit (x86) versie aan voor Windows. Die installeert echter, en kan ook worden
uitgevoerd, op Windows 64-bit (x86-64).\nOnthoud dat u misschien Java in 32-bit
nodig hebt voor aanvulende functionaliteiten die dan slechts eenmalig gekozen
moet worden (in menu 'Extra - Opties - OpenOffice - Java').\n\nBekijk voor meer
informatie over OpenOffice en Java de link aan de rechterkant 'Java en Apache
OpenOffice'.";
l10n.dl_linux_info_text = "Belangrijke hint:
RPM vs. DEB = Wat te kiezen?";
l10n.dl_linux_info_title = "RPM wordt gebruikt
in:\nCentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux,
PCLinuxOS, Red Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux
Enterprise Server\n\nDEB wordt gebruikt in:\nDebian, Kanotix, Knoppix, Kubuntu,
Linux Mint, Lubuntu, Ubuntu, Xubuntu";
//l10n.dl_mac_info_text = "macOS : Text";
