incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r797837 [1/7] - in /websites/production/ooo-site: ./ content/es/scripts/ content/it/ content/it/informazioni/ content/zh/ content/zh/css/ content/zh/doc/ content/zh/faq/ content/zh/images/ content/zh/images/doc/ content/zh/new/ content/zh/n...
Date Tue, 01 Nov 2011 04:24:45 GMT
Author: wave
Date: Tue Nov  1 04:24:39 2011
New Revision: 797837

Log:
Import of full "zh" Chinese both Simplified and Traditional sites. More forum and wiki than most sites. Maillists page uses servlets which needs replacement.
Also some of Pedro's changes to the "it" Italian site will be published. These have to do with changing names to Apache OpenOffice.org.

Added:
    websites/production/ooo-site/content/zh/css/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/css/
    websites/production/ooo-site/content/zh/css/gen.css
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/css/gen.css
    websites/production/ooo-site/content/zh/css/menuStyle.css
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/css/menuStyle.css
    websites/production/ooo-site/content/zh/doc/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/doc/
    websites/production/ooo-site/content/zh/doc/ooodoc_01_01.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_01.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_01_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_01_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_02.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_02.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_02_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_02_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_03.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_03.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_03_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_03_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_04.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_04.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_04_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_04_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_05.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_05.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_05_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_05_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_06.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_06.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_06_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_06_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_07.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_07.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_07_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_07_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_08.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_08.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_08_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_08_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_09.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_09.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_09_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_09_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_10.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_10.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_10_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_10_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_11.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_11.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_11_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_11_gb.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_12.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_12.html
    websites/production/ooo-site/content/zh/doc/ooodoc_01_12_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/doc/ooodoc_01_12_gb.html
    websites/production/ooo-site/content/zh/faq/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/faq/
    websites/production/ooo-site/content/zh/faq/apifaq_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/apifaq_gb.html
    websites/production/ooo-site/content/zh/faq/buildfaq_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/buildfaq_gb.html
    websites/production/ooo-site/content/zh/faq/licensingFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/licensingFAQ.html
    websites/production/ooo-site/content/zh/faq/licensingFAQ_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/licensingFAQ_gb.html
    websites/production/ooo-site/content/zh/faq/mFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/mFAQ.html
    websites/production/ooo-site/content/zh/faq/mFAQ_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/mFAQ_gb.html
    websites/production/ooo-site/content/zh/faq/mostfaqs_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/mostfaqs_gb.html
    websites/production/ooo-site/content/zh/faq/xmlFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/xmlFAQ.html
    websites/production/ooo-site/content/zh/faq/xmlFAQ_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/faq/xmlFAQ_gb.html
    websites/production/ooo-site/content/zh/help_zh.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/help_zh.html
    websites/production/ooo-site/content/zh/help_zh_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/help_zh_gb.html
    websites/production/ooo-site/content/zh/images/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/images/
    websites/production/ooo-site/content/zh/images/doc/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/
    websites/production/ooo-site/content/zh/images/doc/info.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/info.gif
    websites/production/ooo-site/content/zh/images/doc/note.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/note.gif
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_03.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_03.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_04.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_04.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_05.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_05.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_06.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_06.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_07.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_07.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0105_08.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0105_08.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0107_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0107_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0107_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0107_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0107_03.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0107_03.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0107_04.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0107_04.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0108_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0108_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0109_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0109_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0109_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0109_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0110_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0110_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0110_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0110_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_03.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_03.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_04.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_04.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_05.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_05.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_06.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_06.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0111_07.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0111_07.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_01.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_01.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_02.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_02.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_03.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_03.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_04.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_04.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_05.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_05.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_06.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_06.png
    websites/production/ooo-site/content/zh/images/doc/ooo_0112_07.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/ooo_0112_07.png
    websites/production/ooo-site/content/zh/images/doc/skill.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/skill.gif
    websites/production/ooo-site/content/zh/images/doc/warning.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/doc/warning.gif
    websites/production/ooo-site/content/zh/images/linuxicon.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/linuxicon.gif
    websites/production/ooo-site/content/zh/images/macosxicon.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/macosxicon.gif
    websites/production/ooo-site/content/zh/images/ooo.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooo.png
    websites/production/ooo-site/content/zh/images/ooobase.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooobase.gif
    websites/production/ooo-site/content/zh/images/ooocalc.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooocalc.gif
    websites/production/ooo-site/content/zh/images/ooodraw.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooodraw.gif
    websites/production/ooo-site/content/zh/images/oooimpress.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/oooimpress.gif
    websites/production/ooo-site/content/zh/images/ooomath.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooomath.gif
    websites/production/ooo-site/content/zh/images/ooowriter.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/ooowriter.gif
    websites/production/ooo-site/content/zh/images/werk_in_uitvoering.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/werk_in_uitvoering.png
    websites/production/ooo-site/content/zh/images/winicon.gif
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/winicon.gif
    websites/production/ooo-site/content/zh/images/zh-ooo.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/images/zh-ooo.png
    websites/production/ooo-site/content/zh/index.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/index.html
    websites/production/ooo-site/content/zh/index_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/index_gb.html
    websites/production/ooo-site/content/zh/mailinglist.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/mailinglist.html
    websites/production/ooo-site/content/zh/mailinglist_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/mailinglist_gb.html
    websites/production/ooo-site/content/zh/md5sums.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/md5sums.html
    websites/production/ooo-site/content/zh/md5sums_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/md5sums_s.html
    websites/production/ooo-site/content/zh/new/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/
    websites/production/ooo-site/content/zh/new/css/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/css/
    websites/production/ooo-site/content/zh/new/css/gen.css
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/css/gen.css
    websites/production/ooo-site/content/zh/new/css/menuStyle.css
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/css/menuStyle.css
    websites/production/ooo-site/content/zh/new/ico/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/
    websites/production/ooo-site/content/zh/new/ico/Base-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Base-32c.png
    websites/production/ooo-site/content/zh/new/ico/Calc-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Calc-32c.png
    websites/production/ooo-site/content/zh/new/ico/Draw-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Draw-32c.png
    websites/production/ooo-site/content/zh/new/ico/Impress-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Impress-32c.png
    websites/production/ooo-site/content/zh/new/ico/Math-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Math-32c.png
    websites/production/ooo-site/content/zh/new/ico/Writer-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/ico/Writer-32c.png
    websites/production/ooo-site/content/zh/new/index.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/index.html
    websites/production/ooo-site/content/zh/new/pic/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/
    websites/production/ooo-site/content/zh/new/pic/Base-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Base-32c.png
    websites/production/ooo-site/content/zh/new/pic/Calc-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Calc-32c.png
    websites/production/ooo-site/content/zh/new/pic/Draw-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Draw-32c.png
    websites/production/ooo-site/content/zh/new/pic/Impress-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Impress-32c.png
    websites/production/ooo-site/content/zh/new/pic/Math-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Math-32c.png
    websites/production/ooo-site/content/zh/new/pic/Thumbs.db
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Thumbs.db
    websites/production/ooo-site/content/zh/new/pic/Writer-32c.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/pic/Writer-32c.png
    websites/production/ooo-site/content/zh/new/zh_cn/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/
    websites/production/ooo-site/content/zh/new/zh_cn/OOo3.1_New_Features_zh-CN.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/OOo3.1_New_Features_zh-CN.html
    websites/production/ooo-site/content/zh/new/zh_cn/about-features.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/about-features.html
    websites/production/ooo-site/content/zh/new/zh_cn/about-licenses.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/about-licenses.html
    websites/production/ooo-site/content/zh/new/zh_cn/about-odf.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/about-odf.html
    websites/production/ooo-site/content/zh/new/zh_cn/about-ooo.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/about-ooo.html
    websites/production/ooo-site/content/zh/new/zh_cn/dev-ooo-zh.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/dev-ooo-zh.html
    websites/production/ooo-site/content/zh/new/zh_cn/dev-zh_tasks.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/dev-zh_tasks.html
    websites/production/ooo-site/content/zh/new/zh_cn/downloads-addons.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/downloads-addons.html
    websites/production/ooo-site/content/zh/new/zh_cn/downloads-businesses.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/downloads-businesses.html
    websites/production/ooo-site/content/zh/new/zh_cn/downloads-cdrom.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/downloads-cdrom.html
    websites/production/ooo-site/content/zh/new/zh_cn/downloads.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/downloads.html
    websites/production/ooo-site/content/zh/new/zh_cn/downloads_ago.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/downloads_ago.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/
    websites/production/ooo-site/content/zh/new/zh_cn/faq/apifaq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/apifaq.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/buildfaq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/buildfaq.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/licensingFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/licensingFAQ.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/mFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/mFAQ.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/mostfaqs.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/mostfaqs.html
    websites/production/ooo-site/content/zh/new/zh_cn/faq/xmlFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/faq/xmlFAQ.html
    websites/production/ooo-site/content/zh/new/zh_cn/help-doc.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/help-doc.html
    websites/production/ooo-site/content/zh/new/zh_cn/help-faq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/help-faq.html
    websites/production/ooo-site/content/zh/new/zh_cn/help-mailinglist.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/help-mailinglist.html
    websites/production/ooo-site/content/zh/new/zh_cn/index.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/index.html
    websites/production/ooo-site/content/zh/new/zh_cn/nav.js
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/nav.js
    websites/production/ooo-site/content/zh/new/zh_cn/products/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/
    websites/production/ooo-site/content/zh/new/zh_cn/products/base.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/base.html
    websites/production/ooo-site/content/zh/new/zh_cn/products/calc.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/calc.html
    websites/production/ooo-site/content/zh/new/zh_cn/products/draw.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/draw.html
    websites/production/ooo-site/content/zh/new/zh_cn/products/impress.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/impress.html
    websites/production/ooo-site/content/zh/new/zh_cn/products/math.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/math.html
    websites/production/ooo-site/content/zh/new/zh_cn/products/writer.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_cn/products/writer.html
    websites/production/ooo-site/content/zh/new/zh_ooo_logo_nav.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_ooo_logo_nav.png
    websites/production/ooo-site/content/zh/new/zh_ooo_logo_v2.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_ooo_logo_v2.png
    websites/production/ooo-site/content/zh/new/zh_openoffice_wel.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_openoffice_wel.png
    websites/production/ooo-site/content/zh/new/zh_tw/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/
    websites/production/ooo-site/content/zh/new/zh_tw/OOo3.1_New_Features_zh-TW.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/OOo3.1_New_Features_zh-TW.html
    websites/production/ooo-site/content/zh/new/zh_tw/about-features.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/about-features.html
    websites/production/ooo-site/content/zh/new/zh_tw/about-licenses.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/about-licenses.html
    websites/production/ooo-site/content/zh/new/zh_tw/about-odf.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/about-odf.html
    websites/production/ooo-site/content/zh/new/zh_tw/about-ooo.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/about-ooo.html
    websites/production/ooo-site/content/zh/new/zh_tw/dev-ooo-zh.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/dev-ooo-zh.html
    websites/production/ooo-site/content/zh/new/zh_tw/dev-zh_tasks.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/dev-zh_tasks.html
    websites/production/ooo-site/content/zh/new/zh_tw/downloads-addons.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/downloads-addons.html
    websites/production/ooo-site/content/zh/new/zh_tw/downloads-businesses.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/downloads-businesses.html
    websites/production/ooo-site/content/zh/new/zh_tw/downloads-cdrom.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/downloads-cdrom.html
    websites/production/ooo-site/content/zh/new/zh_tw/downloads.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/downloads.html
    websites/production/ooo-site/content/zh/new/zh_tw/downloads_ago.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/downloads_ago.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/
    websites/production/ooo-site/content/zh/new/zh_tw/faq/apifaq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/apifaq.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/buildfaq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/buildfaq.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/licensingFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/licensingFAQ.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/mFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/mFAQ.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/mostfaqs.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/mostfaqs.html
    websites/production/ooo-site/content/zh/new/zh_tw/faq/xmlFAQ.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/faq/xmlFAQ.html
    websites/production/ooo-site/content/zh/new/zh_tw/help-doc.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/help-doc.html
    websites/production/ooo-site/content/zh/new/zh_tw/help-faq.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/help-faq.html
    websites/production/ooo-site/content/zh/new/zh_tw/help-mailinglist.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/help-mailinglist.html
    websites/production/ooo-site/content/zh/new/zh_tw/index.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/index.html
    websites/production/ooo-site/content/zh/new/zh_tw/nav.js
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/nav.js
    websites/production/ooo-site/content/zh/new/zh_tw/products/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/
    websites/production/ooo-site/content/zh/new/zh_tw/products/base.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/base.html
    websites/production/ooo-site/content/zh/new/zh_tw/products/calc.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/calc.html
    websites/production/ooo-site/content/zh/new/zh_tw/products/draw.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/draw.html
    websites/production/ooo-site/content/zh/new/zh_tw/products/impress.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/impress.html
    websites/production/ooo-site/content/zh/new/zh_tw/products/math.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/math.html
    websites/production/ooo-site/content/zh/new/zh_tw/products/writer.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zh_tw/products/writer.html
    websites/production/ooo-site/content/zh/new/zhongwenjihua.png
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/new/zhongwenjihua.png
    websites/production/ooo-site/content/zh/products/
      - copied from r797836, websites/staging/ooo-site/trunk/content/zh/products/
    websites/production/ooo-site/content/zh/products/base_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/base_s.html
    websites/production/ooo-site/content/zh/products/base_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/base_t.html
    websites/production/ooo-site/content/zh/products/calc_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/calc_s.html
    websites/production/ooo-site/content/zh/products/calc_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/calc_t.html
    websites/production/ooo-site/content/zh/products/draw_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/draw_s.html
    websites/production/ooo-site/content/zh/products/draw_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/draw_t.html
    websites/production/ooo-site/content/zh/products/impress_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/impress_s.html
    websites/production/ooo-site/content/zh/products/impress_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/impress_t.html
    websites/production/ooo-site/content/zh/products/math_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/math_s.html
    websites/production/ooo-site/content/zh/products/math_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/math_t.html
    websites/production/ooo-site/content/zh/products/writer_s.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/writer_s.html
    websites/production/ooo-site/content/zh/products/writer_t.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/products/writer_t.html
    websites/production/ooo-site/content/zh/project_tools.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/project_tools.html
    websites/production/ooo-site/content/zh/zh_licenses.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_licenses.html
    websites/production/ooo-site/content/zh/zh_licenses_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_licenses_gb.html
    websites/production/ooo-site/content/zh/zh_members.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_members.html
    websites/production/ooo-site/content/zh/zh_members_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_members_gb.html
    websites/production/ooo-site/content/zh/zh_tasks.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_tasks.html
    websites/production/ooo-site/content/zh/zh_tasks_gb.html
      - copied unchanged from r797836, websites/staging/ooo-site/trunk/content/zh/zh_tasks_gb.html
Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/es/scripts/estructura.css
    websites/production/ooo-site/content/it/index.html
    websites/production/ooo-site/content/it/informazioni/index.html
    websites/production/ooo-site/content/zh/about-businesses.html
    websites/production/ooo-site/content/zh/about-businesses_gb.html
    websites/production/ooo-site/content/zh/about-cdrom.html
    websites/production/ooo-site/content/zh/about-cdrom_gb.html
    websites/production/ooo-site/content/zh/about-ooo.html
    websites/production/ooo-site/content/zh/about-ooo_gb.html
    websites/production/ooo-site/content/zh/about-product.html
    websites/production/ooo-site/content/zh/about-product_gb.html
    websites/production/ooo-site/content/zh/about_zhProject.html
    websites/production/ooo-site/content/zh/about_zhProject_gb.html
    websites/production/ooo-site/content/zh/addons.html
    websites/production/ooo-site/content/zh/addons_gb.html
    websites/production/ooo-site/content/zh/doc_gb.html
    websites/production/ooo-site/content/zh/faq.html
    websites/production/ooo-site/content/zh/faq_gb.html
    websites/production/ooo-site/content/zh/features.html
    websites/production/ooo-site/content/zh/features_gb.html
    websites/production/ooo-site/content/zh/help_ooo.html
    websites/production/ooo-site/content/zh/help_ooo_gb.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 04:24:39 2011
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-797822
+/websites/staging/ooo-site/trunk:797592-797836

Modified: websites/production/ooo-site/content/es/scripts/estructura.css
==============================================================================
--- websites/production/ooo-site/content/es/scripts/estructura.css (original)
+++ websites/production/ooo-site/content/es/scripts/estructura.css Tue Nov  1 04:24:39 2011
@@ -186,16 +186,16 @@ dt {
 	font-weight: bolder;
 	line-height: 1.3em;
 	padding-bottom: 0px;
-	margin-bottom: 0px;
+	margin-bottom: 12px;
 }
 
 dd {
 	line-height: 1.3em;
 	font-size: 12px;
 	padding-bottom: 0px;
-	margin-bottom: 0px;
+	margin-bottom: 12px;
 	padding-top:0px;
-	margin-top: 0px;
+	margin-top: 5px;
 }
 
 /* --- Pie de pagina --- */

Modified: websites/production/ooo-site/content/it/index.html
==============================================================================
--- websites/production/ooo-site/content/it/index.html (original)
+++ websites/production/ooo-site/content/it/index.html Tue Nov  1 04:24:39 2011
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
-  <title>OpenOffice.org in Italiano - Sito ufficiale</title>
+  <title>Apache OpenOffice.org in Italiano - Sito ufficiale</title>
 
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -21,7 +21,7 @@
   </style>
   <link rel="stylesheet" type="text/css" href="http://www.openoffice.org/branding/css/print.css" media="print" />
   <meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
-  <meta name="description" content="OpenOffice.org: The Open Office Suite" />
+  <meta name="description" content="Apache OpenOffice.org: The Open Office Suite" />
   <style type="text/css" media="screen, projection">
 /*<![CDATA[*/
 <!--
@@ -67,10 +67,10 @@ utenti
 
 info generali</span></a> </li>
 
-  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare ai progetti OpenOffice.org"><span>collaborare</span></a>
+  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare ai progetti Apache OpenOffice.org"><span>collaborare</span></a>
   </li>
 
-  <li> <a href="doc/index.html" class="button" id="buttonnew" title="Documentazione su OpenOffice.org"><span>documentazione</span></a>
+  <li> <a href="doc/index.html" class="button" id="buttonnew" title="Documentazione su Apache OpenOffice.org"><span>documentazione</span></a>
   </li>
 
   <li> <a href="supporto/index.html" class="button" id="buttonnativelang" title="Dove trovare supporto gratuito e professionale per OpenOffice.org "><span>supporto</span></a></li>
@@ -102,9 +102,9 @@ info generali</span></a> </li>
 
 </div>
 
-<h1> Benvenuti in OpenOffice.org </h1>
+<h1> Benvenuti in Apache OpenOffice.org </h1>
 
-<p> OpenOffice.org &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
+<p> Apache OpenOffice.org &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
 per ufficio completa, rilasciata con una licenza libera e Open Source
 che ne
 consente la distribuzione gratuita. Legge e scrive file nei formati
@@ -115,9 +115,8 @@ accessibilit&agrave; dei dati, nel forma
 ISO.
 Consente inoltre l'esportazione in formato PDF.<br />
 
-OpenOffice.org &egrave; liberamente, gratuitamente e legalmente
-utilizzabile in
-ogni
+Apache OpenOffice.org &egrave; liberamente, gratuitamente e legalmente
+utilizzabile in ogni
 contesto: pubblico, privato, professionale e aziendale.<br />
 
 Per aiutare la comunit&agrave; a crescere, <a href="contribuire/">unisciti

Modified: websites/production/ooo-site/content/it/informazioni/index.html
==============================================================================
--- websites/production/ooo-site/content/it/informazioni/index.html (original)
+++ websites/production/ooo-site/content/it/informazioni/index.html Tue Nov  1 04:24:39 2011
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
     
-  <title>OpenOffice.org in Italiano</title>
+  <title>Apache OpenOffice.org in Italiano</title>
 
   
   

Modified: websites/production/ooo-site/content/zh/about-businesses.html
==============================================================================
--- websites/production/ooo-site/content/zh/about-businesses.html (original)
+++ websites/production/ooo-site/content/zh/about-businesses.html Tue Nov  1 04:24:39 2011
@@ -4,8 +4,8 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
-		<title>OpenOffice.org 中文網站</title>
-	
+    <title>OpenOffice.org 中文網站</title>
+  
 <meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 
 
@@ -26,144 +26,144 @@
     
     
 
-		<link rel="stylesheet" type="text/css" href="css/menuStyle.css" />
-		<link rel="stylesheet" type="text/css" href="css/gen.css" />
+    <link rel="stylesheet" type="text/css" href="css/menuStyle.css" />
+    <link rel="stylesheet" type="text/css" href="css/gen.css" />
+
+    <table id="zh_top" class="zhCore">
+
+      <tr>
+        <td class="zhContent">
 
-		<table id="zh_top" class="zhCore">
 
-			<tr>
-				<td class="zhContent">
+          <h1>商業辦公室軟體</h1>
+
+          <p>以下列出的是以 OpenOffice.org 源碼為基礎的商業辦公室軟體資料。軟體的簡介都是由其廠商提供,並不代表我們的立場。我們把這些廠商列出的目的是為了方便想要「商業軟體保障」的人或團體,而不是為廠商們賣廣告。
+
+          <p>
+            若您是以 OpenOffice.org 源碼為基礎的商業辦公室軟體的廠商,可以<a href="mailto:pplwong@openoffice.org">與我們聯絡</a>。我們會將您們的網址加在網站上。請在來信中順便提供一小段關於貴商業辦公室軟體的簡介給我們。
+          </p>
+
+          <table class="zh_withInnerBorder">
+            <tr>
+              <th style="width:150px">產品</th>
+              <th>簡介</th>
+            </tr>
+
+
+            <tr>
+              <td class="productName"><a href="http://www.sun.com/StarSuite/" target="_new">昇陽 StarSuite</a></td>
+              <td>
+                <p>
+                  StarSuite 是一種全功能、跨越多平台辦公室套裝軟體,包括文字處理、試算表、簡報、繪圖、網路出版、圖表、方程式編輯、以及資料庫應用,足以取代企業與個人目前使用的單一辦公室套裝軟體。欲近一部取得 StarSuite 6.0 使用者測試版的詳細資訊,請造訪 <a href="http://www.sun.com/StarSuite/" target="_new">http://www.sun.com/StarSuite/</a>。
+                </p>
+              </td>
+            </tr>
+          </table>
+        <p>&nbsp;</p>
+        <p>&nbsp;</p>
+
+        </td>
+
+        <td class="zhMenu">
+
+        <!-- zh Menu Start -->
+
+          <table class="zh_menu" >
+
+            <tr>
+              <th>OpenOffice.org</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="http://www.openoffice.org/">英文總站首頁</a><br />
+                <a href="index.html">正體中文版首頁</a><br />
+                <a href="index_gb.html">簡體中文版首頁</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>關於我們</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="about-ooo.html">關於 OpenOffice.org</a><br />
+                <a href="about_zhProject.html">關於中文計劃</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>產品</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="about-product.html">簡介</a><br />
+                <a href="features.html">重要功能</a><br />
+                 <a href="downloads.html">下載</a><br />
+                <a href="addons.html">功能強化套件</a><br />
+                 <a href="about-cdrom.html">光碟</a><br />
+                 <a href="about-businesses.html">商品化版本</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>支援</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="doc.html">說明文件</a><br />
+                <a href="mailinglist.html">通信論壇</a><br />
+                <a href="faq.html">常見問題</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>參與計劃</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="help_ooo.html">參與開發</a><br />
+                <a href="help_zh.html">參與中文計劃</a><br />
+                <a href="zh_tasks.html">中文計劃工作一覽表</a><br />
+                <a href="http://www.openoffice.org/project_issues.html" target="_new">報告錯誤(英)</a><a href="mailinglist.html">(中)</a><br />
+              </td>
+            </tr>
+
+            <tr>
+              <th>其他</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="zh_members.html">中文計劃成員</a><br />
+                <a href="zh_licenses.html">授權聲明</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>聯絡我們</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="mailto:webmasters@openoffice.org">聯絡 OpenOffice.org</a><br />
+                <a href="mailto:pplwong@openoffice.org">聯絡中文計劃</a>
+              </td>
+            </tr>
 
+          </table>
 
-					<h1>商業辦公室軟體</h1>
-
-					<p>以下列出的是以 OpenOffice.org 源碼為基礎的商業辦公室軟體資料。軟體的簡介都是由其廠商提供,並不代表我們的立場。我們把這些廠商列出的目的是為了方便想要「商業軟體保障」的人或團體,而不是為廠商們賣廣告。
-
-					<p>
-						若您是以 OpenOffice.org 源碼為基礎的商業辦公室軟體的廠商,可以<a href="mailto:pplwong@openoffice.org">與我們聯絡</a>。我們會將您們的網址加在網站上。請在來信中順便提供一小段關於貴商業辦公室軟體的簡介給我們。
-					</p>
-
-					<table class="zh_withInnerBorder">
-						<tr>
-							<th style="width:150px">產品</th>
-							<th>簡介</th>
-						</tr>
-
-
-						<tr>
-							<td class="productName"><a href="http://www.sun.com/StarSuite/" target="_new">昇陽 StarSuite</a></td>
-							<td>
-								<p>
-									StarSuite 是一種全功能、跨越多平台辦公室套裝軟體,包括文字處理、試算表、簡報、繪圖、網路出版、圖表、方程式編輯、以及資料庫應用,足以取代企業與個人目前使用的單一辦公室套裝軟體。欲近一部取得 StarSuite 6.0 使用者測試版的詳細資訊,請造訪 <a href="http://www.sun.com/StarSuite/" target="_new">http://www.sun.com/StarSuite/</a>。
-								</p>
-							</td>
-						</tr>
-					</table>
-				<p>&nbsp;</p>
-				<p>&nbsp;</p>
-
-				</td>
-
-				<td class="zhMenu">
-
-				<!-- zh Menu Start -->
-
-					<table class="zh_menu" >
-
-						<tr>
-							<th>OpenOffice.org</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="http://www.openoffice.org/">英文總站首頁</a><br />
-								<a href="index.html">正體中文版首頁</a><br />
-								<a href="index_gb.html">簡體中文版首頁</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>關於我們</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="about-ooo.html">關於 OpenOffice.org</a><br />
-								<a href="about_zhProject.html">關於中文計劃</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>產品</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="about-product.html">簡介</a><br />
-								<a href="features.html">重要功能</a><br />
-						 		<a href="downloads.html">下載</a><br />
-								<a href="addons.html">功能強化套件</a><br />
-						 		<a href="about-cdrom.html">光碟</a><br />
-						 		<a href="about-businesses.html">商品化版本</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>支援</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="doc.html">說明文件</a><br />
-								<a href="mailinglist.html">通信論壇</a><br />
-								<a href="faq.html">常見問題</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>參與計劃</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="help_ooo.html">參與開發</a><br />
-								<a href="help_zh.html">參與中文計劃</a><br />
-								<a href="zh_tasks.html">中文計劃工作一覽表</a><br />
-								<a href="http://www.openoffice.org/project_issues.html" target="_new">報告錯誤(英)</a><a href="mailinglist.html">(中)</a><br />
-							</td>
-						</tr>
-
-						<tr>
-							<th>其他</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="zh_members.html">中文計劃成員</a><br />
-								<a href="zh_licenses.html">授權聲明</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>聯絡我們</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="mailto:webmasters@openoffice.org">聯絡 OpenOffice.org</a><br />
-								<a href="mailto:pplwong@openoffice.org">聯絡中文計劃</a>
-							</td>
-						</tr>
-
-					</table>
-
-				<!-- zh Menu End -->
-
-				</td>
-
-			</tr>
-		</table>
-	
+        <!-- zh Menu End -->
+
+        </td>
+
+      </tr>
+    </table>
+  
 
   </div>
 

Modified: websites/production/ooo-site/content/zh/about-businesses_gb.html
==============================================================================
--- websites/production/ooo-site/content/zh/about-businesses_gb.html (original)
+++ websites/production/ooo-site/content/zh/about-businesses_gb.html Tue Nov  1 04:24:39 2011
@@ -4,8 +4,8 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
-		<title>OpenOffice.org 中文网站</title>
-	
+    <title>OpenOffice.org 中文网站</title>
+  
 <meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 
 
@@ -26,152 +26,152 @@
     
     
 
-		<link rel="stylesheet" type="text/css" href="css/menuStyle.css" />
-		<link rel="stylesheet" type="text/css" href="css/gen.css" />
+    <link rel="stylesheet" type="text/css" href="css/menuStyle.css" />
+    <link rel="stylesheet" type="text/css" href="css/gen.css" />
 
-		<table id="zh_top" class="zhCore">
+    <table id="zh_top" class="zhCore">
 
-			<tr>
-				<td class="zhContent">
+      <tr>
+        <td class="zhContent">
 
 
-					<h1>商业办公室软件</h1>
+          <h1>商业办公室软件</h1>
 
-					<p>以下列出的是以 OpenOffice.org 源码为基础的商业办公室软件资料。软件的简介都是由其厂商提供,并不代表我们的立场。我们把这些厂商列出的目的是为了方便想要“商业软件保障”的人或团体,而不是为厂商们卖广告。
+          <p>以下列出的是以 OpenOffice.org 源码为基础的商业办公室软件资料。软件的简介都是由其厂商提供,并不代表我们的立场。我们把这些厂商列出的目的是为了方便想要“商业软件保障”的人或团体,而不是为厂商们卖广告。
 
-					<p>
-						若您是以 OpenOffice.org 源码为基础的商业办公室软件的厂商,可以<a href="mailto:pplwong@openoffice.org">与我们联络</a>,我们会将您的网址加在网站上。请在来信中顺便提供一小段关于贵商业办公室软件的简介给我们。
-					</p>
+          <p>
+            若您是以 OpenOffice.org 源码为基础的商业办公室软件的厂商,可以<a href="mailto:pplwong@openoffice.org">与我们联络</a>,我们会将您的网址加在网站上。请在来信中顺便提供一小段关于贵商业办公室软件的简介给我们。
+          </p>
 
-					<table class="zh_withInnerBorder">
-						<tr>
-							<th style="width:150px">产品</th>
-							<th>简介</th>
-						</tr>
+          <table class="zh_withInnerBorder">
+            <tr>
+              <th style="width:150px">产品</th>
+              <th>简介</th>
+            </tr>
 
 
-						<tr>
-							<td class="productName"><a href="http://www.sun.com/StarSuite/" target="_new">升阳 StarSuite</a></td>
-							<td>
-								<p>
-									StarSuite 是一种全功能、跨越多平台办公室套装软件,包括文本文档、电子表格、演示文稿、绘图、网络出版、图表、方程式编辑以及数据库应用,足以取代企业与个人目前使用的单一办公室套装软件。欲进一步取得 StarSuite 6.0 使用者测试版的详细信息,请登陆 <a href="http://www.sun.com/StarSuite/" target="_new">http://www.sun.com/StarSuite/</a>。
-								</p>
-							</td>
-						</tr>
+            <tr>
+              <td class="productName"><a href="http://www.sun.com/StarSuite/" target="_new">升阳 StarSuite</a></td>
+              <td>
+                <p>
+                  StarSuite 是一种全功能、跨越多平台办公室套装软件,包括文本文档、电子表格、演示文稿、绘图、网络出版、图表、方程式编辑以及数据库应用,足以取代企业与个人目前使用的单一办公室套装软件。欲进一步取得 StarSuite 6.0 使用者测试版的详细信息,请登陆 <a href="http://www.sun.com/StarSuite/" target="_new">http://www.sun.com/StarSuite/</a>。
+                </p>
+              </td>
+            </tr>
                                                 <tr>
-							<td class="productName"><a href="http://www.redoffice.com/" target="_new">红旗中文 2000</a></td>
-							<td>
-								<p>
-									 RedOffice 的基本功能可全面满足政府机关、企事业单位和个人的日常办公需求,从公文制作、文字撰写到报表编制、图表分析、幻灯演示 …… 等各类型文档均可通过 RedOffice 快速而轻松地制作完成,不仅拥有优越的排版效果,而且具有强大、平稳的跨平台功能,完美的格式兼容性,充分尊重用户的使用习惯,是单位及个人日常办公的最佳选择。欲进一步取得 RedOffice 的详细信息,请ç
 »é™† <a href="http://www.redoffice.com/" target="_new">http://www.redoffice.com/</a>。
-								</p>
-							</td>
-						</tr>
-					</table>
-				<p>&nbsp;</p>
-				<p>&nbsp;</p>
-
-				</td>
-
-				<td class="zhMenu">
-
-				<!-- zh Menu Start -->
-
-					<table class="zh_menu" >
-
-						<tr>
-							<th>OpenOffice.org</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="http://www.openoffice.org/">英文总站首页</a><br />
-								<a href="index.html">繁体中文版首页</a><br />
-								<a href="index_gb.html">简体中文版首页</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>关于我们</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="about-ooo_gb.html">关于 OpenOffice.org</a><br />
-								<a href="about_zhProject_gb.html">关于中文计划</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>产品</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="about-product_gb.html">简介</a><br />
-								<a href="features_gb.html">重要功能</a><br />
-						 		<a href="downloads_gb.html">下载</a><br />
-								<a href="addons_gb.html">功能强化套件</a><br />
-						 		<a href="about-cdrom_gb.html">光碟</a><br />
-						 		<a href="about-businesses_gb.html">商品化版本</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>支援</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="doc_gb.html">说明文件</a><br />
-								<a href="mailinglist_gb.html">通信论坛</a><br />
-								<a href="faq_gb.html">常见问题</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>参与计划</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="help_ooo_gb.html">参与开发</a><br />
-								<a href="help_zh_gb.html">参与中文计划</a><br />
-								<a href="zh_tasks_gb.html">中文计划工作一览表</a><br />
-								<a href="http://www.openoffice.org/project_issues.html" target="_new">报告错误(英)</a><a href="mailinglist_gb.html">(中)</a><br />
-							</td>
-						</tr>
-
-						<tr>
-							<th>其他</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="zh_members_gb.html">中文计划成员</a><br />
-								<a href="zh_licenses_gb.html">授权声明</a>
-							</td>
-						</tr>
-
-						<tr>
-							<th>联络我们</th>
-						</tr>
-
-						<tr>
-							<td>
-								<a href="mailto:webmasters@openoffice.org">联络 OpenOffice.org</a><br />
-								<a href="mailto:pplwong@openoffice.org">联络中文计划</a>
-							</td>
-						</tr>
-
-					</table>
-
-				<!-- zh Menu End -->
-
-				</td>
-
-			</tr>
-		</table>
-	
+              <td class="productName"><a href="http://www.redoffice.com/" target="_new">红旗中文 2000</a></td>
+              <td>
+                <p>
+                   RedOffice 的基本功能可全面满足政府机关、企事业单位和个人的日常办公需求,从公文制作、文字撰写到报表编制、图表分析、幻灯演示 …… 等各类型文档均可通过 RedOffice 快速而轻松地制作完成,不仅拥有优越的排版效果,而且具有强大、平稳的跨平台功能,完美的格式兼容性,充分尊重用户的使用习惯,是单位及个人日常办公的最佳选择。欲进一步取得 RedOffice 的详细信息,
 请登陆 <a href="http://www.redoffice.com/" target="_new">http://www.redoffice.com/</a>。
+                </p>
+              </td>
+            </tr>
+          </table>
+        <p>&nbsp;</p>
+        <p>&nbsp;</p>
+
+        </td>
+
+        <td class="zhMenu">
+
+        <!-- zh Menu Start -->
+
+          <table class="zh_menu" >
+
+            <tr>
+              <th>OpenOffice.org</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="http://www.openoffice.org/">英文总站首页</a><br />
+                <a href="index.html">繁体中文版首页</a><br />
+                <a href="index_gb.html">简体中文版首页</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>关于我们</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="about-ooo_gb.html">关于 OpenOffice.org</a><br />
+                <a href="about_zhProject_gb.html">关于中文计划</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>产品</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="about-product_gb.html">简介</a><br />
+                <a href="features_gb.html">重要功能</a><br />
+                 <a href="downloads_gb.html">下载</a><br />
+                <a href="addons_gb.html">功能强化套件</a><br />
+                 <a href="about-cdrom_gb.html">光碟</a><br />
+                 <a href="about-businesses_gb.html">商品化版本</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>支援</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="doc_gb.html">说明文件</a><br />
+                <a href="mailinglist_gb.html">通信论坛</a><br />
+                <a href="faq_gb.html">常见问题</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>参与计划</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="help_ooo_gb.html">参与开发</a><br />
+                <a href="help_zh_gb.html">参与中文计划</a><br />
+                <a href="zh_tasks_gb.html">中文计划工作一览表</a><br />
+                <a href="http://www.openoffice.org/project_issues.html" target="_new">报告错误(英)</a><a href="mailinglist_gb.html">(中)</a><br />
+              </td>
+            </tr>
+
+            <tr>
+              <th>其他</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="zh_members_gb.html">中文计划成员</a><br />
+                <a href="zh_licenses_gb.html">授权声明</a>
+              </td>
+            </tr>
+
+            <tr>
+              <th>联络我们</th>
+            </tr>
+
+            <tr>
+              <td>
+                <a href="mailto:webmasters@openoffice.org">联络 OpenOffice.org</a><br />
+                <a href="mailto:pplwong@openoffice.org">联络中文计划</a>
+              </td>
+            </tr>
+
+          </table>
+
+        <!-- zh Menu End -->
+
+        </td>
+
+      </tr>
+    </table>
+  
 
   </div>
 



Mime
View raw message