incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r816847 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/es/ content/es/descargar/ content/zh-cn/ content/zh-cn/faq/ content/zh-cn/news/ content/zh-cn/products/ content/zh/ content/zh/new/ content/zh/new/zh_cn/ content/zh/ne...
Date Wed, 09 May 2012 08:42:16 GMT
Author: buildbot
Date: Wed May  9 08:42:14 2012
New Revision: 816847

Log:
Staging update by buildbot for openofficeorg

Added:
    websites/staging/ooo-site/trunk/content/es/descargar/
    websites/staging/ooo-site/trunk/content/es/descargar/exceptions.css
    websites/staging/ooo-site/trunk/content/es/descargar/index.html
    websites/staging/ooo-site/trunk/content/zh/test.html.zh-cn
    websites/staging/ooo-site/trunk/content/zh/test.html.zh-tw
Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/es/topnav.html
    websites/staging/ooo-site/trunk/content/zh-cn/OOo3.1_New_Features_zh-CN.html
    websites/staging/ooo-site/trunk/content/zh-cn/about-features.html
    websites/staging/ooo-site/trunk/content/zh-cn/about-licenses.html
    websites/staging/ooo-site/trunk/content/zh-cn/about-odf.html
    websites/staging/ooo-site/trunk/content/zh-cn/about-ooo.html
    websites/staging/ooo-site/trunk/content/zh-cn/brand.html
    websites/staging/ooo-site/trunk/content/zh-cn/dev-ooo-zh.html
    websites/staging/ooo-site/trunk/content/zh-cn/dev-zh_tasks.html
    websites/staging/ooo-site/trunk/content/zh-cn/downloads-addons.html
    websites/staging/ooo-site/trunk/content/zh-cn/downloads-businesses.html
    websites/staging/ooo-site/trunk/content/zh-cn/downloads-cdrom.html
    websites/staging/ooo-site/trunk/content/zh-cn/downloads.html
    websites/staging/ooo-site/trunk/content/zh-cn/downloads_ago.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/apifaq.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/buildfaq.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/licensingFAQ.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/mFAQ.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/mostfaqs.html
    websites/staging/ooo-site/trunk/content/zh-cn/faq/xmlFAQ.html
    websites/staging/ooo-site/trunk/content/zh-cn/help-doc.html
    websites/staging/ooo-site/trunk/content/zh-cn/help-faq.html
    websites/staging/ooo-site/trunk/content/zh-cn/help-mailinglist.html
    websites/staging/ooo-site/trunk/content/zh-cn/index.html
    websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/base.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/calc.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/draw.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/impress.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/math.html
    websites/staging/ooo-site/trunk/content/zh-cn/products/writer.html
    websites/staging/ooo-site/trunk/content/zh/new/index.html
    websites/staging/ooo-site/trunk/content/zh/new/zh_cn/index.html
    websites/staging/ooo-site/trunk/content/zh/new/zh_tw/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May  9 08:42:14 2012
@@ -1 +1 @@
-1335905
+1335943

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May  9 08:42:14 2012
@@ -1 +1 @@
-1335905
+1335943

Added: websites/staging/ooo-site/trunk/content/es/descargar/exceptions.css
==============================================================================
--- websites/staging/ooo-site/trunk/content/es/descargar/exceptions.css (added)
+++ websites/staging/ooo-site/trunk/content/es/descargar/exceptions.css Wed May  9 08:42:14 2012
@@ -0,0 +1,94 @@
+img { border: 0px; }
+h1 { padding-left: 0.5em; }
+#hr { visibility:hidden; }
+
+#leftcol { display: none; }
+#bodytd { padding: 0px; width: 100%; margin: 0px; }
+#navcol { display: none; }
+.warning { border: solid 3px #F00; background: #FDD; padding: 1em; }
+
+.optionset { margin: 0 0 0 -2px; float: left; width: 67%; max-width: 1200px; }
+.optionset a { margin: 0; padding: .1em 0 .25em 3%; width: 97%; color: #333; }
+.optionset p { margin: 0; padding: .1em 0 .25em 3%; width: 97%; 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 { margin-top: 20px; }
+.optionset .button h2 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
+.optionset .button h2 a { display: block; padding: 25px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button h3 { margin: 0 0 0 -1px; padding: 0; cursor: pointer; border: none; }
+.optionset .button h3 a { display: block; padding: 5px 25% 0 3%; font-weight: bold; width: 72%; text-decoration: none; cursor: pointer; }
+.optionset .button p { padding: 0; font-size: .9em; padding-bottom: 25px; cursor: pointer; }
+.optionset .button p a { display: block; padding: .1em 25% .25em 3%; text-decoration: none; cursor: pointer; width: 72%; }
+.optionset .first { margin-top: 0; }
+.optionset p.promotional { margin-top: 25px; }
+
+.green { background: url(../../download/cachedimages/button-green.png) #D1EAA0 right top no-repeat; }
+.green:hover { background: url(../../download/cachedimages/button-green.png) #C3E480 right -200px no-repeat; }
+.green h2 a { color: #718D36; }
+.green:hover h2 a, #bodycol .green h2 a:hover { color: #546828; }
+.sub-green { background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; font-size: .8em; }
+.sub-green p { padding: .1em 3%; width: 94%; }
+
+.grey { background: #C0C0C0 right top no-repeat; cursor: default; }
+.grey:hover { background: #A0A0A0 right -200px no-repeat; cursor: default; }
+.grey h2 a { color: #404040; cursor: default; }
+.grey h3 { color: #404040; cursor: default; }
+.grey h3 a { color: #404040; cursor: default; }
+.grey p { color: #404040; cursor: default; }
+.grey p a { color: #404040; cursor: default; }
+.grey:hover h2 a, #bodycol .grey h2 a:hover { color: #202020; cursor: default; }
+.grey:hover h3 a, #bodycol .grey h3 a:hover { color: #202020; cursor: default; }
+.grey:hover p a, #bodycol .grey p a:hover { color: #202020; cursor: default; }
+.sub-grey { background: #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0; font-size: .8em; cursor: default; }
+.sub-grey p { padding: .1em 3%; width: 94%; cursor: default; }
+
+/* exchanged the normal picture with one that includes the extension repository graphic */
+.blue { background: url(../../download/cachedimages/button-blue-ext.png) #D8E5F6 right top no-repeat; }
+.blue:hover { background: url(../../download/cachedimages/button-blue-ext.png) #C3D9F1 right -200px no-repeat; }
+.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; font-size: .8em; }
+.sub-blue p { padding: .1em 3%; width: 94%; }
+
+.yellow { background: url(../../download/cachedimages/button-yellow.png) #FFF379 right top no-repeat; }
+.yellow:hover { background: url(../../download/cachedimages/button-yellow.png) #FFF24F right -200px no-repeat; }
+.yellow h2 a { color: #E09C09; }
+.yellow:hover h2 a, #bodycol .yellow h2 a:hover { color: #C80; }
+.sub-yellow { background: #FFFEAF; border-top: 1px solid #FBD34E; border-bottom: 1px solid #FBD34E; font-size: .8em; }
+.sub-yellow p { padding: .1em 3%; width: 94%; }
+
+.orange { background: url(../../download/cachedimages/button-orange.png) #FFD9A7 right 0 no-repeat; }
+.orange:hover { background: url(../../download/cachedimages/button-orange.png) #FFBE67 right -200px no-repeat; }
+.orange h2 a { color: #D36812; }
+.orange:hover h2 a, #bodycol .orange h2 a:hover { color: #C94800; }
+.sub-orange { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; font-size: .8em; }
+.sub-orange p { padding: .1em 3%; width: 94%; }
+
+.additionalinformation { background: none; float: right; width: 28%; clear: none; }
+.additionalinformation h2 { border-bottom: 1px solid #CCC; margin-bottom: 5px; margin-top: 0px; }
+.additionalinformation h3 { margin-left: 5px; margin-bottom: 5px; }
+.additionalinformation li { margin-left: 5px; font-size: 12px; }
+.additionalinformation a {color:#107EC0;text-decoration:underline;}
+.additionalinformation a:hover {background-color: #e6ebed;}
+
+.additionalinformation #nativelang { background-image: url(../../download/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; }
+#downloadextendedtext ul a { color: #333; text-decoration: none; background: none; }
+#downloadextendedtext ul a:hover { color: #666;text-decoration: none; }
+#downloadextendedtext ul li { float: left; margin: 0px; padding: 4px; margin-right: .5em; border: 1px #D7EFA4 solid; margin-bottom: .5em; width: 7em; height: 1.7em; }
+#downloadextendedtext ul li:hover { background: #D7EFA4; }
+#downloadextendedtext ul li ul { font-weight: normal; width: auto; margin: 0px; padding: 0px; font-size: .4em; color: #555; }
+#downloadextendedtext ul.nonqabuilds { font-size: 1.4em; }
+#downloadextendedtext ul.nonqabuilds li { width: auto; }
+#downloadextendedtext ul.nonqabuilds li ul { font-size: .5em; }
+
+/* .4em is a little bit too small for nonqa */
+/*Overrides some of the special settings for the parent li*/
+#downloadextendedtext ul li ul li { border: 0px none; margin: 0px; padding: 0px; width: auto; margin-right: .4em; }
+#downloadextendedtext ul li ul li:hover { background: none; }
+
+.largetable table tr.even td { background: #EEEEEE; }
+.largetable table tr.odd td  { background: none; }
+.builds   { background-position: left; background-repeat: no-repeat; padding: 2px 0 2px 18px; display: block; }

Added: websites/staging/ooo-site/trunk/content/es/descargar/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/es/descargar/index.html (added)
+++ websites/staging/ooo-site/trunk/content/es/descargar/index.html Wed May  9 08:42:14 2012
@@ -0,0 +1,366 @@
+<!--#include virtual="/doctype.html" -->
+<html>
+<head>
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>Apache OpenOffice - Descargas</title>
+  <script type="text/javascript" src="/download/globalvars_new_dl.js"></script>
+  <script type="text/javascript" src="/download/download_new_dl.js"></script>
+  <!--<script type="text/javascript" src="globalvars.js"></script> -->
+  <script type="text/javascript" src="/download/languages_new_dl.js"></script>
+  <!--  <script type="text/javascript" src="download.js"></script> -->
+  <!-- <script type="text/javascript" src="../download_bouncer.js"></script> -->
+  <script type="text/javascript" src="/download/download_new_mirrorbrain.js"></script>
+  <script type="text/javascript" src="/scripts/entourage.js"></script>
+  <style type="text/css">
+  /* <![CDATA[ */
+  /*-------------------- Exceptions on standard css -----------------------*/
+    @import url("../../download/styles.css");
+    @import url("exceptions.css");
+  /* ]]> */
+  </style>
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-30193653-1']);
+    _gaq.push(['_setDomainName', 'openoffice.org']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>	
+
+</head>
+<body>
+<!--#include virtual="/es/brand.html" -->
+  <div id="topbara">
+    <!--#include virtual="/es/topnav.html" -->
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/es/">es</a>&nbsp;&raquo;&nbsp;<a href="/es/descargar/">descargar</a></div>
+  </div>
+  <div id="clear"></div>
+  
+  
+  <div id="content">
+    
+    
+    
+
+<div class="optionset">
+
+<!-- Green: Stable release -->
+  <script type="text/javascript">  
+  <!--
+  LINK = getLink( VERSION, MIRROR, SCHEMA );
+  // normal processing to simply quoting issues -- keep original
+  var newLINK = "<a href=\"" + LINK + "\"" + " title = \"" + LINK + " \" >";
+     
+  //alert ("hasMirroLink: " + hasMirrorLink() );
+  if ( hasMirrorLink() ) {
+    document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+    + LINK + "');" + "return false;\">" );
+    document.write( "<h2>" + newLINK + "Descargar Apache OpenOffice " + VERSION + "</a></h2>"
+    + "<p>" + newLINK + "Haga clic para descargar la m&aacute;s reciente versi&oacute;n para "
+    + getPlatform(SCHEMA) + " y " + getLanguage() + "."
+    + "<br/></p>" );
+  } else {
+    <!-- dump SF extension if no mirror link -->
+    //alert("link before replacment: " + LINK);
+    var newLINK = LINK.replace(/\/download$/,"");
+    document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+    + newLINK + "');" + "return false;\">" );
+    //alert ("link after replacment: " + newLINK);
+    <!-- route everybody to somplace else ??? -->
+    document.write( "<h2><a href='" + newLINK + "' title='" + newLINK + "'>Descargar Apache OpenOffice</a></h2>"
+    + "<p><a href='" + newLINK + "' title='" + newLINK + "'>Obtenga Apache OpenOffice para " + getLanguage()
+    + ".</a></p>" );
+  }
+  
+  document.write( "</div>" );
+  document.write( "<div class=\"sub-green\">"
+    + "<p><a href='/download/other.html' title='Obtenga todas las plataformas, fuentes, idiomas, paquetes de idiomas disponibles para descargar'>"
+    + "<b>Todas las plataformas, fuentes, idiomas, paquetes de idiomas</b></a> | "
+    + "<a href='/development/releases/" + VERSION + ".html'"
+    + "title='&iquest;Qu&eacute; hay de nuevo, qu&eacute; ha sido mejorado en Apache OpenOffice " + VERSION + "?'>Notas de Lanzamiento</a> | "
+    + "<a href='/download/legacy/index.html' title='Obtenga la versi&oacute;n anterior OpenOffice.org 3.3.0'>Versiones Anteriores</a> | "
+    + "<a href='/download/checksums/3.4.0_checksums.html' title='Checksums para Apache OpenOffice " + VERSION + "'>Checksums</a></p>"
+  + "</div>" );
+  
+  entourage.initialize();
+  //-->
+  </script>
+
+<!-- Green: Stable release: No JavaScript enabled -->
+  <noscript>
+  <div class="button green" id="optionitem1" onclick="openItem('optionitem1','/download/other.html#tested-full'); return false;">
+    <h2><a href="/download/other.html" title="Seleccione otras plataformas e idiomas para descargar">
+    Descargue Apache OpenOffice</a></h2>
+    <p><a href="/download/other.html" title="Seleccione otras plataformas e idiomas para descargar">
+    Para sacar provecho de esta secci&oacute;n de descarga necesita habilitar JavaScript en el navegador. Parece que actualmente no est&aacute; habilitado. Haga clic en el siguiente texto para emplear una p&aacute;gina web alternativa en la cual podr&aacute; seleccionar su plataforma e idiomas favoritos.</a></p>
+  </div>
+  <div class="sub-green">
+    <p><a href="/download/other.html" title="Obtenga todas las plataformas, fuentes, idiomas, paquetes de idiomas disponibles para descargar">
+    <b>Todas las plataformas, fuentes, idiomas, paquetes de idiomas</b></a> |
+    <a href="/development/releases/index.html" title="&iquest;Qu&eacute; hay de nuevo, qu&eacute; ha sido mejorado en Apache OpenOffice?">
+    Notas del lanzamiento</a> |
+    <a href='/download/legacy/index.html' title='Obtenga la versi&oacute;n anterior OpenOffice.org 3.3.0'>Versiones Anteriores</a> |
+    <a href="/download/checksums/3.4.0_checksums.html" title="Checksums for Apache OpenOffice">Checksums</a></p>
+  </div>
+  </noscript>
+
+<!-- Blue: Extensions -->
+  <div class="button blue" id="optionitem3" onclick="openItem('optionitem3','http://extensions.services.openoffice.org');
+    return false;">
+    <h2><a href="http://extensions.openoffice.org"
+    title="Seleccione de un amplio rango de funcionalidad adicional">Obtenga Extensiones para Apache OpenOffice</a></h2>
+    <p><a href="http://extensions.openoffice.org"
+    title="Seleccione de un amplio rango de funcionalidad adicional">
+    Extienda la funcionalidad de su Apache OpenOffice con una larga y creciente biblioteca de extensiones, compartida con otros usuarios.</a></p>
+  </div>
+
+  <!-- Blue: Templates -->
+  <div class="button blue" id="optionitem3" onclick="openItem('optionitem3','http://templates.services.openoffice.org/es');
+    return false;">
+    <h2><a href="http://templates.services.openoffice.org/es"
+    title="Seleccione de un amplio rango de documentos adicionales">Obtenga Plantillas para Apache OpenOffice</a></h2>
+    <p><a href="http://templates.services.openoffice.org/es"
+    title="Seleccione de un amplio rango de documentos adicionales">
+    Ampl&iacute;e su creatividad con una larga y creciente biblioteca de plantillas, compartida con otros usuarios de Apache OpenOffice.</a></p>
+  </div>
+
+<!-- Yellow: Release Candidate online -->
+  <script type="text/javascript">
+  /*
+  <!--
+  if ( RC_ACTIVE == 1 ) {
+    document.write( "<div class=\"button yellow\" id=\"optionitem4\" onclick=\"openItem('optionitem4',"
+      + "'all_rc.html#untested-full');"
+      + "return false;\">"
+      + "<h2><a href='all_rc.html#untested-full' title='Seleccione otras plataformas e idiomas para descargar'>"
+      + "Get OpenOffice.org Release Candidates</a></h2>"
+      + "<p><a href='all_rc.html#untested-full' title='Seleccione otras plataformas e idiomas para descargar'>"
+      + "<b>Most recent: OOo " + RC_NAME + " " + RC_NUMBER + "</b></a></p>"
+    + "</div>" );
+    document.write( "<div class=\"sub-yellow\">"
+      + "<p><a href='all_rc.html' title='Get all platforms, languages, language packs to download'>"
+      + "Get all platforms, languages, language packs</a> | "
+      + "<a href='http://www.openoffice.org/development/releases/" + RC_BUILD + ".html'"
+      + "title='What is new, what has been improved in OpenOffice.org " + RC_NAME + RC_NUMBER + "?'>Release Notes</a> | "
+      + "<a href='next/md5sums/" + RC_BUILD + "_md5sums.txt' title='MD5 checksums for OpenOffice.org " + RC_NAME + RC_NUMBER
+      + "'>MD5 checksums</a></p>"
+    + "</div>" );
+  } else if ( RC_ACTIVE == 0 ) {
+  // Yellow: Release Candidate coming soon
+    document.write( "<div class=\"button yellow\" id=\"optionitem4\">"
+      + "<h2><a>Get OpenOffice.org Release Candidate <small>(" + RC_NAME + RC_NUMBER + " coming soon)</small></a></h2>"
+      + "<p><a>A wide range of platforms and languages will be available."
+      + "<br/><b>Important:</b> These builds are nearly ready but needs to be finally tested and are therefore not "
+      + "released.</a></p>"
+    + "</div>" );
+  }
+  //-->
+  */
+  </script>
+
+<!-- Yellow: Release Candidate: No JavaScript enabled -->
+  <!--
+  <noscript>
+  <div class="button yellow" id="optionitem4" onclick="openItem('optionitem4','all_rc.html#untested-full'); return false;">
+    <h2><a href="all_rc.html" title="Select from all platforms, languages, language packs to download">
+    Get OpenOffice.org Release Candidate</a></h2>
+    <p><a href="all_rc.html" title="Select from other platforms, languages, language packs to download">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-yellow">
+    <p><a href="all_rc.html" title="Get all platforms, languages, language packs to download">
+    Get all platforms, languages, language packs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html"
+    title="What is new, what has been improved in OpenOffice.org?">Release Notes</a> |
+    <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
+  </div>
+  </noscript>
+  //-->
+
+<!-- Yellow: Beta Release online -->
+  <script type="text/javascript">
+  /*
+  <!--
+  if ( BETA_ACTIVE == 1 ) {
+    document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','all_beta.html');"
+      + "return false;\">"
+      + "<h2><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
+      + "Get OpenOffice.org Beta Release</a></h2>"
+      + "<p><a href='all_beta.html' title='Select from all platforms, languages, language packs to download'\">"
+      + "<b>Most recent: OOo-Dev " + BETA_NAME + " " + BETA_NUMBER + "</b></a></p>"
+    + "</div>" );
+    document.write( "<div class=\"sub-yellow\">"
+      + "<p><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>"
+      + "Get all platforms, languages, language packs</a> | "
+      + "<a href='http://www.openoffice.org/development/releases/" + BETA_BUILD + ".html'"
+      + "title='What is new, what has been improved in OpenOffice.org " + BETA_NAME + BETA_NUMBER + "?'>Release Notes</a> | "
+      + "<a href='next/md5sums/index.html" + BETA_BUILD + "_md5sums.txt' title='MD5 checksums for OpenOffice.org "
+      + BETA_NAME + BETA_NUMBER + "'>MD5 checksums</a></p>"
+    + "</div>" );
+  } else if ( BETA_ACTIVE == 0 ) {
+  // Yellow: Beta Release coming soon
+    document.write( "<div class=\"button yellow\" id=\"optionitem2\">"
+      + "<h2><a>Get OpenOffice.org Beta Release <small>(" + BETA_NAME + BETA_NUMBER + " coming soon)</small></a></h2>"
+      + "<p><a>A wide range of platforms and languages will be available."
+      + "<br/><b>Important:</b> The Beta is feature complete but can contain issues and detailed tests needs to be done."
+      + "</a></p>"
+    + "</div>" );
+  }
+  //-->
+  */
+  </script>
+
+<!-- Yellow: Beta: No JavaScript enabled -->
+  <!--
+  <noscript>
+  <div class="button yellow" id="optionitem2" onclick="openItem('optionitem2','all_beta.html#untested-full'); return false;">
+    <h2><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
+    Get OpenOffice.org Beta Release</a></h2>
+    <p><a href="all_beta.html" title="Select from all platforms, languages, language packs to download">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-yellow">
+    <p><a href="all_beta.html" title="Get all platforms, languages, language packs to download">
+    Get all platforms, languages, language packs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html"
+    title="What is new, what has been improved in OpenOffice.org?">Release Notes</a> |
+    <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
+  </div>
+  </noscript>
+  //-->
+
+<!-- Red: Developer Snapshots online -->
+  <script type="text/javascript">
+  /*
+  <!--
+  document.write( "<div class=\"button orange\" id=\"optionitem5\" onclick=\"openItem('optionitem5','next/index.html');"
+    + "return false;\">"
+    + "<h2><a href='next/index.html' title='Select from the most recent OpenOffice.org Developer Snapshots'>"
+    + "Get OpenOffice.org Developer Snapshots</a></h2>" );
+    document.write( "<p><a href='next/index.html' title='Select from the most recent OpenOffice.org Developer "
+    + "Snapshots'><b>" );
+    if ( DEV1_VERSION != "" ) {
+      document.write( "Most recent: " + DEV1_VERSION + " (" + DEV1_BUILD + ") and " + DEV2_VERSION + " (" + DEV2_BUILD
+        + ")" );
+    } else {
+      document.write( "Most recent: " + DEV2_VERSION + " (" + DEV2_BUILD + ")" );
+    }
+    document.write( "</b></a></p>"
+  + "</div>" );
+  document.write( "<div class=\"sub-orange\">"
+    + "<p><a href='next/other.html' title='Get all platforms, languages, SDK builds, source tarballs to download'>"
+    + "Get all platforms, languages, SDK builds, source tarballs</a> | "
+    + "<a href='http://www.openoffice.org/development/releases/dev_index.html'"
+    + "title='What is new, what has been improved in OpenOffice.org?'>Release Notes</a> | "
+    + "<a href='next/md5sums/index.html' title='MD5 checksums for OpenOffice.org'>MD5 checksums</a></p>"
+  + "</div>" );
+  //-->
+  */
+  </script>
+
+<!-- Red: Developer Snapshots: No JavaScript enabled -->
+  <!--
+  <noscript>
+  <div class="button orange" id="optionitem5" onclick="openItem('optionitem5','next/index.html'); return false;">
+    <h2><a href="next/other.html" title="Select from the most recent OpenOffice.org Developer Snapshots">
+    Get OpenOffice.org Developer Snapshots</a></h2>
+    <p><a href="next/other.html" title="Select from the most recent OpenOffice.org Developer Snapshots">
+    JavaScript needs to be enabled to take full advantage of this download section. Currently it does not seem to be enabled.
+    Please click on this text to use the alternative webpage to select the favorite platform and language.</a></p>
+  </div>
+  <div class="sub-orange">
+    <p><a href="next/other.html" title="Get all platforms, languages, language packs, SDK builds, source tarballs to
+    download">
+    Get all platforms, languages, language packs, SDK builds, source tarballs</a> |
+    <a href="http://www.openoffice.org/development/releases/dev_index.html" title="What is new, what has been improved in
+    OpenOffice.org?">
+    Release Notes</a> | <a href="next/md5sums/index.html" title="MD5 checksums for OpenOffice.org">MD5 checksums</a></p>
+  </div>
+  </noscript>
+  //-->
+</div>
+
+<div class="additionalinformation">
+
+  <h2>Informaci&oacute;n Adicional</h2>
+  <ul>
+    <li><a href="/license.html" title="Licencia de Apache OpenOffice">Licencia</a></li>
+    <li><a href="/download/other.html#tested-sdk"
+    title="Para desarrolladores y usuarios avanzados: Obtenga el c&oacute;digo fuente para compilar Apache OpenOffice desde cero.">C&oacute;digo fuente</a>
+    <li><a href="http://wiki.services.openoffice.org/wiki/Documentation/Building_Guide"
+    title="Para desarrolladores y usuarios avanzados: Gu&iacute;a de C&oacute;mo compilar Apache OpenOffice desde cero.">Gu&iacute;a para compilar</a></li>
+    </li>
+  </ul>
+
+  <h3>Documentaci&oacute;n</h3>
+  <ul>
+    <li><a href="http://wiki.services.openoffice.org/wiki/Product_Release" title="&iquest;Para cu&aacute;ndo est&aacute;n planeados los pr&oacute;ximos lanzamientos?">
+    Fechas de lanzamiento</a></li>
+    <li><a href="/development/releases/index.html"
+    title="&iquest;Qu&eacute; hay de nuevo, qu&eacute; ha sido mejorado en Apache OpenOffice?">Notas del lanzamiento</a>
+    </li>
+    <li><a href="/download/checksums/3.4.0_checksums.html"
+    title="Varias checksums para Apache OpenOffice">Checksums para Apache OpenOffice</a></li>
+    <li><a href="/es/producto/index.html" title="Un tour por todas las aplicaciones de Apache OpenOffice">Informaci&oacute;n del producto</a></li>
+    <li><a href="/dev_docs/source/sys_reqs_30.html"
+    title="HDD: ~300MB libre - Memoria: &gt;128MB - Procesador: &gt;500MHz - SO: Win, Linux, Mac, Solaris, FreeBSD...">
+    Requisitos del sistema</a></li>
+    <li><a href="/download/common/instructions.html"
+    title="Instrucciones para instalar Apache OpenOffice en Windows, Linux y Mac OS">Gu&iacute;as de Instalaci&oacute;n</a> y 
+    <a href="/documentation/index.html" title="Manuales de usuario para el uso cotidianto">Manuales de Usuario</a></li>
+    <li><a href="/development/releases/eol.html"
+    title="Informaci&oacute;n sobre lanzamientos que han alcanzado el estado de &quot;End-Of-Life&quot;">Informaci&oacute;n sobre el "End-Of-Life"</a></li>
+    <li><a href="/es/soporte/index.html"
+    title="Si la inforamci&oacute;n mencionada arriba no responde sus dudas: soporte libre para Apache OpenOffice!">Soporte</a></li>
+    <li><a href="/download/common/java.html" title="Explica por qu&eacute; es conveniente usar Java y en qu&eacute; consiste">Java y Apache OpenOffice</a></li>
+    <li><a target="_blank" href="http://java.com/en/download/manual.jsp" title="Obtenga el m&aacute;s reciente Java Runtime Environment (JRE)">
+    Obtenga el m&aacute;s reciente Java (JRE)</a></li>
+  </ul>
+
+  <h3>Recursos Adicionales</h3>
+  <ul>
+    <li><a href="/lingucomponent/download_dictionary.html"
+    title="Agregue soporte de idiomas adicionales a su instalaci&oacute;n de Apache OpenOffice">Diccionarios</a></li>
+    <li><a href="http://templates.services.openoffice.org/es" title="Obtenga plantillas para Apache OpenOffice">Plantillas</a></li>
+    <li><a href="http://extensions.services.openoffice.org"
+    title="Seleccione un amplio rango de funcionalidades adicionales">Extensiones</a></li>
+    <li><a href="/download/sdk/index.html" title="Para desarrolladores: Software Development Kit">Software Development Kit (SDK)</a></li>
+    <!--
+    <li><a href="../distribution/cdrom/iso_download.html"
+    title="Download OpenOffice.org as ISO file and burn it yourself on CD-ROM">ISO images</a> and
+    <a href="../distribution/cdrom/index.html#cdrom"
+    title="If you cannot download OpenOffice.org, order a CD-ROM">Order CD-ROM</a>
+    <li><a href="../distribution/mirrors#mirrors" title="To get alternative download locations">
+    All Mirror Server</a><br/></li>
+    <li><a href="archive.html" title="Download legacy and archived releases">Archived legacy releases</a><br/></li>
+    -->
+  </ul>
+
+  <div id="SupportedAndSupporters">
+    <a href="http://validator.w3.org/check?uri=http://www.openoffice.org/download/index.html"
+    title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
+    <img src="http://www.w3.org/Icons/valid-xhtml10-blue.png"
+    alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"/></a>
+    &nbsp;&nbsp;&nbsp;
+    <a href="http://www.mirrorbrain.org" title="MirrorBrain - A download redirector and metalink generator">
+    <img src="http://mirrorbrain.org/static/images/powered-by-mirrorbrain-50x128-transparent.png"
+    alt="MirrorBrain - A download redirector and metalink generator"/></a>
+  </div>
+</div>
+
+
+  </div>
+
+<!--#include virtual="/footer.html" -->
+
+</body>
+</html>

Modified: websites/staging/ooo-site/trunk/content/es/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/es/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/es/topnav.html Wed May  9 08:42:14 2012
@@ -1,7 +1,7 @@
 <div id="topnava"><ul>
 <li><a href="/es/producto/index.html" title="Descripción de las aplicaciones de Apache OpenOffice">Producto</a></li>
 <li><a href="/download/index.html" title="Descargar Apache OpenOffice (OpenOffice.org)">Descargar</a></li>
-<li><a href="soporte/index.html" title="Encuentre ayuda sobre Apache OpenOffice">Soporte</a></li>
+<li><a href="/es/soporte/index.html" title="Encuentre ayuda sobre Apache OpenOffice">Soporte</a></li>
 <li><a href="http://extensions.openoffice.org" title="Extensiones para Apache OpenOffice">Extensiones</a></li>
 <li><a href="http://templates.openoffice.org/es" title="Plantillas para Apache OpenOffice">Plantillas</a></li>
 <li><a href="http://incubator.apache.org/openofficeorg/get-involved.html" title="Formas de participar en Apache OpenOffice">Participar</a></li>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/OOo3.1_New_Features_zh-CN.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/OOo3.1_New_Features_zh-CN.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/OOo3.1_New_Features_zh-CN.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
   
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/about-features.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/about-features.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/about-features.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/about-licenses.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/about-licenses.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/about-licenses.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/about-odf.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/about-odf.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/about-odf.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/about-ooo.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/about-ooo.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/about-ooo.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/brand.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/brand.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/brand.html Wed May  9 08:42:14 2012
@@ -18,4 +18,4 @@
     </div>
     <div id="bannercenter"><br/>(育成阶段) | 开放免费的文书处理软体</div>
   </div>
-  <div id="announce"><a href="/zh-tw/news/aoo34.html" title="阅读布告">Apache OpenOffice 3.4 正式发表</a></div>
+  <div id="announce"><a href="/zh-cn/news/aoo34.html" title="阅读布告">Apache OpenOffice 3.4 正式发表</a></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/dev-ooo-zh.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/dev-ooo-zh.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/dev-ooo-zh.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/dev-zh_tasks.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/dev-zh_tasks.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/dev-zh_tasks.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/downloads-addons.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/downloads-addons.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/downloads-addons.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/downloads-businesses.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/downloads-businesses.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/downloads-businesses.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/downloads-cdrom.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/downloads-cdrom.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/downloads-cdrom.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/downloads.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/downloads.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/downloads.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
   
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/downloads_ago.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/downloads_ago.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/downloads_ago.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/apifaq.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/apifaq.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/apifaq.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/buildfaq.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/buildfaq.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/buildfaq.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/licensingFAQ.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/licensingFAQ.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/licensingFAQ.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/mFAQ.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/mFAQ.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/mFAQ.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/mostfaqs.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/mostfaqs.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/mostfaqs.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/faq/xmlFAQ.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/faq/xmlFAQ.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/faq/xmlFAQ.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/faq/">faq</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/help-doc.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/help-doc.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/help-doc.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/help-faq.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/help-faq.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/help-faq.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/help-mailinglist.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/help-mailinglist.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/help-mailinglist.html Wed May  9 08:42:14 2012
@@ -11,9 +11,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/index.html Wed May  9 08:42:14 2012
@@ -28,9 +28,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/news/aoo34.html Wed May  9 08:42:14 2012
@@ -19,9 +19,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/news/">news</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/base.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/base.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/base.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/calc.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/calc.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/calc.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/draw.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/draw.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/draw.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/impress.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/impress.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/impress.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/math.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/math.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/math.html Wed May  9 08:42:14 2012
@@ -12,9 +12,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh-cn/products/writer.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh-cn/products/writer.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-cn/products/writer.html Wed May  9 08:42:14 2012
@@ -10,9 +10,9 @@
 
 </head>
 <body>
-<!--#include virtual="/brand.html" -->
+<!--#include virtual="/zh-cn/brand.html" -->
   <div id="topbara">
-    <!--#include virtual="/topnav.html" -->
+    <!--#include virtual="/zh-cn/topnav.html" -->
     <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/">zh-cn</a>&nbsp;&raquo;&nbsp;<a href="/zh-cn/products/">products</a></div>
   </div>
   <div id="clear"></div>

Modified: websites/staging/ooo-site/trunk/content/zh/new/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/new/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh/new/index.html Wed May  9 08:42:14 2012
@@ -47,7 +47,7 @@
           <p class="zh_logo">
             <img src="zh_openoffice_wel.png" alt="Apache OpenOffice 中文" width="435" height="180" />
             <br />
-       <a href="zh_tw/index.html" title="Traditional Chinese">歡迎光臨中文計劃</a>  <a href="zh_cn/" title="Simplified Chinese">欢迎光临中文计划</a>  </p>
+       <a href="/zh-tw/" title="Traditional Chinese">歡迎光臨中文計劃</a>  <a href="/zh-cn/" title="Simplified Chinese">欢迎光临中文计划</a>  </p>
           <p>
             <strong style="color: #00315a;">  Apache OpenOffice</strong> 中文計劃的創立目的是為了讓廣大的華人用戶能夠更方便地取得 Apache OpenOffice 相關訊息及資源。同時我們亦希望藉由 Apache OpenOffice 中文計畫的成立,能夠提升 Apache OpenOffice 的中文處理能力以及相容性,讓全球華人能夠更輕鬆愉快的使用功能強大的 Apache OpenOffice。        </p>
             

Modified: websites/staging/ooo-site/trunk/content/zh/new/zh_cn/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/new/zh_cn/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh/new/zh_cn/index.html Wed May  9 08:42:14 2012
@@ -4,6 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
+<meta http-equiv="Refresh" content="0;url=/zh-cn/"> 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>OpenOffice.org 中文网站</title>

Modified: websites/staging/ooo-site/trunk/content/zh/new/zh_tw/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/new/zh_tw/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh/new/zh_tw/index.html Wed May  9 08:42:14 2012
@@ -4,6 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
+<meta http-equiv="Refresh" content="0;url=/zh-tw/"> 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>Apache OpenOffice 中文網站</title>

Added: websites/staging/ooo-site/trunk/content/zh/test.html.zh-cn
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/test.html.zh-cn (added)
+++ websites/staging/ooo-site/trunk/content/zh/test.html.zh-cn Wed May  9 08:42:14 2012
@@ -0,0 +1 @@
+ç°¡

Added: websites/staging/ooo-site/trunk/content/zh/test.html.zh-tw
==============================================================================
--- websites/staging/ooo-site/trunk/content/zh/test.html.zh-tw (added)
+++ websites/staging/ooo-site/trunk/content/zh/test.html.zh-tw Wed May  9 08:42:14 2012
@@ -0,0 +1 @@
+æ­£



Mime
View raw message