You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2021/10/06 20:17:07 UTC

[openoffice-org] branch main updated (730ee4a -> b2fa4ca)

This is an automated email from the ASF dual-hosted git repository.

marcus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git.


    from 730ee4a  Update for the AOO 4.1.11 release
     new 6cf5c59  Changed file for the AOO 4.1.11 release
     new 77dd05f  Changed file for the AOO 4.1.11 release
     new 219f337  Changed file for the AOO 4.1.11 release
     new 12d8b16  Changed file for the AOO 4.1.11 release
     new 3c97d21  Changed file for the AOO 4.1.11 release
     new 110939e  Changed file for the AOO 4.1.11 release
     new 3c1a7a6  Changed file for the AOO 4.1.11 release
     new 9f3a375  Changed file for the AOO 4.1.11 release
     new b2fa4ca  Merge branch 'main' of https://gitbox.apache.org/repos/asf/openoffice-org into main

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/de/brand.md   |  2 +-
 content/eu/index.html | 46 ++++++++++++++++++++++++++++++++++++++--------
 content/fr/brand.md   |  2 +-
 content/fr/index.html | 24 ++++++++++++------------
 content/it/index.html | 34 ++++++++++++++++++++++++----------
 content/pl/brand.md   |  2 +-
 6 files changed, 77 insertions(+), 33 deletions(-)

[openoffice-org] 04/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 12d8b163863089777af20483628858cb58a7c4b7
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:26:40 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/eu/index.html | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/content/eu/index.html b/content/eu/index.html
index 3a8b8bb..2fb6f9a 100644
--- a/content/eu/index.html
+++ b/content/eu/index.html
@@ -7,6 +7,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
     <title>Apache OpenOffice - Produktibitate Suite Aske eta Irekia</title>
+    <script type="text/javascript" src="/download/globalvars.js"></script>
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
@@ -46,15 +47,44 @@
     <li>
       <hr />
     </li>
-    <li>
-      <div class="action-download">
-        <div class="action-text action-link">
-          <h2><a href="/eu/download/">Apache OpenOffice jaitsi gura dut</a></h2>
-			<p><b>(Azken bertsioa: 4.1.10)</b></p>
-			<p><a href="/eu/download/">Jaitsi doan Apache OpenOffice, edo aurkitu bera lortzeko beste bide batzuk.</a></p>
-        </div>
+  </ul>
+
+  <!-- Show the download link with currently available version number, loaded via JavaScript -->
+  <script>
+  <!--
+  document.write( "<ul><li>"
+    + "<div class='action-download'>"
+      + "<div class='action-text action-link'>"
+        + "<a href='/download/index.html'>"
+          + "<h2>I want to download Apache OpenOffice</h2>"
+          + "<p style='font-size: 1.0em; font-weight: bold;'>(Most recent release: " + DL.VERSION + ")</p>"
+          + "<p>Download Apache OpenOffice for free <b>(really, no license fee!)</b> | "
+            + "<a href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
+              + "title='Blog post: With Apache OpenOffice you get what you do not pay for' target='_blank'>"
+              + "Click here to get more information"
+            + "</a>."
+          + "</p>"
+        + "</a>"
+      + "</div>"
+    + "</div>"
+  + "</li></ul>" );
+  //-->
+  </script>
+
+  <!-- Show the download link, without version number -->
+  <noscript>
+    <div class="action-download">
+      <div class="action-text action-link">
+        <a href="/download/index.html">
+          <h2>I want to download Apache OpenOffice</h2>
+          <p>Download Apache OpenOffice for free, or find out about other ways of getting it.</p>
+        </a>
       </div>
-    </li>    <li>
+    </div>
+  </noscript>
+
+  <ul>
+    <li>
       <hr />
     </li>
     <li>

[openoffice-org] 03/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 219f33771a3a4ba95ca067f7db28169daca2af15
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:17:44 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/de/brand.md | 2 +-
 content/fr/brand.md | 2 +-
 content/pl/brand.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/de/brand.md b/content/de/brand.md
index b2d4912..6bb3b52 100644
--- a/content/de/brand.md
+++ b/content/de/brand.md
@@ -9,6 +9,6 @@ logo=AOO_logos/100MillAOO100px.png
 domain=https://www.openoffice.org
 divid=bannera
 announce=Verfügbar: Apache OpenOffice
-announceurl=https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305380
+announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-17
 announcetip=Verfügbar: Apache OpenOffice
 ~~~~~~
diff --git a/content/fr/brand.md b/content/fr/brand.md
index 876bd71..599d1bc 100644
--- a/content/fr/brand.md
+++ b/content/fr/brand.md
@@ -9,6 +9,6 @@ logo=AOO_logos/AOO4_website_logo.png
 domain=https://www.openoffice.org
 divid=bannera
 announce=Disponible: Apache OpenOffice
-announceurl=https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305702
+announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-17
 announcetip=Disponible: Apache OpenOffice
 ~~~~~~
diff --git a/content/pl/brand.md b/content/pl/brand.md
index 2f99fe2..377ad78 100644
--- a/content/pl/brand.md
+++ b/content/pl/brand.md
@@ -9,6 +9,6 @@ logo=AOO_logos/100MillAOO100px.png
 domain=https://www.openoffice.org
 divid=bannera
 announce=Wydany: Apache OpenOffice
-announceurl=https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305462
+announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-17
 announcetip=Wydany: Apache OpenOffice
 ~~~~~~

[openoffice-org] 09/09: Merge branch 'main' of https://gitbox.apache.org/repos/asf/openoffice-org into main

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit b2fa4cabb11da03e3d64284f44b66297d1a12506
Merge: 9f3a375 730ee4a
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 22:16:53 2021 +0200

    Merge branch 'main' of https://gitbox.apache.org/repos/asf/openoffice-org into main

 content/ja/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[openoffice-org] 06/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 110939e3af7695057b231e2f5880606970ce3be1
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:44:17 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/it/index.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/content/it/index.html b/content/it/index.html
index 7a57221..bc4af46 100644
--- a/content/it/index.html
+++ b/content/it/index.html
@@ -8,6 +8,7 @@
   <meta name="version" content="2.6.2.4.8" />
   <meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
   <meta name="description" content="OpenOffice.org: The Open Office Suite" />
+  <script src="../download/globalvars.js"></script>
   <style type="text/css">
 /*<![CDATA[*/
 <!--
@@ -123,7 +124,13 @@ a noi</a>.<br />
 <span class="button" id="buttondownload">
 <span>
 	<a href="download/" title="Diverse versioni di OpenOffice, Dizionari ed altro">Download</a><br/>
-	<a href="download/" title="L'ultima versione disponibile.">versione 4.1.10</a><br/>
+
+<!-- Show the download link with currently available version number, loaded via JavaScript -->
+<script>
+<!--
+document.write( "<a href='download/' title='L'ultima versione disponibile.'>versione " + DL.VERSION + "</a><br/>" );
+//-->
+</script>
 
 <!--
 <span style="font-size: 0.6em;padding:0px;min-height:0px;">

[openoffice-org] 08/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 9f3a375fb5163e57e153ce4b6c8a8900246d2ef5
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 22:16:24 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/it/index.html | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/content/it/index.html b/content/it/index.html
index bc4af46..a64ebcb 100644
--- a/content/it/index.html
+++ b/content/it/index.html
@@ -6,8 +6,8 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="version" content="2.6.2.4.8" />
-  <meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
-  <meta name="description" content="OpenOffice.org: The Open Office Suite" />
+  <meta name="keywords" content="Apache OpenOffice, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
+  <meta name="description" content="Apache OpenOffice: The Open Office Suite" />
   <script src="../download/globalvars.js"></script>
   <style type="text/css">
 /*<![CDATA[*/
@@ -18,7 +18,7 @@
 /*]]>*/
   </style>
   <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" />
-  <meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
+  <meta name="keywords" content="Apache OpenOffice, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
   <meta name="description" content="Apache OpenOffice: The Open Office Suite" />
   <style type="text/css" media="screen, projection">
 /*<![CDATA[*/
@@ -55,21 +55,21 @@ utenti
 
 info generali</span></a> </li>
 
-  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare al progetto OpenOffice"><span>collaborare</span></a>
+  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare al progetto Apache OpenOffice"><span>collaborare</span></a>
   </li>
 
   <li> <a href="doc/index.html" class="button" id="buttonnew" title="Documentazione su OpenOffice"><span>documentazione</span></a>
   </li>
 
-  <li> <a href="supporto/index.html" class="button" id="buttonnativelang" title="Dove trovare supporto gratuito e professionale per OpenOffice.org "><span>supporto</span></a></li>
+  <li> <a href="supporto/index.html" class="button" id="buttonnativelang" title="Dove trovare supporto gratuito e professionale per Apache OpenOffice "><span>supporto</span></a></li>
 
 </ul>
 
 </div>
 
-<div class="graphicalpresentation"> <img src="graphics/eggsopen_v6_with_gull.gif" alt="OpenOffice.org!" title="OpenOffice.org!" />
+<div class="graphicalpresentation"> <img src="graphics/eggsopen_v6_with_gull.gif" alt="Apache OpenOffice!" title="Apache OpenOffice!" />
 <div class="ooocomponents">
-<h2>Componenti di OpenOffice.org: </h2>
+<h2>Componenti di Apache OpenOffice: </h2>
 
 <!-- Con l'impaginazione attuale, questa lista viene mostrata da destra a sinistra. -->
 <ul class="ooocomponentslist">
@@ -92,7 +92,7 @@ info generali</span></a> </li>
 
 <h1> Benvenuti in OpenOffice </h1>
 
-<p> OpenOffice.org, ora <em>Apache OpenOffice</em>, &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
+<p> Apache OpenOffice, ora <em>Apache OpenOffice</em>, &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
 per ufficio completa, rilasciata con una licenza libera e Open Source
 che ne
 consente la distribuzione gratuita. Legge e scrive file nei formati
@@ -140,7 +140,14 @@ document.write( "<a href='download/' title='L'ultima versione disponibile.'>vers
 
 <span style="font-size: 0.8em;padding:0px;min-height:0px;">
 <!--  <a href="http://www.openoffice.org/it/stampa/comunicati/aoo400.html">Annuncio</a> |  -->
-  <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.10+Release+Notes">Caratteristiche e novit&agrave;</a>
+
+<!-- Show the download link with currently available version number, loaded via JavaScript -->
+<script>
+<!--
+document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + DL.VERSION + "+Release+Notes'>Caratteristiche e novit&agrave;</a>" );
+//-->
+</script>
+
 </span>
 </span>
 </span>

[openoffice-org] 07/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 3c1a7a6a045e87e6756240fc1a407325080aeb96
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 22:10:34 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/fr/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/fr/index.html b/content/fr/index.html
index 81bbea2..9ba4114 100644
--- a/content/fr/index.html
+++ b/content/fr/index.html
@@ -44,10 +44,10 @@ développement de la suite bureautique libre OpenOffice</big>
 <script>
 <!--
 document.write( "<p>"
-    + "<a class='button' href='./Telecharger' id='buttondownload' title='Télécharger Apache OpenOffice' name='buttondownload'>
+    + "<a class='button' href='./Telecharger' id='buttondownload' title='Télécharger Apache OpenOffice' name='buttondownload'>"
       + "<span>Télécharger<br />Apache OpenOffice<br /><small>version : " + DL.VERSION + " (FR)</small></span>"
     + "</a>"
-+ "</p> );
++ "</p>" );
 //-->
 </script>
 

[openoffice-org] 01/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 6cf5c593c62ba6409a34fcad081eec12c4d75526
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:13:42 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 assets/de/download/msg_prop_l10n_de.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/de/download/msg_prop_l10n_de.js b/assets/de/download/msg_prop_l10n_de.js
index 6d79a94..094aac5 100644
--- a/assets/de/download/msg_prop_l10n_de.js
+++ b/assets/de/download/msg_prop_l10n_de.js
@@ -366,6 +366,7 @@ l10n.dl_analyze_table_javascript_text		= "JavaScript&nbsp;Funktionen/Variablen";
 
 
 // General: Links to webpage files that could be localized.
+l10n.dl_rel_notes_aoo4111_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.11+Release+Notes";
 l10n.dl_rel_notes_aoo4110_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305380";
 l10n.dl_rel_notes_aoo419_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=173081636";
 l10n.dl_rel_notes_aoo418_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=165224926";

[openoffice-org] 05/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 3c97d2197c55fbfb1e01fc82bdda1bd7902d1f32
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:38:28 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 content/fr/index.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/content/fr/index.html b/content/fr/index.html
index db888b4..81bbea2 100644
--- a/content/fr/index.html
+++ b/content/fr/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr-fr"><head>
 
-
+<script src="../download/globalvars.js"></script>
 <style type="text/css" media="screen, projection">
 /*<![CDATA[*/
 <!--
@@ -40,22 +40,22 @@
 ressources aux francophones pour le téléchargement, l'utilisation et le
 développement de la suite bureautique libre OpenOffice</big>
 
-<p><a class="button" href="./Telecharger" id="buttondownload" title="Télécharger Apache OpenOffice" name="buttondownload"> <span>Télécharger<br />
-Apache OpenOffice<br />
-<small>version : 4.1.10 (FR)</small></span> </a></p>
+<!-- Show the download link with currently available version number, loaded via JavaScript -->
+<script>
+<!--
+document.write( "<p>"
+    + "<a class='button' href='./Telecharger' id='buttondownload' title='Télécharger Apache OpenOffice' name='buttondownload'>
+      + "<span>Télécharger<br />Apache OpenOffice<br /><small>version : " + DL.VERSION + " (FR)</small></span>"
+    + "</a>"
++ "</p> );
+//-->
+</script>
+
 </div>
 </div>
 <div class="contentpart" id="news">
 
 <div class="item">
-<font style="color: rgb(6, 52, 140);" size="+2"><span style="font-weight: bold;">La 4.1.10 est disponible</span></font>
-<p>L'équipe de développement Apache vous offre désormais la version 4.1.10 de Apache OpenOffice.
-Consultez la <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305702">liste des nouveautés</a>.
-N'hésitez pas à vous mettre à jour...
-</p>
-</div>
-
-<div class="item">
 <font style="color: rgb(6, 52, 140);" size="+2"><span style="font-weight: bold;">Extensions</span></font><br />
 <p>Depuis la version 2.4 de nombreuses <a href="https://extensions.openoffice.org/">extensions</a>
 (addons / greffons) développées par la Communauté sont disponibles pour enrichir les fonctions de OpenOffice.

[openoffice-org] 02/09: Changed file for the AOO 4.1.11 release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit 77dd05f6dc90c7c1ed0c4f09736ef90c1bbe8f53
Author: Marcus <ma...@apache.org>
AuthorDate: Wed Oct 6 21:14:26 2021 +0200

    Changed file for the AOO 4.1.11 release
---
 assets/de/download/msg_prop_l10n_de.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/de/download/msg_prop_l10n_de.js b/assets/de/download/msg_prop_l10n_de.js
index 094aac5..6d79a94 100644
--- a/assets/de/download/msg_prop_l10n_de.js
+++ b/assets/de/download/msg_prop_l10n_de.js
@@ -366,7 +366,6 @@ l10n.dl_analyze_table_javascript_text		= "JavaScript&nbsp;Funktionen/Variablen";
 
 
 // General: Links to webpage files that could be localized.
-l10n.dl_rel_notes_aoo4111_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.11+Release+Notes";
 l10n.dl_rel_notes_aoo4110_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181305380";
 l10n.dl_rel_notes_aoo419_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=173081636";
 l10n.dl_rel_notes_aoo418_link			= "https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=165224926";