Audacity

Update of /cvsroot/audacity/audacity-src/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4731

Modified Files:
	ar.po 
Log Message:
Updated translation from Djalel Chefrour


Index: ar.po
===================================================================
RCS file: /cvsroot/audacity/audacity-src/locale/ar.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ar.po	28 Oct 2007 17:27:05 -0000	1.6
+++ ar.po	30 Nov 2007 22:16:36 -0000	1.7
@@ -1,14 +1,16 @@
-# translation of audacity.po to arabic
+# translation of audacity.pot to arabic
 # Audacity Strings for Translation.
-# Copyright (C) 1999 and beyond Audacity Development Team
+# Copyright (C) YEAR Audacity Development Team
 # This file is distributed under the same license as Audacity.
-# Audacity Team <audacity-translation@...>, 1999 and beyond.
+#
+# Audacity Team <audacity-translation@...>, YEAR.
 # djalel chefrour <cdjalel@...>, 2007.
 msgid ""
[...8086 lines suppressed...]
-#: widgets/TimeTextCtrl.cpp:225
+#: widgets/TimeTextCtrl.cpp:228
 msgid "CDDA frames (75 fps)"
 msgstr "إطارات سي.دي.دي.آي CDDA (75 ط.ف.ث)"
 
-#: widgets/TimeTextCtrl.cpp:226
+#: widgets/TimeTextCtrl.cpp:229
 msgid "01000,01000 frames|75"
 msgstr "01000,01000 إطار|75"
 
-#: widgets/TimeTextCtrl.cpp:363
+#: widgets/TimeTextCtrl.cpp:366
 msgid "Use right mouse button or context key to change format"
 msgstr "استخدم زر الفأرة الأيمن أو المفتاح المناسب لتغيير الصيغة"
 
-#: widgets/TimeTextCtrl.cpp:1377
+#: widgets/TimeTextCtrl.cpp:1380
 msgid "Time Control"
 msgstr "التحكم في الوقت"

Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29624/src/import

Modified Files:
	ImportOGG.cpp 
Log Message:
Extra include needed to make builds without libogg / libvorbis work correctly


Index: ImportOGG.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportOGG.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ImportOGG.cpp	5 Aug 2007 10:43:00 -0000	1.28
+++ ImportOGG.cpp	30 Nov 2007 21:58:19 -0000	1.29
@@ -27,6 +27,7 @@
 
 *//*******************************************************************/
 
+#include <wx/intl.h>
 #include "../Audacity.h"
 #include "ImportOGG.h"
 #include "../Internat.h"

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28424

Modified Files:
	Project.cpp 
Log Message:
Dialog message shortened.

Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- Project.cpp	28 Nov 2007 01:06:01 -0000	1.333
+++ Project.cpp	30 Nov 2007 21:54:48 -0000	1.334
@@ -2143,7 +2143,7 @@
       int icon_choice = wxICON_EXCLAMATION;
       if(fileVersion < wxT("1.1.9" ))
       {
-         msg.Printf(_("This file was saved by Audacity %s, a much\nolder version of Audacity.  The format has changed.\nAudacity will probably destroy the file in trying\nto open it.  You must back up your project\nfirst, to be safe.\n\nWould you like to try to open this file\nright now anyway?"),
+         msg.Printf(_("This file was saved by Audacity %s, a much\nolder version.  The format has changed.\n\nAudacity could corrupt the file in opening\nit, so you must back it up first.\n\nOpen this file now?"),
                  audacityVersion.c_str());
          // Stop icon, and choose 'NO' by default.
          icon_choice = wxICON_STOP | wxNO_DEFAULT;

Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25149/src/widgets

Modified Files:
	Ruler.h 
Log Message:
Remove a compiler warning


Index: Ruler.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Ruler.h	22 Nov 2007 10:16:20 -0000	1.22
+++ Ruler.h	30 Nov 2007 21:46:03 -0000	1.23
@@ -167,7 +167,7 @@
 #ifdef EXPERIMENTAL_RULER_AUTOSIZE
    class Label {
     public:
-#else !//EXPERIMENTAL_RULER_AUTOSIZE
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    struct Label {
 #endif //EXPERIMENTAL_RULER_AUTOSIZE
       int pos;

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24674/src

Modified Files:
	AboutDialog.cpp 
Log Message:
Fix a compilation bug. not clear why this didn't show up earlier


Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- AboutDialog.cpp	24 Nov 2007 21:52:03 -0000	1.56
+++ AboutDialog.cpp	30 Nov 2007 21:44:34 -0000	1.57
@@ -313,7 +313,7 @@
    /* i18n-hint: This is what the library (libmad) does - imports MP3 files */
    AddBuildinfoRow(&informationStr, wxT("libmad"), _("MP3 Importing"), enabled);
    #else
-   AddBuildinfoRow(&informationStr, wxT("libmad"), _("MP3 Importing"), disable);
+   AddBuildinfoRow(&informationStr, wxT("libmad"), _("MP3 Importing"), disabled);
    #endif
 
    /* i18n-hint: Ogg is the container format. Vorbis is the compression codec.

Update of /cvsroot/audacity/audacity-src/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11565

Modified Files:
	nb.po 
Log Message:
Updated norwegian translation

Index: nb.po
===================================================================
RCS file: /cvsroot/audacity/audacity-src/locale/nb.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nb.po	28 Oct 2007 17:27:17 -0000	1.6
+++ nb.po	29 Nov 2007 12:05:36 -0000	1.7
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as Audacity.
 # Audacity Team <audacity-translation@...>, 1999 and beyond.
 #
-#, fuzzy
 msgid ""
 msgstr "Project-Id-Version: Audacity 1.3.3\n"
 "Report-Msgid-Bugs-To: audacity-translation@..."
 "POT-Creation-Date: 2007-05-05 16:30+0100\n"
-"PO-Revision-Date: 2007-04-19 18:15+0100\n"
+"PO-Revision-Date: 2007-11-19 18:59+0100\n"
 "Last-Translator: Kevin Brubeck Unhammer <unhammer@..."
[...2491 lines suppressed...]
 
 #: widgets/ErrorDialog.cpp:73 widgets/ErrorDialog.cpp:97
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
 #: widgets/ErrorDialog.cpp:190
 msgid "Help on the Internet"
-msgstr ""
+msgstr "Hjelp på nettet"
 
 #: widgets/Grabber.cpp:61
 msgid "Grabber"
@@ -7513,5 +7587,5 @@
 #: xml/XMLFileReader.cpp:79
 #, c-format
 msgid "Could not load file: \"%s\""
-msgstr ""
+msgstr "Klarte ikke å laste fil: \"%s\""

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20706

Modified Files:
	HelpText.cpp 
Log Message:
Improvements (fixes?) for browsers not coming up properly on external links.

Index: HelpText.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/HelpText.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- HelpText.cpp	15 Nov 2007 00:16:02 -0000	1.17
+++ HelpText.cpp	29 Nov 2007 01:01:40 -0000	1.18
@@ -158,7 +158,7 @@
 <br/><br/>\
 These are the main formats Audacity will play: <b>AIFF, AU, FLAC, M4A</b> (only on a \
 Mac), <b>MP2/MP3, OGG Vorbis, WAV</b>.  If your file is in some other format see (format help). \
-If you want to import an audio CD, see [[wiki:How to import CDs|How to import CDs]]<br><br>\
+If you want to import an audio CD, see [[wiki:How_to_import_CDs|How to import CDs]]<br><br>\
 To start playing your audio, press the green Play button. \
 To stop, press the yellow Stop button. \
 You can also use spacebar to either play or stop. \
@@ -198,7 +198,7 @@
 <br><br>\
 (3) <b>Input volume</b>. Before recording for real, make a test recording to set the input level, \
 so that it's neither too soft or too loud.\
-To do this, see this [[wiki:Recording levels|illustrated guide]] or follow these two steps: \
+To do this, see this [[wiki:Recording_levels|illustrated guide]] or follow these two steps: \
 <ol><li>\
 Turn on <b>monitoring</b>, by either double-clicking over the right-hand of the two VU Meters, or \
 right-clicking over it and choosing \"Start Monitoring\". \
@@ -208,8 +208,8 @@
 If you can't hear the sound, go to the Audio I/O tab of Preferences and check \"Software Playthrough\". \
 </ol><br><br>\
 There is more help if you're stuck: our Recording FAQs, our Tutorial  <b>Your First Recording </b> in the \
-Manual, and our Wiki [[wiki:Recording Tips|Recording Tips]], especially the \
-[[wiki:Troubleshooting Recordings|Troubleshooting Recordings]] section. \
+Manual, and our Wiki [[wiki:Recording_Tips|Recording Tips]], especially the \
+[[wiki:Troubleshooting_Recordings|Troubleshooting Recordings]] section. \
 <br><br>") +
 ToWelcome()
          );
@@ -269,7 +269,7 @@
 \"Export Selection\" exports only a selected area of audio.\
 \"Export Multiple\" exports multiple files, for example where you have more than one track on \
 screen and want to export each as a separate file. If exporting tracks from a recorded LP or tape to multiple files, \
-use [[wiki:Splitting recordings into separate tracks|labels with Export Multiple]]. \
+use [[wiki:Splitting_recordings_into_separate_tracks|labels with Export Multiple]]. \
 <br><br>\
 Before you can export as <b>MP3</b>, you may need to add the LAME MP3 encoder to your computer.\
 For help with LAME, see [[wiki:Lame_Installation|Lame Installation]]. \
@@ -314,7 +314,7 @@
 _("If you want to burn your work to an audio CD for standalone CD players, you must first \
 [[export|export as WAV or AIFF]] \
 and then burn that file to CD with a CD burning program like \
-iTunes - for more help, see [[wiki:How to burn CDs|How to burn CDs]].\
+iTunes - for more help, see [[wiki:How_to_burn_CDs|How to burn CDs]].\
 <br><br>")+
 ToWelcome()
          );

Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20706/widgets

Modified Files:
	LinkingHtmlWindow.cpp 
Log Message:
Improvements (fixes?) for browsers not coming up properly on external links.

Index: LinkingHtmlWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/LinkingHtmlWindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LinkingHtmlWindow.cpp	27 Oct 2007 22:13:15 -0000	1.7
+++ LinkingHtmlWindow.cpp	29 Nov 2007 01:01:42 -0000	1.8
@@ -28,7 +28,7 @@
          if (pFileType == NULL) 
             return;
          wxString openCmd = pFileType->GetOpenCommand(link.GetHref());
-         if (openCmd.Contains(wxT("iexplore.exe")))
+         if (openCmd.Contains(wxT("IEXPLORE.EXE")))
             // GetOpenCommand is not quite right for Internet Explorer.
             openCmd.Replace(wxT("WWW_OpenURL#\"file://"), wxT("WWW_OpenURL#\""));
          ::wxExecute(openCmd);

Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14485

Modified Files:
	SpectrumPrefs.h 
Log Message:
Corrected #include for Windows.

Index: SpectrumPrefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SpectrumPrefs.h	28 Nov 2007 17:38:49 -0000	1.13
+++ SpectrumPrefs.h	28 Nov 2007 23:19:15 -0000	1.14
@@ -25,7 +25,7 @@
 #include <wx/string.h>
 
 #include "PrefsPanel.h"
-#include "Experimental.h"
+#include "../Experimental.h"
 
 class wxWindow;
 class ShuttleGui;

Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12680/src/prefs

Modified Files:
	SpectrumPrefs.h 
Log Message:
Added some #include entries for the experimental features to compile (under
debian stable).


Index: SpectrumPrefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- SpectrumPrefs.h	22 Nov 2007 06:59:28 -0000	1.12
+++ SpectrumPrefs.h	28 Nov 2007 17:38:49 -0000	1.13
@@ -25,6 +25,7 @@
 #include <wx/string.h>
 
 #include "PrefsPanel.h"
+#include "Experimental.h"
 
 class wxWindow;
 class ShuttleGui;

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12680/src

Modified Files:
	Track.h 
Log Message:
Added some #include entries for the experimental features to compile (under
debian stable).


Index: Track.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Track.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Track.h	22 Nov 2007 10:16:15 -0000	1.42
+++ Track.h	28 Nov 2007 17:38:49 -0000	1.43
@@ -19,6 +19,9 @@
 #include "SampleFormat.h"
 #include "xml/XMLTagHandler.h"
 #include "Experimental.h"
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+#include <wx/gdicmn.h>
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 class wxTextFile;
 class DirManager;

Update of /cvsroot/audacity/htdocs/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25284

Modified Files:
	pt_BR.po 
Log Message:
updated pt_BR translation for website

Index: pt_BR.po
===================================================================
RCS file: /cvsroot/audacity/htdocs/locale/pt_BR.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pt_BR.po	24 Nov 2007 17:21:15 -0000	1.22
+++ pt_BR.po	28 Nov 2007 12:40:06 -0000	1.23
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: audacity site\n"
 "POT-Creation-Date: 2005-01-07 15:43-0800\n"
-"PO-Revision-Date: 2007-11-21 05:50-0300\n"
+"PO-Revision-Date: 2007-11-26 20:43-0300\n"
 "Last-Translator: Cleber Tavano <clebertavano@..."
 "Language-Team: Cleber Tavano <clebertavano@..."
 "MIME-Version: 1.0\n"
@@ -985,7 +985,7 @@
 
 #: about/links.php:26
 msgid "More free software at SourceForge.net:"
-msgstr "Outros programas gratuitos no Sourceforge.net:"
+msgstr "Outros programas livres no Sourceforge.net:"
 
 #: about/links.php:28
 msgid "Audio Editors"
@@ -4106,12 +4106,12 @@
 #: download/mac.php:21
 #, php-format
 msgid "For Mac OS X (PPC): <a href=\"%s\">Audacity %s</a> (.dmg file, %.1lf MB) - The latest version of the free Audacity audio editor."
-msgstr "Para Mac OS X (PowerPC): <a href=\"%s\">Audacity %s</a> (arquivo .dmg, %.1lf MB) - A versão mais recente do editor de áudio gratuito Audacity."
+msgstr "Para Mac OS X (PowerPC): <a href=\"%s\">Audacity %s</a> (arquivo .dmg, %.1lf MB) - A versão mais recente do editor de áudio livre Audacity."
 
 #: download/mac.php:23
 #, php-format
 msgid "For Mac OS X (Intel): <a href=\"%s\">Audacity %s</a> (.dmg file, %.1lf MB) - The latest version of the free Audacity audio editor."
-msgstr "Para Mac OS X (Intel): <a href=\"%s\">Audacity %s</a> (arquivo .dmg, %.1lf MB) - A versão mais recente do editor de áudio gratuito Audacity."
+msgstr "Para Mac OS X (Intel): <a href=\"%s\">Audacity %s</a> (arquivo .dmg, %.1lf MB) - A versão mais recente do editor de áudio livre Audacity."
 
 #: download/mac.php:27
 #, php-format
@@ -4466,7 +4466,7 @@
 
 #: download/buy.php:13
 msgid "Audacity is free to download, but vendors are also free to sell copies of the program (see <a href=\"../download/bundlers\">Vendors that Distribute Audacity</a>), thanks to the <a href=\"../about/license\">GNU General Public License</a>.  If you want a copy of Audacity on CD-ROM, we encourage you to buy from a vendor listed below."
-msgstr "O Audacity é gratuito para ser copiado e instalado via Internet. No entanto, revendedores podem vender o programa  graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Caso queira comprar uma cópia em CD do programa, visite um dos sites abaixo:"
+msgstr "O Audacity é livre para ser copiado e instalado via Internet. No entanto, revendedores podem vender o programa  graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Caso queira comprar uma cópia em CD do programa, visite um dos sites abaixo:"
 
 #: download/buy.php:15
 msgid ""
@@ -4474,7 +4474,7 @@
 "  <p><a href=\"http://www.theopencd.org/\">TheOpenCD</a> is a collection of high-quality free software for Microsoft Windows, including Audacity.  You can <a href=\"http://www.theopencd.org/purchase\">purchase a copy of TheOpenCD</a> from several different vendors.</p>"
 msgstr ""
 "<h3>TheOpenCD (Windows)</h3>\n"
-"  <p><a href=\"http://www.theopencd.org/\">TheOpenCD</a> é uma coleção de programas gratuitos para Microsoft Windows, que inclui o Audacity. <a href=\"http://www.theopencd.org/purchase\">Clique aqui </a> e compre um cópia do TheOpenCD. </p>"
+"  <p><a href=\"http://www.theopencd.org/\">TheOpenCD</a> é uma coleção de programas livres para Microsoft Windows, que inclui o Audacity. <a href=\"http://www.theopencd.org/purchase\">Clique aqui </a> e compre um cópia do TheOpenCD. </p>"
 
 #: download/features-1.3-g.php:9
 msgid "Audacity 1.3: Other features"
@@ -4540,7 +4540,7 @@
 
 #: download/bundlers2.php:14
 msgid "Audacity is free to download, but vendors are also free to bundle copies of the program with their products, thanks to the <a href=\"../about/license\">GNU General Public License</a>. The following are legitimate, legal offerings. We are happy and proud that they chose to bundle Audacity with their products."
-msgstr "O Audacity é gratuito para ser copiado e instalado via Internet, assim como revendedores podem incluir o Audacity aos seus produtos, graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Estas ofetas são legítimas e estamos bastante satisfeitos em saber que o Audacity foi escolhido para ser incluído nestes produtos."
+msgstr "O Audacity é livre para ser copiado e instalado via Internet, assim como revendedores podem incluir o Audacity aos seus produtos, graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Estas ofetas são legítimas e estamos bastante satisfeitos em saber que o Audacity foi escolhido para ser incluído nestes produtos."
 
 #: download/bundlers2.php:16
 msgid "<h3><b>Podcast Factory</b>&trade; from M-Audio (U.S.) and Pinnacle/Avid (Europe)</h3>"
@@ -4588,7 +4588,7 @@
 
 #: download/bundlers.php:16
 msgid "Audacity is free to download, but vendors are also free to bundle copies of the program with their product, or resell or distribute Audacity, thanks to the <a href=\"../about/license\">GNU General Public License</a>. The following are legitimate, legal offerings. We are happy and proud that they chose to bundle Audacity with their products."
-msgstr "O Audacity é gratuito para ser copiado e instalado via Internet, assim como revendedores podem incluir o Audacity aos seus produtos, graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Estas ofetas são legítimas e estamos bastante satisfeitos em saber que o Audacity foi escolhido para ser incluído nestes produtos."
+msgstr "O Audacity é livre para ser copiado e instalado via Internet, assim como revendedores podem incluir o Audacity aos seus produtos, graças à licença <a href=\"../about/license\">GNU General Public License</a>.  Estas ofetas são legítimas e estamos bastante satisfeitos em saber que o Audacity foi escolhido para ser incluído nestes produtos."
 
 #: download/bundlers.php:18
 msgid "Two of these vendors, <a href=\"http://umixit.com\">UmixIt</a> and <a href=\"http://www.thinklabsmedical.com\">Thinklabs</a>, have additionally supported Audacity by sponsoring custom versions. The first <a href=\"http://umixit.com\"><em>UmixIt, powered by Audacity</em></a> Enhanced CD was <a href=\"http://www.bnlmusic.com/\">\"Barenaked Ladies Are Men\"</a>, released February 2007. Both custom versions will soon be available for download."
@@ -5157,7 +5157,7 @@
 
 #: index.php:9
 msgid "Free Audio Editor and Recorder"
-msgstr "Editor de áudio gratuito"
+msgstr "Editor e gravador de áudio livre"
 
 #: index.php:18
 msgid "for Microsoft Windows"
@@ -5177,7 +5177,7 @@
 
 #: index.php:51
 msgid "Audacity is free, open source software for recording and editing sounds.  It is available for Mac OS X, Microsoft Windows, GNU/Linux, and other operating systems. <a href=\"about/\">Learn more about Audacity...</a> Also check our <a href=\"http://audacityteam.org/wiki/\">Wiki</a> and <a href=\"http://audacityteam.org/forum/\">Forum</a> for more information."
-msgstr "O Audacity é um programa gratuito, de código fonte aberto, para edição de áudio digital. Está disponível para Mac OS X, Microsoft Windows, GNU/Linux e outros sistemas operacionais. <a href=\"about/\">Conheça mais sobre o Audacity...</a> Também conheça o nosso <a href=\"http://audacityteam.org/wiki/\">Wiki</a> e o <a href=\"http://audacityteam.org/forum/\">Forum</a> para maiores informações."
+msgstr "O Audacity é um programa livre e gratuito, de código fonte aberto, para edição de áudio digital. Está disponível para Mac OS X, Microsoft Windows, GNU/Linux e outros sistemas operacionais. <a href=\"about/\">Conheça mais sobre o Audacity...</a> Também conheça o nosso <a href=\"http://audacityteam.org/wiki/\">Wiki</a> e o <a href=\"http://audacityteam.org/forum/\">Forum</a> para maiores informações."
 
 #: index.php:53
 msgid "The latest release of Audacity is <a href=\"/download\">1.3.4 (beta)</a>. Because it is a work in progress and does not yet come with complete documentation or translations into foreign languages, it is recommended for more advanced users. See <a href=\"/download/features-1.3-a\">New Features in 1.3</a> for more information about the 1.3.x beta series."

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22349

Modified Files:
	AutoRecovery.cpp Menus.cpp Project.cpp SplashDialog.cpp 
	TrackArtist.cpp TrackArtist.h 
Log Message:
Some 'wording' changes, as the wiki and posts.

Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- TrackArtist.cpp	24 Nov 2007 02:14:28 -0000	1.110
+++ TrackArtist.cpp	28 Nov 2007 01:06:01 -0000	1.111
@@ -1910,7 +1910,7 @@
             data[px++] = gv;
             data[px] = bv;
          }
-         }
+      }
 #else //!LOGARITHMIC_SPECTRUM
       for (int yy = 0; yy < mid.height; yy++) {
          bool selflag = (ssel0 <= w0 && w1 < ssel1);

Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -d -r1.355 -r1.356
--- Menus.cpp	16 Nov 2007 00:32:05 -0000	1.355
+++ Menus.cpp	28 Nov 2007 01:06:00 -0000	1.356
@@ -4436,7 +4436,7 @@
    
    while (true) {
       wxTextEntryDialog* dlg = new wxTextEntryDialog(this,
-         _("Enter new samplerate:"), _("Resample"), wxT(""));
+         _("New sample rate (Hz):"), _("Resample"), wxT(""));
       if (dlg->ShowModal() != wxID_OK)
          return; // user cancelled dialog
       newRate = atoi(dlg->GetValue().mb_str());

Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- Project.cpp	28 Oct 2007 20:45:15 -0000	1.332
+++ Project.cpp	28 Nov 2007 01:06:01 -0000	1.333
@@ -2150,7 +2150,7 @@
       }
       else
       {
-         msg.Printf(_("This file was saved by Audacity %s and the format\nhas changed.  This version of Audacity can try to\nopen it, but there may be problems.  You should back up\nyour project first, to be safe.\n\nAfter you save the file with this version of Audacity,\nyou will not be able to open the file in the older\nversion anymore.  Would you like to open\nthis file right now anyway?"),
+         msg.Printf(_("This file was saved by Audacity %s.\nYou can open the file with this version of Audacity, but if you save it with this version you will no longer be able to open it in older versions.\n\nOpen this file now?"),
                  audacityVersion.c_str());
       }
       int action;

Index: SplashDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SplashDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SplashDialog.cpp	27 Oct 2007 14:54:39 -0000	1.9
+++ SplashDialog.cpp	28 Nov 2007 01:06:01 -0000	1.10
@@ -110,7 +110,7 @@
    {
       S.SetBorder( 5 );
       S.Id( DontShowID).AddCheckBox( _("Don't show this again at start up"), bShow ? wxT("false") : wxT("true") );
-      wxButton *ok = new wxButton(S.GetParent(), wxID_OK, _("OK... Audacious!"));
+      wxButton *ok = new wxButton(S.GetParent(), wxID_OK);
       ok->SetDefault();
       ok->SetFocus();
       S.SetBorder( 5 );

Index: AutoRecovery.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AutoRecovery.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- AutoRecovery.cpp	25 Oct 2007 23:30:03 -0000	1.10
+++ AutoRecovery.cpp	28 Nov 2007 01:06:00 -0000	1.11
@@ -124,8 +124,8 @@
 void AutoRecoveryDialog::OnRecoverNone(wxCommandEvent &evt)
 {
    int ret = wxMessageBox(
-      _("You have chosen not to recover any projects. You will not be able to recover those projects later if you change your mind. Do you really want to continue without recovering?"),
-      _("Really not recover projects?"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
+      _("Are you sure you don't want to recover any projects?\nThey can't be recovered later."),
+      _("Confirm?"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
 
    if (ret == wxYES)
       EndModal(ID_RECOVER_NONE);

Index: TrackArtist.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- TrackArtist.h	22 Nov 2007 06:59:28 -0000	1.30
+++ TrackArtist.h	28 Nov 2007 01:06:01 -0000	1.31
@@ -20,6 +20,7 @@
 
 #include <wx/brush.h>
 #include <wx/pen.h>
+#include "Experimental.h"
 
 class wxDC;
 class wxRect;

Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22349/prefs

Modified Files:
	GUIPrefs.cpp 
Log Message:
Some 'wording' changes, as the wiki and posts.

Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- GUIPrefs.cpp	22 Nov 2007 07:24:29 -0000	1.57
+++ GUIPrefs.cpp	28 Nov 2007 01:06:02 -0000	1.58
@@ -110,7 +110,7 @@
    S.TieChoice(_("Language:"),wxT("/Locale/Language"),wxT("en"),mLangNames, mLangCodes );  
    S.EndTwoColumn();
    S.EndStatic();
-   S.StartStatic( _("Minimum of dB mode display range") );
+   S.StartStatic( _("Display range minimum for 'Waveform (dB)' view") );
    {
       S.StartRadioButtonGroup( wxT("/GUI/EnvdBRange"), ENV_DB_RANGE );
       S.TieRadioButton( _("-36 dB (shallow range for high-amplitude editing)"),36);

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21066

Modified Files:
	TrackPanel.cpp 
Log Message:
Better zooming and drag-zooming for 'Spectrum log(f)' mode, go 2.

Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- TrackPanel.cpp	22 Nov 2007 10:16:15 -0000	1.380
+++ TrackPanel.cpp	27 Nov 2007 00:31:59 -0000	1.381
@@ -2576,6 +2576,7 @@
 ///   - Zoom in; ensure we don't go too large.
 void TrackPanel::HandleVZoomButtonUp( wxMouseEvent & event )
 {
+   int minBins;
    if (!mCapturedTrack)
       return;
 
@@ -2603,11 +2604,10 @@
 #else
    bool spectrum;
 #endif
-   int windowSize, 
+   int windowSize; 
 #ifdef EXPERIMENTAL_FFT_SKIP_POINTS
-      fftSkipPoints=0, 
+   int fftSkipPoints=0; 
 #endif //EXPERIMENTAL_FFT_SKIP_POINTS
-      minBins = 0;
    double rate = ((WaveTrack *)track)->GetRate();
    ((WaveTrack *) track)->GetDisplay() == WaveTrack::SpectrumDisplay ? spectrum = true : spectrum = false;
 #ifdef LOGARITHMIC_SPECTRUM
@@ -2658,10 +2658,18 @@
       if(spectrumLog) {
          double xmin = 1-(mZoomEnd - ypos) / (float)height;
          double xmax = 1-(mZoomStart - ypos) / (float)height;
-		   double lmin=log10(tmin), lmax=log10(tmax);
-		   double d=lmax-lmin;
-		   min=wxMax(1.0, pow(10, xmin*d+lmin));
-		   max=wxMin(rate/2.0, pow(10, xmax*d+lmin));
+         double lmin=log10(tmin), lmax=log10(tmax);
+         double d=lmax-lmin;
+         min=wxMax(1.0, pow(10, xmin*d+lmin));
+         max=wxMin(rate/2.0, pow(10, xmax*d+lmin));
+         // Enforce vertical zoom limits
+         // done in the linear freq domain for now, but not too far out
+         if(max < min + minBins * binSize)
+            max = min + minBins * binSize;
+         if(max > rate/2.) {
+            max = rate/2.;
+            min = max - minBins * binSize;
+         }
       }
       else {
          p1 = (mZoomStart - ypos) / (float)height;
@@ -2669,7 +2677,7 @@
          max = (tmax * (1.0-p1) + tmin * p1);
          min = (tmax * (1.0-p2) + tmin * p2);
 
-         // Enforce maximum vertical zoom
+         // Enforce vertical zoom limits
          if(spectrum) {
             if(min < 0.)
                min = 0.;
@@ -2694,7 +2702,7 @@
       max = (tmax * (1.0-p1) + tmin * p1);
       min = (tmax * (1.0-p2) + tmin * p2);
 
-      // Enforce maximum vertical zoom
+      // Enforce vertical zoom limits
       if(spectrum) {
          if(min < 0.)
             min = 0.;
@@ -2779,7 +2787,7 @@
       if(spectrum) {
          c = 0.5*(min+max);
          // Enforce maximum vertical zoom
-         l = wxMax( 10. * binSize, (c - min));   //is this a sensible min? MJS
+         l = wxMax( minBins * binSize, (c - min));
 
          p1 = (mZoomStart - ypos) / (float)height;
          c = (max * (1.0-p1) + min * p1);
@@ -2797,12 +2805,13 @@
             double d = lmax-lmin;
             min = wxMax(1,pow(10, xmin*d+lmin));
             max = wxMin(rate/2., pow(10, xmax*d+lmin));
-            // Enforce maximum vertical zoom
-            if( (max - min) < (10. * binSize) ) {
-               lmin=log10(min);
-               lmax=log10(max);
-               min = wxMax(1, pow(10, (lmax + lmin)/2.) - 5. * binSize);
-               max = min + 10. * binSize;
+            // Enforce vertical zoom limits
+            // done in the linear freq domain for now, but not too far out
+            if(max < min + minBins * binSize)
+               max = min + minBins * binSize;
+            if(max > rate/2.) {
+               max = rate/2.;
+               min = max - minBins * binSize;
             }
          }
          else {

Update of /cvsroot/audacity/audacity-src/src/export
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29784/src/export

Modified Files:
	ExportPCM.cpp 
Log Message:
Add a translation hint and remove a printf error


Index: ExportPCM.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportPCM.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ExportPCM.cpp	1 Oct 2007 21:14:18 -0000	1.38
+++ ExportPCM.cpp	24 Nov 2007 21:53:58 -0000	1.39
@@ -432,7 +432,8 @@
       char buffer[1000];
       sf_error_str(sf, buffer, 1000);
       wxMessageBox(wxString::Format
-                   (_("Error (file may not have been written): %hs"),
+            /* i18n-hint: %s will be the error message from libsndfile */
+                   (_("Error (file may not have been written): %s"),
                     buffer));
    }

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29023

Modified Files:
	AboutDialog.cpp AboutDialog.h 
Log Message:
A revised about dialogue with a separate tab for much extended build information
to aid *nix support


Index: AboutDialog.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- AboutDialog.h	24 Sep 2007 05:06:56 -0000	1.11
+++ AboutDialog.h	24 Nov 2007 21:52:03 -0000	1.12
@@ -55,10 +55,14 @@
    AboutDialogCreditItemsList creditItems;
    void PopulateAudacityPage( ShuttleGui & S );
    void PopulateLicensePage( ShuttleGui & S );
+   void PopulateInformationPage (ShuttleGui & S );
 
    void CreateCreditsList();
    void AddCredit(const wxString& description, Role role);
    wxString GetCreditsByRole(AboutDialog::Role role);
+
+   void AddBuildinfoRow( wxString* htmlstring, const wxChar * libname, const wxChar * libdesc, wxString status);
+   void AddBuildinfoRow( wxString* htmlstring, const wxChar * libname, const wxChar * libdesc);
 };
 
 #endif

Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- AboutDialog.cpp	4 Nov 2007 14:46:19 -0000	1.55
+++ AboutDialog.cpp	24 Nov 2007 21:52:03 -0000	1.56
@@ -148,9 +148,16 @@
    S.StartNotebook();
    {
       PopulateAudacityPage( S );
+      PopulateInformationPage( S );
       PopulateLicensePage( S );
    }
    S.EndNotebook();
+   
+   wxButton *ok = new wxButton(S.GetParent(), wxID_OK, _("OK... Audacious!"));
+   ok->SetDefault();
+   ok->SetFocus();
+   S.Prop(0).AddWindow( ok );
+
    Fit();
    this->Centre();
 }
@@ -158,83 +165,11 @@
 void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
 {
    wxString versionStr = AUDACITY_VERSION_STRING;
-   wxString informationStr;
+
 
    creditItems.DeleteContents(true); // switchon automatic deletion of list items
    CreateCreditsList();
    
-   wxString enabled = wxString(wxT(": ")) + _("Enabled");
-   wxString disabled = wxString(wxT(": ")) + _("Disabled");
-
-   #ifdef USE_LIBMAD
-   informationStr += wxT("Libmad") + enabled;
-   #else
-   informationStr += wxT("Libmad") + disabled;
-   #endif
-   informationStr += wxT("<br>\n");
-
-   #ifdef USE_LIBVORBIS
-   informationStr += wxT("Ogg Vorbis") + enabled;
-   #else
-   informationStr += wxT("Ogg Vorbis") + disabled;
-   #endif
-   informationStr += wxT("<br>\n");
-
-   #ifdef USE_LIBID3TAG
-   informationStr += wxT("LibID3Tag") + enabled;
-   #else
-   informationStr += wxT("LibID3Tag") + disabled;
-   #endif
-   informationStr += wxT("<br>\n");
-
-   # if USE_LIBFLAC
-   informationStr += wxT("FLAC") + enabled;
-   # else
-   informationStr += wxT("FLAC") + disabled;
-   # endif
-   informationStr += wxT("<br>\n");
-
-   # if USE_LADSPA
-   informationStr += wxT("LADSPA") + enabled;
-   # else
-   informationStr += wxT("LADSPA") + disabled;
-   # endif
-   informationStr += wxT("<br>\n");
-
-   # if USE_VAMP
-   informationStr += wxT("Vamp") + enabled;
-   # else
-   informationStr += wxT("Vamp") + disabled;
-   # endif
-   informationStr += wxT("<br>\n");
-
-   #if USE_LIBRESAMPLE
-   informationStr += wxT("Libresample") + enabled;
-   #elif USE_LIBSAMPLERATE
-   informationStr += wxT("Libsamplerate") + enabled;
-   #endif
-   informationStr += wxT("<br>\n");
-
-   #if USE_PORTAUDIO_V19
-   informationStr += wxT("PortAudio v19");
-   #else
-   informationStr += wxT("PortAudio v18");
-   #endif
-   informationStr += wxT("<br>\n");
-
-   // wxWindows version:
-   informationStr += wxVERSION_STRING;
-   informationStr += wxT("<br>\n");
-
-   // Current date
-   informationStr += _("Program build date: ");
-   informationStr += __TDATE__;
-   informationStr += wxT("<br>\n");
-   
-   // Location of settings
-   informationStr += _("Settings folder: ");
-   informationStr += FileNames::DataDir();
-   informationStr += wxT("<br>\n");
 
    wxString par1Str = _(
      "Audacity is a free program written by a team of volunteer developers around the world. Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects. Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems. Older versions of Audacity are available for Mac OS 9.");
@@ -273,8 +208,6 @@
       wxT("</center><p>") + par1Str +
       wxT("<p>") + par2Str +
       wxT("<p><center><a href=\"http://audacity.sourceforge.net/\">http://audacity.sourceforge.net/</a></center>") + 
-      wxT("<p><center><b>") + _("Information") + wxT("</b></center>") + 
-      wxT("<p><br>") + informationStr + 
       wxT("<p><center><b>") + _("Credits") + wxT("</b></center>")
       + translatorCredits +
       wxT("<p><center><b>") +
@@ -336,51 +269,212 @@
                                          wxSize(LOGOWITHNAME_WIDTH, 264), // wxSize(480, 240),
                                          wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
    html->SetPage(creditStr);
-   S.Prop(1).AddWindow( html, wxEXPAND );
 
-   wxButton *ok = new wxButton(S.GetParent(), wxID_OK, _("OK... Audacious!"));
-   ok->SetDefault();
-   ok->SetFocus();
+   /* locate the html renderer where it fits in the dialogue */
+   S.Prop(0).AddWindow( html, wxEXPAND );
 
-   S.Prop(0).AddWindow( ok );
    S.EndVerticalLay();
    S.EndNotebookPage();
+}
 
+/** \brief: Fills out the "Information" tab of the preferences dialogue 
+ * Provides as much information as possible about build-time options and
+ * the libraries used, to try and make Linux support easier. Basically anything
+ * about the build we might wish to know should be visible here */
+void AboutDialog::PopulateInformationPage( ShuttleGui & S )
+{
+   wxString informationStr;   // string to build up list of information in
+   S.StartNotebookPage( _("Build Information") );  // start the tab
+   S.StartVerticalLay(2);  // create the window
+   wxHtmlWindow *html = new wxHtmlWindow(S.GetParent(), -1, wxDefaultPosition,
+                           wxSize(LOGOWITHNAME_WIDTH, 264), 
+                           wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
+   // create a html pane in it to put the content in.
+   wxString enabled = _("Enabled");
+   wxString disabled = _("Disabled");
+   wxString blank = wxT("");
+   
+   /* this builds up the list of information to go in the window in the string
+    * informationStr */
+   informationStr = wxT("<h2><center>");
+   informationStr += _("Build Information");
+   informationStr += wxT("</center></h2>\n");
+   // top level heading 
+   informationStr += wxT("<h3>");
+   informationStr += _("File Format Support");
+   informationStr += wxT("</h3>\n<p>");
+   // 2nd level headings to split things up a bit
 
-   // Old way to add to about box (for comparison).  Remove this once we're
-   // happy with the new way.
-#if 0
-   wxBoxSizer * pBoxSizer = new wxBoxSizer(wxVERTICAL);
 
-//   logo = new wxBitmap((const char **) AudacityLogo_xpm);
-   icon =
-       new wxStaticBitmap(this, -1, theTheme.Bitmap(bmpAudacityLogo), wxPoint(93, 10),
-                          wxSize(215, 190));
-   pBoxSizer->Add(icon, 0, wxALIGN_CENTER | wxALL, 8);
+   informationStr += wxT("<table>");   // start table of libraries
 
-   wxHtmlWindow *html = 
-      new LinkingHtmlWindow(this, -1,
-                             wxDefaultPosition,
-                             wxSize(480, 240),
-                             wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
-   html->SetPage(creditStr);
-   pBoxSizer->Add(html, 0, wxALIGN_CENTER | wxALL, 8);
 
-   /* i18n-hint: Rather than a literal translation, consider adding the
-   appropriate suffix or prefix to create a word meaning 'something which
-   has Audacity' */
-   wxButton *ok = new wxButton(this, wxID_OK, _("OK... Audacious!"));
-   ok->SetDefault();
-   ok->SetFocus();
-   pBoxSizer->Add(ok, 0, wxALIGN_CENTER | wxALL, 8);
+   #ifdef USE_LIBMAD
+   /* i18n-hint: This is what the library (libmad) does - imports MP3 files */
+   AddBuildinfoRow(&informationStr, wxT("libmad"), _("MP3 Importing"), enabled);
+   #else
+   AddBuildinfoRow(&informationStr, wxT("libmad"), _("MP3 Importing"), disable);
+   #endif
 
-   this->SetAutoLayout(true);
-   this->SetSizer(pBoxSizer);
-   pBoxSizer->Fit(this);
-   pBoxSizer->SetSizeHints(this);
+   /* i18n-hint: Ogg is the container format. Vorbis is the compression codec. 
+    * Both are proper nouns and shouldn't be translated */
+   #ifdef USE_LIBVORBIS
+   AddBuildinfoRow(&informationStr, wxT("libvorbis"),
+         _("Ogg Vorbis Import and Export"), enabled);
+   #else
+   AddBuildinfoRow(&informationStr, wxT("libvorbis"),
+         _("Ogg Vorbis Import and Export"), disabled);
+   #endif
 
-   this->Centre();
-#endif
+   #ifdef USE_LIBID3TAG
+   AddBuildinfoRow(&informationStr, wxT("libid3tag"), _("ID3 tag support"),
+         enabled);
+   #else
+   AddBuildinfoRow(&informationStr, wxT("libid3tag"), _("ID3 tag support"),
+         disabled);
+   #endif
+   
+   /* i18n-hint: FLAC stands for Free Lossless Audio Codec, but is effectively
+    * a proper noun and so shouldn't be translated */
+   # if USE_LIBFLAC
+   AddBuildinfoRow(&informationStr, wxT("libflac"), _("FLAC import and export"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("libflac"), _("FLAC import and export"),
+         disabled);
+   # endif
+
+   # if USE_LIBTWOLAME
+   AddBuildinfoRow(&informationStr, wxT("libtwolame"), _("MP2 export"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("libtwolame"), _("MP2 export"),
+         disabled);
+   # endif
+
+   # if USE_QUICKTIME
+   AddBuildinfoRow(&informationStr, wxT("QuickTime"), _("Import via QuickTime"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("QuickTime"), _("Import via QuickTime"),
+         disabled);
+   # endif
+
+   informationStr += wxT("</table>\n");  //end table of file format libraries
+   informationStr += wxT("<h3>");
+   /* i18n-hint: Libraries that are essential to audacity */
+   informationStr += _("Core Libraries");
+   informationStr += wxT("</h3>\n<table>");  // start table of features
+
+
+   #if USE_LIBRESAMPLE
+   AddBuildinfoRow(&informationStr, wxT("libresample"),
+         _("Sample rate conversion"), enabled);
+   #elif USE_LIBSAMPLERATE
+   AddBuildinfoRow(&informationStr, wxT("libsamplerate"),
+         _("Sample rate conversion"), enabled);
+   #else
+   AddBuildinfoRow(&informationStr, wxT("libresample"),
+         _("Sample rate conversion"), disabled);
+   AddBuildinfoRow(&informationStr, wxT("libsamplerate"),
+         _("Sample rate conversion"), disabled);
+   #endif
+   
+   #if USE_PORTAUDIO_V19
+   AddBuildinfoRow(&informationStr, wxT("PortAudio"),
+         _("Audio playback and recording"), wxString(wxT("v19")));
+   #else
+   AddBuildinfoRow(&informationStr, wxT("PortAudio"),
+         _("Audio playback and recording"), wxString(wxT("v18")));
+   #endif
+
+   informationStr += wxT("<tr><td>");  // start new row
+   // wxWindows version:
+   informationStr += wxVERSION_STRING;
+   informationStr += wxT("</td><td/><td>");
+   /* unicode or not? */
+   informationStr += wxUSE_UNICODE ? wxT("(Unicode)") : wxT("(ANSI)");
+   informationStr += wxT("</td></tr>\n");   // end of row
+
+   informationStr += wxT("</table>\n");  //end table of libraries
+   informationStr += wxT("<h3>");
+   informationStr += _("Features");
+   informationStr += wxT("</h3>\n<table>");  // start table of features
+
+   # if USE_NYQUIST
+   AddBuildinfoRow(&informationStr, wxT("Nyquist"), _("Plug-in support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("Nyquist"), _("Plug-in support"),
+         disabled);
+   # endif
+
+   # if USE_LADSPA
+   AddBuildinfoRow(&informationStr, wxT("LADSPA"), _("Plug-in support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("LADSPA"), _("Plug-in support"),
+         disabled);
+   # endif
+
+   # if USE_VAMP
+   AddBuildinfoRow(&informationStr, wxT("Vamp"), _("Plug-in support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("Vamp"), _("Plug-in support"),
+         disabled);
+   # endif
+
+   # if USE_AUDIO_UNITS
+   AddBuildinfoRow(&informationStr, wxT("Audio Units"), _("Plug-in support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("Audio Units"), _("Plug-in support"),
+         disabled);
+   # endif
+
+   # if USE_PORTMIXER
+   AddBuildinfoRow(&informationStr, wxT("PortMixer"), _("Sound card mixer support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("PortMixer"), _("Sound card mixer support"),
+         disabled);
+   # endif
+
+   # if USE_SOUNDTOUCH
+   AddBuildinfoRow(&informationStr, wxT("SoundTouch"), _("Pitch and Tempo Change support"),
+         enabled);
+   # else
+   AddBuildinfoRow(&informationStr, wxT("SoundTouch"), _("Pitch and Tempo Change support"),
+         disabled);
+   # endif
+
+   informationStr += wxT("</table>\n");   // end of table of features
+
+   informationStr += wxT("<h3>");
+   /* i18n-hint: Information about when audacity was compiled */
+   informationStr += _("Build Information");
+   informationStr += wxT("</h3>\n<table>");
+
+   // Current date
+   AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__);
+  
+   // Install prefix
+   /* i18n-hint: The directory audacity is installed into (on *nix systems) */
+   AddBuildinfoRow(&informationStr, _("Installation Prefix: "), \
+         wxT(INSTALL_PREFIX));
+
+   // Location of settings
+   AddBuildinfoRow(&informationStr,_("Settings folder: "), \
+      FileNames::DataDir());
+   // end of table
+   informationStr += wxT("</table>\n");
+
+   html->SetPage(informationStr);   // push the page into the html renderer
+   S.Prop(2).AddWindow( html, wxEXPAND ); // make it fill the page
+   // I think the 2 here goes with the StartVerticalLay() call above?
+   S.EndVerticalLay();     // end window
+   S.EndNotebookPage(); // end the tab
 }
 
 
@@ -686,7 +780,6 @@
    html->SetPage( PageText );
 
    S.Prop(1).AddWindow( html, wxEXPAND );
-   S.Id( wxID_OK).AddButton( _("Close") );
 
    S.EndVerticalLay();
    S.EndNotebookPage();
@@ -721,6 +814,35 @@
    return s;
 }
 
+/** \brief Add a table row saying if a library is used or not
+ *
+ * Used when creating the build information tab to show if each optional
+ * library is enabled or not, and what it does */
+void AboutDialog::AddBuildinfoRow( wxString* htmlstring, const wxChar * libname, const wxChar * libdesc, wxString status)
+{
+   *htmlstring += wxT("<tr><td>");
+   *htmlstring += libname;
+   *htmlstring += wxT("</td><td>(");
+   *htmlstring += libdesc;
+   *htmlstring += wxT(")</td><td>");
+   *htmlstring += status;
+   *htmlstring += wxT("</td></tr>");
+}
+
+/** \brief Add a table row saying if a library is used or not
+ *
+ * Used when creating the build information tab to show build dates and
+ * file paths */
+void AboutDialog::AddBuildinfoRow( wxString* htmlstring, const wxChar * libname, const wxChar * libdesc)
+{
+   *htmlstring += wxT("<tr><td>");
+   *htmlstring += libname;
+   *htmlstring += wxT("</td><td>");
+   *htmlstring += libdesc;
+   *htmlstring += wxT("</td></tr>");
+}
+
+
 AboutDialog::~AboutDialog()
 {
    delete icon;

Update of /cvsroot/audacity/htdocs/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21467

Modified Files:
	pt_BR.po 
Log Message:
Updated translation from Cleber


Index: pt_BR.po
===================================================================
RCS file: /cvsroot/audacity/htdocs/locale/pt_BR.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pt_BR.po	11 Nov 2007 20:11:17 -0000	1.21
+++ pt_BR.po	24 Nov 2007 17:21:15 -0000	1.22
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: audacity site\n"
 "POT-Creation-Date: 2005-01-07 15:43-0800\n"
-"PO-Revision-Date: 2007-11-11 16:54-0300\n"
+"PO-Revision-Date: 2007-11-21 05:50-0300\n"
 "Last-Translator: Cleber Tavano <clebertavano@..."
-"Language-Team: Cleber Tavano <fotocleber@..."
+"Language-Team: Cleber Tavano <clebertavano@..."
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,10 +25,83 @@
 msgstr "%d de %B de %Y"
 
 #: include/news.inc.php:44
+msgid "Audacity 1.3.4 Released"
+msgstr "Liberada a versão 1.3.4 do Audacity"
+
+#: include/news.inc.php:45
+msgid ""
+"\n"
+"<p>\n"
+"The Audacity Team is pleased to announce the release of \n"
+"<a href=\"/download\">Audacity 1.3.4 (beta)</a>, which includes several \n"
+"new features and user interface improvements, such as:\n"
+"<ul>\n"
+"\t<li>New Welcome Screen with introduction to Audacity.</li>\n"
+"\t<li>New 'Mix and Render to New Track' command.</li>\n"
+"\t<li>Support for VAMP audio analysis plug-ins.</li>\n"
+"\t<li>More keyboard shortcuts and navigation.</li>\n"
+"\t<li>Reworked solo/mute handling.</li>\n"
+"\t<li>New preference: Select all audio in project, if none selected (on by default).</li>\n"
+"\t<li>New preference: Beep on completion of longer activities.</li>\n"
+"\t<li>Envelopes: Many fixes when copying, pasting, or repeating.</li>\n"
+"\t<li>Many translation updates.</li>\n"
+"\t<li>Metadata editor added for OGG, FLAC and WAV/AIFF exports. Metadata import improved.</li>\n"
+"\t<li>Muted tracks are no longer audible in the exported mix.</li>\n"
+"\t<li>Improvements to latency correction.</li>\n"
+"</ul>\n"
+"</p>\n"
+"<p>\n"
+"Note that this release is for Windows and Linux/Unix only. \n"
+"The latest Audacity beta for Mac OS is version 1.3.3.\n"
+"</p>\n"
+"<p>\n"
+"See <a href=\"/download/features-1.3-a\">New Features in 1.3</a>\n"
+"for more information about 1.3.4 and the 1.3.x beta series.\n"
+"</p>\n"
+"<p>\n"
+"Check out the new e-book on \n"
+"<a href=\"http://www.informit.com/store/product.aspx?isbn=0132366576&rl=1\">Podcasting with Audacity</a>.\n"
+"</p>\n"
+msgstr ""
+"\n"
+"<p>\n"
+"O time do Audacity tem o prazer de anunciar o lançamento do\n"
+"<a href=\"/download\">Audacity 1.3.4 (beta)</a>, que \n"
+"apresenta novos recursos e numerosos aprimoramentos\n"
+"na interface gráfica, como:\n"
+"<ul>\n"
+"\t<li>Nova janela de boas-vindas com introdução ao Audacity.</li>\n"
+"\t<li>Novo comando 'Mixar e Gerar nova faixa'.</li>\n"
+"\t<li>Suporte a plug-ins de análise de áudio VAMP.</li>\n"
+"\t<li>Mais atalhos de teclado e navegação.</li>\n"
+"\t<li>Gerenciamento de solo/mudo refeito.</li>\n"
+"\t<li>Nova opção: Selecionar todo o áudio do projeto, se a seleção estiver vazia.</li>\n"
+"\t<li>Nova opção: Bipar ao completar tarefas longas.</li>\n"
+"\t<li>Envelopes: Diversos ajustes feitos ao copiar, colar e repetir.</li>\n"
+"\t<li>Novas traduções atualizadas, incluindo Português brasileiro.</li>\n"
+"\t<li>Editor de metadados para OGG, FLAC e WAV/AIFF.</li>\n"
+"\t<li>Corrigido: Faixas mudas não são mais audíveis no projeto mixado e exportado.</li>\n"
+"\t<li>Correção de latência melhorada.</li>\n"
+"</ul>\n"
+"</p>\n"
+"<p>\n"
+"Note que esta versão está disponível apenas para Windows e Linux. \n"
+"Em Macintoshes rodando Mac OS X, a última versão é a 1.3.3.\n"
+"</p>\n"
+"<p>\n"
+"Veja os <a href=\"/download/features-1.3-a\">novos recursos da versão 1.3</a>\n"
+"para maiores informações sobre o produto.\n"
+"</p>\n"
+"<p>\n"
+"Veja também o novo e-book em inglês \n"
+"<a href=\"http://www.informit.com/store/product.aspx?isbn=0132366576&rl=1\">Podcasting with Audacity</a>.\n"
+"</p>\n"
+
+#: include/news.inc.php:82
 msgid "SourceForge Community Choice Awards 2007"
 msgstr "Prêmio do SourceForge \"Community Choice Awards 2007\""
 
-#: include/news.inc.php:45
+#: include/news.inc.php:83
 msgid ""
 "\n"
 "<p>\n"
@@ -40,23 +113,6 @@
 "<b>Big</b> thanks to SourceForge, to everyone who voted, and to all \n"
 "who contribute to making Audacity great! \n"
 "</p>\n"
-"\n"
-"<p>\n"
-"The latest release of Audacity is \n"
-"<a href=\"/download\">1.3.3 (beta)</a>, which\n"
-"contains numerous new features and capabilities beyond the 1.3.2 (beta) release.\n"
-"Because it is a work \n"
-"in progress and does not yet come with complete documentation or translations\n"
-"into foreign languages, it is recommended for more advanced users.\n"
-"See <a href=\"/download/features-1.3-a\">New Features in 1.3</a>\n"
-"for more information about the 1.3.x beta series.\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"For all users, <a href=\"/download\">Audacity 1.2.6</a>\n"
-"is a stable release, complete and fully documented.  You can have\n"
-"both Audacity 1.2.6 and 1.3.3 installed simultaneously.\n"
-"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
@@ -68,29 +124,12 @@
 "<b>Muito orbigado </b>ao SourceForge, a todos que votaram e a \n"
 "todos que contribuem para que o Audacity seja o que é! \n"
 "</p>\n"
-"\n"
-"<p>\n"
-"A última versão do Audacity é a \n"
-"<a href=\"/download\">1.3.3 (beta)</a>, que \n"
-"contém vários recursos novos em relação à versão 1.3.2 (beta).\n"
-"Como este é um trabalho ainda em progresso \n"
-"e não dispõe de documentação e traduções completas, \n"
-"é recomendada apenas para usuários avançados.\n"
-"Veja a <a href=\"/download/features-1.3-a\">lista de recursos da versão 1.3</a>\n"
-"para maiores informações.\n"
-"</p>\n"
-"\n"
-"<p>\n"
-"For all users, <a href=\"/download\">Audacity 1.2.6</a>\n"
-"is a stable release, complete and fully documented.  You can have\n"
-"both Audacity 1.2.6 and 1.3.3 installed simultaneously.\n"
-"</p>\n"
 
-#: include/news.inc.php:77
+#: include/news.inc.php:98
 msgid "Audacity 1.3.3 Released"
 msgstr "Liberada a versão 1.3.3 do Audacity"
 
-#: include/news.inc.php:78
+#: include/news.inc.php:99
 msgid ""
 "\n"
 "<p>\n"
@@ -230,11 +269,11 @@
 "</dl>\n"
 "</dd></dl>\n"
 
-#: include/news.inc.php:151
+#: include/news.inc.php:172
 msgid "Audacity 1.3.2 and 1.2.5 Released"
 msgstr "Liberada a versão 1.3.2 e 1.2.5 do Audacity"
 
-#: include/news.inc.php:152
+#: include/news.inc.php:173
 msgid ""
 "<p>\n"
 "The Audacity developers have been busy with many new features over  \n"
@@ -359,11 +398,11 @@
 "</dl>\n"
 "</dd></dl>"
 
-#: include/news.inc.php:216
+#: include/news.inc.php:237
 msgid "The Audacity Store Is Open"
 msgstr "A Audacity Store está aberta!"
 
-#: include/news.inc.php:217
+#: include/news.inc.php:238
 msgid ""
 "\n"
 "\t<p>You are invited to try out the new <a href=\"http://audacitystore.com/\">Audacity Store</a>, which features  \n"
@@ -407,7 +446,7 @@
 msgstr ""
 "\n"
 "\t<p>Você está convidado a experimentar a nova<a href=\"http://audacitystore.com/\">Audacity Store</a>, que vende \n"
-" ítens com o logo do Audacity, como camisetas, camisas polo, bolsas bordadas e artigos eletrônicos.\n"
+"\t\t ítens com o logo do Audacity, como camisetas, camisas polo, bolsas bordadas e artigos eletrônicos.\n"
 "\t</p>\n"
 "\t<p align=\"center\">\n"
 "\t\t<a href=\"http://audacitystore.com/\">\n"
@@ -444,11 +483,11 @@
 "\t</p>\n"
 "\t"
 
-#: include/news.inc.php:261
+#: include/news.inc.php:282
 msgid "Audacity 1.2.4 and 1.3.0 Released"
 msgstr "Liberada a versão 1.2.4 e 1.3 do Audacity"
 
-#: include/news.inc.php:262
+#: include/news.inc.php:283
 msgid ""
 "<p>Audacity 1.2.4 is a new stable version of Audacity.  It includes a couple of bug fixes and minor improvements and is recommended for all users.  Audacity 1.3.0 is a beta release that contains hundreds of <a href=\"/download/features-1.3-a\">new features</a>, but this version is unfinished and unstable, and is recommended primarily for advanced users.  You can install both Audacity 1.2 and 1.3 simultaneously.</p>\n"
 "<p>See the <a href=\"/download/release-notes\">1.2.4 Release Notes</a> for a complete list of changes and known problems in Audacity 1.2.4, or see <a href=\"/download/features-1.3-a\">New Features in 1.3</a> for information about the new beta version.</p>\n"
@@ -461,11 +500,11 @@
 "<a href=\"http://audacityteam.org/forum/\">Fórum do Audacity</a>.\n"
 "</p>"
 
-#: include/news.inc.php:272
+#: include/news.inc.php:293
 msgid "Audacity 1.2.3 Released"
 msgstr "Liberada a versão 1.2.3 do Audacity"
 
-#: include/news.inc.php:273
+#: include/news.inc.php:294
 msgid ""
 "<p>Audacity 1.2.3 is a new stable version of Audacity. This version fixes a bug that interfered with long recordings on some Windows systems, and another bug that causes random crashes on Mac OS X. It also includes several updated translations, and other bug fixes and minor improvements.</p>\n"
 "<p>See the <a href=\"/download/release-notes\">Release Notes</a> for a complete list of changes and known problems in this version.</p>"
@@ -553,7 +592,7 @@
 msgstr ""
 "A partir de Março de 2007, o <a href=\"http://sourceforge.net/\">SourceForge.net</a>, \n"
 "  que hospeda o site e os downloads do Audacity, nos permite colocar anúncios \n"
-"  em nossas páginas, divindo conosco o valor dos pagamentos.\n"
+"  em nossas páginas, divindo conosco o valor das receitas. \n"
 "  Obrigado, <a href=\"http://sourceforge.net/\">SourceForge.net</a>!"
 
 #: community/donate.php:30
@@ -673,7 +712,7 @@
 "<p>Subscribe to the <a href=\"../contact/lists#users\">audacity-users mailing list</a> to share tips, questions, and feedback with other Audacity users and developers.</p> <p>Visit the <a href=\"http://audacityteam.org/wiki/\">Audacity Wiki</a>, a community resource where users can add or edit information about Audacity.</p>"
 msgstr ""
 "<h3>Ingresse na comunidade de usuários do Audacity</h3>\n"
-"<P>A <a href=\"../contact/lists#users\">lista de emails </a>é o lugar onde os usuários do Audacity se encontram e trocam idéias, conhecimento e experiências. As mensagens são em inglês, mas se a comunidade luso e brasileira crescer, a criação de uma lista em português será muito bem-vinda</p> <p>Visite também o <a href=\"http://audacityteam.org/wiki/\">Audacity Wiki</a>, um site com textos postados e editados pelos usuários do programa.</p>"
+"<P>A <a href=\"../contact/lists#users\">lista de emails </a>é o lugar onde os usuários do Audacity se encontram e trocam idéias, conhecimento e experiências. As mensagens são em inglês, mas se a comunidade luso e brasileira crescer, a criação de uma lista em português será muito bem-vinda</p> <p>Visite também o <a href=\"http://audacityteam.org/wiki/\">Wiki do Audacityi</a>, um site com textos postados e editados pelos usuários do programa. As páginas em português estão no <a href=\"http://audacityteam.org/wiki/index.php?title=Brazilian_Portuguese_Information\">Wiki brasileiro</a> do programa.</p>"
 
 #: community/users.php:28
 msgid ""
@@ -731,7 +770,7 @@
 msgstr "Use este comando para verificar o código-fonte da última versão estável do Audacity no CVS:"
 
 #: community/developers.php:32
-msgid "Or use this command to check out the latest Audacity unstable/development source code from CVS:"
+msgid "Or use this command to check out the latest Audacity beta/development source code from CVS:"
 msgstr "Ou use este comando para verificar o código-fonte da última versão em teste/beta do Audacity no CVS:"
 
 #: community/developers.php:35
@@ -765,8 +804,8 @@
 msgstr "Um grupo de tradutores voluntários traduz o Audacity para diversos idiomas. Caso queira ajudar, cadastre-se na <a href=\"../contact/lists#translation\">lista de tradução do Audacity</a> e apresente-se."
 
 #: community/translation.php:18
-msgid "The translation effort is now focused on Audacity 1.3.3 and beyond.  Translations from previous versions of Audacity have been imported and need to be updated."
-msgstr "O esforço de tradução está concentrado na versão 1.3.3 e mais recente. As traduções anteriores deverão ser atualizadas e refeitas."
+msgid "The translation effort is now focused on Audacity 1.3.  Translations from previous versions of Audacity have been imported and need to be updated."
+msgstr "O esforço de tradução está concentrado na versão 1.3 e mais recente. As traduções anteriores deverão ser atualizadas e refeitas."
 
 #: community/translation.php:20
 msgid "Resources for Translators"
@@ -1135,15 +1174,216 @@
 "  <li>Com versões para Mac OS X, Windows, e GNU/Linux.</li>\n"
 "</ul>"
 
+#: about/index_t.php:9
 #: about/main.inc.php:11
 #: about/index.php:9
 #: help/faq.php:24
 msgid "About Audacity"
 msgstr "Sobre o Audacity"
 
+#: about/index_t.php:14
+#: about/index.php:14
+msgid ""
+"<p>Audacity is a free, easy-to-use audio editor and recorder for Windows, Mac OS X, GNU/Linux, and other operating systems.  You can use Audacity to:</p>\n"
+"\n"
+"<ul>\n"
+"  <li>Record live audio.</li>\n"
+"  <li>Convert tapes and records into digital recordings or CDs.</li>\n"
+"  <li>Edit Ogg Vorbis, MP3, and WAV sound files.</li>\n"
+"  <li>Cut, copy, splice, and mix sounds together.</li>\n"
+"  <li>Change the speed or pitch of a recording.</li>\n"
+"  <li>And more! See the complete <a href=\"features\">list of features</a>.</li>\n"
+"</ul>"
+msgstr ""
+"<p>O Audacity é um editor de áudio livre e fácil de usar disponível para Windows, Mac OS X, GNU/Linux e outros. Use o Audacity para:</p>\n"
+"\n"
+"<ul>\n"
+"  <li>Gravações ao vivo.</li>\n"
+"  <li>Transformar fitas cassete em gravações digitais e CDs.</li>\n"
+"  <li>Editar arquivos em formato Ogg Vorbis, MP3 e WAV.</li>\n"
+"  <li>Cortar, copiar, colar e juntar sons e faixas de áudio.</li>\n"
+"  <li>Alterar a velocidade ou o timbre de uma gravação.</li>\n"
+"  <li>E muito mais! Veja a <a href=\"features\">lista completa de recursos</a>.</p>\n"
+"</ul>"
+
+#. i18n-hint: You may change the link addresses below, if there is a
+#. version of the page in your language at a different location.
+#.
+#. For official translations of the phrase "free software", please see:
+#. http://www.fsf.org/philosophy/fs-translations.html
+#.
+#. Also check the translations of this web page:
+#. http://www.fsf.org/philosophy/free-sw.html
+#: about/index_t.php:33
+msgid "<h3>About Free Software</h3>"
+msgstr "<h3>Sobre o Software Livre</h3>"
+
+#: about/index_t.php:34
+msgid "<p>Audacity is free software, developed by a group of volunteers and distributed under the <a href=\"license\">GNU General Public License (GPL)</a>.</p>"
+msgstr "<p>O Audacity é um software livre, desenvolvido por um grupo de vountários e distribuído sob a licença <a href=\"license\">GNU General Public License (GPL)</a>.</p>"
+
+#: about/index_t.php:36
+msgid "<p>Free software is not just free of cost (like “free beer”).  It is <b>free as in freedom</b> (like “free speech”).  Free software gives you the freedom to use a program, study how it works, improve it, and share it with others.  For more information, visit the <a href=\"http://www.fsf.org/\">Free Software Foundation</a>.</p>"
+msgstr "<p>Software livre não é só ser grátis. É dar liberdade aos usuários de se envolver no processo de criação e melhoramento, é poder ter voz ativa nos rumos do programa e compartilhar com todos os frutos deste trabalho. Conheça melhor o software livre vendo a página da <a href=\"http://www.fsf.org/\">Free Software Foundation</a>.</p>"
+
+#: about/index_t.php:38
+#: about/index.php:43
+msgid "<p><a href=\"http://www.ohloh.net/projects/59\">Ohloh</a> has statistics on the value of Audacity development. The Ohloh &quot;badge&quot; at the bottom of each page on this site shows updated summary values. We set up the Ohloh pages about Audacity so the statistics show only the values of Audacity-specfic development, i.e., including none of the code libraries Audacity uses.</p>"
+msgstr "<p>O <a href=\"http://www.ohloh.net/projects/59\">Ohloh</a> tem estatísticas sobre o valor desenvolvimento do programa. O selo do Ohloh no rodapé das páginas do site mostra uma estimativa atual do valor do programa. Ele foi ajustado de forma a mostar apenas as estimativas do desenvolvimento do programa em si, sem considerar as bibliotecas que utiliza. </p>"
+
+#: about/index_t.php:40
+msgid "<p>Programs like Audacity are also called <b>open source software</b>, because their source code is available for anyone to study or use.  There are thousands of other free and open source programs, including the <a href=\"http://www.mozilla.com/\">Mozilla</a> web browser, the <a href=\"http://www.openoffice.org/\">OpenOffice.org</a> office suite, and entire <a title=\"Ubuntu Linux\" href=\"http://www.ubuntulinux.org/\">Linux-based operating systems</a>.</p>"
+msgstr "<p>Programas como o Audacity são também chamados de <b>open source</b> ou de <b>código (fonte) aberto </b>, por que os códigos que fazem o programa estão aberto para qualquer pessoa interessada nele. Há muitos outros projetos de código aberto, com o navegador <a href=\"http://www.mozilla.com/\">Mozilla</a>, a suíte de escritório <a href=\"http://www.openoffice.org/\">OpenOffice.org</a> e todo o sistema operacional <a title=\"Ubuntu Linux\" href=\"http://www.ubuntulinux.org/\">Linux/a>.</p>"
+
+#: about/index_t.php:42
+msgid "<p>We welcome <a href=\"../community/donate\">donations</a> to support Audacity development.</p>"
+msgstr "<p>Você também pode <a href=\"../community/donate\">doar dinheiro</a> para auxiliar o desenvolvimento do programa.</p>"
+
+#: about/index_t.php:44
+msgid "<h3>Bundling, Reselling, or Distributing Audacity</h3>"
+msgstr "<h3>Incluindo, revendendo ou distribuindo o Audacity</h3>"
+
+#: about/index_t.php:46
+msgid "<p>Vendors are free to bundle Audacity with their products, or to sell or distribute copies of Audacity (see <a href=\"../download/bundlers\">Vendors and Distributors of Audacity</a>) under the <a href=\"license\">GNU General Public License (GPL)</a>.</p>"
+msgstr "<p>Os revendedores são livres para incluir o Audacity em seus produtos, vendê-lo ou distribuí-lo (veja a página <a href=\"../download/bundlers\">Vendedores e distribuidores do Audacity</a>) na <a href=\"license\">GNU General Public License (GPL)</a>.</p>"
+
+#: about/index_t.php:48
+msgid "<p>If you are interested in distributing Audacity, please see the <a href=\"../about/license\">License, and Advice for Vendors</a> page.</p>"
+msgstr "<p>Se você está interessado em distribuir o Audacity, veja a página <a href=\"../about/license\">Licença e conselhos para vendedores e distribuidores</a>."
+
+#: about/license_t.php:10
+#: about/license.php:10
+#: main.inc.php:26
+msgid "License, and Advice for Vendors and Distributors"
+msgstr "Licença e conselhos para vendedores e distribuidores"
+
+#. i18n-hint:  These gnu.org web pages are available in several languages.
+#. Please link to the version in your language, if possible.  For example:
+#.
+#. http://www.gnu.org/licenses/licenses.es.html#GPL
+#. http://www.gnu.org/licenses/gpl-faq.cs.html
+#.
+#. See the bottom of each page for versions in other languages.
+#.
+#: about/license_t.php:26
+msgid "<h3>License</h3>"
+msgstr "<h3>Licença</h3>"
+
+#: about/license_t.php:28
+msgid "<p>Audacity is <a href=\"../help/faq?s=general&amp;i=free\">free software</a>; you may use it for any personal, commercial, or educational purpose, including installing it on as many different computers as you wish.</p>"
+msgstr "<p>O Audacity é um <a href=\"../help/faq?s=general&amp;i=free\">software livre</a>; você pode usá-lo para uso pessoal, comercial ou educacional, instalando em quantas máquinas quiser.</p>"
+
+#: about/license_t.php:30
+msgid "<p>You may also copy, distribute, modify, and/or resell Audacity, under the terms of the <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GNU General Public License (GPL)</a> as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. In granting you this right, the GPL requires that the source code you distribute is itself available under the same GPL. If you have questions, please email us at the <a href=\"mailto:audacity-help@... list, audacity-help@...>. (This is a public mailing list. For details, see our <a href=\"../contact/privacy\">privacy policy</a>.)</p>"
+msgstr "<p>Você pode copiar, distribuir, modificar ou revender o Audacity, dentro dos termos da <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GNU General Public License (GPL)</a> como publicada pela Free Software Foundation; na sua versão 2 ou outra mais recente, a seu critério. Para garantir este direito, a GPL requer que você disponibilize o código fonte sob a mesma licença GPL. Se você tiver dúvidas, envie um email em inglês para a <a href=\"mailto:audacity-help@... da ajuda,  audacity-help@...>. (Esta é um lista pública, para mais detalhes veja a <a href=\"../contact/privacy\">política de privacidade</a>.)</p>"
+
+#: about/license_t.php:32
+msgid "<p>See also: <a href=\"http://www.gnu.org/licenses/gpl-faq.html\">Frequently Asked Questions about the GNU GPL</a>.</p>"
+msgstr "<p>Veja também: <a href=\"http://www.gnu.org/licenses/gpl-faq.html\">Questões comuns sobre a licença GNU GPL</a>.</p>"
+
+#: about/license_t.php:35
+msgid "<h3>Advice for Vendors and Distributors</h3>"
+msgstr "<h3>Licença e conselhos para vendedores e distribuidores</h3>"
+
+#: about/license_t.php:37
+msgid "<p>Several third parties bundle Audacity with their products, resell, or distribute Audacity (see <a href=\"../download/bundlers\">Vendors that Distribute Audacity</a>). Here are guidelines for bundling, reselling, or distributing Audacity. If you adhere to these guidelines, please <a href=\"../contact/\">contact us</a> for possible inclusion at <a href=\"../download/bundlers\">Vendors and Distributors of Audacity</a> (per instructions there).</p>"
+msgstr "<p>Várias instituições incluem o Audacity com seus produtos, revendem ou distribuem o programa (veja <a href=\"../download/bundlers\">Revendedores que distribuem o Audacity</a>). Há linhas diretrizes para distribuir, revender, ou incluir o Audacity com outros produtos. Ao seguir estas diretrizes, por favor, <a href=\"../contact/\">contate-nos</a> para a possibilidade de inclusão na lista de <a href=\"../download/bundlers\">Vendores e Distribuidores do Audacity</a>.</p>"
+
+#: about/license_t.php:39
+msgid ""
+"<p>You must include, in accordance with Section 3 of the GPL:\n"
+"  <ol>\n"
+"    <li>a copy of the <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> and </li>\n"
+"    <li>the <a href=\"http://audacity.sourceforge.net/download/source\">Audacity source code</a> (or if you are distributing a modified version, then that source code), or make a written offer to supply the code.</li>\n"
+"  </ol>\n"
+"</p>"
+msgstr ""
+"<p>Você deve incluir, de acordo com a sessão 3 da GPL:\n"
+"  <ol>\n"
+"    <li>uma cópia da licença <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> e </li>\n"
+"    <li>o <a href=\"http://audacity.sourceforge.net/download/source\">código-fonte do Audacity</a> (ou o código da versão modificada que você está incluindo) ou fazer um oferta pública deste código a quem se interessar por ele.</li>\n"
+"  </ol>\n"
+"</p>"
+
+#: about/license_t.php:46
+msgid "<p>If you distribute our installers and do not modify them, this will comply with both requirements as these include the <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> and an offer in README.txt for users to obtain the source code from us. Versions of Audacity after 1.3.3 also include the GPL in the application itself, in the About Audacity dialog.</p>"
+msgstr "<p>Ao distribuir também nossos instaladores sem modificá-los, estas condições são cumpridas já que está incluída a licença <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> e a oferta pública do código no arquivo README.txt para que os usuários possam obtê-lo direamente conosco. A partir da versão 1.3.3 o Audacity inclui a licença GPL dentro do próprio programa, acessível pelo menu Ajuda..</p>"
+
+#: about/license_t.php:48
+msgid "<p>We would appreciate your linking to our website: <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> so your users can download updated versions of Audacity when released. Also, please subscribe to the notifications list at the bottom of <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> to ensure you are notified of and can distribute the latest version of Audacity.</p>"
+msgstr "<p>Gostaríamos que você também adicionasse um link para o nosso site: <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> para que seus usuários possam baixar atualizações do programa. Inscreva-se também na lista de notificações no rodapé da página, assim você garante que será sempre informado do lançamento de novas versões.</p>"
+
+#: about/license_t.php:50
+msgid "<p>If possible, please include the Audacity documentation from <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a> with your distribution, to reduce the number of queries we receive. Also, please make it clear in your documentation that the Audacity Team cannot offer support on your own your product, only on Audacity. </p>"
+msgstr "<p>Se possível, inclua a documentação que está em <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a> com sua distribuição, para ajudar a reduzir o volume de suporte necessário. Também certifique-se de deixar claro que o time do Audacity só pode prestar assistência ao Audacity e não ao seu produto.</p>"
+
+#: about/license_t.php:52
+msgid "<p>IMPORTANT: If you write your own documentation on Audacity, please let us review it for possible errors, <em>before</em> you publish it.</p>"
+msgstr "<p>IMPORTANTE: Ao escrever sua própria documentação, por favor revise-a <em>antes</em> de publicá-la para evitar possíveis erros.</p>"
+
+#: about/license_t.php:54
+msgid "<p>If you modify Audacity without the express permission of the Audacity Team, you do not have the right to use the name Audacity, which is registered trademark of Dominic Mazzoni.  You must rename the product and provide all of your own technical support.</p>"
+msgstr "<p>Ao modificar o Audacity sem a autorização expressa e por escrito do time de desenvolvedores, você não obtém o direito de utilizar o nome Audacity, cuja marca é registrada mundialmente em nome de Dominic Mazzoni. Você deve então dar ao programa outro nome e se responsabilizar inteiramente por seu suporte, além de disponibilizar publicamente seu código fonte conforme a licença GPL.</p>"
+
+#: about/license_t.php:56
+msgid ""
+"<p>\n"
+"  <dl><dt></dt><dd><!-- indent cheat -->\n"
+"    <h4>For vendors selling a hardware product, with Audacity included:</h4>\n"
+"  </dd></dl>\n"
+"  <ol>\n"
+"    <li>Thank you for choosing to distribute Audacity with your product! Please <a href=\"../contact/\">contact us</a> early so that we can work together to help make your product a success.</li>\n"
+"    <li>Please distribute Audacity unmodified. If you need to modify it to work with your device, please <a href=\"../contact/\">contact us</a> first.</li>\n"
+"    <li>Please test your device with Audacity thoroughly.  If there are any specific configuration instructions that users need to follow in order for your device to work with Audacity, make sure they are included with your device.</li>\n"
+"    <li>Please do not refer customers to Audacity technical support when they are having difficulties using your device.  If you are selling a commercial product, you should provide your own technical support.  When users are having Audacity-specific issues that are not related to your specific device, we will of course be happy to assist them.</li>\n"
+"  </ol>\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"  <dl><dt></dt><dd><!-- indent cheat -->\n"
+"    <h4>Para distribuidores que pretendem incluir o Audacity em seus produtos:</h4>\n"
+"  </dd></dl>\n"
+"  <ol>\n"
+"    <li>Obrigado por escolher o Audacity! <a href=\"../contact/\">Contate-nos</a> com antecedência, para que possamos ajudar a fazer o seu produto um sucesso.</li>\n"
+"    <li>Por favor, distribua o Audacity sem modificá-lo. Caso seja necessário modificá-lo para torná-lo compatível com o seu sistema, <a href=\"../contact/\">entre em contato</a> primeiro.</li>\n"
+"    <li>Teste bem seu sistema com o Audacity. Se houverem instruções de configuração específicas para o seu sistema que devem ser seguidas, certifique-se que os seus usuários tenham acesso claro a estas informações.</li>\n"
+"    <li>Não envie seus consumidores ao suporte do Audacity para resolver questões referentes ao seu sistema. Ao vendê-lo, você deve oferecer seu próprio suporte técnico. No entanto, ficaremos felizes em ajudar nas questões que os usuários tiverem no uso geral do programa.</li>\n"
+"  </ol>\n"
+"</p>"
+
+#: about/license_t.php:68
+msgid ""
+"<p>\n"
+"  <dl><dt></dt><dd><!-- indent cheat -->\n"
+"    <h4>For those who wish to resell or distribute Audacity:</h4>\n"
+"  </dd></dl>\n"
+"  <ol>\n"
+"    <li>If you are reselling Audacity unmodified, your advertising should make it clear that Audacity is available for free on the Internet, and make it clear what the customer is paying for when they purchase Audacity from you.  Possibilities include the convenience of Audacity on CD-ROM, other bundled software or music files, a printed manual, or more.</li>\n"
+"    <li>If you are reselling Audacity unmodified, we expect you to provide your own technical support wherever possible, in support of your own customers. If you have any concerns or we can help you in this, please <a href=\"../contact/\">contact us</a>.</li>\n"
+"  </ol>\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"  <dl><dt></dt><dd><!-- indent cheat -->\n"
+"    <h4>Para quem deseja revender ou distribuir o Audacity:</h4>\n"
+"  </dd></dl>\n"
+"  <ol>\n"
+"    <li>Se você planeja vender uma versão não modificada do Audacity, sua propaganda deve ser clara sobre o fato do programa estar disponível gratuitamente na Internet e ser claro sobre o que os usuários estão pagando ao comprá-lo. As possibilidades incluem o Audacity em um CD-ROM, outros programas incluídos no pacote, um manual impresso, etc.</li>\n"
+"    <li>Se você planeja vender uma versão não modificada do Audacity, esperamos que você provenha seu próprio suporte técnico, para os seus consumidores. Tendo alguma dúvida, <a href=\"../contact/\">contate-nos</a>.</li>\n"
+"  </ol>\n"
+"</p>"
+
+#: about/license_t.php:78
+msgid "<p>You may not advertise yourself or your business as an authorized distributor of Audacity. The name Audacity is a registered trademark of Dominic Mazzoni.</p>"
+msgstr "<p>Você não pode incluir em sua propaganda algo que induza seus clientes a imaginar que você ou sua empresa são distribuidores autorizados, ou algo semelhante, do Audacity. O nome Audacity é uma marca registrada em nome de Dominic Mazzoni com direitos exclusivos.</p>"
+
+#: about/license_t.php:80
+msgid "<p>See <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Advice for Vendors</a> on the <a href=\"http://audacityteam.org/wiki\">Audacity Wiki</a> for further advice.</p>"
+msgstr "<p>Veja mais em inglês em <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Advice for Vendors</a> no <a href=\"http://audacityteam.org/wiki\">wiki do Audacity</a> para maiores detalhes.</p>"
+
 # News  = notícias
 #: about/news.php:21
-#: index.php:108
+#: index.php:112
 msgid "More news items..."
 msgstr "outras notícias..."
 
@@ -1192,11 +1432,6 @@
 msgid "Recording with Audacity"
 msgstr "Gravando com o Audacity"
 
-#: about/license.php:10
-#: main.inc.php:26
-msgid "License, and Advice for Vendors and Distributors"
-msgstr "Licença e conselhos para vendedores e distribuidores"
-
 #. i18n-hint:  These gnu.org web pages are available in several languages.
 #. Please link to the version in your language, if possible.  For example:
 #.
@@ -1224,7 +1459,6 @@
 "<p>Veja também: <a href=\"http://www.gnu.org/licenses/gpl-faq.html\">Questões comuns sobre a licença GNU GPL</a>.</p>"
 
 #: about/license.php:35
-#, fuzzy
 msgid ""
 "<h3>Advice for Vendors and Distributors</h3>\n"
 "\n"
@@ -1286,63 +1520,39 @@
 "\n"
 "<p>Ao distribuir também nossos instaladores sem modificá-los, estas condições são cumpridas já que está incluída a licença <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> e a oferta pública do código no arquivo README.txt para que os usuários possam obtê-lo direamente conosco. A partir da versão 1.3.3 o Audacity inclui a licença GPL dentro do próprio programa, acessível pelo menu Ajuda..</p>\n"
 "\n"
-"<p>We would appreciate your linking to our website: <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> so your users can download updated versions of Audacity when released. Also, please subscribe to the notifications list at the bottom of <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> to ensure you are notified of and can distribute the latest version of Audacity.</p>\n"
+"<p>Gostaríamos que você também adicionasse um link para o nosso site: <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> para que seus usuários possam baixar atualizações do programa. Inscreva-se também na lista de notificações no rodapé da página, assim você garante que será sempre informado do lançamento de novas versões.</p>\n"
 "\n"
-"<p>If possible, please include the Audacity documentation from <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a> with your distribution, to reduce the number of queries we receive. Also, please make it clear in your documentation that the Audacity Team cannot offer support on your own your product, only on Audacity. </p>\n"
+"<p>Se possível, inclua a documentação que está em <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a> com sua distribuição, para ajudar a reduzir o volume de suporte necessário. Também certifique-se de deixar claro que o time do Audacity só pode prestar assistência ao Audacity e não ao seu produto.</p>\n"
 "\n"
-"<p>IMPORTANT: If you write your own documentation on Audacity, please let us review it for possible errors, <em>before</em> you publish it.</p>\n"
+"<p>IMPORTANTE: Ao escrever sua própria documentação, por favor revise-a antes de publicá-la para evitar possíveis erros.</p>\n"
 "   \n"
-"<p>If you modify Audacity without the express permission of the Audacity Team, you do not have the right to use the name Audacity, which is registered trademark of Dominic Mazzoni.  You must rename the product and provide all of your own technical support.</p>\n"
+"<p>Ao modificar o Audacity sem a autorização expressa e por escrito do time de desenvolvedores, você não obtém o direito de utilizar o nome Audacity, cuja marca é registrada mundialmente em nome de Dominic Mazzoni. Você deve então dar ao programa outro nome e se responsabilizar inteiramente por seu suporte, além de disponibilizar publicamente seu código fonte conforme a licença GPL.</p>\n"
 "\n"
 "<p>\n"
 "  <dl><dt></dt><dd><!-- indent cheat -->\n"
-"    <h4>For vendors selling a hardware product, with Audacity included:</h4>\n"
+"    <h4>Para distribuidores que pretendem incluir o Audacity em seus produtos:</h4>\n"
 "  </dd></dl>\n"
 "  <ol>\n"
-"    <li>Thank you for choosing to distribute Audacity with your product! Please <a href=\"../contact/\">contact us</a> early so that we can work together to help make your product a success.</li>\n"
-"    <li>Please distribute Audacity unmodified. If you need to modify it to work with your device, please <a href=\"../contact/\">contact us</a> first.</li>\n"
-"    <li>Please test your device with Audacity thoroughly.  If there are any specific configuration instructions that users need to follow in order for your device to work with Audacity, make sure they are included with your device.</li>\n"
-"    <li>Please do not refer customers to Audacity technical support when they are having difficulties using your device.  If you are selling a commercial product, you should provide your own technical support.  When users are having Audacity-specific issues that are not related to your specific device, we will of course be happy to assist them.</li>\n"
+"    <li>Obrigado por escolher o Audacity! <a href=\"../contact/\">Contate-nos</a> com antecedência, para que possamos ajudar a fazer o seu produto um sucesso.</li>\n"
+"    <li>Por favor, distribua o Audacity sem modificá-lo. Caso seja necessário modificá-lo para torná-lo compatível com o seu sistema, <a href=\"../contact/\">entre em contato</a> primeiro.</li>\n"
+"    <li>Teste bem seu sistema com o Audacity. Se houverem instruções de configuração específicas para o seu sistema que devem ser seguidas, certifique-se que os seus usuários tenham acesso claro a estas informações.</li>\n"
+"    <li>Não envie seus consumidores ao suporte do Audacity para resolver questões referentes ao seu sistema. Ao vendê-lo, você deve oferecer seu próprio suporte técnico. No entanto, ficaremos felizes em ajudar nas questões que os usuários tiverem no uso geral do programa.</li>\n"
 "  </ol>\n"
 "</p>\n"
 "\n"
 "<p>\n"
 "  <dl><dt></dt><dd><!-- indent cheat -->\n"
-"    <h4>For those who wish to resell or distribute Audacity:</h4>\n"
+"    <h4>Para quem deseja revender ou distribuir o Audacity:</h4>\n"
 "  </dd></dl>\n"
 "  <ol>\n"
-"    <li>If you are reselling Audacity unmodified, your advertising should make it clear that Audacity is available for free on the Internet, and make it clear what the customer is paying for when they purchase Audacity from you.  Possibilities include the convenience of Audacity on CD-ROM, other bundled software or music files, a printed manual, or more.</li>\n"
-"    <li>If you are reselling Audacity unmodified, we expect you to provide your own technical support wherever possible, in support of your own customers. If you have any concerns or we can help you in this, please <a href=\"../contact/\">contact us</a>.</li>\n"
+"    <li>Se você planeja vender uma versão não modificada do Audacity, sua propaganda deve ser clara sobre o fato do programa estar disponível gratuitamente na Internet e ser claro sobre o que os usuários estão pagando ao comprá-lo. As possibilidades incluem o Audacity em um CD-ROM, outros programas incluídos no pacote, um manual impresso, etc.</li>\n"
+"    <li>Se você planeja vender uma versão não modificada do Audacity, esperamos que você provenha seu próprio suporte técnico, para os seus consumidores. Tendo alguma dúvida, <a href=\"../contact/\">contate-nos</a>.</li>\n"
 "  </ol>\n"
 "</p>\n"
 "\n"
-"<p>You may not advertise yourself or your business as an authorized distributor of Audacity. The name Audacity is a registered trademark of Dominic Mazzoni.</p>\n"
-"\n"
-"<p>See <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Advice for Vendors</a> on the <a href=\"http://audacityteam.org/wiki\">Audacity Wiki</a> for further advice.</p>"
-
-#: about/index.php:14
-msgid ""
-"<p>Audacity is a free, easy-to-use audio editor and recorder for Windows, Mac OS X, GNU/Linux, and other operating systems.  You can use Audacity to:</p>\n"
-"\n"
-"<ul>\n"
-"  <li>Record live audio.</li>\n"
-"  <li>Convert tapes and records into digital recordings or CDs.</li>\n"
-"  <li>Edit Ogg Vorbis, MP3, and WAV sound files.</li>\n"
-"  <li>Cut, copy, splice, and mix sounds together.</li>\n"
-"  <li>Change the speed or pitch of a recording.</li>\n"
-"  <li>And more! See the complete <a href=\"features\">list of features</a>.</li>\n"
-"</ul>"
-msgstr ""
-"<p>O Audacity é um editor de áudio livre e fácil de usar disponível para Windows, Mac OS X, GNU/Linux e outros. Use o Audacity para:</p>\n"
+"<p>Você não pode incluir em sua propaganda algo que induza seus clientes a imaginar que você ou sua empresa são distribuidores autorizados, ou algo semelhante, do Audacity. O nome Audacity é uma marca registrada em nome de Dominic Mazzoni com direitos exclusivos.</p>\n"
 "\n"
-"<ul>\n"
-"  <li>Gravações ao vivo.</li>\n"
-"  <li>Transformar fitas cassete em gravações digitais e CDs.</li>\n"
-"  <li>Editar arquivos em formato Ogg Vorbis, MP3 e WAV.</li>\n"
-"  <li>Cortar, copiar, colar e juntar sons e faixas de áudio.</li>\n"
-"  <li>Alterar a velocidade ou o timbre de uma gravação.</li>\n"
-"  <li>E muito mais! Veja a <a href=\"features\">lista completa de recursos</a>.</p>\n"
-"</ul>"
+"<p>Veja mais em inglês em <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Advice for Vendors</a> no <a href=\"http://audacityteam.org/wiki\">wiki do Audacity</a> para maiores detalhes.</p>"
 
 #. i18n-hint: You may change the link addresses below, if there is a
 #. version of the page in your language at a different location.
@@ -1358,8 +1568,6 @@
 "\n"
 "<p>Audacity is free software, developed by a group of volunteers and distributed under the <a href=\"license\">GNU General Public License (GPL)</a>.</p>\n"
 "\n"
-"<p><a href=\"http://www.ohloh.net/projects/59\">Ohloh</a> has statistics on the value of Audacity development. The Ohloh &quot;badge&quot; at the bottom of each page on this site shows updated summary values. We set up the Ohloh pages about Audacity so the statistics show only the values of Audacity-specfic development, i.e., including none of the code libraries Audacity uses.</p>\n"
-"\n"
 "<p>Free software is not just free of cost (like “free beer”).  It is <b>free as in freedom</b> (like “free speech”).  Free software gives you the freedom to use a program, study how it works, improve it, and share it with others.  For more information, visit the <a href=\"http://www.fsf.org/\">Free Software Foundation</a>.</p>\n"
 "\n"
 "<p>Programs like Audacity are also called <b>open source software</b>, because their source code is available for anyone to study or use.  There are thousands of other free and open source programs, including the <a href=\"http://www.mozilla.com/\">Mozilla</a> web browser, the <a href=\"http://www.openoffice.org/\">OpenOffice.org</a> office suite, and entire <a title=\"Ubuntu Linux\" href=\"http://www.ubuntulinux.org/\">Linux-based operating systems</a>.</p>\n"
@@ -1370,8 +1578,6 @@
 "\n"
 "<p>O Audacity é um software livre, desenvolvido por um grupo de vountários e distribuído sob a licença <a href=\"license\">GNU General Public License (GPL)</a>.</p>\n"
 "\n"
-"<p>O <a href=\"http://www.ohloh.net/projects/59\">Ohloh</a> tem estatísticas sobre o valor desenvolvimento do programa. O selo do Ohloh no rodape das páginas do site mostr uma estimativa atual do valor do programa. Ele foi ajustado de forma a mostar apenas as estimativas do desenvolvimento do programa em si, sem considerar as bibliotecas que utiliza. </p>\n"
-"\n"
 "<p>Software livre não é só ser grátis. É dar liberdade aos usuários de se envolver no processo de criação e melhoramento, é poder ter voz ativa nos rumos do programa e compartilhar com todos os frutos deste trabalho. Conheça melhor o software livre vendo a página da <a href=\"http://www.fsf.org/\">Free Software Foundation</a>.</p>\n"
 "\n"
 "<p>Programas como o Audacity são também chamados de <b>open source</b> ou de <b>código (fonte) aberto </b>, por que os códigos que fazem o programa estão aberto para qualquer pessoa interessada nele. Há muitos outros projetos de código aberto, com o navegador <a href=\"http://www.mozilla.com/\">Mozilla</a>, a suíte de escritório <a href=\"http://www.openoffice.org/\">OpenOffice.org</a> e todo o sistema operacional <a title=\"Ubuntu Linux\" href=\"http://www.ubuntulinux.org/\">Linux/a>.</p>\n"
@@ -1730,7 +1936,7 @@
 
 #: main.inc.php:39
 #: download/index.php:41
-#: index.php:60
+#: index.php:64
 msgid "Beta"
 msgstr "Em teste"
 
@@ -1778,7 +1984,7 @@
 
 #: help/faq.php:27
 msgid "Is Audacity really free?  Why?"
-msgstr "O Audacity é realmente gratuito? "
+msgstr "O Audacity é realmente gratuito? Por quê?"
 
 #: help/faq.php:28
 msgid ""
@@ -1860,7 +2066,7 @@
 "<h3>Windows</h3>\n"
 "<ol>\n"
 "  <li>Go to the <a href=\"%s\">LAME download page</a>.</li>\n"
-"  <li>Under \"For Audacity 1.2.6 and 1.3.3 on Windows\", left-click on the link \"%s\" and save the zip folder to anywhere on your computer.</li>\n"
+"  <li>Under \"For Audacity on Windows\", left-click on the link \"%s\" and save the zip folder to anywhere on your computer.</li>\n"
 "  <li>When you have finished downloading the ZIP folder, unzip it and save the file <b>lame_enc.dll</b> that it contains to anywhere on your computer.</li>\n"
 "  <li>The first time you use the \"Export as MP3\" command, Audacity will ask you where lame_enc.dll is saved.</li>\n"
 "  <li>In case of difficulty, please view our more detailed instructions at the\n"
@@ -1879,17 +2085,17 @@
 "<h3>Windows</h3>\n"
 "<ol>\n"
 "  <li>Vá à <a href=\"%s\">página de download do LAME</a>.</li>\n"
-"  <li>Em \"For Audacity 1.2.6 and 1.3.3 on Windows\", clique com o botão esquerdo no link \"%s\" e salve o arquivo ZIP em seu computador. </li>\n"
+"  <li>Em \"For Audacity on Windows\", clique com o botão esquerdo no link \"%s\" e salve o arquivo ZIP em seu computador. </li>\n"
 "  <li>Ao terminar a cópia, descompacte o ZIP e salve o arquivo <b>lame_enc.dll</b> em uma pasta em seu computador.</li>\n"
 "  <li>Ao executar o comando \"Exportar áudio como MP3\", o Audacity perguntará em qual pasta o lame_enc.dll está salvo.</li>\n"
-"  <li>Veja mais detalhes em inglês na \n"
-"  <a href=\"http://audacityteam.org/wiki/index.php?title=Lame_Installation#Windows_Instructions\">Audacity Wiki</a>.</li>\n"
+"  <li>Veja mais detalhes em português no \n"
+"  <a href=\"http://audacityteam.org/wiki/index.php?title=Lame_Installation_Portuguese\">Wiki do Audacity</a>.</li>\n"
 "</ol>\n"
 "<h3>Mac OS 9 ou  X</h3>\n"
 "<ol>\n"
 "  <li>Vá à <a href=\"%s\">página de download do LAME</a>.</li>\n"
 "  <li>Copie libmp3lame ou a versão do LameLib compatível com seu sistema.</li>\n"
-"  <li>Ao terminar, descompacte com o Stuffit Expander</li>\n"
+"  <li>Ao terminar, descompacte com o Stuffit Expander.</li>\n"
 "  <li>Salve o arquivo \"LameLib\" ou libmp3lame.dylib em seu computador.</li>\n"
 "  <li>Ao executar o comando \"Exportar áudio como MP3\", o Audacity perguntará em qual pasta o LameLib ou libmp3lame.dylib está salvo.</li>\n"
 "</ol>"
@@ -3511,7 +3717,7 @@
 
 #: download/features-1.3-k.php:36
 #: download/features-1.3-i.php:77
-#: download/features-1.3-a.php:80
+#: download/features-1.3-a.php:156
 msgid "Repair and Equalization effects"
 msgstr "Efeitos de reparo e equalização"
 
@@ -3530,7 +3736,7 @@
 
 #: download/features-1.3-k.php:43
 #: download/features-1.3-d.php:56
-#: download/features-1.3-a.php:82
+#: download/features-1.3-a.php:158
 msgid "Project saving and recovery"
 msgstr "Gravação e recuperação de arquivos de projeto"
 
@@ -3609,7 +3815,7 @@
 
 #: download/features-1.3-j.php:71
 #: download/features-1.3-l.php:46
-#: download/features-1.3-a.php:81
+#: download/features-1.3-a.php:157
 msgid "Timer Recording"
 msgstr "Gravação temporizada"
 
@@ -3792,13 +3998,13 @@
 
 #: download/features-1.3-c.php:259
 #: download/features-1.3-f.php:47
-#: download/features-1.3-a.php:90
+#: download/features-1.3-a.php:166
 msgid "Collapse/Expand Tracks"
 msgstr "Recolher/Expandir faixas"
 
 #: download/features-1.3-c.php:266
 #: download/features-1.3-g.php:54
-#: download/features-1.3-a.php:92
+#: download/features-1.3-a.php:168
 msgid "Improved Label Tracks"
 msgstr "Faixas de títulos melhoradas"
 
@@ -3837,12 +4043,12 @@
 
 #: download/features-1.3-e.php:67
 #: download/features-1.3-b.php:56
-#: download/features-1.3-a.php:91
+#: download/features-1.3-a.php:167
 msgid "Multiple clips per track"
 msgstr "Múltiplos clips por faixa"
 
 #: download/features-1.3-e.php:74
-#: download/features-1.3-a.php:93
+#: download/features-1.3-a.php:169
 msgid "Other features"
 msgstr "Outros recursos"
 
@@ -3851,8 +4057,8 @@
 msgstr "Aviso: versão em desenvolvimento (Beta)"
 
 #: download/betawarning.inc.php:11
-msgid "Audacity 1.3 is an unstable, beta version of Audacity.  Users who want a completely stable, finished program should be using Audacity 1.2.  Audacity 1.3 has hundreds of new features, but some features may be incomplete or confusing, it is more likely to crash, and you are more likely to lose data.  You can install both Audacity 1.2 and 1.3 on the same machine, if you install them to different directories."
-msgstr "O Audacity 1.3.3 éuma versão instável, ainda em desenvolvimento do Audacity. Usuários que desejam uma versão completamente estável do programa devem optar pela versão 1.2. O Audacity 1.3 apresenta diversos novos recursos, mas alguns podem estar incompletos ou corromperem os arquivos de projeto em uso. É possível instalar no mesmo computador a versão 1.2 e a 1.3 na mesma máquina, apenas certifique-se de instalá-las em pastas diferentes."
+msgid "Audacity 1.3 is a beta version of Audacity.  Users who want a completely stable, finished program should be using Audacity 1.2.  Audacity 1.3 has hundreds of new features, but some features may be incomplete or confusing, it is more likely to crash, and you are more likely to lose data.  You can install both Audacity 1.2 and 1.3 on the same machine, if you install them to different directories."
+msgstr "O Audacity 1.3  é uma versão instável, ainda em desenvolvimento do Audacity. Usuários que desejam uma versão completamente estável do programa devem optar pela versão 1.2. O Audacity 1.3 apresenta diversos novos recursos, mas alguns podem estar incompletos ou corromperem os arquivos de projeto em uso. É possível instalar no mesmo computador a versão 1.2 e a 1.3 na mesma máquina, apenas certifique-se de instalá-las em pastas diferentes."
 
 #: download/betawarning.inc.php:12
 msgid "Audacity 1.3 is available in many languages, but most translations are incomplete.  Words and phrases which have not been translated yet will appear in English."
@@ -3880,7 +4086,7 @@
 
 #: download/features-1.3-f.php:40
 #: download/features-1.3-l.php:53
-#: download/features-1.3-a.php:83
+#: download/features-1.3-a.php:159
 msgid "Selection Bar"
 msgstr "Barra de seleção"
 
@@ -4000,7 +4206,7 @@
 msgstr "Por fim, pressione a seta para cima e a tecla Enter para desmarcar a seleção da faixa acima."
 
 #: download/features-1.3-i.php:70
-#: download/features-1.3-a.php:78
+#: download/features-1.3-a.php:154
 msgid "Improved Toolbar Docking"
 msgstr "Barras de ferramentas melhoradas"
 
@@ -4053,7 +4259,7 @@
 
 #: download/features-1.3-b.php:50
 #: download/features-1.3-d.php:63
-#: download/features-1.3-a.php:84
+#: download/features-1.3-a.php:160
 msgid "Mac OS X features"
 msgstr "Recursos para Mac OS X"
 
@@ -4910,18 +5116,22 @@
 msgstr "O Audacity pode carregar efeitos VST (em Mac e Windows) utilizando o <a href=\"../help/faq?s=install&amp;i=vst-enabler\">VST Enabler</a>.  Plug-ins VST podem ser encontrados em outros sites."
 
 #: download/features-1.3-a.php:17
+msgid "New in Audacity 1.3.4"
+msgstr "Novos recursos da versão 1.3.4"
+
+#: download/features-1.3-a.php:93
 msgid "New features in Audacity 1.3.3"
 msgstr "Novos recursos da versão 1.3.3"
 
-#: download/features-1.3-a.php:75
+#: download/features-1.3-a.php:151
 msgid "New features in Audacity 1.3.1 and 1.3.2"
 msgstr "Novos recursos no Audacity 1.3.1 e 1.3.2"
 
-#: download/features-1.3-a.php:79
+#: download/features-1.3-a.php:155
 msgid "Track focus for improved keyboard navigation"
 msgstr "Navegação pelo teclado melhorada para a seleção de faixas"
 
-#: download/features-1.3-a.php:87
+#: download/features-1.3-a.php:163
 msgid "New features in Audacity 1.3.0"
 msgstr "Novos recursos no Audacity 1.3.0"
 
@@ -4969,30 +5179,38 @@
 msgid "Audacity is free, open source software for recording and editing sounds.  It is available for Mac OS X, Microsoft Windows, GNU/Linux, and other operating systems. <a href=\"about/\">Learn more about Audacity...</a> Also check our <a href=\"http://audacityteam.org/wiki/\">Wiki</a> and <a href=\"http://audacityteam.org/forum/\">Forum</a> for more information."
 msgstr "O Audacity é um programa gratuito, de código fonte aberto, para edição de áudio digital. Está disponível para Mac OS X, Microsoft Windows, GNU/Linux e outros sistemas operacionais. <a href=\"about/\">Conheça mais sobre o Audacity...</a> Também conheça o nosso <a href=\"http://audacityteam.org/wiki/\">Wiki</a> e o <a href=\"http://audacityteam.org/forum/\">Forum</a> para maiores informações."
 
-#: index.php:56
+#: index.php:53
+msgid "The latest release of Audacity is <a href=\"/download\">1.3.4 (beta)</a>. Because it is a work in progress and does not yet come with complete documentation or translations into foreign languages, it is recommended for more advanced users. See <a href=\"/download/features-1.3-a\">New Features in 1.3</a> for more information about the 1.3.x beta series."
+msgstr "A última versão do Audacity é a <a href=\"/download\">1.3.4 (beta)</a>. Como é um trabalho ainda em progresso que não contém documentação ou traduções completas, é recomendado apenas para usuários avançados do sistema. Veja a <a href=\"/download/features-1.3-a\">lista de novos recursos da versão 1.3 </a>para maiores informações."
+
+#: index.php:55
+msgid "For all users, <a href=\"/download\">Audacity 1.2.6</a> is a stable release, complete and fully documented.  You can have both Audacity 1.2.6 and 1.3.3 installed simultaneously."
+msgstr "Para todos os usuários, o <a href=\"/download\">Audacity 1.2.6</a> é a versão estável, completa e documentada. É possível ter as duas versões instaladas no mesmo computador."
+
 #: index.php:60
+#: index.php:64
 #, php-format
 msgid "Download Audacity %s"
 msgstr "Instale o Audacity %s"
 
-#: index.php:68
+#: index.php:72
 msgid "Other downloads"
 msgstr "Outras versões"
 
 # notified - anuncio
-#: index.php:76
+#: index.php:80
 msgid "Get Notified of New Versions"
 msgstr "Receba o anúncio de novas versões:"
 
-#: index.php:88
+#: index.php:92
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: index.php:89
+#: index.php:93
 msgid "Add"
 msgstr "Adicionar"
 
-#: index.php:90
+#: index.php:94
 msgid "Remove"
 msgstr "Remover"

Update of /cvsroot/audacity/audacity-src/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20631

Modified Files:
	pt_BR.po 
Log Message:
Updated translation from Cleber


Index: pt_BR.po
===================================================================
RCS file: /cvsroot/audacity/audacity-src/locale/pt_BR.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pt_BR.po	11 Nov 2007 20:14:08 -0000	1.2
+++ pt_BR.po	24 Nov 2007 17:18:54 -0000	1.3
@@ -7,7 +7,7 @@
 "Project-Id-Version: Audacity 1.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-14 09:03+0200\n"
-"PO-Revision-Date: 2007-11-11 15:54-0300\n"
+"PO-Revision-Date: 2007-11-21 06:27-0300\n"
 "Last-Translator: Cleber Tavano <clebertavano@..."
 "Language-Team: Cleber Tavano <clebertavano@..."
 "MIME-Version: 1.0\n"
@@ -165,8 +165,8 @@
 msgid "Output Meter"
 msgstr "Medidor de saída"
 
-#. i18n-hint: Mac OS X shortcut should be Ctrl+,
 #. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
 #: AudacityApp.cpp:734
 #: Menus.cpp:470
 msgid "&Preferences...\tCtrl+,"
@@ -1411,11 +1411,23 @@
 msgid "Export &Multiple..."
 msgstr "Exportar &múltiplos..."
 
+#: Menus.cpp:245
+msgid "CleanSpeech C&hain..."
+msgstr "Cadeias do Clean Speec&h..."
+
 #: Menus.cpp:246
 #: Menus.cpp:260
 msgid "Edit C&hains..."
 msgstr "Editar arquivos de &lote..."
 
+#: Menus.cpp:247
+msgid "Export CleanSpeech &Presets..."
+msgstr "E&xportar ajustes do CleanSpeech..."
+
+#: Menus.cpp:248
+msgid "I&mport CleanSpeech Presets..."
+msgstr "Im&portar ajustes do CleanSpeech..."
+
 #: Menus.cpp:258
 msgid "Appl&y Chain..."
 msgstr "Apli&car arquivo de lote..."
@@ -7123,7 +7135,7 @@
 
 #: toolbars/EditToolBar.cpp:160
 msgid "Fit Selection"
-msgstr "Ajustar à seleção"
+msgstr "Ajustar zoom à seleção"
 
 #: toolbars/EditToolBar.cpp:160
 msgid "Fit selection in window"
@@ -7131,7 +7143,7 @@
 
 #: toolbars/EditToolBar.cpp:162
 msgid "Fit Project"
-msgstr "Ajustar ao projeto"
+msgstr "Ajustar zoom ao projeto"
 
 #: toolbars/EditToolBar.cpp:162
 msgid "Fit project in window"

Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5379

Modified Files:
	TrackArtist.cpp 
Log Message:
Two constants changed in Find Notes mode (minColor & maxTableSize).
FFT_Y_GRID improved.

Andreas Micheler

Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- TrackArtist.cpp	22 Nov 2007 10:16:15 -0000	1.109
+++ TrackArtist.cpp	24 Nov 2007 02:14:28 -0000	1.110
@@ -1655,7 +1655,10 @@
    sampleCount w1 = (sampleCount) ((t0*rate + x *rate *tstep) + .5);
  
 #ifdef LOGARITHMIC_SPECTRUM
-   const float e=exp(1.0f), f=rate/2.0f/half, 
+   const float 
+      e=exp(1.0f), 
+      log2=log(2.0f),
+      f=rate/2.0f/half, 
       lmin=log(float(minFreq)),
       lmax=log(float(maxFreq)),
 #ifdef EXPERIMENTAL_FFT_SKIP_POINTS
@@ -1666,10 +1669,26 @@
       lmaxs=lmax,
 #endif //EXPERIMENTAL_FFT_SKIP_POINTS
       scale=lmax-lmin, 
-      scale2=(lmax-lmin)/log(2.0), 
-      lmin2=lmin/log(2.0),
+      scale2=(lmax-lmin)/log2, 
+      lmin2=lmin/log2,
       expo=exp(scale);
-   int midHeight12 = mid.height/12;
+
+#ifdef EXPERIMENTAL_FFT_Y_GRID
+   bool *yGrid;
+   yGrid=new bool[mid.height];
+   for (int y = 0; y < mid.height; y++) {
+      float n =(float(y  )/mid.height*scale2-lmin2)*12; 
+      float n2=(float(y+1)/mid.height*scale2-lmin2)*12; 
+      float f =float(minFreq)/(fftSkipPoints+1)*pow(2.0f, n /12.0f+lmin2);
+      float f2=float(minFreq)/(fftSkipPoints+1)*pow(2.0f, n2/12.0f+lmin2);
+      n =log(f /440)/log2*12;
+      n2=log(f2/440)/log2*12;
+      if (floor(n) < floor(n2))
+         yGrid[y]=true;
+      else
+         yGrid[y]=false;
+   }
+#endif //EXPERIMENTAL_FFT_Y_GRID
 #endif //LOGARITHMIC_SPECTRUM
 
 #ifdef EXPERIMENTAL_FIND_NOTES
@@ -1682,12 +1701,11 @@
       f2bin = half/(rate/2.0f),
 #endif //EXPERIMENTAL_FFT_SKIP_POINTS
       bin2f = 1.0f/f2bin,
-      log2=log(2.0f),
       minDistance = pow(2.0f, 2.0f/12.0f),
       i0=exp(lmin)/f,
       i1=exp(scale+lmin)/f,
-      minColor=0.1f;
-   const int maxTableSize=64;
+      minColor=0.0f;
+   const int maxTableSize=1024;
    int *indexes=new int[maxTableSize];
 #endif //EXPERIMENTAL_FIND_NOTES
 
@@ -1753,6 +1771,7 @@
          unsigned char rv, gv, bv;
          float value;
          int x0=x*half;
+
 #ifdef EXPERIMENTAL_FIND_NOTES
          int maximas=0;
          if (!usePxCache && fftFindNotes) {
@@ -1867,11 +1886,6 @@
                      value = (value + 80.0) / 80.0;
                   }
                }
-#ifdef EXPERIMENTAL_FFT_Y_GRID
-               if (fftYGrid && (fabs(fmod(h*scale2-lmin2-1/24.0, 1/12.0)) <=0.01))
-               {  value /= 1.2f;
-               }
-#endif //EXPERIMENTAL_FFT_Y_GRID
                if (value > 1.0)
                   value = float(1.0);
                if (value < 0.0)
@@ -1883,6 +1897,14 @@
 
             GetColorGradient(value, selflag, isGrayscale, &rv, &gv, &bv);
 
+#ifdef EXPERIMENTAL_FFT_Y_GRID
+            if (fftYGrid && yGrid[yy]) {
+               rv /= 1.1f;
+               gv /= 1.1f;
+               bv /= 1.1f;
+            }
+#endif //EXPERIMENTAL_FFT_Y_GRID
+
             int px = ((mid.height - 1 - yy) * mid.width + x) * 3;
             data[px++] = rv;
             data[px++] = gv;
@@ -1956,6 +1978,9 @@
    delete image;
    delete[] where;
    delete[] freq;
+#ifdef EXPERIMENTAL_FFT_Y_GRID
+   delete[] yGrid;
+#endif //EXPERIMENTAL_FFT_Y_GRID
 #ifdef EXPERIMENTAL_FIND_NOTES
    delete[] indexes;
 #endif //EXPERIMENTAL_FIND_NOTES

Update of /cvsroot/audacity/htdocs/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1354

Modified Files:
	sl.po 
Log Message:
New Website Slovenian translation

Index: sl.po
===================================================================
RCS file: /cvsroot/audacity/htdocs/locale/sl.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- sl.po	15 Nov 2007 13:10:54 -0000	1.33
+++ sl.po	23 Nov 2007 11:42:44 -0000	1.34
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacity Website - 1.2\n"
+"Project-Id-Version: Audacity Website - 1.3\n"
 "POT-Creation-Date: 2003-07-04 00:53-0700\n"
-"PO-Revision-Date: 2007-11-15 00:17+0100\n"
+"PO-Revision-Date: 2007-11-23 12:32+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@..."
 "Language-Team: Martin Srebotnjak <miles@..."
 "MIME-Version: 1.0\n"
@@ -1295,10 +1295,16 @@
 "  </ol>\n"
 "</p>"
 msgstr ""
+"<p>V skladu z razdelkom 3 licence GPL morate vključiti:\n"
+"  <ol>\n"
+"    <li>kopijo <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">licence GPL</a> in </li>\n"
+"    <li><a href=\"http://audacity.sourceforge.net/download/source\">izvorno kodo Audacity</a> (če razširjate spremenjeno različico, pa njeno izvorno kodo) ali pisno ponuditi oskrbo s kodo.</li>\n"
+"  </ol>\n"
+"</p>"
 
 #: about/license_t.php:46
 msgid "<p>If you distribute our installers and do not modify them, this will comply with both requirements as these include the <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> and an offer in README.txt for users to obtain the source code from us. Versions of Audacity after 1.3.3 also include the GPL in the application itself, in the About Audacity dialog.</p>"
-msgstr ""
+msgstr "<p>Če razširjate naše namestitvene datoteke in jih ne spreminjate, s tem ustrežete obema zahtevama, saj vključujejo licenco <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\">GPL</a> in ponudbo uporabnikom v datoteki README.txt, da od nas pridobijo izvorno kodo. Novejše različice Audacity od 1.3.3 vključujejo tudi GPL v sami aplikaciji, v pogovornem oknu O Audacity.</p>"
 
 #: about/license_t.php:48
 msgid "<p>We would appreciate your linking to our website: <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> so your users can download updated versions of Audacity when released. Also, please subscribe to the notifications list at the bottom of <a href=\"http://audacity.sourceforge.net\">http://audacity.sourceforge.net</a> to ensure you are notified of and can distribute the latest version of Audacity.</p>"
@@ -1306,15 +1312,15 @@
 
 #: about/license_t.php:50
 msgid "<p>If possible, please include the Audacity documentation from <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a> with your distribution, to reduce the number of queries we receive. Also, please make it clear in your documentation that the Audacity Team cannot offer support on your own your product, only on Audacity. </p>"
-msgstr ""
+msgstr "<p>Če je le mogoče, vključite v svojo distribucijo dokumentacijo Audacity z naslova <a href=\"http://audacity.sourceforge.net/help/documentation\">http://audacity.sourceforge.net/help/documentation</a>, tako da zmanjšate število povpraševanj, ki jih prejemamo. Prav tako vas prosimo, da v svoji dokumentaciji jasno razložite, da ekipa Audacity ne more zagotoviti podpore za vaš lasten izdelek, le za Audacity. </p>"
 
 #: about/license_t.php:52
 msgid "<p>IMPORTANT: If you write your own documentation on Audacity, please let us review it for possible errors, <em>before</em> you publish it.</p>"
-msgstr ""
+msgstr "<p>POMEMBNO: Če pišete lastno dokumentacijo o Audacity, nam jo, prosimo, dajte v pregled za odpravo morebitnih napak, <em>preden</em> jo objavite.</p>"
 
 #: about/license_t.php:54
 msgid "<p>If you modify Audacity without the express permission of the Audacity Team, you do not have the right to use the name Audacity, which is registered trademark of Dominic Mazzoni.  You must rename the product and provide all of your own technical support.</p>"
-msgstr ""
+msgstr "<p>Če spreminjate Audacity brez izrecnega dovoljenja ekipe Audacity, nimate pravice uporabljati imena Audacity, ki je registrirana blagovna znamka Dominica Mazzonija.  Izdelek morate poimenovati drugače in ponuditi lastno tehnično pomoč.</p>"
 
 #: about/license_t.php:56
 msgid ""
@@ -1346,11 +1352,11 @@
 
 #: about/license_t.php:78
 msgid "<p>You may not advertise yourself or your business as an authorized distributor of Audacity. The name Audacity is a registered trademark of Dominic Mazzoni.</p>"
-msgstr ""
+msgstr "<p>Sebe ali svojega podjetja ne smete oglaševati kot avtoriziranega distributerja Audacity. Ime Audacity je registrirana blagovna znamka Dominica Mazzonija.</p>"
 
 #: about/license_t.php:80
 msgid "<p>See <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Advice for Vendors</a> on the <a href=\"http://audacityteam.org/wiki\">Audacity Wiki</a> for further advice.</p>"
-msgstr ""
+msgstr "<p>Oglejte si <a href=\"http://audacityteam.org/wiki/index.php?title=AudacityVendors#Advice_for_Vendors\">Nasvet za prodajalce</a> na <a href=\"http://audacityteam.org/wiki\">wikiju Audacity</a> za nadaljnje nasvete.</p>"
 
 #: about/news.php:21
 #: index.php:112
@@ -5100,7 +5106,7 @@
 
 #: index.php:53
 msgid "The latest release of Audacity is <a href=\"/download\">1.3.4 (beta)</a>. Because it is a work in progress and does not yet come with complete documentation or translations into foreign languages, it is recommended for more advanced users. See <a href=\"/download/features-1.3-a\">New Features in 1.3</a> for more information about the 1.3.x beta series."
-msgstr ""
+msgstr "Najnovejša različica Audacity je <a href=\"/download\">1.3.4 (beta)</a>. Ker gre za delo v nastajanju in ker še nima popolne dokumentacije ali prevodov v druge jezike, jo svetujemo le naprednejšim uporabnikom. Oglejte si <a href=\"/download/features-1.3-a\">Nove odlike v 1.3</a> za več podatkov o nizu izdaj 1.3.x beta."
 
 #: index.php:55
 msgid "For all users, <a href=\"/download\">Audacity 1.2.6</a> is a stable release, complete and fully documented.  You can have both Audacity 1.2.6 and 1.3.3 installed simultaneously."

Update of /cvsroot/audacity/audacity-src/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv570

Modified Files:
	sl.po 
Log Message:
New Slovenian translation

Index: sl.po
===================================================================
RCS file: /cvsroot/audacity/audacity-src/locale/sl.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sl.po	15 Nov 2007 13:10:11 -0000	1.19
+++ sl.po	23 Nov 2007 11:40:44 -0000	1.20
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Audacity 1.4\n"
 "POT-Creation-Date: 2003-07-04 00:53-0700\n"
-"PO-Revision-Date: 2007-11-14 23:53+0100\n"
+"PO-Revision-Date: 2007-11-23 12:33+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@..."
 "Language-Team: Martin Srebotnjak <miles@..."
 "MIME-Version: 1.0\n"
@@ -165,8 +165,8 @@
 msgid "Output Meter"
 msgstr "Merilo izhoda"
 
-#. i18n-hint: Mac OS X shortcut should be Ctrl+,
 #. i18n-hint: Mac OS X Preferences shortcut should be Ctrl+,
+#. i18n-hint: Mac OS X shortcut should be Ctrl+,
 #: AudacityApp.cpp:734
 #: Menus.cpp:470
 msgid "&Preferences...\tCtrl+,"
@@ -382,7 +382,7 @@
 #: WaveTrack.cpp:548
 #: WaveTrack.cpp:567
 #: WaveTrack.cpp:1656
-#: effects/Effect.cpp:433
+#: effects/Effect.cpp:436
 #: export/ExportMP2.cpp:230
 #: prefs/DirectoriesPrefs.cpp:189
 #: prefs/KeyConfigPrefs.cpp:245
@@ -417,7 +417,7 @@
 msgstr "&Izberi ukaz"
 
 #: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+msgid "Stereo to Mono Effect not found"
 msgstr "Uèinka Stereo v mono ni mogoèe najti"
 
 #: BatchCommands.cpp:497
@@ -558,7 +558,7 @@
 #: Tags.cpp:783
 #: Tags.cpp:1423
 #: Tags.cpp:2023
-#: TrackPanel.cpp:3983
+#: TrackPanel.cpp:4145
 msgid "&Remove"
 msgstr "&Odstrani"
 
@@ -943,7 +943,7 @@
 msgstr "Analiza frekvence"
 
 #: FreqWindow.cpp:140
-#: TrackPanel.cpp:507
+#: TrackPanel.cpp:510
 msgid "Spectrum"
 msgstr "Spekter"
 
@@ -1117,8 +1117,8 @@
 msgstr "<p>Dobrodo¹li v Audacity "
 
 #: HelpText.cpp:134
-msgid "Let's get started!</p><p>You can click on the links below to learn how to:<ul><li>[[play|play back]] an existing sound file.<li>[[record|record]] a new sound file.<li>[[edit|edit]] sound and [[export|export]] to a sound file like MP3. <li>[[burnCD|burn to a CD]] </ul><br><br>"
-msgstr "Pa zaènimo!</p><p>Kliknite na spodnje povezave, da izveste:<ul><li>kako [[play|predvajamo]] obstojeèo zvoèno datoteko,<li>kako [[record|posnamemo]] novo zvoèno datoteko,<li>kako [[edit|zmontiramo]] zvoke in [[export|izvozimo]] v zvoèno datoteko, kot je MP3,<li>kako jih [[burncd|zapeèemo na CD]]. </ul><br><br>"
+msgid "Let's get started!</p><p>You can click on the links below to learn how to:<ul><li>[[play|play back]] an existing sound file.<li>[[record|record]] a new sound file.<li>[[edit|edit]] sound and [[export|export]] to a sound file like MP3. <li>[[burncd|burn to a CD]] </ul><br><br>"
+msgstr "Pa zaènimo!</p><p>Kliknite na spodnje povezave, da izveste:<ul><li>kako [[play|predvajamo]] obstojeèo zvoèno datoteko;<li>kako [[record|posnamemo]] novo zvoèno datoteko;<li>kako [[edit|zmontiramo]] zvoke in jih [[export|izvozimo]] v zvoèno datoteko, kot je MP3;<li>kako jih [[burncd|zapeèemo na CD]]; </ul><br><br>"
 
 #: HelpText.cpp:142
 msgid "You can always get back to these instructions by clicking the 'Help' menu, then 'Show Welcome Message.' For more detailed reading, please read our full Help by clicking the 'Help' menu, then 'Index', or <a href=\"http://audacity.sourceforge.net/help/documentation\">download our Manual</a> in PDF format.<br><br>Welcome again to Audacity."
@@ -1126,7 +1126,7 @@
 
 #: HelpText.cpp:156
 msgid "You can either drag existing files into Audacity, or use the <b>File > Import > Audio</b> command. <b>File > Open</b> does the same, but opens a new Audacity window for any file after the first.<br/><br/>These are the main formats Audacity will play: <b>AIFF, AU, FLAC, M4A</b> (only on a Mac), <b>MP2/MP3, OGG Vorbis, WAV</b>.  If your file is in some other format see (format help). If you want to import an audio CD, see [[wiki:How to import CDs|How to import CDs]]<br><br>To start playing your audio, press the green Play button. To stop, press the yellow Stop button. You can also use spacebar to either play or stop. When you start playing again after stopping, playback resumes from its previous starting point. To change the starting point, use the <b>|&lt;&lt;</b> and <b>&gt;&gt;|</b> buttons to skip to the start or end respectively, or click anywhere in the track to restart from that point.<br><br>"
-msgstr ""
+msgstr "Obstojeèe datoteke lahko povleèete v Audacity ali pa uporabite ukaz <b>File > Uvozi > Zvok</b>. <b>Datoteka > Odpri</b> naredi enako, vendar odpre novo okno Audacity za vsako novo datoteko po prvi.<br/><br/>Sledijo glavne vrste datotek, ki jih predvaja Audacity: <b>AIFF, AU, FLAC, M4A</b> (samo na Macih), <b>MP2/MP3, OGG Vorbis, WAV</b>.  Èe je va¹a datoteka v kak¹nem drugem zapisu, si oglejte pomoè. Èe ¾elite uvoziti zvoèni CD, si oglejte [[wiki:How to import CDs|Kako uvozimo CD]]<br><br>Za zaèetek predvajanja zvoka pritisnite zeleni gumb Predvajaj. Za ustavitev predvajanja pritisnite rumeni gumb Ustavi. Uporabite lahko tudi preslednico - za predvajanje ali njegovo ustavitev. Ko po prekinitvi zaènete znova predvajati, se le-to nadaljuje od prej¹nje zaèetne toèke. Za spremembo zaèetne toèke uporabite gumba <b>|&lt;&lt;</b> in <b>&gt;&gt;|</b>, da skoèite na zaèetek oz. konec, ali pa kliknite kamor koli na sledi, da zaènete s te toèke.<br><br>"
 
 #: HelpText.cpp:179
 msgid "<b>To start recording, press the red Record button</b>. Before doing so however, there are three crucial settings you must check:<br><br>(1) The <b>Recording Device</b>, set in the Audio I/O tab of Preferences. By default Audacity will use the current system device, which is usually your inbuilt sound device, so you may not need to set this. But if you're using an external USB or Firewire device such as a USB turntable, make sure this device is selected as your recording device. <br><br>(2) The <b>input source</b> for your device, such as microphone or line-in. <ul><li><b>On Windows</b>, you normally choose your input in the dropdown selector on the right of the <b>Mixer Toolbar<b> <i>note: on Vista, you must do so at Recording Device on the Audio I/O Preferences tab.</i></li><li><b>On a Mac</b>, you normally choose input sources outside Audacity, in Apple Audio-MIDI Setup.</li></ul><i>Note: many USB or Firewire devices don't have a choice of inputs, so you can ignore this step - see the documentation for your device. <br><br>(3) <b>Input volume</b>. Before recording for real, make a test recording to set the input level, so that it's neither too soft or too loud.To do this, see this [[wiki:Recording levels|illustrated guide]] or follow these two steps: <ol><li>Turn on <b>monitoring</b>, by either double-clicking over the right-hand of the two VU Meters, or right-clicking over it and choosing \"Start Monitoring\". If you do not see the meters, click View > Toolbars and check \"Meter Toolbar\". <li>Press Record, and adjust the input volume slider on the Mixer Toolbar (by the microphone symbol), so that the red bars in the meter come close to (but do not touch) the right edge of the scale. If you can't hear the sound, go to the Audio I/O tab of Preferences and check \"Software Playthrough\". </ol><br><br>There is more help if you're stuck: our Recording FAQs, our Tutorial  <b>Your First Recording </b> in the Manual, and our Wiki [[wiki:Recording Tips|Recording Tips]], especially the [[wiki:Troubleshooting Recordings|Troubleshooting Recordings]] section. <br><br>"
@@ -1506,7 +1506,7 @@
 #: Menus.cpp:356
 #: Menus.cpp:556
 #: effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+msgid "&Stereo to Mono"
 msgstr "&Stereo v mono"
 
 #: Menus.cpp:363
@@ -2204,7 +2204,7 @@
 msgstr "Ponovitev ni izvedljiva"
 
 #: Menus.cpp:2336
-#: TrackPanel.cpp:546
+#: TrackPanel.cpp:552
 #: toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr "Izre¾i"
@@ -2224,7 +2224,7 @@
 #: Menus.cpp:2439
 #: Menus.cpp:2510
 #: Menus.cpp:2604
-#: TrackPanel.cpp:548
+#: TrackPanel.cpp:554
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr "Prilepi"
@@ -2369,7 +2369,7 @@
 msgstr "Oznaèena podroèja razdru¾evanja"
 
 #: Menus.cpp:2917
-#: TrackPanel.cpp:5859
+#: TrackPanel.cpp:6024
 msgid "Split"
 msgstr "Razdvoji"
 
@@ -2608,11 +2608,11 @@
 msgid "Note Track"
 msgstr "Notiraj sled"
 
-#: Printing.cpp:187
+#: Printing.cpp:198
 msgid "There was a problem printing."
 msgstr "Pri tiskanju je pri¹lo do te¾av."
 
-#: Printing.cpp:188
+#: Printing.cpp:199
 msgid "Print"
 msgstr "Natisni"
 
@@ -2630,13 +2630,13 @@
 msgstr "(obnovljeno)"
 
 #: Project.cpp:1472
-#: TrackPanel.cpp:770
+#: TrackPanel.cpp:776
 #: toolbars/ControlToolBar.cpp:191
 msgid "Record"
 msgstr "Posnemi"
 
 #: Project.cpp:1472
-#: TrackPanel.cpp:770
+#: TrackPanel.cpp:776
 msgid "Recorded Audio"
 msgstr "Posneti zvok"
 
@@ -2970,7 +2970,7 @@
 msgstr "V projektni datoteki je opa¾ena luknja/razmik\n"
 
 #: ShuttleGui.cpp:1852
-#: effects/Effect.cpp:339
+#: effects/Effect.cpp:342
 #: effects/audiounits/AudioUnitEffect.cpp:872
 msgid "Pre&view"
 msgstr "Pre&dogled"
@@ -3373,422 +3373,426 @@
 msgid "Specify Time"
 msgstr "Doloèite èas"
 
-#: TrackPanel.cpp:448
-#: TrackPanel.cpp:449
+#: TrackPanel.cpp:451
+#: TrackPanel.cpp:452
 msgid "Track Panel"
 msgstr "Podokno sledi"
 
-#: TrackPanel.cpp:492
+#: TrackPanel.cpp:495
 #: export/ExportPCM.cpp:133
 #: prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr "Drugo ..."
 
-#: TrackPanel.cpp:500
-#: TrackPanel.cpp:521
-#: TrackPanel.cpp:530
-#: TrackPanel.cpp:538
+#: TrackPanel.cpp:503
+#: TrackPanel.cpp:527
+#: TrackPanel.cpp:536
+#: TrackPanel.cpp:544
 msgid "Name..."
 msgstr "Ime ..."
 
-#: TrackPanel.cpp:502
-#: TrackPanel.cpp:523
-#: TrackPanel.cpp:534
+#: TrackPanel.cpp:505
+#: TrackPanel.cpp:529
 #: TrackPanel.cpp:540
+#: TrackPanel.cpp:546
 msgid "Move Track Up"
 msgstr "Premakni sled navzgor"
 
-#: TrackPanel.cpp:503
-#: TrackPanel.cpp:524
-#: TrackPanel.cpp:535
+#: TrackPanel.cpp:506
+#: TrackPanel.cpp:530
 #: TrackPanel.cpp:541
+#: TrackPanel.cpp:547
 msgid "Move Track Down"
 msgstr "Premakni sled navzdol"
 
-#: TrackPanel.cpp:505
-#: effects/ToneGen.cpp:303
+#: TrackPanel.cpp:508
+#: effects/ToneGen.cpp:325
 msgid "Waveform"
 msgstr "Signalna oblika"
 
-#: TrackPanel.cpp:506
+#: TrackPanel.cpp:509
 msgid "Waveform (dB)"
 msgstr "Signalna oblika (dB)"
 
-#: TrackPanel.cpp:508
+#: TrackPanel.cpp:512
+msgid "Spectrum log(f)"
+msgstr "Spektralni logaritem(f)"
+
+#: TrackPanel.cpp:514
 msgid "Pitch (EAC)"
 msgstr "Vi¹ina tona (EAC)"
 
-#: TrackPanel.cpp:510
-#: TrackPanel.cpp:5829
+#: TrackPanel.cpp:516
+#: TrackPanel.cpp:5994
 msgid "Mono"
 msgstr "Mono"
 
-#: TrackPanel.cpp:511
-#: TrackPanel.cpp:5828
+#: TrackPanel.cpp:517
+#: TrackPanel.cpp:5993
 msgid "Left Channel"
 msgstr "Levi kanal"
 
-#: TrackPanel.cpp:512
-#: TrackPanel.cpp:5828
+#: TrackPanel.cpp:518
+#: TrackPanel.cpp:5993
 msgid "Right Channel"
 msgstr "Desni kanal"
 
-#: TrackPanel.cpp:513
+#: TrackPanel.cpp:519
 msgid "Make Stereo Track"
 msgstr "Naredi stereo sled"
 
-#: TrackPanel.cpp:514
+#: TrackPanel.cpp:520
 msgid "Split Stereo Track"
 msgstr "Razdvoji stereo sled"
 
-#: TrackPanel.cpp:516
+#: TrackPanel.cpp:522
 msgid "Set Sample Format"
 msgstr "Nastavi obliko vzorcev"
 
-#: TrackPanel.cpp:518
-#: TrackPanel.cpp:6046
+#: TrackPanel.cpp:524
+#: TrackPanel.cpp:6223
 msgid "Set Rate"
 msgstr "Nastavi frekvenco"
 
-#: TrackPanel.cpp:526
+#: TrackPanel.cpp:532
 msgid "Up Octave"
 msgstr "Zvi¹aj za oktavo"
 
-#: TrackPanel.cpp:527
+#: TrackPanel.cpp:533
 msgid "Down Octave"
 msgstr "Zni¾aj za oktavo"
 
-#: TrackPanel.cpp:532
+#: TrackPanel.cpp:538
 msgid "Font..."
 msgstr "Pisava ..."
 
-#: TrackPanel.cpp:543
+#: TrackPanel.cpp:549
 msgid "Set Range..."
 msgstr "Nastavi podroèje ..."
 
-#: TrackPanel.cpp:547
+#: TrackPanel.cpp:553
 #: toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: TrackPanel.cpp:1237
+#: TrackPanel.cpp:1250
 msgid "Click to vertically zoom in, Shift-click to zoom out, Drag to create a particular zoom region."
 msgstr "Kliknite za navpièno poveèavo, kliknite s Shift-om za pomanj¹anje, povlecite za ustvarjanje doloèenega podroèja za poveèavo."
 
-#: TrackPanel.cpp:1242
+#: TrackPanel.cpp:1255
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr "Povlecite naslov vertikalno, da boste spremenili vrstni red posnetkov."
 
-#: TrackPanel.cpp:1262
+#: TrackPanel.cpp:1275
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr "Kliknite in povlecite, da izbolj¹ate relativno velikost stereo posnetkov."
 
-#: TrackPanel.cpp:1265
+#: TrackPanel.cpp:1278
 msgid "Click and drag to resize the track."
 msgstr "Kliknite in povlecite, da bi spremenili velikost posnetka."
 
-#: TrackPanel.cpp:1296
+#: TrackPanel.cpp:1309
 msgid "Drag one or more label boundaries"
 msgstr "Povlecite eno ali veè mej oznak"
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1310
 msgid "Drag label boundary"
 msgstr "Povlecite mejo oznake"
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1313
+#: TrackPanel.cpp:1326
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr "Veèorodni naèin: Cmd-, za nastavitve mi¹ke in tipkovnice"
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1316
+#: TrackPanel.cpp:1329
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr "Veèorodni naèin: Ctrl-P za nastavitve mi¹ke in tipkovnice"
 
-#: TrackPanel.cpp:1336
+#: TrackPanel.cpp:1349
 msgid "Click and drag to move left selection boundary."
 msgstr "Kliknite in povlecite, da bi premaknili levi okvir izbora."
 
-#: TrackPanel.cpp:1341
+#: TrackPanel.cpp:1354
 msgid "Click and drag to move right selection boundary."
 msgstr "Kliknite in povlecite, da bi premaknili desni okvir izbora."
 
-#: TrackPanel.cpp:1667
-#: TrackPanel.cpp:3775
-#: TrackPanel.cpp:3807
-#: TrackPanel.cpp:4062
-#: TrackPanel.cpp:6158
-#: TrackPanel.cpp:6178
+#: TrackPanel.cpp:1680
+#: TrackPanel.cpp:3937
+#: TrackPanel.cpp:3969
+#: TrackPanel.cpp:4224
+#: TrackPanel.cpp:6335
+#: TrackPanel.cpp:6355
 msgid "Modified Label"
 msgstr "Spremenjen naslov"
 
-#: TrackPanel.cpp:1668
-#: TrackPanel.cpp:3776
-#: TrackPanel.cpp:3808
-#: TrackPanel.cpp:4063
-#: TrackPanel.cpp:6159
-#: TrackPanel.cpp:6179
+#: TrackPanel.cpp:1681
+#: TrackPanel.cpp:3938
+#: TrackPanel.cpp:3970
+#: TrackPanel.cpp:4225
+#: TrackPanel.cpp:6336
+#: TrackPanel.cpp:6356
 msgid "Label Edit"
 msgstr "Uredi naslov"
 
-#: TrackPanel.cpp:1895
+#: TrackPanel.cpp:1908
 msgid "Adjusted envelope."
 msgstr "Optimirana kuverta."
 
-#: TrackPanel.cpp:1896
+#: TrackPanel.cpp:1909
 #: prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr "Ovojnica"
 
-#: TrackPanel.cpp:2032
+#: TrackPanel.cpp:2045
 msgid "Moved clip to another track"
 msgstr "Posnetek premaknjen na drugo sled"
 
-#: TrackPanel.cpp:2036
+#: TrackPanel.cpp:2049
 msgid "left"
 msgstr "levo"
 
-#: TrackPanel.cpp:2036
+#: TrackPanel.cpp:2049
 msgid "right"
 msgstr "desno"
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2038
+#: TrackPanel.cpp:2051
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr "Èasovno %s zamaknjene sledi/posnetki %.02f sekund"
 
-#: TrackPanel.cpp:2042
+#: TrackPanel.cpp:2055
 #: prefs/MousePrefs.cpp:111
 #: prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr "Èasovni zamik"
 
-#: TrackPanel.cpp:2735
+#: TrackPanel.cpp:2897
 msgid "Draw currently only works with linear-view waveforms."
 msgstr "Risanje trenutno deluje le z linearno prikazanimi signalnimi oblikami."
 
-#: TrackPanel.cpp:2752
+#: TrackPanel.cpp:2914
 msgid "You are not zoomed in enough. Zoom in until you can see the individual samples."
 msgstr "Niste dovolj poveèali pogleda. Poveèajte pogled, dokler ne vidite posameznih vzorcev."
 
-#: TrackPanel.cpp:3023
+#: TrackPanel.cpp:3185
 msgid "Moved Sample"
 msgstr "Premaknjeni vzorec"
 
-#: TrackPanel.cpp:3024
+#: TrackPanel.cpp:3186
 msgid "Sample Edit"
 msgstr "Urejanje vzorcev"
 
-#: TrackPanel.cpp:3123
+#: TrackPanel.cpp:3285
 #, c-format
 msgid "Removed track '%s.'"
 msgstr "Odstranjen posnetek '%s.'"
 
-#: TrackPanel.cpp:3125
+#: TrackPanel.cpp:3287
 msgid "Track Remove"
 msgstr "Odstrani sled"
 
-#: TrackPanel.cpp:3266
+#: TrackPanel.cpp:3428
 msgid "Moved gain slider"
 msgstr "Premaknjeni drsnik ojaèitve"
 
-#: TrackPanel.cpp:3266
+#: TrackPanel.cpp:3428
 msgid "Moved pan slider"
 msgstr "Premaknjeni drsnik zasuka"
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3267
-#: TrackPanel.cpp:5476
-#: TrackPanel.cpp:6827
+#: TrackPanel.cpp:3429
+#: TrackPanel.cpp:5638
+#: TrackPanel.cpp:7003
 msgid "Gain"
 msgstr "Okrepitev"
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3267
-#: TrackPanel.cpp:5414
-#: TrackPanel.cpp:6834
+#: TrackPanel.cpp:3429
+#: TrackPanel.cpp:5576
+#: TrackPanel.cpp:7010
 msgid "Pan"
 msgstr "Zasuk"
 
-#: TrackPanel.cpp:3392
-#: TrackPanel.cpp:6111
+#: TrackPanel.cpp:3554
+#: TrackPanel.cpp:6288
 #: effects/ChangePitch.cpp:284
 msgid "up"
 msgstr "navzgor"
 
-#: TrackPanel.cpp:3396
-#: TrackPanel.cpp:6112
+#: TrackPanel.cpp:3558
+#: TrackPanel.cpp:6289
 #: effects/ChangePitch.cpp:284
 msgid "down"
 msgstr "navzdol"
 
-#: TrackPanel.cpp:3403
-#: TrackPanel.cpp:6107
+#: TrackPanel.cpp:3565
+#: TrackPanel.cpp:6284
 #, c-format
 msgid "Moved '%s' %s"
 msgstr "Premaknjeno '%s' %s"
 
-#: TrackPanel.cpp:3406
-#: TrackPanel.cpp:6113
+#: TrackPanel.cpp:3568
+#: TrackPanel.cpp:6290
 msgid "Move Track"
 msgstr "Premakni sled"
 
-#: TrackPanel.cpp:3962
+#: TrackPanel.cpp:4124
 msgid "Expand"
 msgstr "Razpostri"
 
-#: TrackPanel.cpp:3962
+#: TrackPanel.cpp:4124
 msgid "Expanded Cut Line"
 msgstr "Èrta reza raz¹irjena"
 
-#: TrackPanel.cpp:3971
+#: TrackPanel.cpp:4133
 msgid "Merge"
 msgstr "Spoji"
 
-#: TrackPanel.cpp:3971
+#: TrackPanel.cpp:4133
 msgid "Merged Clips"
 msgstr "Spojeni posnetki"
 
-#: TrackPanel.cpp:3983
+#: TrackPanel.cpp:4145
 msgid "Removed Cut Line"
 msgstr "Èrta reza odstranjena"
 
-#: TrackPanel.cpp:5414
+#: TrackPanel.cpp:5576
 msgid "Adjusted Pan"
 msgstr "Prilagojeni zasuk"
 
-#: TrackPanel.cpp:5476
+#: TrackPanel.cpp:5638
 msgid "Adjusted gain"
 msgstr "Prilagojena ojaèitev"
 
-#: TrackPanel.cpp:5656
+#: TrackPanel.cpp:5821
 msgid "Can't delete track with active audio"
 msgstr "Sledi z aktivnim zvokom ni mogoèe izbrisati"
 
-#: TrackPanel.cpp:5809
+#: TrackPanel.cpp:5974
 msgid "Stereo, "
 msgstr "Stereo, "
 
-#: TrackPanel.cpp:5812
+#: TrackPanel.cpp:5977
 msgid "Mono, "
 msgstr "Mono, "
 
-#: TrackPanel.cpp:5814
+#: TrackPanel.cpp:5979
 msgid "Left, "
 msgstr "Levo, "
 
-#: TrackPanel.cpp:5816
+#: TrackPanel.cpp:5981
 msgid "Right, "
 msgstr "Desno, "
 
-#: TrackPanel.cpp:5838
-#: TrackPanel.cpp:5951
+#: TrackPanel.cpp:6003
+#: TrackPanel.cpp:6128
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr "Spremenjeno: '%s' v %s"
 
-#: TrackPanel.cpp:5843
+#: TrackPanel.cpp:6008
 msgid "Channel"
 msgstr "Kanal"
 
-#: TrackPanel.cpp:5856
+#: TrackPanel.cpp:6021
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr "Razdvoji stereo sled '%s'"
 
-#: TrackPanel.cpp:5877
+#: TrackPanel.cpp:6042
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr "Stereo posnetek '%s' narejen."
 
-#: TrackPanel.cpp:5880
+#: TrackPanel.cpp:6045
 msgid "Make Stereo"
 msgstr "Naredi stereo"
 
-#: TrackPanel.cpp:5915
+#: TrackPanel.cpp:6092
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr "Spremenjeno: '%s' v %d Hz"
 
-#: TrackPanel.cpp:5917
+#: TrackPanel.cpp:6094
 msgid "Rate Change"
 msgstr "Sprememba mere"
 
-#: TrackPanel.cpp:5955
+#: TrackPanel.cpp:6132
 msgid "Format Change"
 msgstr "Sprememba formata:"
 
-#: TrackPanel.cpp:6045
+#: TrackPanel.cpp:6222
 msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
 msgstr "Vnesite frekvenco vzorèenja v Hz (na sekundo) med 1 in 100000:"
 
-#: TrackPanel.cpp:6055
+#: TrackPanel.cpp:6232
 msgid "Invalid rate."
 msgstr "Nepravilna frekvenca."
 
-#: TrackPanel.cpp:6075
+#: TrackPanel.cpp:6252
 msgid "Change lower speed limit (%) to:"
 msgstr "Spremeni spodnjo mejo hitrosti (%) na:"
 
-#: TrackPanel.cpp:6076
-#: TrackPanel.cpp:6077
+#: TrackPanel.cpp:6253
+#: TrackPanel.cpp:6254
 msgid "Lower speed limit"
 msgstr "Spodnja meja hitrosti"
 
-#: TrackPanel.cpp:6082
+#: TrackPanel.cpp:6259
 msgid "Change upper speed limit (%) to:"
 msgstr "Spremeni zgornjo mejo hitrosti (%) na:"
 
-#: TrackPanel.cpp:6083
-#: TrackPanel.cpp:6084
+#: TrackPanel.cpp:6260
+#: TrackPanel.cpp:6261
 msgid "Upper speed limit"
 msgstr "Zgornja meja hitrosti"
 
-#: TrackPanel.cpp:6092
+#: TrackPanel.cpp:6269
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr "Nastavi obmoèje na '%d' - '%d'"
 
-#: TrackPanel.cpp:6095
+#: TrackPanel.cpp:6272
 msgid "Set Range"
 msgstr "Nastavi podroèje"
 
-#: TrackPanel.cpp:6140
+#: TrackPanel.cpp:6317
 msgid "Change track name to:"
 msgstr "Spremeni naslov posnetka v:"
 
-#: TrackPanel.cpp:6141
+#: TrackPanel.cpp:6318
 msgid "Track Name"
 msgstr "Ime sledi"
 
-#: TrackPanel.cpp:6144
+#: TrackPanel.cpp:6321
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr "Preimenovano '%s' v '%s'"
 
-#: TrackPanel.cpp:6147
+#: TrackPanel.cpp:6324
 msgid "Name Change"
 msgstr "Sprememba imena"
 
-#: TrackPanel.cpp:6213
+#: TrackPanel.cpp:6390
 msgid "Label Track Font"
 msgstr "Pisava naslova sledi"
 
-#: TrackPanel.cpp:6225
+#: TrackPanel.cpp:6402
 msgid "Face name"
 msgstr "Ime pisave"
 
-#: TrackPanel.cpp:6234
+#: TrackPanel.cpp:6411
 msgid "Face size"
 msgstr "Velikost pisave"
 
-#: TrackPanel.cpp:6754
+#: TrackPanel.cpp:6930
 msgid "Mute"
 msgstr "Uti¹aj"
 
-#: TrackPanel.cpp:6754
+#: TrackPanel.cpp:6930
 msgid "Solo"
 msgstr "Solo"
 
@@ -4286,8 +4290,8 @@
 
 #: effects/DtmfGen.cpp:444
 #: effects/Noise.cpp:255
-#: effects/ToneGen.cpp:306
-#: effects/ToneGen.cpp:342
+#: effects/ToneGen.cpp:328
+#: effects/ToneGen.cpp:364
 msgid "Amplitude (0-1)"
 msgstr "Amplituda (0-1)"
 
@@ -4362,15 +4366,15 @@
 msgid "Performing Echo"
 msgstr "Izvajanje odmeva"
 
-#: effects/Effect.cpp:387
+#: effects/Effect.cpp:390
 msgid "Preparing preview"
 msgstr "Priprava predposlu¹anja"
 
-#: effects/Effect.cpp:416
+#: effects/Effect.cpp:419
 msgid "Previewing"
 msgstr "Predposlu¹anje"
 
-#: effects/Effect.cpp:432
+#: effects/Effect.cpp:435
 msgid "Error while opening sound device. Please check the output device settings and the project sample rate."
 msgstr "Napaka pri odpiranju zvoène naprave. Prosimo preverite nastavitve izhodne naprave in mero vzorèenja projekta."
 
@@ -4916,79 +4920,92 @@
 msgstr "Izvajanje Èistilca konic ..."
 
 #: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
-msgstr "Pretvorba sterea v mono"
+msgid "Applying Stereo to Mono"
+msgstr "Izvajanje pretvorbe sterea v mono"
 
-#: effects/ToneGen.cpp:59
+#: effects/ToneGen.cpp:65
 #, c-format
 msgid "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, %.6lf seconds"
 msgstr "Uporabljen uèinek: Ustvari %s valovanja %s, frekvenca = %.2f Hz, amplituda = %.2f, %.6lf sekund"
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:74
+#: widgets/Meter.cpp:362
+msgid "Linear"
+msgstr "Linearno"
+
+#: effects/ToneGen.cpp:75
+msgid "Logarithmic"
+msgstr "Logaritemsko"
+
+#: effects/ToneGen.cpp:77
 msgid "Chirp Generator"
 msgstr "Ustvari pisk"
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:77
 msgid "Tone Generator"
 msgstr "Ustvari ton"
 
-#: effects/ToneGen.cpp:67
+#: effects/ToneGen.cpp:78
 msgid "Sine"
 msgstr "Sinusni"
 
-#: effects/ToneGen.cpp:68
+#: effects/ToneGen.cpp:79
 msgid "Square"
 msgstr "Kvadratni"
 
-#: effects/ToneGen.cpp:69
+#: effects/ToneGen.cpp:80
 msgid "Sawtooth"
 msgstr "Zobati"
 
-#: effects/ToneGen.cpp:70
+#: effects/ToneGen.cpp:81
 msgid "Square, no alias"
 msgstr "Kvadratni, brez aliasa"
 
-#: effects/ToneGen.cpp:305
-#: effects/ToneGen.cpp:340
+#: effects/ToneGen.cpp:327
+#: effects/ToneGen.cpp:362
 msgid "Frequency (Hz)"
 msgstr "Frekvenca (Hz)"
 
-#: effects/ToneGen.cpp:307
-#: effects/ToneGen.cpp:348
+#: effects/ToneGen.cpp:329
+#: effects/ToneGen.cpp:373
 #: toolbars/SelectionBar.cpp:147
 #: toolbars/SelectionBar.cpp:241
 msgid "Length"
 msgstr "Dol¾ina"
 
-#: effects/ToneGen.cpp:331
+#: effects/ToneGen.cpp:353
 msgid "Waveform:"
 msgstr "Signalna oblika:"
 
-#: effects/ToneGen.cpp:338
+#: effects/ToneGen.cpp:360
 #: toolbars/ControlToolBar.cpp:185
 msgid "Start"
 msgstr "Zaèetek"
 
-#: effects/ToneGen.cpp:339
+#: effects/ToneGen.cpp:361
 #: toolbars/ControlToolBar.cpp:188
 #: toolbars/SelectionBar.cpp:141
 #: toolbars/SelectionBar.cpp:242
 msgid "End"
 msgstr "Konec"
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.cpp:371
+msgid "Interpolation:"
+msgstr "Interpolacija:"
+
+#: effects/ToneGen.h:40
 msgid "Chirp..."
 msgstr "Pisk ..."
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.h:40
 msgid "Tone..."
 msgstr "Ton ..."
 
-#: effects/ToneGen.h:47
+#: effects/ToneGen.h:48
 msgid "Generating Chirp"
 msgstr "Ustvarjanje piska"
 
-#: effects/ToneGen.h:47
+#: effects/ToneGen.h:48
 msgid "Generating Tone"
 msgstr "Ustvarjanje tona"
 
@@ -6019,7 +6036,7 @@
 msgid "Error parsing MIDI file."
 msgstr "Napaka pri branju datoteke MIDI."
 
-#: import/ImportMP3.cpp:78
+#: import/ImportMP3.cpp:38
 msgid "MP3 files"
 msgstr "Datoteke MP3"
 
@@ -6854,63 +6871,92 @@
 msgid "Silence level (dB):"
 msgstr "Raven ti¹ine (dB):"
 
-#: prefs/SpectrumPrefs.cpp:36
-#: prefs/SpectrumPrefs.cpp:37
+#: prefs/SpectrumPrefs.cpp:41
+#: prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
 msgstr "Spektogrami"
 
-#: prefs/SpectrumPrefs.cpp:72
+#: prefs/SpectrumPrefs.cpp:85
 msgid "FFT Size"
 msgstr "Velikost FFT"
 
-#: prefs/SpectrumPrefs.cpp:75
+#: prefs/SpectrumPrefs.cpp:88
 msgid "8 - most wideband"
 msgstr "8 - naj¹ir¹e"
 
-#: prefs/SpectrumPrefs.cpp:80
+#: prefs/SpectrumPrefs.cpp:93
 msgid "256 - default"
 msgstr "256 - privzeto"
 
-#: prefs/SpectrumPrefs.cpp:84
+#: prefs/SpectrumPrefs.cpp:101
+msgid "32768 - most narrowband"
+msgstr "32768 - najo¾je"
+
+#: prefs/SpectrumPrefs.cpp:103
 msgid "4096 - most narrowband"
 msgstr "4096 - najo¾je"
 
-#: prefs/SpectrumPrefs.cpp:90
+#: prefs/SpectrumPrefs.cpp:110
 msgid "Window type:"
 msgstr "Vrsta okna:"
 
-#: prefs/SpectrumPrefs.cpp:96
+#: prefs/SpectrumPrefs.cpp:116
 msgid "Display"
 msgstr "Prikaz"
 
-#: prefs/SpectrumPrefs.cpp:100
+#: prefs/SpectrumPrefs.cpp:120
 msgid "&Grayscale"
 msgstr "&sivinsko"
 
-#: prefs/SpectrumPrefs.cpp:103
+#: prefs/SpectrumPrefs.cpp:123
 msgid "Minimum Frequency (Hz):"
 msgstr "Najmanj¹a frekvenca (Hz):"
 
-#: prefs/SpectrumPrefs.cpp:108
+#: prefs/SpectrumPrefs.cpp:128
 msgid "Maximum Frequency (Hz):"
 msgstr "Najvi¹ja frekvenca (Hz):"
 
 #: prefs/SpectrumPrefs.cpp:134
+msgid "&Find Notes"
+msgstr "&Najdi note"
+
+#: prefs/SpectrumPrefs.cpp:135
+msgid "&Quantize Notes"
+msgstr "&Kvantiziraj note"
+
+#: prefs/SpectrumPrefs.cpp:138
+msgid "Minimum Amplitude (dB):"
+msgstr "Najmanj¹a amplituda (dB):"
+
+#: prefs/SpectrumPrefs.cpp:143
+msgid "Max. Number of Notes (1..128):"
+msgstr "Najv. ¹tevilo not (1..128):"
+
+#: prefs/SpectrumPrefs.cpp:170
 msgid "The maximum frequency must be an integer"
 msgstr "Maksimalna frekvenca mora biti ¹tevilo"
 
-#: prefs/SpectrumPrefs.cpp:138
+#: prefs/SpectrumPrefs.cpp:174
 msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
 msgstr "Najvi¹ja frekvenca mora biti med 100 Hz - 100,000 Hz"
 
-#: prefs/SpectrumPrefs.cpp:146
+#: prefs/SpectrumPrefs.cpp:182
 msgid "The minimum frequency must be an integer"
 msgstr "Najmanj¹a frekvenca mora biti pozitivno celo ¹tevilo"
 
-#: prefs/SpectrumPrefs.cpp:150
+#: prefs/SpectrumPrefs.cpp:186
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr "Najmanj¹a frekvenca mora biti vsaj 0 Hz"
 
+#: prefs/SpectrumPrefs.cpp:193
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr "Najmanj¹a amplituda (dB) mora biti celo ¹tevilo"
+
+#: prefs/SpectrumPrefs.cpp:199
+#: prefs/SpectrumPrefs.cpp:203
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr "Najveèje ¹tevilo not mora biti celo ¹tevilo v obsegu 1..128"
+
 #: prefs/ThemePrefs.cpp:62
 #: prefs/ThemePrefs.cpp:63
 msgid "Theme"
@@ -7485,10 +7531,6 @@
 msgid "Vertical Stereo"
 msgstr "Navpièni stereo"
 
-#: widgets/Meter.cpp:362
-msgid "Linear"
-msgstr "Linearen"
-
 #: widgets/Meter.cpp:371
 msgid "Preferences..."
 msgstr "Nastavitve ..."
@@ -7517,8 +7559,8 @@
 msgid " Please select an action "
 msgstr " Prosimo, izberite dejanje"
 
-#: widgets/Ruler.cpp:1138
-#: widgets/Ruler.cpp:1139
+#: widgets/Ruler.cpp:1224
+#: widgets/Ruler.cpp:1225
 msgid "Vertical Ruler"
 msgstr "Navpièno ravnilo"

Update of /cvsroot/audacity/htdocs/locale
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10198

Modified Files:
	audacity.pot 
Log Message:
updated audacity.pot file for translators download

Index: audacity.pot
===================================================================
RCS file: /cvsroot/audacity/htdocs/locale/audacity.pot,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- audacity.pot	16 Nov 2007 10:45:17 -0000	1.22
+++ audacity.pot	23 Nov 2007 10:43:43 -0000	1.23
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Audacity 1.3.3\n"
 "Report-Msgid-Bugs-To: audacity-translation@..."
-"POT-Creation-Date: 2007-11-12 09:48-0300\n"
+"POT-Creation-Date: 2007-11-21 09:18-0300\n"
 "PO-Revision-Date: 1999 and beyond\n"
 "Last-Translator: FULL NAME <audacity-translation@..."
 "Language-Team: LANGUAGE <LL@..."
@@ -354,7 +354,7 @@
 
 #: AutoRecovery.cpp:147 AutoRecovery.cpp:184 Menus.cpp:2545 Menus.cpp:4445
 #: Project.cpp:1937 Project.cpp:3296 Project.cpp:3375 WaveTrack.cpp:548
-#: WaveTrack.cpp:567 WaveTrack.cpp:1656 effects/Effect.cpp:433
+#: WaveTrack.cpp:567 WaveTrack.cpp:1656 effects/Effect.cpp:436
 #: export/ExportMP2.cpp:230 prefs/DirectoriesPrefs.cpp:189
 #: prefs/KeyConfigPrefs.cpp:245 toolbars/ControlToolBar.cpp:532
 #: toolbars/ControlToolBar.cpp:841
@@ -384,7 +384,7 @@
 msgstr ""
 
 #: BatchCommands.cpp:477
-msgid "Stereo To Mono Effect not found"
+msgid "Stereo to Mono Effect not found"
 msgstr ""
 
 #: BatchCommands.cpp:497
@@ -504,7 +504,7 @@
 msgstr ""
 
 #: BatchProcessDialog.cpp:436 LabelDialog.cpp:126 Tags.cpp:783 Tags.cpp:1423
-#: Tags.cpp:2023 TrackPanel.cpp:3983
+#: Tags.cpp:2023 TrackPanel.cpp:4145
 msgid "&Remove"
 msgstr ""
 
@@ -854,7 +854,7 @@
 msgid "Frequency Analysis"
 msgstr ""
 
-#: FreqWindow.cpp:140 TrackPanel.cpp:507
+#: FreqWindow.cpp:140 TrackPanel.cpp:510
 msgid "Spectrum"
 msgstr ""
 
@@ -1013,7 +1013,7 @@
 "Let's get started!</p><p>You can click on the links below to learn how to:"
 "<ul><li>[[play|play back]] an existing sound file.<li>[[record|record]] a "
 "new sound file.<li>[[edit|edit]] sound and [[export|export]] to a sound file "
-"like MP3. <li>[[burnCD|burn to a CD]] </ul><br><br>"
+"like MP3. <li>[[burncd|burn to a CD]] </ul><br><br>"
 msgstr ""
 
 #: HelpText.cpp:142
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #: Menus.cpp:356 Menus.cpp:556 effects/StereoToMono.h:23
-msgid "&Stereo To Mono"
+msgid "&Stereo to Mono"
 msgstr ""
 
 #: Menus.cpp:363
@@ -2179,7 +2179,7 @@
 msgid "Nothing to redo"
 msgstr ""
 
-#: Menus.cpp:2336 TrackPanel.cpp:546 toolbars/EditToolBar.cpp:133
+#: Menus.cpp:2336 TrackPanel.cpp:552 toolbars/EditToolBar.cpp:133
 msgid "Cut"
 msgstr ""
 
@@ -2195,7 +2195,7 @@
 msgid "Split-cut to the clipboard"
 msgstr ""
 
-#: Menus.cpp:2439 Menus.cpp:2510 Menus.cpp:2604 TrackPanel.cpp:548
+#: Menus.cpp:2439 Menus.cpp:2510 Menus.cpp:2604 TrackPanel.cpp:554
 #: toolbars/EditToolBar.cpp:137
 msgid "Paste"
 msgstr ""
@@ -2336,7 +2336,7 @@
 msgid "Disjoined labeled regions"
 msgstr ""
 
-#: Menus.cpp:2917 TrackPanel.cpp:5859
+#: Menus.cpp:2917 TrackPanel.cpp:6024
 msgid "Split"
 msgstr ""
 
@@ -2568,11 +2568,11 @@
 msgid "Note Track"
 msgstr ""
 
-#: Printing.cpp:187
+#: Printing.cpp:198
 msgid "There was a problem printing."
 msgstr ""
 
-#: Printing.cpp:188
+#: Printing.cpp:199
 msgid "Print"
 msgstr ""
 
@@ -2589,11 +2589,11 @@
 msgid "(Recovered)"
 msgstr ""
 
-#: Project.cpp:1472 TrackPanel.cpp:770 toolbars/ControlToolBar.cpp:191
+#: Project.cpp:1472 TrackPanel.cpp:776 toolbars/ControlToolBar.cpp:191
 msgid "Record"
 msgstr ""
 
-#: Project.cpp:1472 TrackPanel.cpp:770
+#: Project.cpp:1472 TrackPanel.cpp:776
 msgid "Recorded Audio"
 msgstr ""
 
@@ -2888,7 +2888,7 @@
 msgid "Gap detected in project file\n"
 msgstr ""
 
-#: ShuttleGui.cpp:1852 effects/Effect.cpp:339
+#: ShuttleGui.cpp:1852 effects/Effect.cpp:342
 #: effects/audiounits/AudioUnitEffect.cpp:872
 msgid "Pre&view"
 msgstr ""
@@ -3211,384 +3211,388 @@
 msgid "Specify Time"
 msgstr ""
 
-#: TrackPanel.cpp:448 TrackPanel.cpp:449
+#: TrackPanel.cpp:451 TrackPanel.cpp:452
 msgid "Track Panel"
 msgstr ""
 
-#: TrackPanel.cpp:492 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
+#: TrackPanel.cpp:495 export/ExportPCM.cpp:133 prefs/QualityPrefs.cpp:97
 msgid "Other..."
 msgstr ""
 
-#: TrackPanel.cpp:500 TrackPanel.cpp:521 TrackPanel.cpp:530 TrackPanel.cpp:538
+#: TrackPanel.cpp:503 TrackPanel.cpp:527 TrackPanel.cpp:536 TrackPanel.cpp:544
 msgid "Name..."
 msgstr ""
 
-#: TrackPanel.cpp:502 TrackPanel.cpp:523 TrackPanel.cpp:534 TrackPanel.cpp:540
+#: TrackPanel.cpp:505 TrackPanel.cpp:529 TrackPanel.cpp:540 TrackPanel.cpp:546
 msgid "Move Track Up"
 msgstr ""
 
-#: TrackPanel.cpp:503 TrackPanel.cpp:524 TrackPanel.cpp:535 TrackPanel.cpp:541
+#: TrackPanel.cpp:506 TrackPanel.cpp:530 TrackPanel.cpp:541 TrackPanel.cpp:547
 msgid "Move Track Down"
 msgstr ""
 
-#: TrackPanel.cpp:505 effects/ToneGen.cpp:303
+#: TrackPanel.cpp:508 effects/ToneGen.cpp:325
 msgid "Waveform"
 msgstr ""
 
-#: TrackPanel.cpp:506
+#: TrackPanel.cpp:509
 msgid "Waveform (dB)"
 msgstr ""
 
-#: TrackPanel.cpp:508
+#: TrackPanel.cpp:512
+msgid "Spectrum log(f)"
+msgstr ""
+
+#: TrackPanel.cpp:514
 msgid "Pitch (EAC)"
 msgstr ""
 
-#: TrackPanel.cpp:510 TrackPanel.cpp:5829
+#: TrackPanel.cpp:516 TrackPanel.cpp:5994
 msgid "Mono"
 msgstr ""
 
-#: TrackPanel.cpp:511 TrackPanel.cpp:5828
+#: TrackPanel.cpp:517 TrackPanel.cpp:5993
 msgid "Left Channel"
 msgstr ""
 
-#: TrackPanel.cpp:512 TrackPanel.cpp:5828
+#: TrackPanel.cpp:518 TrackPanel.cpp:5993
 msgid "Right Channel"
 msgstr ""
 
-#: TrackPanel.cpp:513
+#: TrackPanel.cpp:519
 msgid "Make Stereo Track"
 msgstr ""
 
-#: TrackPanel.cpp:514
+#: TrackPanel.cpp:520
 msgid "Split Stereo Track"
 msgstr ""
 
-#: TrackPanel.cpp:516
+#: TrackPanel.cpp:522
 msgid "Set Sample Format"
 msgstr ""
 
-#: TrackPanel.cpp:518 TrackPanel.cpp:6046
+#: TrackPanel.cpp:524 TrackPanel.cpp:6223
 msgid "Set Rate"
 msgstr ""
 
-#: TrackPanel.cpp:526
+#: TrackPanel.cpp:532
 msgid "Up Octave"
 msgstr ""
 
-#: TrackPanel.cpp:527
+#: TrackPanel.cpp:533
 msgid "Down Octave"
 msgstr ""
 
-#: TrackPanel.cpp:532
+#: TrackPanel.cpp:538
 msgid "Font..."
 msgstr ""
 
-#: TrackPanel.cpp:543
+#: TrackPanel.cpp:549
 msgid "Set Range..."
 msgstr ""
 
-#: TrackPanel.cpp:547 toolbars/EditToolBar.cpp:135
+#: TrackPanel.cpp:553 toolbars/EditToolBar.cpp:135
 msgid "Copy"
 msgstr ""
 
-#: TrackPanel.cpp:1237
+#: TrackPanel.cpp:1250
 msgid ""
 "Click to vertically zoom in, Shift-click to zoom out, Drag to create a "
 "particular zoom region."
 msgstr ""
 
-#: TrackPanel.cpp:1242
+#: TrackPanel.cpp:1255
 msgid "Drag the label vertically to change the order of the tracks."
 msgstr ""
 
-#: TrackPanel.cpp:1262
+#: TrackPanel.cpp:1275
 msgid "Click and drag to adjust relative size of stereo tracks."
 msgstr ""
 
-#: TrackPanel.cpp:1265
+#: TrackPanel.cpp:1278
 msgid "Click and drag to resize the track."
 msgstr ""
 
-#: TrackPanel.cpp:1296
+#: TrackPanel.cpp:1309
 msgid "Drag one or more label boundaries"
 msgstr ""
 
-#: TrackPanel.cpp:1297
+#: TrackPanel.cpp:1310
 msgid "Drag label boundary"
 msgstr ""
 
 #. i18n-hint: This string is for the Mac OS, which uses Command-, as the shortcut for Preferences
-#: TrackPanel.cpp:1313
+#: TrackPanel.cpp:1326
 msgid "Multi-Tool Mode: Cmd-, for Mouse and Keyboard Preferences"
 msgstr ""
 
 #. i18n-hint: This string is for Windows and Linux, which uses Control-P as the shortcut for Preferences
-#: TrackPanel.cpp:1316
+#: TrackPanel.cpp:1329
 msgid "Multi-Tool Mode: Ctrl-P for Mouse and Keyboard Preferences"
 msgstr ""
 
-#: TrackPanel.cpp:1336
+#: TrackPanel.cpp:1349
 msgid "Click and drag to move left selection boundary."
 msgstr ""
 
-#: TrackPanel.cpp:1341
+#: TrackPanel.cpp:1354
 msgid "Click and drag to move right selection boundary."
 msgstr ""
 
-#: TrackPanel.cpp:1667 TrackPanel.cpp:3775 TrackPanel.cpp:3807
-#: TrackPanel.cpp:4062 TrackPanel.cpp:6158 TrackPanel.cpp:6178
+#: TrackPanel.cpp:1680 TrackPanel.cpp:3937 TrackPanel.cpp:3969
+#: TrackPanel.cpp:4224 TrackPanel.cpp:6335 TrackPanel.cpp:6355
 msgid "Modified Label"
 msgstr ""
 
-#: TrackPanel.cpp:1668 TrackPanel.cpp:3776 TrackPanel.cpp:3808
-#: TrackPanel.cpp:4063 TrackPanel.cpp:6159 TrackPanel.cpp:6179
+#: TrackPanel.cpp:1681 TrackPanel.cpp:3938 TrackPanel.cpp:3970
+#: TrackPanel.cpp:4225 TrackPanel.cpp:6336 TrackPanel.cpp:6356
 msgid "Label Edit"
 msgstr ""
 
-#: TrackPanel.cpp:1895
+#: TrackPanel.cpp:1908
 msgid "Adjusted envelope."
 msgstr ""
 
-#: TrackPanel.cpp:1896 prefs/MousePrefs.cpp:115
+#: TrackPanel.cpp:1909 prefs/MousePrefs.cpp:115
 msgid "Envelope"
 msgstr ""
 
-#: TrackPanel.cpp:2032
+#: TrackPanel.cpp:2045
 msgid "Moved clip to another track"
 msgstr ""
 
-#: TrackPanel.cpp:2036
+#: TrackPanel.cpp:2049
 msgid "left"
 msgstr ""
 
-#: TrackPanel.cpp:2036
+#: TrackPanel.cpp:2049
 msgid "right"
 msgstr ""
 
 #. i18n-hint: %s is a direction like left or right
-#: TrackPanel.cpp:2038
+#: TrackPanel.cpp:2051
 #, c-format
 msgid "Time shifted tracks/clips %s %.02f seconds"
 msgstr ""
 
-#: TrackPanel.cpp:2042 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
+#: TrackPanel.cpp:2055 prefs/MousePrefs.cpp:111 prefs/MousePrefs.cpp:112
 #: prefs/MousePrefs.cpp:113
 msgid "Time-Shift"
 msgstr ""
 
-#: TrackPanel.cpp:2735
+#: TrackPanel.cpp:2897
 msgid "Draw currently only works with linear-view waveforms."
 msgstr ""
 
-#: TrackPanel.cpp:2752
+#: TrackPanel.cpp:2914
 msgid ""
 "You are not zoomed in enough. Zoom in until you can see the individual "
 "samples."
 msgstr ""
 
-#: TrackPanel.cpp:3023
+#: TrackPanel.cpp:3185
 msgid "Moved Sample"
 msgstr ""
 
-#: TrackPanel.cpp:3024
+#: TrackPanel.cpp:3186
 msgid "Sample Edit"
 msgstr ""
 
-#: TrackPanel.cpp:3123
+#: TrackPanel.cpp:3285
 #, c-format
 msgid "Removed track '%s.'"
 msgstr ""
 
-#: TrackPanel.cpp:3125
+#: TrackPanel.cpp:3287
 msgid "Track Remove"
 msgstr ""
 
-#: TrackPanel.cpp:3266
+#: TrackPanel.cpp:3428
 msgid "Moved gain slider"
 msgstr ""
 
-#: TrackPanel.cpp:3266
+#: TrackPanel.cpp:3428
 msgid "Moved pan slider"
 msgstr ""
 
 #. i18n-hint: Title of the Gain slider, used to adjust the volume
-#: TrackPanel.cpp:3267 TrackPanel.cpp:5476 TrackPanel.cpp:6827
+#: TrackPanel.cpp:3429 TrackPanel.cpp:5638 TrackPanel.cpp:7003
 msgid "Gain"
 msgstr ""
 
 #. i18n-hint: Title of the Pan slider, used to move the sound left or right stereoscopically
-#: TrackPanel.cpp:3267 TrackPanel.cpp:5414 TrackPanel.cpp:6834
+#: TrackPanel.cpp:3429 TrackPanel.cpp:5576 TrackPanel.cpp:7010
 msgid "Pan"
 msgstr ""
 
-#: TrackPanel.cpp:3392 TrackPanel.cpp:6111 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3554 TrackPanel.cpp:6288 effects/ChangePitch.cpp:284
 msgid "up"
 msgstr ""
 
-#: TrackPanel.cpp:3396 TrackPanel.cpp:6112 effects/ChangePitch.cpp:284
+#: TrackPanel.cpp:3558 TrackPanel.cpp:6289 effects/ChangePitch.cpp:284
 msgid "down"
 msgstr ""
 
-#: TrackPanel.cpp:3403 TrackPanel.cpp:6107
+#: TrackPanel.cpp:3565 TrackPanel.cpp:6284
 #, c-format
 msgid "Moved '%s' %s"
 msgstr ""
 
-#: TrackPanel.cpp:3406 TrackPanel.cpp:6113
+#: TrackPanel.cpp:3568 TrackPanel.cpp:6290
 msgid "Move Track"
 msgstr ""
 
-#: TrackPanel.cpp:3962
+#: TrackPanel.cpp:4124
 msgid "Expand"
 msgstr ""
 
-#: TrackPanel.cpp:3962
+#: TrackPanel.cpp:4124
 msgid "Expanded Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:3971
+#: TrackPanel.cpp:4133
 msgid "Merge"
 msgstr ""
 
-#: TrackPanel.cpp:3971
+#: TrackPanel.cpp:4133
 msgid "Merged Clips"
 msgstr ""
 
-#: TrackPanel.cpp:3983
+#: TrackPanel.cpp:4145
 msgid "Removed Cut Line"
 msgstr ""
 
-#: TrackPanel.cpp:5414
+#: TrackPanel.cpp:5576
 msgid "Adjusted Pan"
 msgstr ""
 
-#: TrackPanel.cpp:5476
+#: TrackPanel.cpp:5638
 msgid "Adjusted gain"
 msgstr ""
 
-#: TrackPanel.cpp:5656
+#: TrackPanel.cpp:5821
 msgid "Can't delete track with active audio"
 msgstr ""
 
-#: TrackPanel.cpp:5809
+#: TrackPanel.cpp:5974
 msgid "Stereo, "
 msgstr ""
 
-#: TrackPanel.cpp:5812
+#: TrackPanel.cpp:5977
 msgid "Mono, "
 msgstr ""
 
-#: TrackPanel.cpp:5814
+#: TrackPanel.cpp:5979
 msgid "Left, "
 msgstr ""
 
-#: TrackPanel.cpp:5816
+#: TrackPanel.cpp:5981
 msgid "Right, "
 msgstr ""
 
-#: TrackPanel.cpp:5838 TrackPanel.cpp:5951
+#: TrackPanel.cpp:6003 TrackPanel.cpp:6128
 #, c-format
 msgid "Changed '%s' to %s"
 msgstr ""
 
-#: TrackPanel.cpp:5843
+#: TrackPanel.cpp:6008
 msgid "Channel"
 msgstr ""
 
-#: TrackPanel.cpp:5856
+#: TrackPanel.cpp:6021
 #, c-format
 msgid "Split stereo track '%s'"
 msgstr ""
 
-#: TrackPanel.cpp:5877
+#: TrackPanel.cpp:6042
 #, c-format
 msgid "Made '%s' a stereo track"
 msgstr ""
 
-#: TrackPanel.cpp:5880
+#: TrackPanel.cpp:6045
 msgid "Make Stereo"
 msgstr ""
 
-#: TrackPanel.cpp:5915
+#: TrackPanel.cpp:6092
 #, c-format
 msgid "Changed '%s' to %d Hz"
 msgstr ""
 
-#: TrackPanel.cpp:5917
+#: TrackPanel.cpp:6094
 msgid "Rate Change"
 msgstr ""
 
-#: TrackPanel.cpp:5955
+#: TrackPanel.cpp:6132
 msgid "Format Change"
 msgstr ""
 
-#: TrackPanel.cpp:6045
+#: TrackPanel.cpp:6222
 msgid "Enter a sample rate in Hz (per second) between 1 and 100000:"
 msgstr ""
 
-#: TrackPanel.cpp:6055
+#: TrackPanel.cpp:6232
 msgid "Invalid rate."
 msgstr ""
 
-#: TrackPanel.cpp:6075
+#: TrackPanel.cpp:6252
 msgid "Change lower speed limit (%) to:"
 msgstr ""
 
-#: TrackPanel.cpp:6076 TrackPanel.cpp:6077
+#: TrackPanel.cpp:6253 TrackPanel.cpp:6254
 msgid "Lower speed limit"
 msgstr ""
 
-#: TrackPanel.cpp:6082
+#: TrackPanel.cpp:6259
 msgid "Change upper speed limit (%) to:"
 msgstr ""
 
-#: TrackPanel.cpp:6083 TrackPanel.cpp:6084
+#: TrackPanel.cpp:6260 TrackPanel.cpp:6261
 msgid "Upper speed limit"
 msgstr ""
 
-#: TrackPanel.cpp:6092
+#: TrackPanel.cpp:6269
 #, c-format
 msgid "Set range to '%d' - '%d'"
 msgstr ""
 
-#: TrackPanel.cpp:6095
+#: TrackPanel.cpp:6272
 msgid "Set Range"
 msgstr ""
 
-#: TrackPanel.cpp:6140
+#: TrackPanel.cpp:6317
 msgid "Change track name to:"
 msgstr ""
 
-#: TrackPanel.cpp:6141
+#: TrackPanel.cpp:6318
 msgid "Track Name"
 msgstr ""
 
-#: TrackPanel.cpp:6144
+#: TrackPanel.cpp:6321
 #, c-format
 msgid "Renamed '%s' to '%s'"
 msgstr ""
 
-#: TrackPanel.cpp:6147
+#: TrackPanel.cpp:6324
 msgid "Name Change"
 msgstr ""
 
-#: TrackPanel.cpp:6213
+#: TrackPanel.cpp:6390
 msgid "Label Track Font"
 msgstr ""
 
-#: TrackPanel.cpp:6225
+#: TrackPanel.cpp:6402
 msgid "Face name"
 msgstr ""
 
-#: TrackPanel.cpp:6234
+#: TrackPanel.cpp:6411
 msgid "Face size"
 msgstr ""
 
-#: TrackPanel.cpp:6754
+#: TrackPanel.cpp:6930
 msgid "Mute"
 msgstr ""
 
-#: TrackPanel.cpp:6754
+#: TrackPanel.cpp:6930
 msgid "Solo"
 msgstr ""
 
@@ -4060,8 +4064,8 @@
 msgid "DTMF sequence:"
 msgstr ""
 
-#: effects/DtmfGen.cpp:444 effects/Noise.cpp:255 effects/ToneGen.cpp:306
-#: effects/ToneGen.cpp:342
+#: effects/DtmfGen.cpp:444 effects/Noise.cpp:255 effects/ToneGen.cpp:328
+#: effects/ToneGen.cpp:364
 msgid "Amplitude (0-1)"
 msgstr ""
 
@@ -4134,15 +4138,15 @@
 msgid "Performing Echo"
 msgstr ""
 
-#: effects/Effect.cpp:387
+#: effects/Effect.cpp:390
 msgid "Preparing preview"
 msgstr ""
 
-#: effects/Effect.cpp:416
+#: effects/Effect.cpp:419
 msgid "Previewing"
 msgstr ""
 
-#: effects/Effect.cpp:432
+#: effects/Effect.cpp:435
 msgid ""
 "Error while opening sound device. Please check the output device settings "
 "and the project sample rate."
@@ -4675,75 +4679,87 @@
 msgstr ""
 
 #: effects/StereoToMono.h:32
-msgid "Applying Stereo To Mono"
+msgid "Applying Stereo to Mono"
 msgstr ""
 
-#: effects/ToneGen.cpp:59
+#: effects/ToneGen.cpp:65
 #, c-format
 msgid ""
 "Applied effect: Generate %s wave %s, frequency = %.2f Hz, amplitude = %.2f, "
 "%.6lf seconds"
 msgstr ""
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:74 widgets/Meter.cpp:362
+msgid "Linear"
+msgstr ""
+
+#: effects/ToneGen.cpp:75
+msgid "Logarithmic"
+msgstr ""
+
+#: effects/ToneGen.cpp:77
 msgid "Chirp Generator"
 msgstr ""
 
-#: effects/ToneGen.cpp:66
+#: effects/ToneGen.cpp:77
 msgid "Tone Generator"
 msgstr ""
 
-#: effects/ToneGen.cpp:67
+#: effects/ToneGen.cpp:78
 msgid "Sine"
 msgstr ""
 
-#: effects/ToneGen.cpp:68
+#: effects/ToneGen.cpp:79
 msgid "Square"
 msgstr ""
 
-#: effects/ToneGen.cpp:69
+#: effects/ToneGen.cpp:80
 msgid "Sawtooth"
 msgstr ""
 
-#: effects/ToneGen.cpp:70
+#: effects/ToneGen.cpp:81
 msgid "Square, no alias"
 msgstr ""
 
-#: effects/ToneGen.cpp:305 effects/ToneGen.cpp:340
+#: effects/ToneGen.cpp:327 effects/ToneGen.cpp:362
 msgid "Frequency (Hz)"
 msgstr ""
 
-#: effects/ToneGen.cpp:307 effects/ToneGen.cpp:348
+#: effects/ToneGen.cpp:329 effects/ToneGen.cpp:373
 #: toolbars/SelectionBar.cpp:147 toolbars/SelectionBar.cpp:241
 msgid "Length"
 msgstr ""
 
-#: effects/ToneGen.cpp:331
+#: effects/ToneGen.cpp:353
 msgid "Waveform:"
 msgstr ""
 
-#: effects/ToneGen.cpp:338 toolbars/ControlToolBar.cpp:185
+#: effects/ToneGen.cpp:360 toolbars/ControlToolBar.cpp:185
 msgid "Start"
 msgstr ""
 
-#: effects/ToneGen.cpp:339 toolbars/ControlToolBar.cpp:188
+#: effects/ToneGen.cpp:361 toolbars/ControlToolBar.cpp:188
 #: toolbars/SelectionBar.cpp:141 toolbars/SelectionBar.cpp:242
 msgid "End"
 msgstr ""
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.cpp:371
+msgid "Interpolation:"
+msgstr ""
+
+#: effects/ToneGen.h:40
 msgid "Chirp..."
 msgstr ""
 
-#: effects/ToneGen.h:39
+#: effects/ToneGen.h:40
 msgid "Tone..."
 msgstr ""
 
-#: effects/ToneGen.h:47
+#: effects/ToneGen.h:48
 msgid "Generating Chirp"
 msgstr ""
 
-#: effects/ToneGen.h:47
+#: effects/ToneGen.h:48
 msgid "Generating Tone"
 msgstr ""
 
@@ -5726,7 +5742,7 @@
 msgid "Error parsing MIDI file."
 msgstr ""
 
-#: import/ImportMP3.cpp:78
+#: import/ImportMP3.cpp:38
 msgid "MP3 files"
 msgstr ""
 
@@ -6516,62 +6532,90 @@
 msgid "Silence level (dB):"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:36 prefs/SpectrumPrefs.cpp:37
+#: prefs/SpectrumPrefs.cpp:41 prefs/SpectrumPrefs.cpp:42
 msgid "Spectrograms"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:72
+#: prefs/SpectrumPrefs.cpp:85
 msgid "FFT Size"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:75
+#: prefs/SpectrumPrefs.cpp:88
 msgid "8 - most wideband"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:80
+#: prefs/SpectrumPrefs.cpp:93
 msgid "256 - default"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:84
+#: prefs/SpectrumPrefs.cpp:101
+msgid "32768 - most narrowband"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:103
 msgid "4096 - most narrowband"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:90
+#: prefs/SpectrumPrefs.cpp:110
 msgid "Window type:"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:96
+#: prefs/SpectrumPrefs.cpp:116
 msgid "Display"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:100
+#: prefs/SpectrumPrefs.cpp:120
 msgid "&Grayscale"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:103
+#: prefs/SpectrumPrefs.cpp:123
 msgid "Minimum Frequency (Hz):"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:108
+#: prefs/SpectrumPrefs.cpp:128
 msgid "Maximum Frequency (Hz):"
 msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:134
-msgid "The maximum frequency must be an integer"
+msgid "&Find Notes"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:135
+msgid "&Quantize Notes"
 msgstr ""
 
 #: prefs/SpectrumPrefs.cpp:138
+msgid "Minimum Amplitude (dB):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:143
+msgid "Max. Number of Notes (1..128):"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:170
+msgid "The maximum frequency must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:174
 msgid "Maximum frequency must be in the range 100 Hz - 100,000 Hz"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:146
+#: prefs/SpectrumPrefs.cpp:182
 msgid "The minimum frequency must be an integer"
 msgstr ""
 
-#: prefs/SpectrumPrefs.cpp:150
+#: prefs/SpectrumPrefs.cpp:186
 msgid "Minimum frequency must be at least 0 Hz"
 msgstr ""
 
+#: prefs/SpectrumPrefs.cpp:193
+msgid "The minimum amplitude (dB) must be an integer"
+msgstr ""
+
+#: prefs/SpectrumPrefs.cpp:199 prefs/SpectrumPrefs.cpp:203
+msgid "The Maximum Number of Notes must be an integer in the range 1..128"
+msgstr ""
+
 #: prefs/ThemePrefs.cpp:62 prefs/ThemePrefs.cpp:63
 msgid "Theme"
 msgstr ""
@@ -7107,10 +7151,6 @@
 msgid "Vertical Stereo"
 msgstr ""
 
-#: widgets/Meter.cpp:362
-msgid "Linear"
-msgstr ""
-
 #: widgets/Meter.cpp:371
 msgid "Preferences..."
 msgstr ""
@@ -7135,7 +7175,7 @@
 msgid " Please select an action "
 msgstr ""
 
-#: widgets/Ruler.cpp:1138 widgets/Ruler.cpp:1139
+#: widgets/Ruler.cpp:1224 widgets/Ruler.cpp:1225
 msgid "Vertical Ruler"
 msgstr ""

Update of /cvsroot/audacity/audacity-src/src/xml
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23288/xml

Modified Files:
	XMLTagHandler.cpp 
Log Message:
Fix bug where large ints were incorrectly rejected although they really where in range

Index: XMLTagHandler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/xml/XMLTagHandler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- XMLTagHandler.cpp	25 Jan 2007 03:01:11 -0000	1.10
+++ XMLTagHandler.cpp	23 Nov 2007 09:53:44 -0000	1.11
@@ -110,28 +110,32 @@
    const size_t lenMAXABS = strlen("2147483647");
    const size_t lenStrInt = strInt.Length();
 
-   unsigned long nTest;
-   wxString strTest;
-
    if (lenStrInt > (lenMAXABS + 1))
       return false;
    else if ((lenStrInt == (lenMAXABS + 1)) && (strInt[0] == '-'))
    {
-      const unsigned long digitsMAXABS[] = {2, 1, 4, 7, 4, 8, 3, 6, 4, 8};
-      for (unsigned int i = 0; i < lenMAXABS; i++) {
-         strTest = strInt[i+1];
-         if (!strTest.ToULong(&nTest) || (nTest > digitsMAXABS[i]))
-            return false;
-      }
+      const int digitsMAXABS[] = {2, 1, 4, 7, 4, 8, 3, 6, 4, 9};
+      unsigned int i;
+      for (i = 0; i < lenMAXABS; i++)
+         if (strInt[i+1] < '0' || strInt[i+1] > '9')
+            return false; // not a digit
+            
+      for (i = 0; i < lenMAXABS; i++)
+         if (strInt[i+1] - '0' < digitsMAXABS[i])
+            return true; // number is small enough
+      return false;
    }
    else if (lenStrInt == lenMAXABS)
    {
-      const unsigned long digitsMAXABS[] = {2, 1, 4, 7, 4, 8, 3, 6, 4, 7};
-      for (unsigned int i = 0; i < lenMAXABS; i++) {
-         strTest = strInt[i];
-         if (!strTest.ToULong(&nTest) || (nTest > digitsMAXABS[i]))
-            return false;
-      }
+      const int digitsMAXABS[] = {2, 1, 4, 7, 4, 8, 3, 6, 4, 8};
+      unsigned int i;
+      for (i = 0; i < lenMAXABS; i++)
+         if (strInt[i] < '0' || strInt[i+1] > '9')
+            return false; // not a digit
+      for (i = 0; i < lenMAXABS; i++)
+         if (strInt[i] - '0' < digitsMAXABS[i])
+            return true; // number is small enough
+      return false;
    }
    return true;
 }

Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4270/widgets

Modified Files:
	Meter.cpp Ruler.cpp Ruler.h 
Log Message:
EXPERIMENTAL_RULER_AUTOSIZE
Some fixes for the rulers.
If activated, the ruler's labels don't spill over,
instead all rulers are resized to fit the biggest ruler.

Andreas Micheler

Index: Ruler.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Ruler.h	18 Nov 2007 15:09:09 -0000	1.21
+++ Ruler.h	22 Nov 2007 10:16:20 -0000	1.22
@@ -83,7 +83,11 @@
    void SetFlip(bool flip);
 
    // Good defaults are provided, but you can override here
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   void SetFonts(const wxFont &minorFont, const wxFont &majorFont, const wxFont &minorMinorFont);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    void SetFonts(const wxFont &minorFont, const wxFont &majorFont);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    // The ruler will not draw text within this (pixel) range.
    // Use this if you have another graphic object obscuring part
@@ -115,11 +119,19 @@
    void FindTickSizes();
    void FindLinearTickSizes(double UPP);
    wxString LabelString(double d, bool major);
+
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   void Tick(int pos, double d, bool major, bool minor);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    void Tick(int pos, double d, bool major);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 public:
    bool mbTicksOnly;
    bool mbTicksAtExtremes;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   wxRect mRect;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 private:
    wxColour mTickColour;
@@ -128,9 +140,15 @@
    int          mMaxWidth, mMaxHeight;
    int          mLeft, mTop, mRight, mBottom, mLead;
    int          mLength;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   int          mLengthOld;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    wxDC        *mDC;
 
    wxFont      *mMinorFont, *mMajorFont;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   wxFont      *mMinorMinorFont;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    bool         mUserFonts;
 
    double       mMin, mMax;
@@ -146,7 +164,12 @@
 
    bool         mValid;
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   class Label {
+    public:
+#else !//EXPERIMENTAL_RULER_AUTOSIZE
    struct Label {
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       int pos;
       int lx, ly;
       wxString text;
@@ -156,6 +179,11 @@
    Label       *mMajorLabels;
    int          mNumMinor;
    Label       *mMinorLabels;   
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   int          mNumMinorMinor;
+   Label       *mMinorMinorLabels;   
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+
 
    int          mOrientation;
    int          mSpacing;
@@ -222,6 +250,9 @@
    void GetPlayRegion(double* playRegionStart, double* playRegionEnd);
    
    void SetProject(AudacityProject* project) {mProject = project;};
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   void GetMaxSize(wxCoord *width, wxCoord *height);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
 private:
    void OnErase(wxEraseEvent &evt);

Index: Ruler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Ruler.cpp	18 Nov 2007 15:09:09 -0000	1.45
+++ Ruler.cpp	22 Nov 2007 10:16:20 -0000	1.46
@@ -115,17 +115,27 @@
    fontSize = 8;
 #endif
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mMinorMinorFont = new wxFont(fontSize-1, wxSWISS, wxNORMAL, wxNORMAL);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    mMinorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
    mMajorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
    mUserFonts = false;
 
    #ifdef __WXMAC__
+   #ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mMinorMinorFont->SetNoAntiAliasing(true);
+   #endif //EXPERIMENTAL_RULER_AUTOSIZE
    mMinorFont->SetNoAntiAliasing(true);
    mMajorFont->SetNoAntiAliasing(true);
    #endif
 
    mMajorLabels = 0;
    mMinorLabels = 0;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mMinorMinorLabels = 0;
+   mLengthOld = 0;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    mBits = NULL;
    mUserBits = NULL;
    mUserBitLen = 0;
@@ -140,6 +150,16 @@
       delete [] mUserBits;//JKC
    delete mMinorFont;
    delete mMajorFont;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   delete mMinorMinorFont;
+
+   if (mMajorLabels)
+      delete[] mMajorLabels;
+   if (mMinorLabels)
+      delete[] mMinorLabels;
+   if (mMinorMinorLabels)
+      delete[] mMinorMinorLabels;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 void Ruler::SetFormat(RulerFormat format)
@@ -241,12 +261,22 @@
    }
 }
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+void Ruler::SetFonts(const wxFont &minorFont, const wxFont &majorFont, const wxFont &minorMinorFont)
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
 void Ruler::SetFonts(const wxFont &minorFont, const wxFont &majorFont)
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   *mMinorMinorFont = minorMinorFont;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    *mMinorFont = minorFont;
    *mMajorFont = majorFont;
 
    #ifdef __WXMAC__
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mMinorMinorFont->SetNoAntiAliasing(true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    mMinorFont->SetNoAntiAliasing(true);
    mMajorFont->SetNoAntiAliasing(true);
    #endif
@@ -309,6 +339,8 @@
    else
       mLength = mBottom-mTop;
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    if (mMajorLabels) {
       delete [] mMajorLabels;
       mMajorLabels = NULL;
@@ -317,6 +349,7 @@
       delete [] mMinorLabels;
       mMinorLabels = NULL;
    }
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    if (mBits) {
       delete [] mBits;
       mBits = NULL;
@@ -652,7 +685,11 @@
    return s;
 }
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+void Ruler::Tick(int pos, double d, bool major, bool minor)
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
 void Ruler::Tick(int pos, double d, bool major)
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 {
    wxString l;
    wxCoord strW, strH, strD, strL;
@@ -660,6 +697,10 @@
 
    // FIXME: We don't draw a tick if of end of our label arrays
    // But we shouldn't have an array of labels.
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   if( mNumMinorMinor >= mLength )
+      return;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    if( mNumMinor >= mLength )
       return;
    if( mNumMajor >= mLength )
@@ -668,15 +709,26 @@
    Label *label;
    if (major)
       label = &mMajorLabels[mNumMajor++];
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   else if (minor)
+      label = &mMinorLabels[mNumMinor++];
+   else
+      label = &mMinorMinorLabels[mNumMinorMinor++];
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    else
       label = &mMinorLabels[mNumMinor++];
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    label->pos = pos;
    label->lx = mLeft - 1000; // don't display
    label->ly = mTop - 1000;  // don't display
    label->text = wxT("");
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mDC->SetFont(major? *mMajorFont: minor? *mMinorFont : *mMinorMinorFont);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    mDC->SetFont(major? *mMajorFont: *mMinorFont);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    l = LabelString(d, major);
    mDC->GetTextExtent(l, &strW, &strH, &strD, &strL);
 
@@ -693,9 +745,13 @@
          mMaxHeight = max(mMaxHeight, strH + 4);
       }
       else {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+         strTop =-strH-mLead;
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
          strTop = mBottom - strH -6;
          // Still leaves room for an umlaut or whatever above normal character
          strTop = mTop- mLead+4;// More space was needed...
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
          mMaxHeight = max(mMaxHeight, strH + 6);
       }
    }
@@ -712,8 +768,12 @@
          mMaxWidth = max(mMaxWidth, strW + 5);
       }
       else {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+         strLeft =-strW-6;
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
          strLeft = mRight - strW - 6;
          mMaxWidth = max(mMaxWidth, strW + 6);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       }
    }
 
@@ -753,6 +813,11 @@
 
    for(i=0; i<strLen; i++)
       mBits[strPos+i] = 1;
+
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   wxRect r(strLeft, strTop, strW, strH);
+   mRect.Union(r);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 void Ruler::Update()
@@ -780,8 +845,13 @@
      else
        desiredPixelHeight = (mRight-mLeft)/2;
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+     if (desiredPixelHeight < 10)//8)
+       desiredPixelHeight = 10;//8;
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
      if (desiredPixelHeight < 8)
        desiredPixelHeight = 8;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
      if (desiredPixelHeight > 12)
        desiredPixelHeight = 12;
 
@@ -798,13 +868,19 @@
       mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL);
       mLead = strL;
 
+     if (mMajorFont)
+        delete mMajorFont;
+     mMajorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
+
      if (mMinorFont)
         delete mMinorFont;
      mMinorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
 
-     if (mMajorFont)
-        delete mMajorFont;
-     mMajorFont = new wxFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+     if (mMinorMinorFont)
+        delete mMinorMinorFont;
+     mMinorMinorFont = new wxFont(fontSize-1, wxSWISS, wxNORMAL, wxNORMAL);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    }
 
    // If ruler is being resized, we could end up with it being too small.
@@ -817,18 +893,40 @@
    if (mOrientation == wxHORIZONTAL) {
       mMaxWidth = mLength;
       mMaxHeight = 0;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+      mRect = wxRect(0,0, mLength,0);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    }
    else {
       mMaxWidth = 0;
       mMaxHeight = mLength;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+      mRect = wxRect(0,0, 0,mLength);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    }
 
    // FIXME: Surely we do not need to allocate storage for the labels?
    // We can just recompute them as we need them?
    mNumMajor = 0;
-   mMajorLabels = new Label[mLength+1];
    mNumMinor = 0;
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mNumMinorMinor = 0;
+   if (mLength!=mLengthOld) {
+      if (mMajorLabels)
+         delete[] mMajorLabels;
+      mMajorLabels = new Label[mLength+1];
+      if (mMinorLabels)
+         delete[] mMinorLabels;
+      mMinorLabels = new Label[mLength+1];
+      if (mMinorMinorLabels)
+         delete[] mMinorMinorLabels;
+      mMinorMinorLabels = new Label[mLength+1];
+      mLengthOld = mLength;
+   }
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
+   mMajorLabels = new Label[mLength+1];
    mMinorLabels = new Label[mLength+1];
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
    
    if (mBits)
       delete[] mBits;
@@ -848,14 +946,23 @@
       
       // Left and Right Edges
       if (mLabelEdges) {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+         Tick(0, mMin, true, false);
+         Tick(0, mMin, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
          Tick(0, mMin, true);
          Tick(mLength, mMax, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       }
       
       // Zero (if it's in the middle somewhere)
       if (mMin * mMax < 0.0) {
          int mid = (int)(mLength*(mMin/(mMin-mMax)) + 0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+         Tick(mid, 0.0, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
          Tick(mid, 0.0, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       }
       
       double sg = UPP > 0.0? 1.0: -1.0;
@@ -883,7 +990,11 @@
          
          if ((int)floor(sg * d / mMajor) > majorInt) {
             majorInt = (int)floor(sg * d / mMajor);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+            Tick(i, sg * majorInt * mMajor, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
             Tick(i, sg * majorInt * mMajor, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
          }
       }
          
@@ -910,14 +1021,23 @@
          
          if ((int)floor(sg * d / mMinor) > minorInt) {
             minorInt = (int)floor(sg * d / mMinor);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+            Tick(i, sg * minorInt * mMinor, false, true);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
             Tick(i, sg * minorInt * mMinor, false);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
          }
       }
       
       // Left and Right Edges
       if (mLabelEdges) {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+         Tick(0, mMin, true, false);
+         Tick(mLength, mMax, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
          Tick(0, mMin, true);
          Tick(mLength, mMax, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       }
       
    }
@@ -939,15 +1059,19 @@
       // Major ticks are the decades
 #ifdef LOGARITHMIC_SPECTRUM
       double decade = startDecade;
-		int delta=hiDecade-loDecade, steps=abs(delta);
-		double step = delta>=0 ? 10 : 0.1;
-		double rMin=wxMin(mMin, mMax), rMax=wxMax(mMin, mMax);
-		for(i=0; i<=steps; i++) 
-		{  // if(i!=0) 
-			{  val = decade;
+      int delta=hiDecade-loDecade, steps=abs(delta);
+      double step = delta>=0 ? 10 : 0.1;
+      double rMin=wxMin(mMin, mMax), rMax=wxMax(mMin, mMax);
+      for(i=0; i<=steps; i++) 
+      {  // if(i!=0) 
+         {  val = decade;
             if(val > rMin && val < rMax) {
                pos = (int)(((log10(val) - loLog)*scale)+0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
                Tick(pos, val, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
             }
          }
          decade *= step;
@@ -959,7 +1083,11 @@
             val = decade;
             if(val > mMin && val < mMax) {
                pos = (int)(((log10(val) - loLog)*scale)+0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, true, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
                Tick(pos, val, true);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
             }
          }
          decade *= 10.;
@@ -969,24 +1097,48 @@
       // Minor ticks are multiples of decades
 #ifdef LOGARITHMIC_SPECTRUM
       decade = startDecade;
-		int start, end, mstep;
-      if (delta > 0) {
-		   start=2;
-         end=10;
-         mstep=1;
-      }
-      else {
-		   start=9;
-         end=1;
-         mstep=-1;
+      float start, end, mstep;
+      if (delta > 0)
+      {  start=2; end=10; mstep=1;
+      }else
+      {  start=9; end=1; mstep=-1;
       }
-		steps++;
+      steps++;
       for(i=0; i<=steps; i++) {
          for(j=start; j!=end; j+=mstep) {
             val = decade * j;
             if(val >= rMin && val < rMax) {
                pos = (int)(((log10(val) - loLog)*scale)+0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, false, true);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, false);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+            }
+         }
+         decade *= step;
+      }
+
+      // MinorMinor ticks are multiples of decades
+      decade = startDecade;
+      if (delta > 0)
+      {  start= 1; end=10; mstep= 0.1f;
+      }else
+      {  start=10; end= 1; mstep=-0.1f;
+      }
+      steps++;
+      for(i=0; i<=steps; i++) {
+         for(float f=start; f<=end; f+=mstep) {
+            if (int(f)!=f) {
+               val = decade * f;
+               if(val >= rMin && val < rMax) {
+                  pos = (int)(((log10(val) - loLog)*scale)+0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, false, false);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
                Tick(pos, val, false);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+               }
             }
          }
          decade *= step;
@@ -998,14 +1150,52 @@
             val = decade * j;
             if(val >= mMin && val < mMax) {
                pos = (int)(((log10(val) - loLog)*scale)+0.5);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+               Tick(pos, val, false, true);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
                Tick(pos, val, false);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
             }
          }
          decade *= 10.;
       }
 #endif
    }
-   
+
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   int displacementx=0, displacementy=0;
+   if (!mFlip) {
+      if (mOrientation==wxHORIZONTAL) {
+         int d=mTop+mRect.GetHeight()+5;
+         mRect.Offset(0,d);
+         mRect.Inflate(0,5);
+         displacementx=0; 
+         displacementy=d;
+      }
+      else {
+         int d=mLeft-mRect.GetLeft()+5;
+         mRect.Offset(d,0);
+         mRect.Inflate(5,0);
+         displacementx=d;
+         displacementy=0;
+      }
+   }
+   for(i=0; i<mNumMajor; i++) {
+      mMajorLabels[i].lx+= displacementx;
+      mMajorLabels[i].ly+= displacementy;
+   }
+   for(i=0; i<mNumMinor; i++) {
+      mMinorLabels[i].lx+= displacementx;
+      mMinorLabels[i].ly+= displacementy;
+   }
+   for(i=0; i<mNumMinorMinor; i++) {
+      mMinorMinorLabels[i].lx+= displacementx;
+      mMinorMinorLabels[i].ly+= displacementy;
+   }
+   mMaxWidth = mRect.GetWidth ();
+   mMaxHeight= mRect.GetHeight();
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+
    mValid = true;
 }
 
@@ -1045,7 +1235,11 @@
          if (mFlip)
             mDC->DrawLine(mLeft, mTop, mLeft, mBottom+1);
          else
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+            mDC->DrawLine(mRect.x-mRect.width, mTop, mRect.x-mRect.width, mBottom+1);
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
             mDC->DrawLine(mRight, mTop, mRight, mBottom+1);
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
       }
    }
 
@@ -1120,6 +1314,41 @@
                        mMinorLabels[i].lx,
                        mMinorLabels[i].ly);
    }
+
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mDC->SetFont(*mMinorMinorFont);
+
+   for(i=0; i<mNumMinorMinor; i++) {
+      int pos = mMinorMinorLabels[i].pos;
+
+      if( mbTicksAtExtremes || ((pos!=0)&&(pos!=iMaxPos)))
+      {
+         if (mOrientation == wxHORIZONTAL) 
+         {
+            if (mFlip)
+               mDC->DrawLine(mLeft + pos, mTop,
+                             mLeft + pos, mTop + 2);
+            else
+               mDC->DrawLine(mLeft + pos, mBottom - 2,
+                             mLeft + pos, mBottom);
+         }
+         else 
+         {
+            if (mFlip)
+               mDC->DrawLine(mLeft, mTop + pos,
+                             mLeft + 2, mTop + pos);
+            else
+               mDC->DrawLine(mRight - 2, mTop + pos,
+                             mRight, mTop + pos);
+         }
+      }
+
+      if (mMinorMinorLabels[i].text != wxT(""))
+         mDC->DrawText(mMinorMinorLabels[i].text,
+                       mMinorMinorLabels[i].lx,
+                       mMinorMinorLabels[i].ly);
+   }
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 void Ruler::GetMaxSize(wxCoord *width, wxCoord *height)
@@ -1134,10 +1363,18 @@
    }
 
    if (width)
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+      *width = mRect.GetWidth(); //mMaxWidth;
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
       *width = mMaxWidth;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    if (height)
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+      *height = mRect.GetHeight(); //mMaxHeight;
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
       *height = mMaxHeight;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 }
 
 
@@ -1692,6 +1929,13 @@
    }
 }
 
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+void AdornedRulerPanel::GetMaxSize(wxCoord *width, wxCoord *height)
+{
+   ruler.GetMaxSize(width, height);
+}
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+
 // Indentation settings for Vim and Emacs and unique identifier for Arch, a
 // version control system. Please do not modify past this point.
 //

Index: Meter.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Meter.cpp	7 Aug 2007 20:16:27 -0000	1.30
+++ Meter.cpp	22 Nov 2007 10:16:20 -0000	1.31
@@ -247,7 +247,11 @@
    }
 
    CreateIcon(2);
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+   mRuler.SetFonts(GetFont(), GetFont(), GetFont());
+#else //!EXPERIMENTAL_RULER_AUTOSIZE
    mRuler.SetFonts(GetFont(), GetFont());
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
 
    mTimer.SetOwner(this, OnMeterUpdateID);
    Reset(44100.0, true);