[audacity] r13994 committed - Updated for current and planned Mac OS X support.

[auda...@googlecode.com]

Revision: 13994
Author: windi...@gmail.com
Date: Tue Jul 14 05:42:30 2015 UTC
Log: Updated for current and planned Mac OS X support.
https://code.google.com/p/audacity/source/detail?r=13994

Modified:
/website/trunk/htdocs/contact/index.php
/website/trunk/htdocs/download/index.php
/website/trunk/htdocs/download/legacy_mac.php
/website/trunk/htdocs/download/mac.php
/website/trunk/htdocs/index.php

=======================================
--- /website/trunk/htdocs/contact/index.php Thu Jul 9 23:02:13 2015 UTC
+++ /website/trunk/htdocs/contact/index.php Tue Jul 14 05:42:30 2015 UTC
@@ -70,7 +70,7 @@
<p><?=_('<b>Please include the following information.</b> This is
important.</p>
<ol>
<li><b>The exact three-section version number of Audacity</b> (for
example, 2.0.0) - you can check this at Help > About Audacity, or Audacity
> About Audacity on Mac</li>
- <li><b>Your operating system</b> (for example, Windows 7 Service Pack 1
or Intel Mac OS X 10.4)</li>
+ <li><b>Your operating system</b> (for example, Windows 7 Service Pack 1
or Intel Mac OS X 10.9.5)</li>
<li><b>Details of what you were trying to do</b>, including what steps
led to the problem occurring, and the text of any error messages.</li>
</ol>
</div>
=======================================
--- /website/trunk/htdocs/download/index.php Fri May 1 14:58:56 2015 UTC
+++ /website/trunk/htdocs/download/index.php Tue Jul 14 05:42:30 2015 UTC
@@ -52,7 +52,7 @@
<span class="downloads_smaller">
<br>
<img src="../images/download_spacer.png">
- <?=_("(Universal Binary for Mac OS X 10.4 to 10.10.x)")?>
+ <?=_("(Universal Binary for Mac OS X 10.5 to 10.10.x)")?>
</span>
</h3>

@@ -90,8 +90,8 @@
<div class="under_downloads">
<h3 id="legacy"><?=_("Legacy Downloads")?></h3>
<ul>
- <li><p><?=_("For users of <b>Windows 98 and ME</b>, a legacy 2.0.0
version of Audacity is available on the <a href=\"legacy_windows\">Legacy
Windows downloads page")?></a>.</p></li>
- <li><p><?=_("For users of <b>Mac OS 9</b> and <b>Mac OS 10.0 through
10.3</b>, legacy versions of Audacity are available on the <a
href=\"legacy_mac\">Legacy Mac downloads page")?></a>.</p></li>
+ <li><p><?=_("For users of <b>Windows 98, ME and 2000</b>, legacy
versions of Audacity are available on the <a href=\"legacy_windows\">Legacy
Windows downloads page")?></a>.</p></li>
+ <li><p><?=_("For users of <b>Mac OS 9</b> and <b>Mac OS 10.0 through
10.4</b>, legacy versions of Audacity are available on the <a
href=\"legacy_mac\">Legacy Mac downloads page")?></a>.</p></li>
</ul>

<h3><?=_("More Information")?></h3>
=======================================
--- /website/trunk/htdocs/download/legacy_mac.php Sun May 3 15:25:49 2015
UTC
+++ /website/trunk/htdocs/download/legacy_mac.php Tue Jul 14 05:42:30 2015
UTC
@@ -2,7 +2,7 @@
/*
* Copyright 2004 Matt Brubeck
* Richard Ash 2006
- * Gale Andrews 2009-2012
+ * Gale Andrews 2009-2015
* This file is licensed under a Creative Commons license:
* http://creativecommons.org/licenses/by/3.0/
*/
@@ -17,12 +17,13 @@
<h2><?=$pageTitle?></h2>

<div class="advice">
-<?=_('<b>Mac OS X 10.4 and later are not supported in Audacity 1.2. Please
use</b> <a href="../download/mac">the latest Mac version</a><b> for these
operating systems.</b>')?>
+<?=_('<b>These are legacy downloads. Please use the </b> <a
href="../download/mac">latest Audacity version</a><b> for Mac OS X 10.5 to
10.10.x.</b>')?>
</div>

<h3><?=_("Download")?></h3>
<p><a href="#sysreq"><?=_("System Requirements")?></a></p>
<ul>
+ <li><p><?=_('For Mac OS X 10.4 (<b>Universal binary</b>): <a
href="http://www.oldfoss.com/Audacity/download/audacity-macosx-ub-2.0.6.dmg">Audacity
2.0.6</a> (.dmg file, 30.9 MB) - use this also on PPC Macs on OS X 10.5 if
you want to use Audio Units in Audacity')?></p></li>
<li><p><?php printf(_('For Mac OS X 10.0 to 10.3 (<b>Intel</b>): <a
href="%s">Audacity %s</a> (.dmg file, %.1lf MB)'),
download_url($macosx_intel_url), macosx_intel_version,
macosx_intel_size)?></p></li>
<li><p><?php printf(_('For Mac OS X 10.0 to 10.3 (<b>PPC</b>): <a
href="%s">Audacity %s</a> (.dmg file, %.1lf MB)'), download_url
($macosx_url), macosx_version, macosx_size)?></p></li>
<li><p><?php printf(_('For Mac OS 9: <a href="%s">Audacity %s</a> (.sit
file, %.1lf MB)'), download_url($mac_classic_url), mac_classic_version,
mac_classic_size)?></p></li>
@@ -59,9 +60,10 @@
</ul>

<h3 id="sysreq"><?=_("System Requirements")?></h3>
-<?=_("Audacity 2.0 series requires Mac OS X 10.4 or later.")?>
+<?=_('The <a href="../download/mac">latest Audacity version</a> requires
Mac OS X 10.5 or later')?>
<p>
<ul>
+<li><?=_("Audacity 2.0.6 is a legacy version for Mac OS X 10.4 (Universal
binary) only.")?></li>
<li><?=_("Audacity 1.2.5 is a legacy version for Mac OS X 10.0 to 10.3
(Intel) only.")?></li>
<li><?=_("Audacity 1.2.6a is a legacy version for Mac OS X 10.0 to 10.3
(PPC) only.")?></li>
<li><?=_("Audacity 1.0.0 is a legacy version for Mac OS 9 only.")?></li>
=======================================
--- /website/trunk/htdocs/download/mac.php Sun May 3 15:23:04 2015 UTC
+++ /website/trunk/htdocs/download/mac.php Tue Jul 14 05:42:30 2015 UTC
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright 2004 - 2014
+ * Copyright 2004 - 2015
* Matt Brubeck
* Dominic Mazzoni
* Richard Ash
@@ -51,7 +51,7 @@

<div class="advice">
<?=_('<b>Known Issue:</b> Security settings on OS X 10.7 or later may
block Audacity being
-launched. Most users on OS X 10.9.5 will experience this, due to changes
made by Apple.')?>
+launched. Most users on OS X 10.9.5 and later will experience this, due to
changes made by Apple.')?>
<p><ul><li>
<?=_('To permanently enable Audacity launch, right-click or control-click
on the Audacity
application in Finder, choose "Open", then in the dialog box that appears,
choose "Open".')?>
@@ -108,10 +108,11 @@
<h3 id="sysreq"><?=_("System Requirements")?></h3>
<p>
<div class="advice">
-<b><?=_("Audacity for Mac is released as a Universal Binary. It runs on
<b>OS X 10.4 to 10.10.x</b>.")?></b>
-<br>
-<b><?=_("Audacity runs best with at least 1 GB RAM and a 1 GHz processor
(2 GB RAM/2 GHz on OS X 10.7 or later).")?></b>
-<p><?=_("For lengthy multi-track projects, we recommend a minimum of 2 GB
RAM and 2 GHz processor (4 GB RAM on OS X 10.7 or later).")?></p>
+<?=_("Audacity for Mac is a Universal Binary for <b>OS X 10.5 to
10.10.x</b>. Audacity runs best with at least <b>1 GB RAM and a 1 GHz
processor (2 GB RAM/2 GHz on OS X 10.7 or later).</b>")?>
+<br><br><?=_("For lengthy multi-track projects, we recommend a minimum of
2 GB RAM and 2 GHz processor (4 GB RAM on OS X 10.7 or later).")?>
+<p><ul><li><?=_("The current 2.1.1 release is expected to be the final
release for PPC Macs.")?>
+</ul></p>
+
</div>
</p>

=======================================
--- /website/trunk/htdocs/index.php Mon Apr 27 20:40:44 2015 UTC
+++ /website/trunk/htdocs/index.php Tue Jul 14 05:42:30 2015 UTC
@@ -33,7 +33,7 @@
else if ($download == "mac") {
$download_version = macosx_version;
$download_OS = _("for Mac");
- $download_OS_versions = _("OS X 10.4 to 10.10.x");
+ $download_OS_versions = _("OS X 10.5 to 10.10.x");
$download_page = "mac";
$recommended_download = $macosx_url;
/*