Author: buildbot
Date: Wed Jun 11 22:11:31 2014
New Revision: 912287

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/de/downloads/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 11 22:11:31 2014
@@ -1 +1 @@
-1602036
+1602037

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 11 22:11:31 2014
@@ -1 +1 @@
-1602036
+1602037

Modified: websites/staging/ooo-site/trunk/content/de/downloads/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/de/downloads/index.html (original)
+++ websites/staging/ooo-site/trunk/content/de/downloads/index.html Wed Jun 11 
22:11:31 2014
@@ -68,7 +68,7 @@
   <!--
   // The text in the H1 tag is intentionally shown as "display: none" (do not 
display).
   // This is to please accessibility tools like a screen reader.
-  document.write( "<h1 style='display: none;'>" + l10n_download_headline + 
"</h1>" );
+  document.write( "<h1 style='display: none;'>" + l10n_download_headline_text 
+ "</h1>" );
   //-->
   </script>
 
@@ -85,28 +85,25 @@
   document.write( "<div class='first button green-sel' id='optionitem2'>"
     // Headline.
     + "<h2>"
-      + "<a title='" + l10n_download_green_box_headline_title + "'>" + 
l10n_download_green_box_headline_text
-      + "</a>"
+      + "<a title='" + l10n_download_green_box_headline_title + "'>"    + 
l10n_download_green_box_headline_text + "</a>"
     + "</h2>"
 
     // Select text.
     + "<p style='padding-bottom: 0px;'>"
-      + "<a title='" + l10n_download_green_box_subtext1_title + "'>" + 
l10n_download_green_box_subtext1_text
-      + "</a>"
-      + "<a title='" + l10n_download_green_box_subtext2_title + "'>" + "<b>" + 
l10n_download_green_box_subtext2_text + ":</b>"
-      + "</a>"
+      + "<a title='" + l10n_download_green_box_subtext1_title + "'>"    + 
l10n_download_green_box_subtext1_text + "</a>"
+      + "<a title='" + l10n_download_green_box_subtext2_title + "'><b>" + 
l10n_download_green_box_subtext2_text + ":</b></a>"
     + "</p>"
 
     // Select boxes.
     + "<form name='download'>"
-      + "<select class='sel-os' id='os' name='os' title='" + 
l10n_download_green_box_selectbox_os_title
-        + "' onchange='getLinkSel()'>"
+      + "<select class='sel-os' id='os' name='os' ' onchange='getLinkSel()'"
+        + "title='" + l10n_download_green_box_selectbox_os_title + "'>"
       + "</select>"
-      + "<select class='sel-lang' id='lang' name='lang' title='" + 
l10n_download_green_box_selectbox_lang_title
-        + "' onchange='getLinkSel()'>"
+      + "<select class='sel-lang' id='lang' name='lang' 
onchange='getLinkSel()'"
+        + "title='" + l10n_download_green_box_selectbox_lang_title + "' >"
       + "</select>"
-      + "<select class='sel-ver' id='ver' name='ver' title='" + 
l10n_download_green_box_selectbox_ver_title
-        + "' onchange='getLinkSel()'>"
+      + "<select class='sel-ver' id='ver' name='ver' onchange='getLinkSel()'"
+        + "title='" + l10n_download_green_box_selectbox_ver_title + "'>"
       + "</select>"
     + "</form>"
 
@@ -204,124 +201,6 @@
   </div>
   </noscript>
 
-  <!-- Yellow: Beta Release online -->
-  <script type="text/javascript">
-  <!--
-  if ( BETA_ACTIVE == 1 ) {
-    // Set a specific language ISO code to force to assemble a certain 
localized build as download URL
-    var NL_LANGUAGE = "";
-    // Get the download URL for Beta releases (>0 = beta mode)
-    var LINK        = getLink( 2 );
-    if ( hasMirrorLink() ) {
-      if ( SOURCEFORGE ) {
-        // If a Beta Release is available for download, then download from 
Sourceforge with displayed platform and language.
-        document.write( "<div class=\"button yellow\" id=\"optionitem2\" 
onclick=\"openItem('optionitem2','"
-          + LINK + "') return false;\">"
-          + "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | 
Milestone " + BETA_MILESTONE
-          + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | 
Released: " + BETA_REL_DATE + "'>"
-          + "Herunterladen von Apache OpenOffice " + BETA_NAME + "</a></h2>"
-          + "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | 
Milestone " + BETA_MILESTONE + " | "
-          + "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | 
Released: " + BETA_REL_DATE + "'>"
-          + "Hier klicken f&uuml;r (startet von Sourceforge.net):<br />"
-          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | 
~" + FILESIZE + " MByte | "
-          + "Released: " + BETA_REL_DATE + "<br />"
-          + "<br /><b>Die Beta-Version ist funktionsfertig, aber noch nicht 
vollst&auml;ndig getestet und kann Probleme "
-          + "beinhalten. Es wird dringend empfohlen sie nicht in einer 
Produktionsumgebung einzusetzen!</b></a></p>"
-        + "</div>" );
-      } else if ( OTHER ) {
-        // If download URL contains "other" (-> platform, OS or package 
manager was not recognized),
-        // then use "other.html" as download link.
-        document.write( "<div class=\"button yellow\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-          + LINK + "');" + "return false;\">"
-          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-          + "Herunterladen von Apache OpenOffice</a></h2>"
-          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice 
" + BETA_NAME + " f&uuml;r "
-          + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + 
LANG_ARRAY[ 1 ] + ")</b> ist nicht "
-          + "verf&uuml;gbar. Bitte den Text anklicken, um eine andere 
Plattform von der alternativen Download-Webseite "
-          + "auszuw&auml;hlen</a>.</p>"
-        + "</div>" );
-      } else if ( ARCHIVE ) {
-        // If download URL contains "archive" (-> platform/OS is no longer 
supported),
-        // then provide a download link to the previous version.
-        document.write( "<div class=\"button yellow\" id=\"optionitem1\" 
onclick=\"openItem('optionitem1','"
-          + LINK + "');" + "return false;\">"
-          + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-          + "Herunterladen von Apache OpenOffice</a></h2>"
-          + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice 
" + BETA_NAME + " f&uuml;r "
-          + "<b>" + UI_PLATFORM + "</b> und <b>" + LANG_ARRAY[ 2 ] + " (" + 
LANG_ARRAY[ 1 ] + ")</b> ist nicht "
-          + "verf&uuml;gbar. Hier klicken f&uuml;r die vorherige Version " + 
PRE_VERSION + "</a>.</p>"
-        + "</div>" );
-      }
-    } else {
-      // If browser language do not match with AOO languages, then use 
"all_beta.html" as download link.
-      // LINK = "http://www.openoffice.org/download/test/all_beta.html";;
-      document.write( "<div class=\"button yellow\" id=\"optionitem2\" 
onclick=\"openItem('optionitem2','"
-        + LINK + "') return false;\">"
-        + "<h2><a href='" + LINK + "' title='" + LINK + "'>"
-        + "Herunterladen von Apache OpenOffice " + BETA_NAME + "</a></h2>"
-        + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " 
+ BETA_NAME + " f&uuml;r "
-        + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> ist nicht 
verf&uuml;gbar. Bitte den Text anklicken, um "
-        + "von der lokalen " + LANG_ARRAY[ 1 ] + " Download-Webseite 
auszuw&auml;hlen</a>.</p>"
-      + "</div>" );
-    }
-    // Show some helpful links for SDK, source, checksums, release notes.
-    document.write( "<div class=\"sub-yellow\">" );
-    document.write( "<p>" );
-    if ( CHECKSUM_ASC ) {
-      document.write( "Signaturen und Hashwerte: "
-      + "<a href='" + CHECKSUM_KEYS   + "' + title='KEYS Signatur'>KEYS</a> , "
-      + "<a href='" + CHECKSUM_ASC    + "' + title='ASC Signatur'>ASC</a> , "
-      + "<a href='" + CHECKSUM_MD5    + "' + title='MD5 Hashwert'>MD5</a> , "
-      + "<a href='" + CHECKSUM_SHA256 + "' + title='SHA256 
Hashwert'>SHA256</a> , "
-      + "<a href='http://www.openoffice.org/download/checksums.html' "
-      + "title='Wie kann der Download mit Signaturen und Hashwerten 
überprüft werden?'>Download überprüfen?</a> | " );
-    }
-    document.write( "<a 
href='http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes+(Deutsch)'"
-      + "title='Was ist neu, was wurde verbessert in Apache OpenOffice " + 
BETA_NAME + "?'>Release Notes</a> | <br />"
-      + "<a href='http://www.openoffice.org/download/all_beta.html'"
-      + "title='Hier gibts alle Plattformen, Spachen, Sprachpakete zum 
Herunterladen'>"
-      + "<b>Alle Plattformen, Sprachen, Sprachpakete</b></a> | "
-      + "<a href='http://www.openoffice.org/download/all_beta.html#source'"
-      + "title='Hier gibts alle Quelldateien und das SDK zum Herunterladen'>"
-      + "Quelldateien und SDK</a> | <br />"
-      + "</div>" );
-  } else if ( BETA_ACTIVE == 0 ) {
-    // Yellow: Beta Release coming soon
-    var ANN_LINK  = "http://blogs.apache.org/OOo/";;
-    var ANN_TITLE = "Official blog of Apache OpenOffice";
-    document.write( "<div class=\"button yellow\" id=\"optionitem2_1\" 
onclick=\"openItem('optionitem2_1','"
-      + ANN_LINK + "') return false;\">"
-      + "<h2><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'>"
-      + "Get Apache OpenOffice " + BETA_NAME + "<br /><small>(planned for: " + 
BETA_REL_DATE + ")</small></a></h2>"
-      + "<p><a href='" + ANN_LINK + "' title='" + ANN_TITLE + "'><br />"
-      + "The Beta release is not yet available. Please make sure to come back 
on the release date to download and test the "
-      + "new version.</a></p>"
-    + "</div>" );
-  } else {
-    // Yellow: Beta Release, show nothing as it is not yet ready
-  }
-
-  //-->
-  </script>
-  <!-- Yellow: Beta: No JavaScript enabled -->
-<!--
-  <noscript>
-  <div class="button yellow" id="optionitem2" onclick="openItem('optionitem2',
-    'http://sourceforge.net/projects/openofficeorg.mirror/files/'); return 
false;">
-    <h2><a href="http://sourceforge.net/projects/openofficeorg.mirror/files/";
-    title="Select from all platforms, languages, language packs to download">
-    Herunterladen von Apache OpenOffice Beta</a></h2>
-    <p><a href="http://sourceforge.net/projects/openofficeorg.mirror/files/";
-    title="Select from all platforms, languages, language packs to 
download">JavaScript muss aktiviert sein, um Apache
-    OpenOffice herunterzuladen. Bitte den Text anklicken, um die 
gew&uuml;nschte Plattform und Sprache von der alternativen
-    Download-Webseite auszuw&auml;hlen</a>.</p>
-  </div>
-  <div class="sub-yellow">
-    <p><a href="http://www.openoffice.org/development/releases/index.html";
-    title="Was ist neu, was wurde verbessert in Apache OpenOffice?"><b>Release 
Notes</b></a></p>
-  </div>
-  </noscript>
--->
   <!-- Light Blue: Share download with social networks -->
   <script type="text/javascript">
   <!--


Reply via email to