This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/asf-site by this push:
new dc99fcb git-site-role commit from copy_staging.sh
dc99fcb is described below
commit dc99fcbf18a5cd8d90932d8d56e0359c0a60a1f9
Author: jenkins <[email protected]>
AuthorDate: Sun Apr 11 18:41:26 2021 +0000
git-site-role commit from copy_staging.sh
---
content/de/download/msg_prop_l10n_de.js | 15 +++++++
content/de/download/platform_hints.html | 67 +++++++++++++++++++++++++++++++
content/download/boxed_download.js | 10 ++---
content/download/download.js | 10 ++++-
content/download/full_vs_lp.html | 50 +++++++++++++----------
content/download/msg_prop_l10n_en.js | 19 ++++++++-
content/download/platform_hints.html | 66 ++++++++++++++++++++++++++++++
content/feed.xml | 4 +-
content/fr/Documentation/Base/index.html | 1 +
content/fr/Documentation/Basic/index.html | 1 +
content/stats/aoo-downloads.txt | 7 ++++
11 files changed, 216 insertions(+), 34 deletions(-)
diff --git a/content/de/download/msg_prop_l10n_de.js
b/content/de/download/msg_prop_l10n_de.js
index c2ca65b..7c16491 100644
--- a/content/de/download/msg_prop_l10n_de.js
+++ b/content/de/download/msg_prop_l10n_de.js
@@ -235,6 +235,21 @@ l10n.dl_full_link_text =
"Herunterladen: Vollinstallation";
l10n.dl_full_link_title = "Klicken zum
Herunterladen: ";
l10n.dl_langpack_link_text = "Herunterladen: Sprachpaket";
l10n.dl_langpack_link_title = "Klicken zum Herunterladen: ";
+
+l10n.dl_platform_info_text = "Wichtige Hinweise für ";
+l10n.dl_platform_info_title = "Klicken für wichtige
Hinweise für ";
+l10n.dl_platform_info_link = "platform_hints.html";
+l10n.dl_platform_info_headline = "Apache OpenOffice - Wichtige
Hinweise zur gewählten Plattform";
+l10n.dl_platform_info_win_headline = "Windows";
+l10n.dl_platform_info_win_sub_headline = "32-Bit, 64-Bit und Java -
Was wählen?";
+l10n.dl_platform_info_win_text = "Derzeit wird nur eine 32-bit
(x86) Version für Windows angeboten. Es funktioniert aber auch mit einem
Windows 64-bit (x86-64).\nBitte beachten Sie, dass Sie für zusätzliche
Funktionen Java mit 32-bit benötigen, das einmalig ausgewählt werden muss
(siehe Menü 'Extras - Einstellungen - OpenOffice - Java').\n\nFür weitere
Informationen über OpenOffice und Java siehe: <a
href=https://www.openoffice.org/download/common/java.html>https://www.openoffice.org/d
[...]
+l10n.dl_platform_info_mac_headline = "macOS";
+l10n.dl_platform_info_mac_sub_headline = "Informationen kommen
demnächst";
+l10n.dl_platform_info_mac_text = "";
+l10n.dl_platform_info_linux_headline = "Linux";
+l10n.dl_platform_info_linux_sub_headline = "RPM oder DEB - Was wählen?";
+l10n.dl_platform_info_linux_text = "RPM wird benutzt in: <br/>
CentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red
Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server <br /><br /> DEB wird benutzt in: <br/> Debian, Kanotix, Knoppix,
Kubuntu, Linux Mint, Lubuntu, Ubuntu, Xubuntu";
+
l10n.dl_win_info_text = "Wichtiger Hinweis: 32-bit,
64-bit und Java - Was soll ich wählen?";
l10n.dl_win_info_title = "Derzeit wird nur eine 32-bit
(x86) Version für Windows angeboten. Es funktioniert aber auch mit einem
Windows 64-bit (x86-64).\nBitte beachten Sie, dass Sie für zusätzliche
Funktionen Java mit 32-bit benötigen, das einmalig ausgewählt werden muss
(siehe Menü 'Extras - Einstellungen - OpenOffice - Java').\n\nFür weitere
Informationen über OpenOffice und Java klicken Sie bitte rechts auf den Link
'Java und Apache OpenOffice'.";
l10n.dl_linux_info_text = "Wichtiger Hinweis:
RPM oder DEB - Was soll ich wählen?";
diff --git a/content/de/download/platform_hints.html
b/content/de/download/platform_hints.html
new file mode 100644
index 0000000..eb63073
--- /dev/null
+++ b/content/de/download/platform_hints.html
@@ -0,0 +1,67 @@
+
+<!--#include virtual="/doctype.html" -->
+<html>
+ <head>
+
+ <link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Apache OpenOffice - Important hints for the choosen platform</title>
+ <script type="text/javascript" src="/download/globalvars.js"></script>
+ <script type="text/javascript" src="/download/msg_prop_l10n_en.js"></script>
+ <script type="text/javascript" src="msg_prop_l10n_de.js"></script>
+ <style type="text/css">
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ @import "styles.css";
+ @import "exceptions.css";
+ /* ]]> */
+ </style>
+
+
+ <script src="https://www.apachecon.com/event-images/snippet.js";></script>
+ <!--#include virtual="/scripts/google-analytics.js" -->
+ <!--#include virtual="/scripts/entourage.js" -->
+ </head>
+ <body style="padding: 10px 10px 10px 10px;">
+ <!--#include virtual="/de/brand.html" -->
+ <div id="topbara">
+ <!--#include virtual="/de/topnav.html" -->
+ <div id="breadcrumbsa"><a href="/">home</a> » <a
href="/de/">de</a> » <a href="/de/download/">download</a></div>
+ </div>
+ <div id="clear"></div>
+
+
+ <div id="content">
+
+
+ <!-- The text in the H1 tag is intentionally shown as not displayable, just
to please accessibility tools like a
+ screen reader. -->
+ <h1 style="display: none;">Apache OpenOffice</h1>
+ <h2 style="display: none;">Apache OpenOffice</h2>
+
+ <!-- Text is coming from 'msg_prop_l10n_xy.js' -->
+ <script type="text/javascript">
+ <!--
+ document.write( "<h3>" + l10n.dl_platform_info_headline + "</h3>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_win_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_win_sub_headline + "</h5>"
);
+ document.write( "<p>" + l10n.dl_platform_info_win_text + "</p>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_mac_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_mac_sub_headline + "</h5>"
);
+ document.write( "<p>" + l10n.dl_platform_info_mac_text + "</p>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_linux_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_linux_sub_headline +
"</h5>" );
+ document.write( "<p>" + l10n.dl_platform_info_linux_text + "</p>" );
+ //-->
+ </script>
+
+
+
+ </div>
+ <!--#include virtual="/footer.html" -->
+ </body>
+</html>
diff --git a/content/download/boxed_download.js
b/content/download/boxed_download.js
index bf35ba6..befea37 100644
--- a/content/download/boxed_download.js
+++ b/content/download/boxed_download.js
@@ -36,12 +36,7 @@ DL.createDownloadBox = function() {
+ "<select class='sel-version' id='version' name='version'
onchange='DL.getLinkSelection()'"
+ "title='" + l10n.dl_green_box_selectbox_ver_title + "'>"
+ "</select>"
-/*
- // Platform info text.
- + "<a id='platform_info'>"
- + ""
- + "</a>"
-*/
+
+ "</form>"
// Both download text buttons: First (left) for "full install", then
(right) for "langpack".
@@ -67,7 +62,8 @@ DL.createDownloadBox = function() {
+ "<div style='margin: 0px 0px 0px 3%;'>"
+ "<div class='btn_hint_text' style='display: inline-block;'>"
+ "<h3>"
- + "<a id='platform_info' target='_blank'></a>"
+// + "<a id='platform_info' target='_blank'></a>"
+ + "<a id='platform_info' target='_blank' onclick='DL.showWindow(
this.href ); return false;'></a>"
+ "</h3>"
+ "</div>"
+ "</div>"
diff --git a/content/download/download.js b/content/download/download.js
index 1f4487d..21e0be9 100644
--- a/content/download/download.js
+++ b/content/download/download.js
@@ -871,6 +871,7 @@ DL.getLinkSelection = function() {
DL.SHOW_SUB_BOX = true;
DL.ERROR = false;
+/*
// If a Windows file is selected and a respective text is
existing, then set the values for the Windows info link.
if( DL.INSTALL_EXTENSION === "EXE" & l10n.dl_win_info_title !=
null ) {
document.getElementById( "platform_info" ).style.cursor
= "help";
@@ -899,6 +900,14 @@ DL.getLinkSelection = function() {
document.getElementById( "platform_info" ).text
= "";
document.getElementById( "platform_info"
).style.display = "none";
}
+*/
+
+ // Show a link to get hints for the choosen platform.
+ document.getElementById( "platform_info" ).style.cursor =
"pointer";
+ document.getElementById( "platform_info" ).href =
l10n.dl_platform_info_link;
+ document.getElementById( "platform_info" ).title =
l10n.dl_platform_info_title + DL.UI_PLATFORM;
+ document.getElementById( "platform_info" ).text =
l10n.dl_platform_info_text + DL.UI_PLATFORM;
+ document.getElementById( "platform_info" ).style.display=
"inline";
// Set the values for both download text buttons and set the
focus to the "full install".
document.getElementById( "dl_f_link" ).href =
DL.LINK_FULL;
@@ -1444,4 +1453,3 @@ DL.debug = function( location ) {
return;
}
-
diff --git a/content/download/full_vs_lp.html b/content/download/full_vs_lp.html
index 7773f44..6e61912 100644
--- a/content/download/full_vs_lp.html
+++ b/content/download/full_vs_lp.html
@@ -32,6 +32,7 @@
<div id="content">
+
<!-- The text in the H1 tag is intentionally shown as not displayable, just
to please accessibility tools like a
screen reader. -->
<h1 style="display: none;">Apache OpenOffice</h1>
@@ -39,33 +40,38 @@
<h3>Apache OpenOffice - Full Installation vs. Language Pack</h3>
- <p>By default Apache OpenOffice is offering a single language when
installing a full installation. Full installation means
- that all application modules (Write, Calc, Impress, etc.) are available. The
term does not belong to languages.</p>
+ <p>By default Apache OpenOffice is offering a single language when
installing a full installation. Full
+ installation means that all application modules (Write, Calc, Impress, etc.)
are available. The term does not
+ belong to languages.</p>
+
+ <p>When you want to use one or more languages in OpenOffice for the user
interface (for example, menus,
+ dialogs and messages ) and help topics then it is recommended to use
language packs. The idea is to have a base
+ installation for, e.g., English (US) and additional languages on top without
a need to install a full
+ installation for every language. For this every language pack has to be
installed over a full installation.
+ Important is that the same version number and platform has to fit to the
base installation (for example, it is
+ not possible to install a language pack from release 4.1.9 over the base
installation of 4.1.8).</p>
+
+ <p>Language packs contain only resource files to show menus, dialogs,
messages, etc. in your favorite language
+ but there is no program logic. In case text is not fully localized some
elements of the user interface or help
+ topics will display in English as default language.</p>
+
+ <p>After the language pack is installed the new language can be switched via
the menu "Tools - Options -
+ Language - Settings - Languages - User Interface".</p>
- <p>When you want to use one or more languages in OpenOffice for the user
interface (for example, menus, dialogs and
- messages ) and help topics then it is recommended to use language packs. The
idea is to have a base installation for,
- e.g., English (US) and additional languages on top without a need to install
a full installation for every language. For
- this every language pack has to be installed over a full installation.
Important is that the same version number and
- platform has to fit to the base installation (for example, it is not
possible to install a language pack from release
- 4.1.2 over the base installation of 4.1.3).</p>
+ <p><b>Please note:</b></p>
- <p>Language packs contain only resource files to show menus, dialogs,
messages, etc. in your favorite language but there
- is no program logic. In case text is not fully localized some elements of
the user interface or help topics will display
- in English as default language.</p>
+ <p>Currently dictionaries are not included in language packs, only in full
installations. This limitation is a
+ technical issue still to be fixed, see <a
href="https://bz.apache.org/ooo/show_bug.cgi?id=124473";>Bug 124473</a>
+ for more details.</p>
- <p>After the language pack is installed the new language can be switched via
the menu "Tools - Options - Language
- Settings - Languages - User Interface".</p>
+ <p>Users who install language packs must take an extra step to manually
download the matching dictionary from
+ the <a href="https://extensions.openoffice.org/en/search?query=dictionaries";
+ title="Get Apache OpenOffice Extensions and Dictionaries"
target="_blank">Extensions website</a>.</p>
- <p><b>Please note:</b><br />
- Currently dictionaries are not included in language packs, only in full
installations. This limitation is a technical
- issue still to be fixed, see <a
href="https://bz.apache.org/ooo/show_bug.cgi?id=124473";>Bug 124473</a> for more
details.<br/>
- Users who install language packs must take an extra step to manually
download the matching dictionary from the
- <a href="https://extensions.openoffice.org/en/search?query=dictionaries";
title="Get Apache OpenOffice Extensions and Dictionaries"
target="_blank">Extensions website</a>.<br/>
- Dictionaries get improved independently of the release schedule of OpenOffice
- and are offered separately. They can be updated at any time when new
- versions are released.
- </p>
+ <p>Dictionaries get improved independently of the release schedule of
OpenOffice and are offered separately.
+ They can be updated at any time when new versions are released.</p>
+
</div>
<!--#include virtual="/footer.html" -->
diff --git a/content/download/msg_prop_l10n_en.js
b/content/download/msg_prop_l10n_en.js
index 722f42f..c56fb61 100644
--- a/content/download/msg_prop_l10n_en.js
+++ b/content/download/msg_prop_l10n_en.js
@@ -229,12 +229,27 @@ l10n.dl_full_link_text =
"Download full installation";
l10n.dl_full_link_title = "Click to download: ";
l10n.dl_langpack_link_text = "Download language pack";
l10n.dl_langpack_link_title = "Click to download: ";
+
+l10n.dl_platform_info_text = "Important hints for ";
+l10n.dl_platform_info_title = "Click here to get important
hints for ";
+l10n.dl_platform_info_link = "platform_hints.html";
+l10n.dl_platform_info_headline = "Apache OpenOffice -
Important hints for the chosen platform";
+l10n.dl_platform_info_win_headline = "Windows";
+l10n.dl_platform_info_win_sub_headline = "32-bit, 64-bit and Java -
What to choose?";
+l10n.dl_platform_info_win_text = "At the moment we offer a
32-bit (x86) version for Windows. However, it installs and runs also on Windows
64-bit (x86-64). <br /> Please note that you may need Java in 32-bit for
additional functionality which must then be selected only once (see menu 'Tools
- Options - OpenOffice - Java'). <br /><br /> For more information about
OpenOffice and Java please see: <a
href=https://www.openoffice.org/download/common/java.html>https://www.openoffice.org/downl
[...]
+l10n.dl_platform_info_mac_headline = "macOS";
+l10n.dl_platform_info_mac_sub_headline = "Coming soon";
+l10n.dl_platform_info_mac_text = "";
+l10n.dl_platform_info_linux_headline = "Linux";
+l10n.dl_platform_info_linux_sub_headline = "RPM vs. DEB - What to
choose?";
+l10n.dl_platform_info_linux_text = "RPM is used in: <br/>
CentOS, Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red
Hat Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server <br /><br /> DEB is used in: <br/> Debian, Kanotix, Knoppix, Kubuntu,
Linux Mint, Lubuntu, Ubuntu, Xubuntu";
+
l10n.dl_win_info_text = "Important hint: 32-bit,
64-bit and Java - What to choose?";
l10n.dl_win_info_title = "At the moment we offer a
32-bit (x86) version for Windows. However, it installs and runs also on Windows
64-bit (x86-64).\nPlease note that you may need Java in 32-bit for additional
functionality which must then be selected only once (see menu 'Tools - Options
- OpenOffice - Java').\n\nFor more information about OpenOffice and Java please
see the link on the right 'Java and Apache OpenOffice'.";
l10n.dl_linux_info_text = "Important hint: RPM
vs. DEB - What to choose?";
l10n.dl_linux_info_title = "RPM is used in:\nCentOS,
Fedora, Mageia, Mandriva, MeeGo, openSUSE, Oracle Linux, PCLinuxOS, Red Hat
Enterprise Linux, Sailfish OS, Scientific Linux, SUSE Linux Enterprise
Server\n\nDEB is used in:\nDebian, Kanotix, Knoppix, Kubuntu, Linux Mint,
Lubuntu, Ubuntu, Xubuntu";
-//l10n.dl_mac_info_text = "macOS : Text";
-//l10n.dl_mac_info_title = "macOS : Title";
+// l10n.dl_mac_info_text = "macOS : Text";
+// l10n.dl_mac_info_title = "macOS : Title";
l10n.dl_full_link_porting_text = "Porting: Click to choose
from 3rd party vendors";
l10n.dl_full_link_porting_title = "Click to browse to
the porting webpage and download from 3rd party vendors";
diff --git a/content/download/platform_hints.html
b/content/download/platform_hints.html
new file mode 100644
index 0000000..8983c44
--- /dev/null
+++ b/content/download/platform_hints.html
@@ -0,0 +1,66 @@
+
+<!--#include virtual="/doctype.html" -->
+<html>
+ <head>
+
+ <link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Apache OpenOffice - Important hints for the choosen platform</title>
+ <script type="text/javascript" src="globalvars.js"></script>
+ <script type="text/javascript" src="msg_prop_l10n_en.js"></script>
+ <style type="text/css">
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ @import "styles.css";
+ @import "exceptions.css";
+ /* ]]> */
+ </style>
+
+
+ <script src="https://www.apachecon.com/event-images/snippet.js";></script>
+ <!--#include virtual="/scripts/google-analytics.js" -->
+ <!--#include virtual="/scripts/entourage.js" -->
+ </head>
+ <body style="padding: 10px 10px 10px 10px;">
+ <!--#include virtual="/brand.html" -->
+ <div id="topbara">
+ <!--#include virtual="/topnav.html" -->
+ <div id="breadcrumbsa"><a href="/">home</a> » <a
href="/download/">download</a></div>
+ </div>
+ <div id="clear"></div>
+
+
+ <div id="content">
+
+
+ <!-- The text in the H1 tag is intentionally shown as not displayable, just
to please accessibility tools like a
+ screen reader. -->
+ <h1 style="display: none;">Apache OpenOffice</h1>
+ <h2 style="display: none;">Apache OpenOffice</h2>
+
+ <!-- Text is coming from 'msg_prop_l10n_xy.js' -->
+ <script type="text/javascript">
+ <!--
+ document.write( "<h3>" + l10n.dl_platform_info_headline + "</h3>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_win_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_win_sub_headline + "</h5>"
);
+ document.write( "<p>" + l10n.dl_platform_info_win_text + "</p>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_mac_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_mac_sub_headline + "</h5>"
);
+ document.write( "<p>" + l10n.dl_platform_info_mac_text + "</p>" );
+
+ document.write( "<h4><b>" + l10n.dl_platform_info_linux_headline +
"</b></h4>" );
+ document.write( "<h5>" + l10n.dl_platform_info_linux_sub_headline +
"</h5>" );
+ document.write( "<p>" + l10n.dl_platform_info_linux_text + "</p>" );
+ //-->
+ </script>
+
+
+
+ </div>
+ <!--#include virtual="/footer.html" -->
+ </body>
+</html>
diff --git a/content/feed.xml b/content/feed.xml
index 4d67742..d2c5180 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>Wed, 31 Mar 2021 20:09:17 +0000</pubDate>
- <lastBuildDate>Wed, 31 Mar 2021 20:09:17 +0000</lastBuildDate>
+ <pubDate>Sun, 11 Apr 2021 17:59:59 +0000</pubDate>
+ <lastBuildDate>Sun, 11 Apr 2021 17:59:59 +0000</lastBuildDate>
</channel>
diff --git a/content/fr/Documentation/Base/index.html
b/content/fr/Documentation/Base/index.html
index 7014a83..1739058 100644
--- a/content/fr/Documentation/Base/index.html
+++ b/content/fr/Documentation/Base/index.html
@@ -5,6 +5,7 @@
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+<meta content="text/html; charset=UTF-8" http-equiv="content-type">
<title>Démarrer avec Base</title>
diff --git a/content/fr/Documentation/Basic/index.html
b/content/fr/Documentation/Basic/index.html
index 8ecb66c..02c1e71 100644
--- a/content/fr/Documentation/Basic/index.html
+++ b/content/fr/Documentation/Basic/index.html
@@ -5,6 +5,7 @@
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+<meta content="text/html; charset=UTF-8" http-equiv="content-type">
<title>Introduction aux macros et au Basic</title>
diff --git a/content/stats/aoo-downloads.txt b/content/stats/aoo-downloads.txt
index eac7282..a93cc82 100644
--- a/content/stats/aoo-downloads.txt
+++ b/content/stats/aoo-downloads.txt
@@ -3246,3 +3246,10 @@
2021-03-26,49703,309952926
2021-03-27,39616,309992542
2021-03-28,41396,310033938
+2021-03-29,52334,310086272
+2021-03-30,52056,310138328
+2021-03-31,49808,310188136
+2021-04-01,46130,310234266
+2021-04-02,41036,310275302
+2021-04-03,34930,310310232
+2021-04-04,33125,310343357
