svn commit: r905364 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/cy/index.html

[bu...@apache.org]

Author: buildbot
Date: Mon Apr  7 19:00:51 2014
New Revision: 905364

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/cy/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr  7 19:00:51 2014
@@ -1 +1 @@
-1585562
+1585565

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr  7 19:00:51 2014
@@ -1 +1 @@
-1585562
+1585565

Modified: websites/staging/ooo-site/trunk/content/cy/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/cy/index.html (original)
+++ websites/staging/ooo-site/trunk/content/cy/index.html Mon Apr  7 19:00:51 2014
@@ -48,10 +48,8 @@
 
 <p>Mae modd llwytho'r fersiwn Cymraeg diweddaraf o OpenOffice.org i lawr ar gyfer y systemau uchod ond mae fersiynau poblogaidd fel <a href="http://www.ubuntu.com/">Ubuntu</a>, <a href="http://www.redhat.com/">Red Hat</a>, <a href="http://www.mandriva.com">Mandriva</a> a <a href="http://www.novell.com/linux/">SuSE</a> yn cynnwys OpenOffice.org Cymraeg yn barod.     </p>
 <p><strong>Apple Mac</strong></p>
-<p> Mae dau fersiwn o OpenOffice.org i'w gael ar gyfer y Mac:           <br />
-  <br />
-  <a href="http://www.openoffice.org">OpenOffice.org</a>  ar gyfer y Mac Intel.</p>
-<p><a href="http://www.neooffice.org/neojava/en/index.php">NeoOffice.org</a> ar gyfer y  Mac PPC.</p>
+<p> Mae dau fersiwn o OpenOffice.org i'w gael ar gyfer y Mac:<br />
+<a href="http://www.openoffice.org">OpenOffice.org</a>ar gyfer y Mac Intel.</p>
 <p><strong>Fersiwn Dwyieithog Windows </strong></p>
 <p> Mae posib cael fersiwn  o OpenOffice.org 2.0 sy'n cynnig rhyngwyneb dwyieithog, lle mae modd dewis y naill iaith neu'r llall. Mae'r pecyn i'w gael ar gyfer Windows yn unig hefyd yn rhoi'r dewis o bryd i ddefnyddio'r gwirydd sillafu mewn dogfennau cymysg eu iaith neu rhai sydd mewn iaith gwahanol i'r rhyngwyneb.     </p>
 <p><a href="http://www.codepoets.co.uk/~divec/ooowin-meddal-2.0.0-1.exe">OpenOffice.org 2.0 Dwyieithog </a></p>
@@ -67,10 +65,8 @@
 <p class="priflinc"><a href="#Cymraeg">(Cliciwch am destun Cymraeg)</a></p>
 <p>There are Welsh language versions of  OpenOffice.org available for the most systems but some popular Linux systems such as <a href="http://www.ubuntu.com/">Ubuntu</a>, <a href="http://www.redhat.com/">Red Hat</a>, <a href="http://www.mandriva.com">Mandriva</a> a <a href="http://www.novell.com/linux/">SuSE</a> provide the Welsh version of OpenOffice.org within their distribution. </p>
 <p><strong>Apple Mac</strong></p>
-<p> Two versions of  OpenOffice.org are available for the  Mac: <br />
-    <br />
-    <a href="http://www.openoffice.org">OpenOffice.org</a> for the Mac Intel. It uses  X11, which is  available on the OSX installation  DVD. </p>
-<p><a href="http://www.neooffice.org/neojava/en/index.php">NeoOffice.org</a>  for the Mac PPC. </p>
+<p> The version of OpenOffice.org is available for Mac:<br />
+<a href="http://www.openoffice.org">OpenOffice.org</a> for the Mac Intel. It uses  X11, which is  available on the OSX installation  DVD. </p>
 <p><strong> Windows Bilingual Version </strong></p>
 <p> A bilingual Welsh-English, version of  OpenOffice.org 2.0 for Windows is available which provides a switchable bilingual interface. The version provides a means of chosing which spellchecker to use in mixed language documents or ones that are different to the program's interface. </p>
 <p><a href="http://www.codepoets.co.uk/~divec/ooowin-meddal-2.0.0-1.exe">Bilingual OpenOffice.org 2.0 </a></p>