You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2017/03/29 22:53:07 UTC

svn commit: r1009341 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/fi/brand.html content/fi/download/index.html content/fi/download/msg_prop_l10n_fi.js content/fi/index.html content/fi/topnav.html content/robots.txt

Author: buildbot
Date: Wed Mar 29 22:53:07 2017
New Revision: 1009341

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/fi/brand.html
    websites/staging/ooo-site/trunk/content/fi/download/index.html
    websites/staging/ooo-site/trunk/content/fi/download/msg_prop_l10n_fi.js
    websites/staging/ooo-site/trunk/content/fi/index.html
    websites/staging/ooo-site/trunk/content/fi/topnav.html
    websites/staging/ooo-site/trunk/content/robots.txt

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar 29 22:53:07 2017
@@ -1 +1 @@
-1789394
+1789420

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar 29 22:53:07 2017
@@ -1 +1 @@
-1789394
+1789420

Modified: websites/staging/ooo-site/trunk/content/fi/brand.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/brand.html (original)
+++ websites/staging/ooo-site/trunk/content/fi/brand.html Wed Mar 29 22:53:07 2017
@@ -1,6 +1,6 @@
   <div id="bannera">
   <div id="languagesdiv">
-  	Suomi:
+  	Language:
   	<select id="selectlanguage" onchange="javascript:location.href=location.protocol+'//'+location.host+'/'+this.value;">
   	<!-- Asturian --><option value="ast">Asturianu (ast)</option>
 	<!-- Catalan --><option value="ca">CatalĂ  (ca)</option>
@@ -55,7 +55,7 @@
 	  }
 	</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">
@@ -73,4 +73,4 @@
     </div>
     <div id="bannercenter"><br/>The Free and Open Productivity Suite</div>
   </div>
-  <div id="announce"><a href="https://s.apache.org/JiCT" title="Apache OpenOffice 4.1.3 released!">Apache OpenOffice 4.1.3 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/fi/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/fi/download/index.html Wed Mar 29 22:53:07 2017
@@ -12,22 +12,22 @@
   <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_fi.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_fi.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 ) {
@@ -36,11 +36,11 @@
       if ( platform == 'apacheblog' ) {
         window.open( 'https://blogs.apache.org/OOo/', '_blank' );
       } else if ( platform == 'facebook' ) {
-        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' );
+        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( '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+200+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+200+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
       } else if ( platform == 'google+' ) {
-        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' );
+        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>
@@ -99,16 +99,16 @@
     <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/"
-          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.
+        <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.
           Our apologies for the inconvenience.
         </a>
       </p>

Modified: websites/staging/ooo-site/trunk/content/fi/download/msg_prop_l10n_fi.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/download/msg_prop_l10n_fi.js (original)
+++ websites/staging/ooo-site/trunk/content/fi/download/msg_prop_l10n_fi.js Wed Mar 29 22:53:07 2017
@@ -34,7 +34,7 @@ l10n.dl_green_box_selectbox_ver_title		=
 // The strings that will be shown in the OS, language and version drop-down select boxes.
 // You must leave at least one single empty string (see the comment lines below the 3 following variables)!
 l10n.dl_green_box_select_box_os_values		= [ "Windows (EXE)",
-				    		"Linux 64-bit (x86-64) (DEB)",
+				    		    "Linux 64-bit (x86-64) (DEB)",
 						    "Linux 64-bit (x86-64) (RPM)",
 						    "Linux 32-bit (x86) (DEB)",
 						    "Linux 32-bit (x86) (RPM)",
@@ -112,7 +112,7 @@ 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_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";
@@ -173,7 +173,7 @@ l10n.dl_nav_hist_schedule_text			= "Hist
 l10n.dl_nav_hist_schedule_title			= "When were old releases planned?";
 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, macOS (OS&nbsp;X) and Linux machines";
+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";
@@ -296,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";
@@ -351,15 +351,16 @@ l10n.dl_analyze_table_javascript_text		=
 
 
 // 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_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";
\ No newline at end of file
+l10n.dl_aoo341_link				= "https://www.openoffice.org/download/other-341.html";
+

Modified: websites/staging/ooo-site/trunk/content/fi/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/index.html (original)
+++ websites/staging/ooo-site/trunk/content/fi/index.html Wed Mar 29 22:53:07 2017
@@ -9,78 +9,77 @@
     <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_fi.js"></script>
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
-	@import "/css/home.css";
-	@import "/css/styles.css";
-	@import "/css/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' ) {
           window.open( "https://twitter.com/ApacheOO", "_blank" );
         } else if ( platform == 'GooglePlus' ) {
           window.open( "https://plus.google.com/+openoffice", "_blank" );
-		} else if ( platform == 'YouTube' ) {
+        } else if ( platform == 'YouTube' ) {
           window.open( "https://www.youtube.com/channel/UC5VAaY4mqQVhNe8j7fZCEfw", "_blank" );
         }
       }
 
-      function showAlertbox( show ) {
-	// More see "http://html-color-codes.info/"
-        var l10n_alert_box_background_color = "#F5A9A9";
-        // Make the whole alert box clickable with a link.
-        var l10n_alert_box_href		    = "https://openoffice.apache.org/translate.html";
-	// Maximum 49 characters.
-        var l10n_alert_box_headline_text    = "We need your help to complete translation into Finnish!";
-	// Maximum 630 characters.
-        var l10n_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 Finnish 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.";
-
-        // Show alert box or not?
-        if( show ) {
-          // If no background color value was set then use the default value.
-          if( ! l10n_alert_box_background_color )
-            var l10n_alert_box_background_color = "#FFD9A7";
-
-          // Show alert box with defined background color.
-          // Depending if link is available, make the whole DIV clickable or not.
-          if( l10n_alert_box_href ) {
-            // Show the text with link and cursor as poiner.
-            document.write( "<div id='alert_box' style='background: " + l10n_alert_box_background_color
-            + "; ' onclick='window.open(\"" + l10n_alert_box_href + "\", \"_blank\"); return false;'>" );
-
-            // Show headline.
-            document.write( "<h2 style='cursor: pointer;'>" + l10n_alert_box_headline_text + "</h2>" );
-
-            // Show text.
-            if( l10n_alert_box_text_text )
-              document.write( "<p style='cursor: pointer;'>" + l10n_alert_box_text_text + "</p>" );
-
-          } else {
-            // Show the text without link and normal cursor.
-            document.write( "<div id='alert_box' style='background: " + l10n_alert_box_background_color + "'>" );
-
-            // Show headline.
-            document.write( "<h2 style='cursor: default;'>" + l10n_alert_box_headline_text + "</h2>" );
-
-            // Shoe text.
-            if( l10n_alert_box_text_text )
-              document.write( "<p style='cursor: default;'>" + l10n_alert_box_text_text + "</p>" );
-          }
+      function showAlertBox() {
+	// The text is defined in "/msg_prop_l10n.js".
 
-          document.write( "</div>" ); // Alert box
-        }
+	// Show alert box or not?
+	if( l10n.index_alert_box_show ) {
+		// If no background color value was set then use the default value.
+		if( ! l10n.index_alert_box_background_color || l10n.index_alert_box_background_color === "" )
+			l10n.index_alert_box_background_color = "#FFD9A7";
+
+		// Show alert box with defined background color.
+		// Depending if link is available, make the whole DIV clickable or not.
+		if( l10n.index_alert_box_href ) {
+			// Show the text with link and cursor as poiner.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color
+			+ "; ' onclick='window.open( \"" + l10n.index_alert_box_href
+			+ "\", \"_blank\" ); return false;'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: pointer;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: pointer;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		} else {
+			// Show the text without link and normal cursor.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color + "'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: default;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: default;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		}
+		document.write( "</div>" ); // Alert box
+	}
       }
-
     </script>
 
 <!--#include virtual="/google-analytics.js" --> 
@@ -110,7 +109,8 @@ screen reader.
   <script type="text/javascript">
   <!--
   // Show alert box.
-  showAlertbox( true );
+  // Change to 'true' if you want to show the text that is defined in the variables above.
+  showAlertBox();
   //-->
   </script>
 
@@ -129,43 +129,43 @@ screen reader.
     <li>
       <hr />
     </li>
+  </ul>
 
-    <!-- Show the download link with currently available version number, loaded via JavaScript -->
-    <script type="text/javascript">
-    <!--
-    document.write( "<li>"
-      + "<div class='action-download'>"
-        + "<div class='action-text action-link'>"
-			+ "<a href='./download/index.html'>"
-            + "<h2>I want to download Apache OpenOffice</h2>"
-            + "<p style='font-size: 1.0em; font-weight: bold;'>(Most recent release: " + DL.VERSION + ")</p>"
-            + "<p>Download Apache OpenOffice for free <b>(really!)</b> | "
-              + "<a href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
-                + "title='Blog post: With Apache OpenOffice you get what you do not pay for' target='_blank'>"
-                + "Click here to get more information"
-              + "</a>."
-            + "</p>"
-          + "</a>"
-        + "</div>"
+  <!-- Show the download link with currently available version number, loaded via JavaScript -->
+  <script type="text/javascript">
+  <!--
+  document.write( "<ul><li>"
+    + "<div class='action-download'>"
+      + "<div class='action-text action-link'>"
+        + "<a href='./download/index.html'>"
+          + "<h2>I want to download Apache OpenOffice</h2>"
+          + "<p style='font-size: 1.0em; font-weight: bold;'>(Most recent release: " + DL.VERSION + ")</p>"
+          + "<p>Download Apache OpenOffice for free <b>(really!)</b> | "
+            + "<a href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
+              + "title='Blog post: With Apache OpenOffice you get what you do not pay for' target='_blank'>"
+              + "Click here to get more information"
+            + "</a>."
+          + "</p>"
+        + "</a>"
       + "</div>"
-    + "</li>" );
-    //-->
-    </script>
+    + "</div>"
+  + "</li></ul>" );
+  //-->
+  </script>
 
-    <!-- Show the download link, without version number -->
-    <noscript>
-      <li>
-        <div class="action-download">
-          <div class="action-text action-link">
-			  <a href="./download/index.html">
-              <h2>I want to download Apache OpenOffice</h2>
-              <p>Download Apache OpenOffice for free, or find out about other ways of getting it.</p>
-            </a>
-          </div>
-        </div>
-      </li>
-    </noscript>
+  <!-- Show the download link, without version number -->
+  <noscript>
+    <div class="action-download">
+      <div class="action-text action-link">
+        <a href="./download/index.html">
+          <h2>I want to download Apache OpenOffice</h2>
+          <p>Download Apache OpenOffice for free, or find out about other ways of getting it.</p>
+        </a>
+      </div>
+    </div>
+  </noscript>
 
+  <ul>
     <li>
       <hr />
     </li>
@@ -211,20 +211,21 @@ screen reader.
             <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' );"
+		<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>
+                <a>YouTube</a>
+		</span>
               </p>
             </div>
         </div>
@@ -236,10 +237,10 @@ screen reader.
   </ul>
 
   <div id="SupportedAndSupporters">
-	<a href="https://validator.w3.org/check?uri=referer"
-	title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
-	<img src="https://www.w3.org/Icons/valid-xhtml10-blue.png"
-    alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+    <a href="https://validator.w3.org/check?uri=referer"
+    title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
+    <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>
 
@@ -294,7 +295,6 @@ screen reader.
       <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>
 
@@ -303,7 +303,7 @@ screen reader.
       <h2>Recent News</h2>
 
       <p style="text-align:right">
-	  <a href="/news/index.html">All News</a>
+        <a href="news/index.html">All News</a>
       </p>
       <p></p>
 
@@ -413,7 +413,7 @@ screen reader.
         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>
+	volunteers, be any good?<br /></strong><a href="/why/why_volunteers.html">Read on for an answer...</a>
       </p>
     </div>
 

Modified: websites/staging/ooo-site/trunk/content/fi/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/fi/topnav.html Wed Mar 29 22:53:07 2017
@@ -11,10 +11,11 @@
 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/index.html" title="Apache OpenOffice product description">Product</a></li>
-<li><a href="download/index.html" title="Download Apache OpenOffice">Download</a></li>
-<li><a href="/support/index.html" title="Find Support for Apache OpenOffice">Support</a></li>
-<li><a href="/extensions/index.html" title="Extensions and Templates for Apache OpenOffice">Extend</a></li>
-<li><a href="http://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
+<li><a href="/fi/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 eri kielillä">Kielet</a></li>
+<li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/robots.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/robots.txt (original)
+++ websites/staging/ooo-site/trunk/content/robots.txt Wed Mar 29 22:53:07 2017
@@ -24,6 +24,7 @@ Disallow: /servlets/
 Disallow: /support/test/
 Disallow: /test/
 Disallow: /download-NEXT2/
+Disallow: /de/Archiv/
 Disallow: /da-test/
 Disallow: /no-test/
 Disallow: /vi-test/