Update of /cvsroot/audacity/htdocs/download
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7485

Modified Files:
        common.inc.php mac.php windows.php 
Log Message:
Categorise contents of 1.2 "Optional downloads"

Index: mac.php
===================================================================
RCS file: /cvsroot/audacity/htdocs/download/mac.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mac.php     10 May 2008 15:36:58 -0000      1.12
+++ mac.php     1 Sep 2009 07:14:12 -0000       1.13
@@ -2,7 +2,7 @@
 /*
  * Copyright 2004 Matt Brubeck
  * Richard Ash 2006
- * Gale Andrews 2008
+ * Gale Andrews 2009
  * This file is licensed under a Creative Commons license:
  * http://creativecommons.org/licenses/by/2.0/
  */
@@ -17,8 +17,7 @@
 <p><?=$downloadTagline?></p>
 
 <h3><?=_("Recommended Download")?></h3>
-<a href="#sysreq">System Requirements</a>
-<?php include "recommended.inc.php" ?>
+<p><a href="#sysreq">System Requirements</a></p>
 <ul>
   <li><p><?php printf(_('For Mac OS X (<b>Intel</b>): <a href="%s">Audacity 
%s</a> (.dmg file, %.1lf MB) - The latest version of the free Audacity audio 
editor.'), "../latest/".$macosx_intel_url, macosx_intel_version, 
macosx_intel_size)?></p></li>
   <li><p><?php printf(_('For Mac OS X (<b>PPC</b>): <a href="%s">Audacity 
%s</a> (.dmg file, %.1lf MB) - The latest version of the free Audacity audio 
editor.'), "../latest/".$macosx_url, macosx_version, macosx_size)?></p></li>
@@ -36,10 +35,11 @@
 </p>
 
 <h3 id="optional"><?=_("Optional Downloads")?></h3>
+
+<h4><?=_("Plug-ins and Libraries")?></h4>
 <ul>
-  <li><p><a 
href="http://ardour.org/files/releases/swh-plugins-0.4.15.dmg";>LADSPA plugins 
installer</a> - over 90 plug-ins.</p></li>
+  <li><p><a 
href="http://ardour.org/files/releases/swh-plugins-0.4.15.dmg";>LADSPA plug-ins 
installer</a> - over 90 plug-ins.</p></li>
 <?php include "common.inc.php"; ?>
-</ul>
 
 <h3 id="sysreq"><?=_("System Requirements")?></h3>
 <ul>

Index: windows.php
===================================================================
RCS file: /cvsroot/audacity/htdocs/download/windows.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- windows.php 17 Jul 2009 07:44:27 -0000      1.12
+++ windows.php 1 Sep 2009 07:14:12 -0000       1.13
@@ -32,9 +32,13 @@
     echo _("localized_downloads_windows");
   }
 ?>
+<h4><?=_("Plug-ins and Libraries")?></h4>
 <ul>
-  <li><p><?php printf(_('<a href="%s">LADSPA plugins %s installer</a> (.exe 
file, %.1lf MB) - over 90 plug-ins.'), "".$ladspa_url, ladspa_version, 
ladspa_size)?></p></li>
+  <li><p><?php printf(_('<a href="%s">LADSPA plug-ins %s installer</a> (.exe 
file, %.1lf MB) - over 90 plug-ins.'), "".$ladspa_url, ladspa_version, 
ladspa_size)?></p></li>
   <?php include "common.inc.php"; ?>
+
+<h4><?=_("Audacity Zip file")?></h4>
+<ul>
   <li><p><?php printf(_('Windows 98/ME/2000/XP/Vista: <a href="%s">Audacity %s 
zip file</a> (%.1lf MB)
   - If you cannot run the installer because of restricted permissions, 
download and unzip this file instead.'),
     "../latest/".$win_zip_url, win_zip_version, win_zip_size)?></p></li>

Index: common.inc.php
===================================================================
RCS file: /cvsroot/audacity/htdocs/download/common.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.inc.php      8 Jul 2009 20:50:28 -0000       1.4
+++ common.inc.php      1 Sep 2009 07:14:12 -0000       1.5
@@ -1,17 +1,23 @@
 <?php
 /*
- * Copyright 2004 Matt Brubeck
+ * Copyright 2004 Matt Brubeck, 2009 Gale Andrews
  * This file is licensed under a Creative Commons license:
  * http://creativecommons.org/licenses/by/3.0/
  *
  * This file contains text shared by "mac.php" and "windows.php".
  */
 ?>
-  <li><p><a href="../help/faq?s=install&amp;item=lame-mp3"><?=_("LAME MP3 
encoder")?></a> - <?=_("Allows Audacity to export MP3 files.")?></p></li>
-  <li><p><a href="../help/faq?s=install&amp;item=vst-enabler"><?=_("VST 
Enabler")?></a> - <?=_('Allows Audacity to load VST plug-ins.')?></p></li>
+  <li><p><a href="../help/faq?s=install&amp;item=vst-enabler"><?=_("VST 
Enabler")?></a> - <?=_('Allows Audacity to load VST effect 
plug-ins.')?></p></li>
   <li><p><a href="plugins"><?=_("Plug-Ins")?></a> - <?=_("Download additional 
effects and filters.")?></p></li>
+  <li><p><a href="../help/faq?s=install&amp;item=lame-mp3"><?=_("LAME MP3 
encoder")?></a> - <?=_("Allows Audacity to export MP3 files.")?></p></li>
+</ul>
+
+<h4>Alternative Download Links</h4>    
+<ul>
   <li><p><?php printf(_('If you have trouble with your download, or need an 
older version of Audacity, try our alternate download links:')) ?></p>
         <ul><li><?php printf(_('<a href="%s">Sourceforge</a> (older versions 
can be viewed by clicking on the appropriate package)'), 
"http://sourceforge.net/project/showfiles.php?group_id=6235";)?></li>
        <li><?php printf(_('<a href="%s">Google Code</a> (click on the headings 
to sort the list)'), "http://code.google.com/p/audacity/downloads/list";)?></li>
        </ul>
-</li>
+  </li>
+</ul>
+


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to