openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1019514 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/
Date Sat, 14 Oct 2017 16:28:07 GMT
Author: buildbot
Date: Sat Oct 14 16:28:07 2017
New Revision: 1019514

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/analyze.html
    websites/staging/ooo-site/trunk/content/download/test/download.js
    websites/staging/ooo-site/trunk/content/download/test/exceptions.css
    websites/staging/ooo-site/trunk/content/download/test/globalvars.js
    websites/staging/ooo-site/trunk/content/download/test/index.html
    websites/staging/ooo-site/trunk/content/download/test/msg_prop_l10n_en.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 14 16:28:07 2017
@@ -1 +1 @@
-1811893
+1812192

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 14 16:28:07 2017
@@ -1 +1 @@
-1811893
+1812192

Modified: websites/staging/ooo-site/trunk/content/download/test/analyze.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/analyze.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze.html Sat Oct 14 16:28:07
2017
@@ -3,7 +3,7 @@
 <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" />
   <title>Apache OpenOffice Downloads - Analyze errors of stable release</title>
   <script type="text/javascript" src="globalvars.js"></script>
   <script type="text/javascript" src="msg_prop_l10n_en.js"></script>
@@ -79,7 +79,7 @@
       + "<br />"
 
       + "*) "
-      + "<a href='http://openoffice.apache.org/mailing-lists.html' target='_blank'"
+      + "<a href='https://openoffice.apache.org/mailing-lists.html' target='_blank'"
 	+ "title='" + l10n.dl_analyze_instruction_learn_more_title + "'>"
 	+ "<b>" + l10n.dl_analyze_instruction_learn_more_text + "</b>"
       + "</a>."
@@ -242,9 +242,9 @@ function updateTable() {
   		    DL.LINK_CHK_MD5_FULL, DL.LINK_CHK_MD5_LP, DL.SF_BASE_URL, DL.ASF_ARC_BASE_URL, DL.getLinkSelection(),
 		    DL.isLanguageSupported(), DL.SHOW_SUB_BOX, DL.ERROR ];
 
-  // Start with the 20th row (i = 19) in the 2nd cell (1), count through the elements array
(j)
+  // Start with the 21st row (i = 20) in the 2nd cell (1), count through the elements array
(j)
   // and assign the found values as innerHMTL to the table cells.
-  for( var i = 19, j = 0, k = variables.length; j < k; i++, j++ ) {
+  for( var i = 20, j = 0, k = variables.length; j < k; i++, j++ ) {
 	document.getElementById( "table_data" ).rows[ i ].cells[ 1 ].innerHTML = variables[ j ];
   }
 

Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Sat Oct 14 16:28:07
2017
@@ -1118,7 +1118,9 @@ DL.getPlatform = function() {
 			}
 
 			// OS X: 10.7 or newer?
-			if( ua.indexOf( " 10.11"	) !== -1 ||
+			if( ua.indexOf( " 10.12"	) !== -1 ||
+			    ua.indexOf( " 10_12"	) !== -1 ||
+			    ua.indexOf( " 10.11"	) !== -1 ||
 			    ua.indexOf( " 10_11"	) !== -1 ||
 			    ua.indexOf( " 10.10"	) !== -1 ||
 			    ua.indexOf( " 10_10"	) !== -1 ||

Modified: websites/staging/ooo-site/trunk/content/download/test/exceptions.css
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/exceptions.css (original)
+++ websites/staging/ooo-site/trunk/content/download/test/exceptions.css Sat Oct 14 16:28:07
2017
@@ -38,7 +38,7 @@ h1 { padding-left: 0.5em; }
 .optionset p { margin: 0; padding: .1em 0 .25em 0; color: #333; }
 .optionset p a { margin: 0; padding: 0; color: #333; }
 #bodycol .optionset p a:hover, #bodycol.optionset .button:hover p a { color: #000; }
-.optionset .button { border-radius: 15px; margin-top: 8px; }
+.optionset .button { border-radius: 10px; margin-top: 8px; }
 .optionset .button h2 { margin-left: 3%; padding: 2% 0 0 0; border: none; font-weight: bold;
text-decoration: none; }
 .optionset .button h2 a { display: block; margin-left: 3%; padding: 2% 0 0 0; font-weight:
bold; text-decoration: none; }
 .optionset .button h3 { margin: 0; padding: 0; border: none; font-style: normal; cursor:
pointer; }
@@ -83,17 +83,17 @@ h1 { padding-left: 0.5em; }
 .green-sel:hover p, #bodycol .green-sel p:hover { cursor: default; }
 .green-sel:hover p a, #bodycol .green-sel p a:hover { cursor: default; }
 .green-sel form { margin: 0 0 20px 3%; }
-.green-sel .sel-os { background: transparent; border: 2px solid #718D36; width: 200px; padding:
2px; }
-.green-sel .sel-language { background: transparent; border: 2px solid #718D36; width: 300px;
padding: 2px; }
-.green-sel .sel-version { background: transparent; border: 2px solid #718D36; width: 140px;
padding: 2px; }
-.green-sel .btn_dl h3 a { background: #E9FEBE; display: inline-block; margin: 0px 0px 0px
0px; padding: 5px 5px 5px 5px; border: 3px solid #546828; border-radius: 15px; color: #546828;
text-decoration: none; font-style: normal; }
-.green-sel .btn_dl h3 a:hover { background: #546828; display: inline-block; margin: 0px 0px
0px 0px; padding: 5px 5px 5px 5px; border: 3px solid #E9FEBE; border-radius: 15px; color:
#E9FEBE; text-decoration: none; font-style: normal; }
-.sub-green-sel { background: #E9FEBE; border: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
+.green-sel .sel-os { background: transparent; border: 2px solid #718D36; width: 210px; height:
30px; padding: 2px; }
+.green-sel .sel-language { background: transparent; border: 2px solid #718D36; width: 300px;
height: 30px; padding: 2px; }
+.green-sel .sel-version { background: transparent; border: 2px solid #718D36; width: 140px;
height: 30px; padding: 2px; }
+.green-sel .btn_dl h3 a { background: #E9FEBE; display: inline-block; margin: 0px 0px 0px
0px; padding: 5px 5px 5px 5px; border: 2px solid #546828; border-radius: 5px; color: #546828;
text-decoration: none; font-style: normal; }
+.green-sel .btn_dl h3 a:hover { background: #546828; display: inline-block; margin: 0px 0px
0px 0px; padding: 5px 5px 5px 5px; border: 2px solid #E9FEBE; border-radius: 5px; color: #E9FEBE;
text-decoration: none; font-style: normal; }
+.sub-green-sel { background: #E9FEBE; border: 1px solid #C3E480; border-radius: 10px; font-size:
.8em; padding: 5px 5px 5px 0px; }
 .sub-green-sel p { padding: .1em 3%; width: 100%; }
-.sub-green-sel_error { background: #FECBCB; border: 1px solid #C00000; border-radius: 15px;
font-size: .8em; padding: 5px 5px 5px 0px; }
+.sub-green-sel_error { background: #FECBCB; border: 1px solid #C00000; border-radius: 10px;
font-size: .8em; padding: 5px 5px 5px 0px; }
 
 .green-sel-icon {
-  background: url(../cachedimages/button-green-top.png) no-repeat right top;
+  background: url(cachedimages/button-green-top.png) no-repeat right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -102,7 +102,7 @@ h1 { padding-left: 0.5em; }
 }
 
 .green-sel-icon:hover {
-  background: url(../cachedimages/button-green-bottom.png) no-repeat right top;
+  background: url(cachedimages/button-green-bottom.png) no-repeat right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -140,11 +140,11 @@ h1 { padding-left: 0.5em; }
 .lightblue span { margin-left: -2px; cursor: pointer; }
 .lightblue:hover h2 a, #bodycol .lightblue h2 a:hover { color: #21549A; }
 .lightblue .icon_box { margin-left: 3%; padding-bottom: 1%; }
-.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid
#D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-lightblue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid
#D1D1FF; border-radius: 10px; font-size: .8em; }
 .sub-lightblue p { padding: .1em 3%; width: 100%; }
 
 .lightblue-icon {
-  background: url(../cachedimages/button-lightblue-top.png) no-repeat transparent right top;
+  background: url(cachedimages/button-lightblue-top.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -153,7 +153,7 @@ h1 { padding-left: 0.5em; }
 }
 
 .lightblue-icon:hover {
-  background: url(../cachedimages/button-lightblue-bottom.png) no-repeat transparent right
top;
+  background: url(cachedimages/button-lightblue-bottom.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -186,11 +186,11 @@ h1 { padding-left: 0.5em; }
 .blue h2 { margin: 0; border: none; font-weight: bold; color: #2D72CE; text-decoration: none;
cursor: pointer; }
 .blue h2 a { color: #2D72CE; }
 .blue:hover h2 a, #bodycol .blue h2 a:hover { color: #21549A; }
-.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid
#D1D1FF; border-radius: 15px; font-size: .8em; }
+.sub-blue { background: #E1E1FF; border-top: 1px solid #D1D1FF; border-bottom: 1px solid
#D1D1FF; border-radius: 10px; font-size: .8em; }
 .sub-blue p { padding: .1em 3%; width: 100%; }
 
 .blue-icon {
-  background: url(../cachedimages/button-blue-ext-top.png) no-repeat transparent right top;
+  background: url(cachedimages/button-blue-ext-top.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -199,7 +199,7 @@ h1 { padding-left: 0.5em; }
 }
 
 .blue-icon:hover {
-  background: url(../cachedimages/button-blue-ext-bottom.png) no-repeat transparent right
top;
+  background: url(cachedimages/button-blue-ext-bottom.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -230,17 +230,17 @@ h1 { padding-left: 0.5em; }
  position: relative; }
 
 /*
-.yellow { background: url(../cachedimages/button-yellow.png) #FFF379 right top no-repeat;
}
-.yellow:hover { background: url(../cachedimages/button-yellow.png) #FFF24F right -200px no-repeat;
}
+.yellow { background: url(/cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
+.yellow:hover { background: url(/cachedimages/button-yellow.png) #FFF24F right -200px no-repeat;
}
 */
 .yellow h2 { margin: 0; border: none; font-weight: bold; color: #E09C09; text-decoration:
none; cursor: pointer; }
 .yellow h2 a { color: #E09C09; }
 .yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
-.sub-yellow { background: #FFFEAF; border: 1px solid #FBD34E; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
+.sub-yellow { background: #FFFEAF; border: 1px solid #FBD34E; border-radius: 10px; font-size:
.8em; padding: 5px 5px 5px 0px; }
 .sub-yellow p { padding: .1em 3%; width: 100%; }
 
 .yellow-icon {
-  background: url(../cachedimages/button-yellow-top.png) no-repeat transparent right top;
+  background: url(cachedimages/button-yellow-top.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -249,7 +249,7 @@ h1 { padding-left: 0.5em; }
 }
 
 .yellow-icon:hover {
-  background: url(../cachedimages/button-yellow-bottom.png) no-repeat transparent right top;
+  background: url(cachedimages/button-yellow-bottom.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -281,11 +281,11 @@ h1 { padding-left: 0.5em; }
 
 .orange h2 { margin: 0; border: none; font-weight: bold; color: #D36812; text-decoration:
none; cursor: pointer; }
 .orange h2 a { color: #D36812; cursor: default; }
-.sub-orange { background: #FFE2B5; border: 1px solid #FFB15E; border-radius: 15px; font-size:
.8em; padding: 5px 5px 5px 0px; }
+.sub-orange { background: #FFE2B5; border: 1px solid #FFB15E; border-radius: 10px; font-size:
.8em; padding: 5px 5px 5px 0px; }
 .sub-orange p { padding: .1em 3%; width: 100%; }
 
 .orange-icon {
-  background: url(../cachedimages/button-orange-top.png) no-repeat transparent right top;
+  background: url(cachedimages/button-orange-top.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -294,7 +294,7 @@ h1 { padding-left: 0.5em; }
 }
 
 .orange-icon:hover {
-  background: url(../cachedimages/button-orange-bottom.png) no-repeat transparent right top;
+  background: url(cachedimages/button-orange-bottom.png) no-repeat transparent right top;
   display: block;
   height: 100px;
   position: absolute;
@@ -309,7 +309,7 @@ h1 { padding-left: 0.5em; }
 .additionalinformation a { color: #107EC0; text-decoration: underline; }
 .additionalinformation a:hover { background-color: #E6EBED; }
 
-.additionalinformation #nativelang { background-image: url(../cachedimages/nativelang.gif);
background-repeat: no-repeat; background-position: top left; }
+.additionalinformation #nativelang { background-image: url(cachedimages/nativelang.gif);
background-repeat: no-repeat; background-position: top left; }
 
 #downloadextendedtext p { background: none; }
 #downloadextendedtext ul { background: none; font-weight: bold; list-style: none; margin:
0px; padding: 0px; font-size: 2em; width: 100%; float: left; color: #333; padding-left: 20px;
}

Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/globalvars.js Sat Oct 14 16:28:07
2017
@@ -95,10 +95,10 @@ DL.SEL_VER			= [ "4.1.3",  "4.1.3",
 				    "older",  "Older releases" ];
 
 // Base URLs to the Sourceforge and Apache mirror server.
-DL.SF				= "http://sourceforge.net/projects/openofficeorg.mirror/files/";
-DL.ASF				= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
-DL.ASF_DIST			= "http://www.apache.org/dist/openoffice/";
-DL.ASF_ARC			= "http://archive.apache.org/dist/openoffice/";
+DL.SF				= "https://sourceforge.net/projects/openofficeorg.mirror/files/";
+DL.ASF				= "https://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
+DL.ASF_DIST			= "https://www.apache.org/dist/openoffice/";
+DL.ASF_ARC			= "https://archive.apache.org/dist/openoffice/";
 
 // Only used in "download_other.js".
 DL.REL_PLATFORM			= [ "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm", "Linux_x86-64_deb",
@@ -142,11 +142,11 @@ DL_BETA.LP_LANG			= [ "ast", "bg", "ca",
 DL_BETA.SDK_LANG		= [ "en-US" ];
 
 // Base URLs to the Sourceforge and Apache mirror server.
-DL_BETA.SOURCEFORGE		= "http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/"
+ DL_BETA.VERSION;
+DL_BETA.SOURCEFORGE		= "https://sourceforge.net/projects/openofficeorg.mirror/files/milestones/"
+ DL_BETA.VERSION;
 DL_BETA.SOURCEFORGE		= DL_BETA.SOURCEFORGE + "/binaries/";
-DL_BETA.ASF			= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"		   + DL_BETA.VERSION;
-DL_BETA.ASF_DIST		= "http://www.apache.org/dist/openoffice/"				   + DL_BETA.VERSION;
-DL_BETA.ASF_ARC			= "http://archive.apache.org/dist/openoffice/"				   + DL_BETA.VERSION;
+DL_BETA.ASF			= "https://www.apache.org/dyn/aoo-closer.cgi/openoffice/"		   + DL_BETA.VERSION;
+DL_BETA.ASF_DIST		= "https://www.apache.org/dist/openoffice/"				   + DL_BETA.VERSION;
+DL_BETA.ASF_ARC			= "https://archive.apache.org/dist/openoffice/"				   + DL_BETA.VERSION;
 
 // Debug: Uncomment to use different base URLs.
 // var DL.PEOPLE_BASE_URL	= "http://people.apache.org/~marcus/aoo/"				   + DL.VERSION;

Modified: websites/staging/ooo-site/trunk/content/download/test/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index.html Sat Oct 14 16:28:07 2017
@@ -3,34 +3,34 @@
 <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="description" content="Join the OpenOffice revolution, the free office
productivity suite with over 200 million trusted downloads." />
   <meta itemprop="keywords" content="Apache OpenOffice, OpenOffice, Apache Open Office,
Download, Official, Official Download, Open Office, OpenOffice.org" />
-  <meta itemprop="image" content="https://www.openoffice.org/images/aoo-logo-100x100.png"
/>
+<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="https://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 215 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 215 million trusted downloads."
/>
   <title>Apache OpenOffice - Official Download</title>
-  <script type="text/javascript" src="globalvars.js"></script>
-  <script type="text/javascript" src="msg_prop_l10n_en.js"></script>
-  <script type="text/javascript" src="languages.js"></script>
-  <script type="text/javascript" src="release_matrix.js"></script>
-  <script type="text/javascript" src="boxed_download.js"></script>
-  <script type="text/javascript" src="download.js"></script>
+  <script type="text/javascript" src="./globalvars.js"></script>
+  <script type="text/javascript" src="./msg_prop_l10n_en.js"></script>
+  <script type="text/javascript" src="./languages.js"></script>
+  <script type="text/javascript" src="./release_matrix.js"></script>
+  <script type="text/javascript" src="./boxed_download.js"></script>
+  <script type="text/javascript" src="./download.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "styles.css";
-  @import "exceptions.css";
+  @import "./styles.css";
+  @import "./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 ) {
@@ -41,9 +41,9 @@
       } else if ( platform == 'facebook' ) {
         window.open( 'https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
       } else if ( platform == 'twitter' ) {
-        window.open( 'https://twitter.com/intent/tweet?url=https%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=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+215+million+trusted+downloads.',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
       } else if ( platform == 'google+' ) {
-        window.open( 'https://plus.google.com/share?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
+        window.open( 'https://plus.google.com/share?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F',
'_blank', 'toolbar=0, status=0, width=400, height=440' );
       }
     }
   </script>
@@ -67,9 +67,9 @@
 
 <div itemscope>
   <span itemprop="name" content="Download Apache OpenOffice"></span>
-  <span itemprop="description" content="Join the OpenOffice revolution, the free office
productivity suite with over 125 million trusted downloads."></span>
+  <span itemprop="description" content="Join the OpenOffice revolution, the free office
productivity suite with over 215 million trusted downloads."></span>
   <span itemprop="keywords" content="Apache OpenOffice, OpenOffice, Apache Open Office,
Download, Official, Official Download, Open Office, OpenOffice.org"></span>
-  <span itemprop="image" content="https://www.openoffice.org/images/aoo-logo-100x100.png"></span>
+  <span itemprop="image" content="https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"></span>
 </div>
 
 <div class="overall_optionset">
@@ -109,13 +109,13 @@
     <div class="first button green-sel" id="optionitem2">
       <div class="green-sel-icon"></div>
       <h2>
-        <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
+        <a style="cursor: pointer;" href="https://sourceforge.net/projects/openofficeorg.mirror/files/"
           title="Select from all platforms, languages, language packs to download">
-          Apache OpenOffice - Official Download
+          Apache OpenOffice Downloads - Official Site
         </a>
       </h2>
       <p>
-        <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
+        <a style="cursor: pointer;" href="https://sourceforge.net/projects/openofficeorg.mirror/files/"
           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.
You will have to navigate to

Modified: websites/staging/ooo-site/trunk/content/download/test/msg_prop_l10n_en.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/msg_prop_l10n_en.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/msg_prop_l10n_en.js Sat Oct 14 16:28:07
2017
@@ -56,7 +56,7 @@ l10n.dl_getdev_orange_box_headline_text
 l10n.dl_getdev_orange_box_headline_title	= "The Apache OpenOffice project seeks developers
to take part in expanding its activities";
 l10n.dl_getdev_orange_box_text_text		= "Are you a software developer with C++ skills? Do
you have expertise in building software? Are you an experienced lead technical writer? Are
you proficient in English? Do you like contributing to open source projects? Come and join
us in helping Apache OpenOffice to thrive.";
 l10n.dl_getdev_orange_box_text_title		= "The Apache OpenOffice project seeks developers to
take part in expanding its activities";
-l10n.dl_getdev_orange_box_text_href		= "http://openoffice.apache.org/get-involved.html";
+l10n.dl_getdev_orange_box_text_href		= "https://openoffice.apache.org/get-involved.html";
 
 // Share: Strings in the light-blue box (used in "index.html").
 l10n.dl_share_light_blue_box_headline_text	= "Help Spread the Word";
@@ -64,20 +64,20 @@ l10n.dl_share_light_blue_box_headline_ti
 l10n.dl_share_light_blue_box_text_text		= "Please tell your friends about Apache OpenOffice:";
 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		= "../images/logo-rss-32.png";
+l10n.dl_share_light_blue_box_blog_title		= "Weblog of OpenOffice";
+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	= "../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	= "../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	= "../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").
@@ -98,85 +98,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 (OS&nbsp;X) and Linux";
+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_mirrors1_text			= "Alternative download link (binaries)";
+l10n.dl_nav_stat_href				= "https://www.openoffice.org/stats/index.html";
+l10n.dl_nav_mirrors1_text			= "Alternative download link #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_mirrors2_text			= "Alternative download link (source)";
+l10n.dl_nav_mirrors1_href			= "https://sourceforge.net/projects/openofficeorg.mirror/files/";
+l10n.dl_nav_mirrors2_text			= "Alternative download link #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			= "../images/sourceforge.png";
+l10n.dl_img_sourceforge_href			= "https://www.sourceforge.net/";
+l10n.dl_img_sourceforge_src			= "/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				= "../images/valid-xhtml10-blue.png";
+l10n.dl_img_w3c_href				= "https://validator.w3.org/check?uri=referer";
+l10n.dl_img_w3c_src				= "/images/valid-xhtml10-blue.png";
 l10n.dl_img_w3c_alt				= "W3C Validator";
 
 
@@ -218,17 +218,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				= "../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			= "../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				= "../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.";
@@ -240,7 +240,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			= "../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: ";
@@ -248,7 +248,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";
@@ -266,7 +266,7 @@ l10n.dl_error_custom_4_text			= "";
 
 // Analyze: Strings for the instruction text (used in "analyze.html").
 l10n.dl_analyze_headline_text			= "How to report a broken download link?";
-l10n.dl_analyze_instruction_select_text		= "<b>Select your favorites</b>: Operating
system, language and version in the green below.";
+l10n.dl_analyze_instruction_select_text		= "<b>Select your favorites</b>: Operating
system, language and version in the green box below.";
 l10n.dl_analyze_instruction_verify_text		= "Verify that these options <b>still do not</b>
lead to valid download links.";
 l10n.dl_analyze_instruction_click_text		= "Click on the button below the green box: ";
 l10n.dl_analyze_instruction_copy_text		= "Copy the selected table data into the clipboard:
";
@@ -303,15 +303,15 @@ l10n.dl_analyze_table_stable_release_tex
 l10n.dl_analyze_table_javascript_text		= "JavaScript&nbsp;functions/variables";
 
 // General: Links to webpage files that could be localized.
-l10n.dl_rel_notes_aoo413_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.3+Release+Notes";
-l10n.dl_rel_notes_aoo412_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes";
-l10n.dl_rel_notes_aoo411_link			= "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";
-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";



Mime
View raw message