openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1009323 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/hi/ content/hi/download/
Date Wed, 29 Mar 2017 16:20:57 GMT
Author: buildbot
Date: Wed Mar 29 16:20:56 2017
New Revision: 1009323

Log:
Staging update by buildbot for ooo-site

Removed:
    websites/staging/ooo-site/trunk/content/hi/in_progress.png
Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/hi/about-cdrom.html
    websites/staging/ooo-site/trunk/content/hi/about-documentation.html
    websites/staging/ooo-site/trunk/content/hi/about-downloads.html
    websites/staging/ooo-site/trunk/content/hi/about-helping.html
    websites/staging/ooo-site/trunk/content/hi/about-issuezilla.html
    websites/staging/ooo-site/trunk/content/hi/about-legal.html
    websites/staging/ooo-site/trunk/content/hi/about-mailinglist.html
    websites/staging/ooo-site/trunk/content/hi/about-product.html
    websites/staging/ooo-site/trunk/content/hi/about-spellcheck.html
    websites/staging/ooo-site/trunk/content/hi/about-us.html
    websites/staging/ooo-site/trunk/content/hi/adresses.html
    websites/staging/ooo-site/trunk/content/hi/background.html
    websites/staging/ooo-site/trunk/content/hi/brand.html
    websites/staging/ooo-site/trunk/content/hi/contr_spellch.html
    websites/staging/ooo-site/trunk/content/hi/credits.html
    websites/staging/ooo-site/trunk/content/hi/download/index.html
    websites/staging/ooo-site/trunk/content/hi/download/msg_prop_l10n_hi.js
    websites/staging/ooo-site/trunk/content/hi/faq.html
    websites/staging/ooo-site/trunk/content/hi/index.html
    websites/staging/ooo-site/trunk/content/hi/msg_prop_l10n_hi.js
    websites/staging/ooo-site/trunk/content/hi/topnav.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar 29 16:20:56 2017
@@ -1 +1 @@
-1789378
+1789385

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar 29 16:20:56 2017
@@ -1 +1 @@
-1789378
+1789385

Modified: websites/staging/ooo-site/trunk/content/hi/about-cdrom.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-cdrom.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-cdrom.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-documentation.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-documentation.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-documentation.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-downloads.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-downloads.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-downloads.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-helping.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-helping.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-helping.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-issuezilla.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-issuezilla.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-issuezilla.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-legal.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-legal.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-legal.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-mailinglist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-mailinglist.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-mailinglist.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-product.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-product.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-product.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-spellcheck.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-spellcheck.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-spellcheck.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/about-us.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/about-us.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/about-us.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/adresses.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/adresses.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/adresses.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/background.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/background.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/background.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/brand.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/brand.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/brand.html Wed Mar 29 16:20:56 2017
@@ -55,13 +55,13 @@
 	  }
 	</script>
   </div>
-  <div id="bannerleft"><a title="Apache OpenOffice" href="/"><img id="ooo-logo" alt="Apache OpenOffice" src="/images/AOO_logos/100MillAOO100px.png"/></a></div>
+  <div id="bannerleft"><a title="Apache OpenOffice" href="/"><img id="ooo-logo" alt="Apache OpenOffice" src="/images/AOO_logos/AOO4_website_logo.png"/></a></div>
     <div id="bannerright">        
       <div id="searchdiv">
 	<form id="cse-search-box-header" action="https://www.google.com/search" method="get">
 	  <div>
-	    <input type="hidden" name="domains" value="www.openoffice.org"/>
-	    <input type="hidden" name="sitesearch" value="www.openoffice.org"/>
+	    <input type="hidden" name="domains" value="https://www.openoffice.org"/>
+	    <input type="hidden" name="sitesearch" value="https://www.openoffice.org"/>
 	  </div>
 	  <div class="topsrchbox">
 	    <input name="resultsPerPage" value="40" type="hidden"/> 
@@ -73,4 +73,4 @@
     </div>
     <div id="bannercenter"><br/>The Free and Open Productivity Suite</div>
   </div>
-  <div id="announce"><a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce" title="New: Apache OpenOffice 4.1.0 released!">New: Apache OpenOffice 4.1.0 released!</a></div>
+  <div id="announce"><a href="https://s.apache.org/JiCT" title="The Apache OpenOffice Project Announces Apache OpenOffice v4.1.3">Apache OpenOffice 4.1.3 released!</a></div>

Modified: websites/staging/ooo-site/trunk/content/hi/contr_spellch.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/contr_spellch.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/contr_spellch.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/credits.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/credits.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/credits.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/download/index.html Wed Mar 29 16:20:56 2017
@@ -3,44 +3,44 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta itemprop="name" content="Download Apache OpenOffice" />
-  <meta itemprop="description" content="Join the OpenOffice revolution, the free office productivity suite with over 125 million trusted downloads." />
-  <meta itemprop="image" content="http://www.openoffice.org/images/aoo-logo-100x100.png" />
+  <meta itemprop="description" content="Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
+  <meta itemprop="image" content="https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png" />
   <meta property="og:title" content="Download Apache OpenOffice" />
-  <meta property="og:description" content="Join the OpenOffice revolution, the free office productivity suite with over 125 million trusted downloads." />
-  <meta property="og:image" content="http://www.openoffice.org/images/aoo-logo-100x100.png" />
-  <meta name="description" content="Official Apache OpenOffice download page. Join the OpenOffice revolution, the free office productivity suite with over 125 million trusted downloads." />
+  <meta property="og:description" content="Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
+  <meta property="og:image" content="https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png" />
+  <meta name="description" content="Official Apache OpenOffice download page. Join the OpenOffice revolution, the free office productivity suite with over 200 million trusted downloads." />
   <title>Apache OpenOffice Downloads - Official Site</title>
-  <script type="text/javascript" src="../../download/globalvars.js"></script>
-  <script type="text/javascript" src="msg_prop_l10n_hi.js"></script>
-  <script type="text/javascript" src="../../download/languages.js"></script>
-  <script type="text/javascript" src="../../download/release_matrix.js"></script>
-  <script type="text/javascript" src="../../download/boxed_download.js"></script>
-  <script type="text/javascript" src="../../download/download.js"></script>
+  <script type="text/javascript" src="/download/globalvars.js"></script>
+  <script type="text/javascript" src="./msg_prop_l10n_hi.js"></script>
+  <script type="text/javascript" src="/download/languages.js"></script>
+  <script type="text/javascript" src="/download/release_matrix.js"></script>
+  <script type="text/javascript" src="/download/boxed_download.js"></script>
+  <script type="text/javascript" src="/download/download.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "../../download/styles.css";
-  @import "../../download/exceptions.css";
+  @import "/download/styles.css";
+  @import "/download/exceptions.css";
   /* ]]> */
   </style>
   <script>
     if ( window.document.referrer.indexOf( "shell.windows.com" ) != -1 ) {
-       location.href = "http://www.openoffice.org/why/why_odf.html";
+       location.href = "/why/why_odf.html";
     }
 
     function share( platform ) {
       _gaq.push( ['_trackEvent', 'social', 'shareDownload', platform] ); 
 
       if ( platform == 'apacheblog' ) {
-        window.open( 'http://blogs.apache.org/OOo/', '_blank' );
+        window.open( 'https://blogs.apache.org/OOo/', '_blank' );
       } else if ( platform == 'facebook' ) {
-        window.open( 'http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+        window.open( 'https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
       } else if ( platform == 'twitter' ) {
-        window.open( 'http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+100+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+        window.open( 'https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+200+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
       } else if ( platform == 'google+' ) {
-        window.open( 'http://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+        window.open( 'https://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=400, height=440' );
       }
     }
   </script>
@@ -49,9 +49,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a>&nbsp;&raquo;&nbsp;<a href="/hi/download/">download</a></div>
   </div>
   <div id="clear"></div>
@@ -99,13 +99,13 @@
     <div class="first button green-sel" id="optionitem2">
       <div class="green-sel-icon"></div>
       <h2>
-        <a style="cursor: pointer;" href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+        <a style="cursor: pointer;" href="https://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
           title="Select from all platforms, languages, language packs to download">
           Apache OpenOffice Downloads - Official Site
         </a>
       </h2>
       <p>
-        <a style="cursor: pointer;" href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+        <a style="cursor: pointer;" href="https://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
           title="Select from all platforms, languages and language packs to download">The browser seems to have JavaScript
           disabled. This technique is used for showing the actual download link. If you want to download Apache
           OpenOffice anyway, click this text to choose from the alternative download webpage.

Modified: websites/staging/ooo-site/trunk/content/hi/download/msg_prop_l10n_hi.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/download/msg_prop_l10n_hi.js (original)
+++ websites/staging/ooo-site/trunk/content/hi/download/msg_prop_l10n_hi.js Wed Mar 29 16:20:56 2017
@@ -15,7 +15,7 @@ var l10n = new Object();
 // The following variables are used in the "index.html" file:
 
 // Set a specific language ISO code to force to assemble a download link with a certain language.
-DL.NL_LANG					= "hi";
+DL.NL_LANG					= "ca";
 
 // General:
 l10n.dl_headline_text				= "Apache OpenOffice Download";
@@ -38,8 +38,8 @@ l10n.dl_green_box_select_box_os_values
 						    "Linux 64-bit (x86-64) (RPM)",
 						    "Linux 32-bit (x86) (DEB)",
 						    "Linux 32-bit (x86) (RPM)",
-						    "OS X 64-bit (x86-64) (DMG)",
-						    "OS X 32-bit (x86) (DMG)",
+						    "OS X (version >= 10.7) (DMG)",
+						    "OS X (version <= 10.6) (DMG)",
 						    "More platforms / operating systems" ];
 /* l10n.dl_green_box_select_box_os_values	= [ "" ]; */
 
@@ -86,11 +86,15 @@ l10n.dl_green_box_select_box_language_va
 						    "Vietnamese (Tiếng Việt)" ];
 /* l10n.dl_green_box_select_box_language_values	= [ "" ]; */
 
-l10n.dl_green_box_select_box_version_values	= [ "4.1.1", "4.1.0",
+l10n.dl_green_box_select_box_version_values	= [ "4.1.3",
+                            "4.1.2",
+                            "4.1.1",
+                            "4.1.0",
 						    "4.0.1",
 						    "4.0.0",
 						    "3.4.1",
 						    "Older releases" ];
+
 /* l10n.dl_green_box_select_box_version_values	= [ "" ]; */
 
 // Download: Strings in the sub-green box (used in "index.html").
@@ -109,19 +113,19 @@ l10n.dl_share_light_blue_box_text_text
 l10n.dl_share_light_blue_box_text_title		= "Help spread the word and tell your friends about Apache OpenOffice";
 l10n.dl_share_light_blue_box_blog_text		= "Official Blog";
 l10n.dl_share_light_blue_box_blog_title		= "Weblog of OpenOffice.";
-l10n.dl_share_light_blue_box_blog_src		= "http://www.openoffice.org/images/logo-rss-32.png";
+l10n.dl_share_light_blue_box_blog_src		= "/images/logo-rss-32.png";
 l10n.dl_share_light_blue_box_blog_alt		= "Weblog of OpenOffice";
 l10n.dl_share_light_blue_box_facebook_text	= "Facebook";
 l10n.dl_share_light_blue_box_facebook_title	= "Please tell your friends about Apache OpenOffice via Facebook";
-l10n.dl_share_light_blue_box_facebook_src	= "http://www.openoffice.org/images/logo-facebook-32.png";
+l10n.dl_share_light_blue_box_facebook_src	= "/images/logo-facebook-32.png";
 l10n.dl_share_light_blue_box_facebook_alt	= "Share on Facebook";
 l10n.dl_share_light_blue_box_twitter_text	= "Twitter";
 l10n.dl_share_light_blue_box_twitter_title	= "Please tell your friends about Apache OpenOffice via Twitter";
-l10n.dl_share_light_blue_box_twitter_src	= "http://www.openoffice.org/images/logo-twitter-32.png";
+l10n.dl_share_light_blue_box_twitter_src	= "/images/logo-twitter-32.png";
 l10n.dl_share_light_blue_box_twitter_alt	= "Share on Twitter";
 l10n.dl_share_light_blue_box_googleplus_text	= "Google+";
 l10n.dl_share_light_blue_box_googleplus_title	= "Please tell your friends about Apache OpenOffice via Google+";
-l10n.dl_share_light_blue_box_googleplus_src	= "http://www.openoffice.org/images/logo-googleplus-32.png";
+l10n.dl_share_light_blue_box_googleplus_src	= "/images/logo-googleplus-32.png";
 l10n.dl_share_light_blue_box_googleplus_alt	= "Share on Google+";
 
 // Extensions: Strings in the blue box (top) (used in "index.html").
@@ -142,85 +146,85 @@ l10n.dl_tlp_blue_box_text_href			= "http
 // Release Information
 l10n.dl_nav_headline_1_text			= "Release Information";
 l10n.dl_nav_sysreq_text				= "System Requirements";
-l10n.dl_nav_sysreq_title			= "HDD: ~300MB free - Memory: &gt;128MB - Processor: &gt;500MHz - OS: Win, Linux, Mac OS, Solaris, FreeBSD...";
-l10n.dl_nav_sysreq_href				= "http://www.openoffice.org/dev_docs/source/sys_reqs_aoo41.html";
+l10n.dl_nav_sysreq_title			= "HDD: ~300MB free - Memory: &gt;128MB - Processor: &gt;500MHz - OS: Windows, macOS (OS&nbsp;X), Linux, Solaris, FreeBSD...";
+l10n.dl_nav_sysreq_href				= "https://www.openoffice.org/dev_docs/source/sys_reqs_aoo41.html";
 l10n.dl_nav_license_text			= "License";
 l10n.dl_nav_license_title			= "Apache OpenOffice License";
-l10n.dl_nav_license_href			= "http://www.openoffice.org/license.html";
+l10n.dl_nav_license_href			= "https://www.openoffice.org/license.html";
 l10n.dl_nav_source_text				= "Source";
 l10n.dl_nav_source_title			= "For developers and power users: Get the source to build Apache OpenOffice from scratch.";
-l10n.dl_nav_source_href				= "http://openoffice.apache.org/downloads.html";
+l10n.dl_nav_source_href				= "https://openoffice.apache.org/downloads.html";
 l10n.dl_nav_build_text				= "Building Guide";
 l10n.dl_nav_build_title				= "For developers and power users: HowTo guide to build Apache OpenOffice from scratch.";
-l10n.dl_nav_build_href				= "http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO";
+l10n.dl_nav_build_href				= "https://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO";
 l10n.dl_nav_sdk_text				= "Software Development Kit (SDK)";
 l10n.dl_nav_sdk_title				= "For developers: Software Development Kit.";
-l10n.dl_nav_sdk_href				= "http://openoffice.apache.org/downloads.html";
+l10n.dl_nav_sdk_href				= "https://openoffice.apache.org/downloads.html";
 l10n.dl_nav_devbuilds_text			= "Development Builds";
 l10n.dl_nav_devbuilds_title			= "For QA volunteers: Development Builds";
-l10n.dl_nav_devbuilds_href			= "http://www.openoffice.org/download/devbuilds.html";
+l10n.dl_nav_devbuilds_href			= "https://www.openoffice.org/download/devbuilds.html";
 
 // Documentation
 l10n.dl_nav_headline_2_text			= "Documentation";
 l10n.dl_nav_schedule_text			= "Release Schedules";
 l10n.dl_nav_schedule_title			= "When are new releases planned?";
-l10n.dl_nav_schedule_href			= "http://cwiki.apache.org/confluence/display/OOOUSERS/Releases";
+l10n.dl_nav_schedule_href			= "https://cwiki.apache.org/confluence/display/OOOUSERS/Releases";
 l10n.dl_nav_hist_schedule_text			= "Historic Release Schedule";
 l10n.dl_nav_hist_schedule_title			= "When were old releases planned?";
-l10n.dl_nav_hist_schedule_href			= "http://wiki.services.openoffice.org/wiki/Product_Release";
+l10n.dl_nav_hist_schedule_href			= "https://wiki.openoffice.org/wiki/Product_Release";
 l10n.dl_nav_inst_guide_text			= "Installation Guides";
-l10n.dl_nav_inst_guide_title			= "Instructions for installing Apache OpenOffice on Windows, Linux and Mac OS machines";
-l10n.dl_nav_inst_guide_href			= "http://www.openoffice.org/download/common/instructions.html";
+l10n.dl_nav_inst_guide_title			= "Instructions for installing Apache OpenOffice on Windows, macOS and Linux machines";
+l10n.dl_nav_inst_guide_href			= "https://www.openoffice.org/download/common/instructions.html";
 l10n.dl_nav_user_guide_text			= "User Guides";
 l10n.dl_nav_user_guide_title			= "Extensive user manuals for every day use";
-l10n.dl_nav_user_guide_href			= "http://www.openoffice.org/documentation/index.html";
+l10n.dl_nav_user_guide_href			= "https://www.openoffice.org/documentation/index.html";
 l10n.dl_nav_why_java_text			= "Java and Apache OpenOffice";
 l10n.dl_nav_why_java_title			= "Explains why to use Java and what it is";
-l10n.dl_nav_why_java_href			= "http://www.openoffice.org/download/common/java.html";
+l10n.dl_nav_why_java_href			= "https://www.openoffice.org/download/common/java.html";
 l10n.dl_nav_eol_text				= "End-Of-Life Information";
 l10n.dl_nav_eol_title				= "Information about releases that have reached End-Of-Life status";
-l10n.dl_nav_eol_href				= "http://www.openoffice.org/development/releases/eol.html";
+l10n.dl_nav_eol_href				= "https://www.openoffice.org/development/releases/eol.html";
 
 // Additional Resources
 l10n.dl_nav_headline_3_text			= "Additional Resources";
 l10n.dl_nav_support_text			= "Support";
 l10n.dl_nav_support_title			= "If the information above did not answer your question: Free and paid support!";
-l10n.dl_nav_support_href			= "http://www.openoffice.org/support/index.html";
+l10n.dl_nav_support_href			= "https://www.openoffice.org/support/index.html";
 l10n.dl_nav_local_text				= "Localizations";
 l10n.dl_nav_local_title				= "Information and support in your favorite language";
-l10n.dl_nav_local_href				= "http://openoffice.apache.org/native-lang.html";
+l10n.dl_nav_local_href				= "https://openoffice.apache.org/native-lang.html";
 l10n.dl_nav_stat_text				= "Download Statistics";
 l10n.dl_nav_stat_title				= "Download and other statistics";
-l10n.dl_nav_stat_href				= "http://www.openoffice.org/stats/index.html";
+l10n.dl_nav_stat_href				= "https://www.openoffice.org/stats/index.html";
 l10n.dl_nav_mirrors1_text			= "Alternative download mirrors #1";
 l10n.dl_nav_mirrors1_title			= "Use Sourceforge mirrors to download Apache OpenOffice";
-l10n.dl_nav_mirrors1_href			= "http://sourceforge.net/projects/openofficeorg.mirror/files/";
+l10n.dl_nav_mirrors1_href			= "https://sourceforge.net/projects/openofficeorg.mirror/files/";
 l10n.dl_nav_mirrors2_text			= "Alternative download mirrors #2";
 l10n.dl_nav_mirrors2_title			= "Use Apache mirrors to download Apache OpenOffice";
-l10n.dl_nav_mirrors2_href			= "http://www.apache.org/dyn/closer.lua/openoffice/";
+l10n.dl_nav_mirrors2_href			= "https://www.apache.org/dyn/closer.lua/openoffice/";
 l10n.dl_nav_porting_text			= "3rd party ports and distributions";
 l10n.dl_nav_porting_title			= "Ports and distributions from 3rd party vendors";
-l10n.dl_nav_porting_href			= "http://www.openoffice.org/porting/index.html";
+l10n.dl_nav_porting_href			= "https://www.openoffice.org/porting/index.html";
 l10n.dl_nav_archive_text			= "Archived and legacy releases";
 l10n.dl_nav_archive_title			= "Download legacy and archived releases";
-l10n.dl_nav_archive_href			= "http://www.openoffice.org/download/archive.html";
+l10n.dl_nav_archive_href			= "https://www.openoffice.org/download/archive.html";
 
 // List items in the navigation bar that are not used for now.
 l10n.dl_nav_release_notes_text			= "Release Notes";
 l10n.dl_nav_release_notes_title			= "What is new, what has been improved in Apache OpenOffice?";
-l10n.dl_nav_release_notes_href			= "http://www.openoffice.org/development/releases/index.html";
+l10n.dl_nav_release_notes_href			= "https://www.openoffice.org/development/releases/index.html";
 l10n.dl_nav_checksum_text			= "Verify the downloaded file";
 l10n.dl_nav_checksum_title			= "How to verify the downloaded file with signatures and hashes?";
-l10n.dl_nav_checksum_href			= "http://www.openoffice.org/download/checksums.html";
+l10n.dl_nav_checksum_href			= "https://www.openoffice.org/download/checksums.html";
 
 // Strings for the logo graphics.
 l10n.dl_img_sourceforge_title			= "Sourceforge - Download, Develop and Publish Free Open Source Software";
-l10n.dl_img_sourceforge_href			= "http://www.sourceforge.net/";
-l10n.dl_img_sourceforge_src			= "http://www.openoffice.org/images/sourceforge.png";
+l10n.dl_img_sourceforge_href			= "https://www.sourceforge.net/";
+l10n.dl_img_sourceforge_src			= "https://www.openoffice.org/images/sourceforge.png";
 l10n.dl_img_sourceforge_alt			= "Sourceforge";
 l10n.dl_img_w3c_title				= "W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents";
-l10n.dl_img_w3c_href				= "http://validator.w3.org/check?uri=referer";
-l10n.dl_img_w3c_src				= "http://www.openoffice.org/images/valid-xhtml10-blue.png";
+l10n.dl_img_w3c_href				= "https://validator.w3.org/check?uri=referer";
+l10n.dl_img_w3c_src				= "https://www.openoffice.org/images/valid-xhtml10-blue.png";
 l10n.dl_img_w3c_alt				= "W3C Validator";
 
 
@@ -262,17 +266,17 @@ l10n.dl_checksum_sha256_text			= "SHA256
 l10n.dl_checksum_sha256_title			= "SHA256 hash for: ";
 
 l10n.dl_help_img_title				= "What is the difference between full installation and language pack?";
-l10n.dl_help_img_src				= "http://www.openoffice.org/download/cachedimages/help-information-icon.png";
+l10n.dl_help_img_src				= "/download/cachedimages/help-information-icon.png";
 l10n.dl_help_img_alt				= "Install info";
 l10n.dl_help_text				= "What is a language pack?";
 l10n.dl_help_title				= "What is the difference between full installation and language pack?";
 l10n.dl_checksum_img_title			= "How to verify the downloaded file with checksums?";
-l10n.dl_checksum_img_src			= "http://www.openoffice.org/download/cachedimages/help-information-icon.png";
+l10n.dl_checksum_img_src			= "/download/cachedimages/help-information-icon.png";
 l10n.dl_checksum_img_alt			= "Checksum verify";
 l10n.dl_checksum_text				= "How to verify the download?";
 l10n.dl_checksum_title				= "How to verify the downloaded file with checksums?";
 l10n.dl_report_img_title			= "Broken download link? Click here to report.";
-l10n.dl_report_img_src				= "http://www.openoffice.org/download/cachedimages/help-report-broken-link-icon.png";
+l10n.dl_report_img_src				= "/download/cachedimages/help-report-broken-link-icon.png";
 l10n.dl_report_img_alt				= "Broken link";
 l10n.dl_report_text				= "Report broken link";
 l10n.dl_report_title				= "Broken download link? Click here to report.";
@@ -284,7 +288,7 @@ l10n.dl_langpack_link_error_text		= "No
 l10n.dl_langpack_link_error_title		= "Please select another language, platform or version.";
 
 l10n.dl_error_problem_img_title			= "The selected download file is not available";
-l10n.dl_error_problem_img_src			= "http://www.openoffice.org/download/cachedimages/exclamation-icon.png";
+l10n.dl_error_problem_img_src			= "/download/cachedimages/exclamation-icon.png";
 l10n.dl_error_problem_img_alt			= "Error text";
 l10n.dl_error_problem_text			= "Problem: ";
 l10n.dl_error_solution_text			= "Solution: ";
@@ -292,7 +296,7 @@ l10n.dl_error_aoo_text				= "Apache Open
 l10n.dl_error_not_available_for_text		= " is not available for ";
 l10n.dl_error_please_select_1_text		= "Please select version 4.0.1.";
 l10n.dl_error_please_select_2_text		= "Please select version 4.1.0 or newer.";
-l10n.dl_error_please_select_3_text		= "Please select a download for Windows, Linux or OS X.";
+l10n.dl_error_please_select_3_text		= "Please select a download for Windows, macOS (OS&nbsp;X) or Linux.";
 l10n.dl_error_please_select_4_text		= "Please select another language or version.";
 
 l10n.dl_unknown_platform_text			= "unknown operating system / platform";
@@ -347,13 +351,16 @@ l10n.dl_analyze_table_javascript_text		=
 
 
 // General: Links to webpage files that could be localized.
-l10n.dl_rel_notes_aoo410_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes";
-l10n.dl_rel_notes_aoo401_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes";
-l10n.dl_rel_notes_aoo400_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";
-l10n.dl_help_link				= "http://www.openoffice.org/download/full_vs_lp.html";
-l10n.dl_checksum_link				= "http://www.openoffice.org/download/checksums.html";
-l10n.dl_report_link				= "http://www.openoffice.org/download/analyze.html";
-l10n.dl_porting_link				= "http://www.openoffice.org/porting/index.html";
-l10n.dl_archive_link				= "http://www.openoffice.org/download/archive.html";
-l10n.dl_aoo341_link				= "http://www.openoffice.org/download/other-341.html";
+l10n.dl_rel_notes_aoo413_link            	= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes";
+l10n.dl_rel_notes_aoo412_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes";
+l10n.dl_rel_notes_aoo411_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";
+l10n.dl_rel_notes_aoo410_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes";
+l10n.dl_rel_notes_aoo401_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes";
+l10n.dl_rel_notes_aoo400_link			= "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";
+l10n.dl_help_link				= "https://www.openoffice.org/download/full_vs_lp.html";
+l10n.dl_checksum_link				= "https://www.openoffice.org/download/checksums.html";
+l10n.dl_report_link				= "https://www.openoffice.org/download/analyze.html";
+l10n.dl_porting_link				= "https://www.openoffice.org/porting/index.html";
+l10n.dl_archive_link				= "https://www.openoffice.org/download/archive.html";
+l10n.dl_aoo341_link				= "https://www.openoffice.org/download/other-341.html";
 

Modified: websites/staging/ooo-site/trunk/content/hi/faq.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/faq.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/faq.html Wed Mar 29 16:20:56 2017
@@ -9,9 +9,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/hi/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/index.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/index.html Wed Mar 29 16:20:56 2017
@@ -5,33 +5,34 @@
 
     <meta name="description" content="The official home page of the Apache OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw and Base." />
     <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open Document Format, free office editors" />
-    <meta name="google-site-verification" content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4" />
-    <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e" /> 
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="https://plus.google.com/+openoffice" rel="publisher" />
     <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
-    <script type="text/javascript" src="../download/globalvars.js"></script>
-    <script type="text/javascript" src="msg_prop_l10n_hi.js"></script>
+    <script type="text/javascript" src="/download/globalvars.js"></script>
+    <script type="text/javascript" src="./msg_prop_l10n_hi.js"></script>
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
-    @import "../home.css";
-    @import "../styles.css";
-    @import "../exceptions.css";
+    @import "/css/home.css";
+    @import "/css/styles.css";
+    @import "/css/exceptions.css";
     /* ]]> */
     </style>
     <script>
       function follow( platform ) {
         _gaq.push( ['_trackEvent','social', 'followUs', platform] ); 
 
-        if ( platform == 'ApacheBlog' )
+        if ( platform == 'ApacheBlog' ) {
           window.open( "https://blogs.apache.org/OOo/", "_blank" );
-        else if ( platform == 'Facebook' )
+        } else if ( platform == 'Facebook' ) {
           window.open( "https://www.facebook.com/ApacheOO", "_blank" );
-        else if ( platform == 'Twitter' )
+        } else if ( platform == 'Twitter' ) {
           window.open( "https://twitter.com/ApacheOO", "_blank" );
-        else if ( platform == 'GooglePlus' )
+        } else if ( platform == 'GooglePlus' ) {
           window.open( "https://plus.google.com/+openoffice", "_blank" );
+        } else if ( platform == 'YouTube' ) {
+          window.open( "https://www.youtube.com/channel/UC5VAaY4mqQVhNe8j7fZCEfw", "_blank" );
+        }
       }
 
       function showAlertBox() {
@@ -85,9 +86,9 @@
 <!--#include virtual="/scripts/entourage.js" -->
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/hi/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/hi/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/hi/">hi</a></div>
   </div>
   <div id="clear"></div>
@@ -120,7 +121,7 @@ screen reader.
     <li>
       <div class="action-info">
         <div class="action-text action-link">
-          <a href="why/index.html"><h2>I want to learn more about OpenOffice</h2>
+          <a href="/why/index.html"><h2>I want to learn more about OpenOffice</h2>
           <p>What is Apache OpenOffice? And why should I use it?</p></a>
         </div>
       </div>
@@ -136,7 +137,7 @@ screen reader.
   document.write( "<ul><li>"
     + "<div class='action-download'>"
       + "<div class='action-text action-link'>"
-        + "<a href='download/index.html'>"
+        + "<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!)</b> | "
@@ -156,7 +157,7 @@ screen reader.
   <noscript>
     <div class="action-download">
       <div class="action-text action-link">
-        <a href="download/index.html">
+        <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>
@@ -171,7 +172,7 @@ screen reader.
     <li>
       <div class="action-help">
         <div class="action-text action-link">
-          <a href="support/index.html"><h2>I need help with my OpenOffice</h2>
+          <a href="/support/index.html"><h2>I need help with my OpenOffice</h2>
           <p>Help is at hand whenever you need it.</p></a>
         </div>
       </div>
@@ -182,7 +183,7 @@ screen reader.
     <li>
       <div class="action-extend">
         <div class="action-text action-link">
-          <a href="extensions/index.html"><h2>I want to do more with my OpenOffice</h2>
+          <a href="/extensions/index.html"><h2>I want to do more with my OpenOffice</h2>
           <p>Extend Apache OpenOffice with additional functionality, templates and clipart.</p></a>
         </div>
       </div>
@@ -193,7 +194,7 @@ screen reader.
     <li>
       <div class="action-participate">
         <div class="action-text action-link">
-          <a href="http://openoffice.apache.org/get-involved.html"><h2>I want to participate in OpenOffice</h2>
+          <a href="https://openoffice.apache.org/get-involved.html"><h2>I want to participate in OpenOffice</h2>
           <p>Apache OpenOffice is made with help from people all over the world. Feel free to contribute!</p></a>
         </div>
       </div>
@@ -204,23 +205,27 @@ screen reader.
     <li>
      <div class="action-social">
         <div class="action-text action-link">
-          <a href="social/index.html" onclick="javascript:follow('SocialLink');">
+          <a href="/social/index.html" onclick="javascript:follow('SocialLink');">
           <h2>I want to stay in touch with OpenOffice</h2>
           <p>Follow the progress of OpenOffice via our announcement list, social media areas and blog.</p></a>
             <div class="action-social-extra">
               <p>
                 <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('ApacheBlog');"
-                title="Blog of OpenOffice."><img src="../images/logo-rss-16.png" alt="Blog of OpenOffice" />
+                title="Blog of OpenOffice."><img src="/images/logo-rss-16.png" alt="Blog of OpenOffice" />
                 <a>Official Blog</a></span>
                 <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Facebook');"
-                title="Follow us on Facebook."><img src="../images/logo-facebook-16.png" alt="Follow us on Facebook." />
+                title="Follow us on Facebook."><img src="/images/logo-facebook-16.png" alt="Follow us on Facebook." />
                 <a>Facebook</a></span>
                 <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Twitter');"
-                title="Follow us on Twitter."><img src="../images/logo-twitter-16.png" alt="Follow us on Twitter." />
+                title="Follow us on Twitter."><img src="/images/logo-twitter-16.png" alt="Follow us on Twitter." />
                 <a>Twitter</a></span>
                 <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('GooglePlus');"
-                title="Follow us on Google+."><img src="../images/logo-googleplus-16.png" alt="Follow us on Google+." />
+                title="Follow us on Google+."><img src="/images/logo-googleplus-16.png" alt="Follow us on Google+." />
                 <a>Google+</a></span>
+		<span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'YouTube' );"
+                title="Subscribe to our YouTube channel"><img src="/images/logo-youtube-16.png" alt="Subscribe to our YouTube channel" />
+                <a>YouTube</a>
+		</span>
               </p>
             </div>
         </div>
@@ -232,42 +237,68 @@ screen reader.
   </ul>
 
   <div id="SupportedAndSupporters">
-    <a href="http://validator.w3.org/check?uri=referer"
+    <a href="https://validator.w3.org/check?uri=referer"
     title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
-    <img src="http://www.w3.org/Icons/valid-xhtml10-blue.png"
+    <img src="https://www.w3.org/Icons/valid-xhtml10-blue.png"
     alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"/></a>
   </div>
 </div>
 
-<div id="news" style="margin: 2% 3% 0 0; height: 520px;">
+<div id="news">
 
-  <div class="campaign" style="height: 200px; float: right; overflow: auto;">
-    <h2 style="display: inline;">Recent Blog Posts</h2>
+  <div class="first campaign" style="height: 210px; float: right; overflow: auto;">
+    <h2>Recent Blog Posts</h2>
 
     <p style="text-align:right">
-      <a href="http://blogs.apache.org/OOo/">All Posts</a>
+      <a href="https://blogs.apache.org/OOo/">All Posts</a>
     </p>
 
     <p>
-      <em>29 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">
-      Apache OpenOffice 4.1.0 released</a>
-      <br/>
-      <em>28 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2">
-      Apache OpenOffice Weekly News #2</a>
-      <br/>
-      <em>25 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1">
-      Apache OpenOffice Weekly News #1</a>
-      <br/>
-      <em>17 April:</em><br /><a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
-      100 Million downloads</a>
-      <br/>
-      <em>31 December:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
-      Apache OpenOffice in 2013: a year in review</a>
-      <br/>
+      <em>28 November 2016:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/over_200_million_downloads_of">
+      Over 200 million downloads of Apache OpenOffice</a>
+      <br />
+
+      <em>12 October 2016:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_12">
+      Announcing Apache OpenOffice 4.1.3</a>
+      <br />
+
+      <em>28 October 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_11">
+      Announcing Apache OpenOffice 4.1.2</a>
+      <br />
+    
+      <em>27 September 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/coming_soon_apache_openoffice_4">
+      Coming soon... Apache OpenOffice 4.1.2</a>
+      <br />
+    
+      <em>13 May 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/authoring_e_books_in_apache">
+      Authoring e-Books in Apache OpenOffice</a>
+      <br />
+    
+      <em>13 April 2015:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/collaboration_is_in_our_dna">
+      Collaboration is in our DNA</a>
+      <br />
+    
+      <em>31 December 2014:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2014_a">
+      Apache OpenOffice in 2014: a year in review</a>
+      <br />
     </p>
   </div>
 
-  <div id="all_news" style="height: 320px; float: left; overflow: auto;">
+  <div id="all_news" style="height: 375px; float: left; overflow: auto;">
     <div class="campaign">
       <h2>Recent News</h2>
 
@@ -276,48 +307,114 @@ screen reader.
       </p>
       <p></p>
 
+      <h2>Apache OpenOffice 4.1.3 released</h2>
+
+      <p>
+        <em>12 October 2016:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_12"
+        title="Offical blog post about Apache OpenOffice 4.1.3">official release of version 4.1.3</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.3">Release Notes</a> you can read about all new bugfixes,
+        improvements and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.3">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.2 released</h2>
+
+      <p>
+        <em>28 October 2015:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_11"
+        title="Offical blog post about Apache OpenOffice 4.1.2">official release of version 4.1.2</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.2">Release Notes</a> you can read about all bugfixes,
+        improvements and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.2">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Udine moves to OpenOffice, will save 360,000 Euro</h2>
+
+      <p>
+        <em>16 September 2014:</em>
+        The City of Udine, in Italy, announced a process that will lead to the installation
+        of OpenOffice on 900 municipal desktops, saving the city 360,000 Euro.  
+        ZDNet's Raffaele Mastrolonardo has the
+        <a href="http://www.zdnet.com/another-italian-city-announces-its-ditching-microsoft-windows-for-open-source-7000033682/">details</a>.
+      </p>
+    </div>
+
+    <div class="campaign">
+      <h2>Apache OpenOffice 4.1.1 released</h2>
+
+      <p>
+        <em>21 August 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1"
+        title="Offical blog post about Apache OpenOffice 4.1.1">official release of version 4.1.1</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.1">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.1">Don't miss to download</a> the new release and find out yourself.
+      </p>
+    </div>
+
+    <div class="campaign">
       <h2>Apache OpenOffice 4.1.0 released</h2>
 
-      <p><em>29 April 2014:</em>
-      The Apache OpenOffice project announces the   
-      <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce"
-      title="Offical blog post about Apache OpenOffice 4.1.0">official release of version 4.1.0</a>.
-      In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes"
-     title="Release Notes for Apache OpenOffice 4.1.0">Release Notes</a> you can read about all new features, functions
-      and languages. <a href="https://www.openoffice.org/download/"
-      title="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the new release and find out yourself.</p>
+      <p>
+        <em>29 April 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce"
+        title="Offical blog post about Apache OpenOffice 4.1.0">official release of version 4.1.0</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.0">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the new release and find out yourself.
+      </p>
     </div>
 
     <div class="campaign">
       <h2>100 Million downloads</h2>
 
-      <p><em>17 April 2014:</em>
-      The Apache OpenOffice project is proud to tell you that our software was   
-      <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56"
-      title="Apache OpenOffice was downloaded 100 million times">downloaded over 100 million times</a>. Join us in
-      celebrating this big achievement!</p>
+      <p>
+        <em>17 April 2014:</em>
+        The Apache OpenOffice project is proud to tell you that our software was   
+        <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56"
+        title="Apache OpenOffice was downloaded 100 million times">downloaded over 100 million times</a>. Join us in
+        celebrating this big achievement!
+      </p>
     </div>
 
     <div class="campaign">
       <h2>Italian region adopts OpenOffice, saves 2 Million Euro</h2>
 
-      <p><em>10 October 2013:</em>
-      The Italian administrative region of Emilia-Romagna announced plans to move to OpenOffice,
-      <a href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million">
-      saving 2 million euro</a>.</p>
+      <p>
+        <em>10 October 2013:</em>
+        The Italian administrative region of Emilia-Romagna announced plans to move to OpenOffice,
+        <a href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million">
+        saving 2 million euro</a>.
+      </p>
     </div>
 
     <div class="campaign">
       <h2>Volunteers, not Amateurs</h2>
 
-      <p><em>8 January 2013:</em>
-      Apache OpenOffice is developed 100% by volunteers.  Apache does not pay for developers, for translators, for QA, for
-      marketing, for UI, for support, etc. Of course, we're happy to accept
-      <a href="http://www.apache.org/foundation/contributing.html">donations to the Apache Software Foundation</a>, to keep
-      our servers runnings and for similar overhead expenses. But our products are developed entirely by volunteers.
-
-      <p>Some users are initially worried by this statement:<br /><strong>How can software for free, developed by volunteers,
-      be any good?<br /></strong><a href="why/why_volunteers.html">Read on for an answer...</a></p>
+      <p>
+        <em>8 January 2013:</em>
+        Apache OpenOffice is developed 100% by volunteers.  Apache does not pay for developers, for translators, for QA,
+        for marketing, for UI, for support, etc. Of course, we're happy to accept
+        <a href="https://www.apache.org/foundation/contributing.html">donations to the Apache Software Foundation</a>, to
+        keep our servers runnings and for similar overhead expenses. But our products are developed entirely by
+        volunteers.
+      </p>
+      <p>Some users are initially worried by this statement:<br /><strong>How can software for free, developed by
+	volunteers, be any good?<br /></strong><a href="/why/why_volunteers.html">Read on for an answer...</a>
+      </p>
     </div>
 
   </div>

Modified: websites/staging/ooo-site/trunk/content/hi/msg_prop_l10n_hi.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/msg_prop_l10n_hi.js (original)
+++ websites/staging/ooo-site/trunk/content/hi/msg_prop_l10n_hi.js Wed Mar 29 16:20:56 2017
@@ -21,4 +21,3 @@ l10n.index_alert_box_href			= "index.htm
 l10n.index_alert_box_headline_text		= "We need your help to complete translation into Hindi!";
 									// Maximum 630 characters.
 l10n.index_alert_box_text_text			= "This note is in English because we have no one to translate this webpage and others into your language. The links on the page will help you download and install Apache OpenOffice with Hindi translation. But we still need help with this website. <br /><br /> If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"L10N@openoffice.apache.org\" if you want to volunteer or if you have questions.";
-

Modified: websites/staging/ooo-site/trunk/content/hi/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/hi/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/hi/topnav.html Wed Mar 29 16:20:56 2017
@@ -10,10 +10,12 @@
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <ul>
-<li><a href="/product/" title="Apache OpenOffice product description">Product</a></li>
-<li><a href="/hi/download/" title="Download Apache OpenOffice">Download</a></li>
-<li><a href="/support/" title="Find Support for OpenOffice">Support</a></li>
-<li><a href="http://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog</a></li>
-<li><a href="/extensions/" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="/participate/" title="Get involved in Apache OpenOffice">Get Involved</a></li>
+<li><a href="/product/index.html" title="Apache OpenOffice product description">Product</a></li>
+<li><a href="/hi/download/index.html" title="Download OpenOffice">Download</a></li>
+<li><a href="/support/index.html" title="Find Support for OpenOffice">Support</a></li>
+<li><a href="https://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog</a></li>
+<li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
+<li><a href="https://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
+<li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
+<li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>



Mime
View raw message